X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=e8184fabeb26483e94abadafd73bd80825bd9ae8;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=aea52105b2af9291effccaf898468c4b15c4a75b;hpb=e0fa1332f109b6455207ea701da386b2fddddf09;p=kdenlive

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index aea52105..e8184fab 100644
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -65,15 +65,15 @@ const int SHADOWEFFECT = 2;
 const int TYPEWRITEREFFECT = 3;
 
 TitleWidget::TitleWidget(const KUrl &url, const Timecode &tc, const QString &projectTitlePath, Render *render, QWidget *parent) :
-        QDialog(parent),
-        Ui::TitleWidget_UI(),
-        m_startViewport(NULL),
-        m_endViewport(NULL),
-        m_render(render),
-        m_count(0),
-        m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)),
-        m_projectTitlePath(projectTitlePath),
-        m_tc(tc)
+    QDialog(parent),
+    Ui::TitleWidget_UI(),
+    m_startViewport(NULL),
+    m_endViewport(NULL),
+    m_render(render),
+    m_count(0),
+    m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)),
+    m_projectTitlePath(projectTitlePath),
+    m_tc(tc)
 {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());
@@ -503,10 +503,11 @@ TitleWidget::TitleWidget(const KUrl &url, const Timecode &tc, const QString &pro
 
     // scale the view so that the title widget is not too big at startup
     graphicsView->scale(.5, .5);
-    if (!url.isEmpty()) loadTitle(url);
-    else {
-	prepareTools(NULL);
-	slotTextTool();
+    if (!url.isEmpty()) {
+        loadTitle(url);
+    } else {
+        prepareTools(NULL);
+        slotTextTool();
         QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
     }
     initAnimation();
@@ -639,12 +640,14 @@ void TitleWidget::refreshTitleTemplates()
     }
     kDebug()  << titlenamelist << titlefiles;
 }
+
 void TitleWidget::templateIndexChanged(int index)
 {
     QString item = templateBox->itemData(index).toString();
     if (!item.isEmpty()) {
         if (lastDocumentHash != QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex()) {
-            if (KMessageBox::questionYesNo(this, i18n("Do you really want to load a new template? Changes in this title will be lost!")) == KMessageBox::No) return;
+            if (KMessageBox::questionYesNo(this, i18n("Do you really want to load a new template? Changes in this title will be lost!")) == KMessageBox::No)
+                return;
         }
         loadTitle(item);
 
@@ -669,9 +672,11 @@ void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
     //slotAdjustZoom();
 }
 //virtual
-void TitleWidget::keyPressEvent(QKeyEvent *e){
+void TitleWidget::keyPressEvent(QKeyEvent *e)
+{
     if(e->key()!=Qt::Key_Escape && e->key()!=Qt::Key_Return && e->key()!=Qt::Key_Enter) QDialog::keyPressEvent(e);
 }
+
 void TitleWidget::slotTextTool()
 {
     m_scene->setTool(TITLE_TEXT);
@@ -741,7 +746,7 @@ void TitleWidget::slotImageTool()
             svg->setZValue(m_count++);
             svg->setData(Qt::UserRole, url.path());
             graphicsView->scene()->addItem(svg);
-	    prepareTools(svg);
+            prepareTools(svg);
         } else {
             QPixmap pix(url.path());
             QGraphicsPixmapItem *image = new QGraphicsPixmapItem(pix);
@@ -750,7 +755,7 @@ void TitleWidget::slotImageTool()
             image->setData(Qt::UserRole, url.path());
             image->setZValue(m_count++);
             graphicsView->scene()->addItem(image);
-	    prepareTools(image);
+            prepareTools(image);
         }
     }
     m_scene->setTool(TITLE_SELECT);
@@ -1078,10 +1083,7 @@ void TitleWidget::selectionChanged()
             zUp->setEnabled(false);
             zDown->setEnabled(false);
         }
-
-
     }
-
 }
 
 void TitleWidget::slotValueChanged(int type)
@@ -1110,7 +1112,7 @@ void TitleWidget::slotValueChanged(int type)
         break;
     }
 
-    for (int k = 0; k < l.size(); k++) {
+    for (int k = 0; k < l.size(); ++k) {
         std::cout << "Type of item " << k << ": " << l.at(k)->type() << "\n";
 
         if (l.at(k)->type() == TEXTITEM) {
@@ -1429,7 +1431,7 @@ void TitleWidget::slotOriginXClicked()
 
         // Remember x axis setting
         l.at(0)->setData(TitleDocument::OriginXLeft, origin_x_left->isChecked() ?
-                         TitleDocument::AxisInverted : TitleDocument::AxisDefault);
+                             TitleDocument::AxisInverted : TitleDocument::AxisDefault);
     }
     graphicsView->setFocus();
 }
@@ -1453,7 +1455,7 @@ void TitleWidget::slotOriginYClicked()
         updateCoordinates(l.at(0));
 
         l.at(0)->setData(TitleDocument::OriginYTop, origin_y_top->isChecked() ?
-                         TitleDocument::AxisInverted : TitleDocument::AxisDefault);
+                             TitleDocument::AxisInverted : TitleDocument::AxisDefault);
 
     }
     graphicsView->setFocus();
@@ -1608,7 +1610,7 @@ void TitleWidget::slotUpdateText()
         cformat.setForeground(QBrush(color));
         cur.setCharFormat(cformat);
         cur.setBlockFormat(format);
-//  item->setTextCursor(cur);
+        //  item->setTextCursor(cur);
         cur.clearSelection();
         item->setTextCursor(cur);
         item->setDefaultTextColor(color);
@@ -1618,8 +1620,7 @@ void TitleWidget::slotUpdateText()
 void TitleWidget::rectChanged()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    int i;
-    for (i = 0; i < l.length(); ++i) {
+    for (int i = 0; i < l.length(); ++i) {
         if (l.at(i)->type() == RECTITEM && !settingUp) {
             QGraphicsRectItem *rec = static_cast<QGraphicsRectItem *>(l.at(i));
             QColor f = rectFColor->color();
@@ -1863,10 +1864,10 @@ void TitleWidget::saveTitle(KUrl url)
     QGraphicsPixmapItem pix;
     int pixmapType = pix.type();
     foreach(const QGraphicsItem *item, list) {
-	if (item->type() == pixmapType && item != m_frameImage) {
-	    embed_image = true;
-	    break;
-	}
+        if (item->type() == pixmapType && item != m_frameImage) {
+            embed_image = true;
+            break;
+        }
     }
     if (embed_image && KMessageBox::questionYesNo(this, i18n("Do you want to embed Images into this TitleDocument?\nThis is most needed for sharing Titles.")) != KMessageBox::Yes)
     {
@@ -1878,8 +1879,9 @@ void TitleWidget::saveTitle(KUrl url)
         fs->setMode(KFile::File);
         fs->setConfirmOverwrite(true);
         fs->setKeepLocation(true);
-        fs->exec();
-        if (fs) url = fs->selectedUrl();
+        if (fs->exec()) {
+            url = fs->selectedUrl();
+        }
         delete fs;
     }
     if (!url.isEmpty()) {
@@ -1993,7 +1995,7 @@ void TitleWidget::writeChoices()
     titleConfig.writeEntry("font_alpha", textAlpha->value());
     titleConfig.writeEntry("font_outline_alpha", textOutlineAlpha->value());
 #endif
-   
+
     titleConfig.writeEntry("font_outline", textOutline->value());
     titleConfig.writeEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     titleConfig.writeEntry("font_italic", buttonItalic->isChecked());
@@ -2571,127 +2573,127 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem)
         if (referenceItem->type() == TEXTITEM) {
             showToolbars(TITLE_TEXT);
             QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(referenceItem);
-	    if (!i->toPlainText().isEmpty()) {
-		// We have an existing text item selected
-		if (!i->data(100).isNull()) {
-		    // Item has an effect
-		    QStringList effdata = i->data(100).toStringList();
-		    QString effectName = effdata.takeFirst();
-		    if (effectName == "typewriter") {
-			QStringList params = effdata.at(0).split(';');
-			typewriter_delay->setValue(params.at(0).toInt());
-			typewriter_start->setValue(params.at(1).toInt());
-			effect_list->setCurrentIndex(effect_list->findData((int) TYPEWRITEREFFECT));
-			effect_stack->setHidden(false);
-		    }
-		} else {
+            if (!i->toPlainText().isEmpty()) {
+                // We have an existing text item selected
+                if (!i->data(100).isNull()) {
+                    // Item has an effect
+                    QStringList effdata = i->data(100).toStringList();
+                    QString effectName = effdata.takeFirst();
+                    if (effectName == "typewriter") {
+                        QStringList params = effdata.at(0).split(';');
+                        typewriter_delay->setValue(params.at(0).toInt());
+                        typewriter_start->setValue(params.at(1).toInt());
+                        effect_list->setCurrentIndex(effect_list->findData((int) TYPEWRITEREFFECT));
+                        effect_stack->setHidden(false);
+                    }
+                } else {
 #if QT_VERSION >= 0x040600
-		    if (i->graphicsEffect()) {
-			QGraphicsBlurEffect *blur = static_cast <QGraphicsBlurEffect *>(i->graphicsEffect());
-			if (blur) {
-			    effect_list->setCurrentIndex(effect_list->findData((int) BLUREFFECT));
-			    int rad = (int) blur->blurRadius();
-			    blur_radius->setValue(rad);
-			    effect_stack->setHidden(false);
-			} else {
-			    QGraphicsDropShadowEffect *shad = static_cast <QGraphicsDropShadowEffect *>(i->graphicsEffect());
-			    if (shad) {
-				effect_list->setCurrentIndex(effect_list->findData((int) SHADOWEFFECT));
-				shadow_radius->setValue(shad->blurRadius());
-				shadow_x->setValue(shad->xOffset());
-				shadow_y->setValue(shad->yOffset());
-				effect_stack->setHidden(false);
-			    }
-			}
-		    } else {
-			effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
-			effect_stack->setHidden(true);
-		    }
+                    if (i->graphicsEffect()) {
+                        QGraphicsBlurEffect *blur = static_cast <QGraphicsBlurEffect *>(i->graphicsEffect());
+                        if (blur) {
+                            effect_list->setCurrentIndex(effect_list->findData((int) BLUREFFECT));
+                            int rad = (int) blur->blurRadius();
+                            blur_radius->setValue(rad);
+                            effect_stack->setHidden(false);
+                        } else {
+                            QGraphicsDropShadowEffect *shad = static_cast <QGraphicsDropShadowEffect *>(i->graphicsEffect());
+                            if (shad) {
+                                effect_list->setCurrentIndex(effect_list->findData((int) SHADOWEFFECT));
+                                shadow_radius->setValue(shad->blurRadius());
+                                shadow_x->setValue(shad->xOffset());
+                                shadow_y->setValue(shad->yOffset());
+                                effect_stack->setHidden(false);
+                            }
+                        }
+                    } else {
+                        effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
+                        effect_stack->setHidden(true);
+                    }
 #else
-		    effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
-		    effect_stack->setHidden(true);
+                    effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
+                    effect_stack->setHidden(true);
 #endif
-		}
-		font_size->blockSignals(true);
-		font_family->blockSignals(true);
-		font_weight_box->blockSignals(true);
-		buttonItalic->blockSignals(true);
-		buttonUnder->blockSignals(true);
-		fontColorButton->blockSignals(true);
+                }
+                font_size->blockSignals(true);
+                font_family->blockSignals(true);
+                font_weight_box->blockSignals(true);
+                buttonItalic->blockSignals(true);
+                buttonUnder->blockSignals(true);
+                fontColorButton->blockSignals(true);
 #if not KDE_IS_VERSION(4,5,0)
-		textAlpha->blockSignals(true);
+                textAlpha->blockSignals(true);
 #endif
-		buttonAlignLeft->blockSignals(true);
-		buttonAlignRight->blockSignals(true);
-		buttonAlignNone->blockSignals(true);
-		buttonAlignCenter->blockSignals(true);
-
-		QFont font = i->font();
-		font_family->setCurrentFont(font);
-		font_size->setValue(font.pixelSize());
-		m_scene->slotUpdateFontSize(font.pixelSize());
-		buttonItalic->setChecked(font.italic());
-		buttonUnder->setChecked(font.underline());
-		setFontBoxWeight(font.weight());
-
-		QTextCursor cursor(i->document());
-		cursor.select(QTextCursor::Document);
-		QColor color = cursor.charFormat().foreground().color();
+                buttonAlignLeft->blockSignals(true);
+                buttonAlignRight->blockSignals(true);
+                buttonAlignNone->blockSignals(true);
+                buttonAlignCenter->blockSignals(true);
+
+                QFont font = i->font();
+                font_family->setCurrentFont(font);
+                font_size->setValue(font.pixelSize());
+                m_scene->slotUpdateFontSize(font.pixelSize());
+                buttonItalic->setChecked(font.italic());
+                buttonUnder->setChecked(font.underline());
+                setFontBoxWeight(font.weight());
+
+                QTextCursor cursor(i->document());
+                cursor.select(QTextCursor::Document);
+                QColor color = cursor.charFormat().foreground().color();
 #if not KDE_IS_VERSION(4,5,0)
-		textAlpha->setValue(color.alpha());
-		color.setAlpha(255);
+                textAlpha->setValue(color.alpha());
+                color.setAlpha(255);
 #endif
-		fontColorButton->setColor(color);
-
-		if (!i->data(101).isNull()) {
-		    textOutline->blockSignals(true);
-		    textOutline->setValue(i->data(101).toDouble() * 10);
-		    textOutline->blockSignals(false);
-		}
-		if (!i->data(102).isNull()) {
-		    textOutlineColor->blockSignals(true);
-		    QVariant variant = i->data(102);
-		    color = variant.value<QColor>();
+                fontColorButton->setColor(color);
+
+                if (!i->data(101).isNull()) {
+                    textOutline->blockSignals(true);
+                    textOutline->setValue(i->data(101).toDouble() * 10);
+                    textOutline->blockSignals(false);
+                }
+                if (!i->data(102).isNull()) {
+                    textOutlineColor->blockSignals(true);
+                    QVariant variant = i->data(102);
+                    color = variant.value<QColor>();
 #if not KDE_IS_VERSION(4,5,0)
-		    textOutlineAlpha->blockSignals(true);
-		    textOutlineAlpha->setValue(color.alpha());
-		    color.setAlpha(255);
-		    textOutlineAlpha->blockSignals(false);
+                    textOutlineAlpha->blockSignals(true);
+                    textOutlineAlpha->setValue(color.alpha());
+                    color.setAlpha(255);
+                    textOutlineAlpha->blockSignals(false);
 #endif
-		    textOutlineColor->setColor(color);
-		    textOutlineColor->blockSignals(false);
-		}
-		QTextCursor cur = i->textCursor();
-		QTextBlockFormat format = cur.blockFormat();
-		if (i->textWidth() == -1) buttonAlignNone->setChecked(true);
-		else if (format.alignment() == Qt::AlignHCenter) buttonAlignCenter->setChecked(true);
-		else if (format.alignment() == Qt::AlignRight) buttonAlignRight->setChecked(true);
-		else if (format.alignment() == Qt::AlignLeft) buttonAlignLeft->setChecked(true);
-
-		font_size->blockSignals(false);
-		font_family->blockSignals(false);
-		font_weight_box->blockSignals(false);
-		buttonItalic->blockSignals(false);
-		buttonUnder->blockSignals(false);
-		fontColorButton->blockSignals(false);
+                    textOutlineColor->setColor(color);
+                    textOutlineColor->blockSignals(false);
+                }
+                QTextCursor cur = i->textCursor();
+                QTextBlockFormat format = cur.blockFormat();
+                if (i->textWidth() == -1) buttonAlignNone->setChecked(true);
+                else if (format.alignment() == Qt::AlignHCenter) buttonAlignCenter->setChecked(true);
+                else if (format.alignment() == Qt::AlignRight) buttonAlignRight->setChecked(true);
+                else if (format.alignment() == Qt::AlignLeft) buttonAlignLeft->setChecked(true);
+
+                font_size->blockSignals(false);
+                font_family->blockSignals(false);
+                font_weight_box->blockSignals(false);
+                buttonItalic->blockSignals(false);
+                buttonUnder->blockSignals(false);
+                fontColorButton->blockSignals(false);
 #if not KDE_IS_VERSION(4,5,0)
-		textAlpha->blockSignals(false);
+                textAlpha->blockSignals(false);
 #endif
-		buttonAlignLeft->blockSignals(false);
-		buttonAlignRight->blockSignals(false);
-		buttonAlignNone->blockSignals(false);
-		buttonAlignCenter->blockSignals(false);
-
-		// mbt 1607: Select text if the text item is an unchanged template item.
-		if (i->property("isTemplate").isValid()) {
-		    cur.setPosition(0, QTextCursor::MoveAnchor);
-		    cur.select(QTextCursor::Document);
-		    i->setTextCursor(cur);
-		    // Make text editable now.
-		    i->grabKeyboard();
-		    i->setTextInteractionFlags(Qt::TextEditorInteraction);
-		}
-	    }
+                buttonAlignLeft->blockSignals(false);
+                buttonAlignRight->blockSignals(false);
+                buttonAlignNone->blockSignals(false);
+                buttonAlignCenter->blockSignals(false);
+
+                // mbt 1607: Select text if the text item is an unchanged template item.
+                if (i->property("isTemplate").isValid()) {
+                    cur.setPosition(0, QTextCursor::MoveAnchor);
+                    cur.select(QTextCursor::Document);
+                    i->setTextCursor(cur);
+                    // Make text editable now.
+                    i->grabKeyboard();
+                    i->setTextInteractionFlags(Qt::TextEditorInteraction);
+                }
+            }
 
             updateAxisButtons(i);
             updateCoordinates(i);
@@ -2767,3 +2769,5 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem)
     value_w->blockSignals(blockW);
     value_h->blockSignals(blockH);
 }
+
+#include "titlewidget.moc"