X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=85e230e2cb6f490a91e014dc08cb62c8597d8432;hb=7ddafe6594e2d97a28110dccae9280df65448053;hp=4bb5ddf62743c9138fc8535bc31ae1cbeabe814d;hpb=be1fcfc170760bf7de37bca27d7aa3c88ca8fa1b;p=kdenlive

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 4bb5ddf6..85e230e2 100644
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -61,15 +61,15 @@ const int SHADOWEFFECT = 2;
 const int TYPEWRITEREFFECT = 3;
 
 TitleWidget::TitleWidget(KUrl url, Timecode tc, 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());
@@ -143,7 +143,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     showToolbars(TITLE_SELECT);
 
     //If project is drop frame, set the input mask as such.
-    title_duration->setInputMask(m_tc.inputMask());
+    title_duration->setInputMask("");
+    title_duration->setValidator(m_tc.validator());
     title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration()));
 
     connect(backgroundColor, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
@@ -421,7 +422,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     m_endViewport->setData(0, m_frameWidth);
     m_endViewport->setData(1, m_frameHeight);
 
-    if (!url.isEmpty()) loadTitle(url);
+    if(!url.isEmpty()) loadTitle(url);
     else {
         slotTextTool();
         QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
@@ -474,7 +475,7 @@ QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl, bool isClone)
     titlePath.append((isClone == false) ? "title" : "clone");
     int counter = 0;
     QString path;
-    while (path.isEmpty() || QFile::exists(path)) {
+    while(path.isEmpty() || QFile::exists(path)) {
         counter++;
         path = titlePath + QString::number(counter).rightJustified(3, '0', false) + ".png";
     }
@@ -496,12 +497,12 @@ QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QStr
 QStringList TitleWidget::extractImageList(QString xml)
 {
     QStringList result;
-    if (xml.isEmpty()) return result;
+    if(xml.isEmpty()) return result;
     QDomDocument doc;
     doc.setContent(xml);
     QDomNodeList images = doc.elementsByTagName("content");
-    for (int i = 0; i < images.count(); i++) {
-        if (images.at(i).toElement().hasAttribute("url"))
+    for(int i = 0; i < images.count(); i++) {
+        if(images.at(i).toElement().hasAttribute("url"))
             result.append(images.at(i).toElement().attribute("url"));
     }
     return result;
@@ -511,12 +512,12 @@ QStringList TitleWidget::extractImageList(QString xml)
 QStringList TitleWidget::extractFontList(QString xml)
 {
     QStringList result;
-    if (xml.isEmpty()) return result;
+    if(xml.isEmpty()) return result;
     QDomDocument doc;
     doc.setContent(xml);
     QDomNodeList images = doc.elementsByTagName("content");
-    for (int i = 0; i < images.count(); i++) {
-        if (images.at(i).toElement().hasAttribute("font"))
+    for(int i = 0; i < images.count(); i++) {
+        if(images.at(i).toElement().hasAttribute("font"))
             result.append(images.at(i).toElement().attribute("font"));
     }
     return result;
@@ -530,9 +531,9 @@ void TitleWidget::refreshTitleTemplates()
     filters << "*.kdenlivetitle" ;
     titletemplates.clear();
     QStringList titleTemplates = KGlobal::dirs()->findDirs("appdata", "titles");
-    foreach(const QString &folder, titleTemplates) {
+    foreach(const QString & folder, titleTemplates) {
         QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
-        foreach(const QString &fname, filesnames) {
+        foreach(const QString & fname, filesnames) {
             //titlenamelist.append(fname);
             //titlefiles.append(KUrl(folder).path(KUrl::AddTrailingSlash) + fname);
             TitleTemplate t;
@@ -547,11 +548,24 @@ void TitleWidget::refreshTitleTemplates()
 void TitleWidget::templateIndexChanged(int index)
 {
     QString item = templateBox->itemData(index).toString();
-    if (item != "") {
-        if (lastDocumentHash != QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex()) {
-            if (KMessageBox::questionYesNo(this, i18n("Title was changed !\nDo you really want to load a new template?\nAll changes in this document are lost !!")) == KMessageBox::No) return;
+    if(item != "") {
+        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;
         }
         loadTitle(item);
+
+        // mbt 1607: Add property to distinguish between unchanged template titles and user titles.
+        // Text of unchanged template titles should be selected when clicked.
+        QList<QGraphicsItem *> list = graphicsView->scene()->items();
+        foreach(QGraphicsItem * qgItem, list) {
+            if(qgItem->type() == TEXTITEM) {
+                QGraphicsTextItem *i;
+                i = static_cast<QGraphicsTextItem *>(qgItem);
+                i->setProperty("isTemplate", "true");
+                i->setProperty("templateText", i->toHtml());
+            }
+
+        }
         lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
     }
 }
@@ -582,8 +596,8 @@ void TitleWidget::slotSelectTool()
     // Find out which toolbars need to be shown, depending on selected item
     TITLETOOL t = TITLE_SELECT;
     QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
-    if (l.size() > 0) {
-        switch (l.at(0)->type()) {
+    if(l.size() > 0) {
+        switch(l.at(0)->type()) {
         case TEXTITEM:
             t = TITLE_TEXT;
             break;
@@ -597,13 +611,13 @@ void TitleWidget::slotSelectTool()
     }
 
     enableToolbars(t);
-    if (t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) {
+    if(t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) {
         //graphicsView->centerOn(l.at(0));
         t = TITLE_SELECT;
     }
     showToolbars(t);
 
-    if (l.size() > 0) {
+    if(l.size() > 0) {
         updateCoordinates(l.at(0));
         updateDimension(l.at(0));
         updateRotZoom(l.at(0));
@@ -617,8 +631,8 @@ void TitleWidget::slotImageTool()
     // TODO: find a way to get a list of all supported image types...
     QString allExtensions = "image/gif image/jpeg image/png image/x-tga image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr";
     KUrl url = KFileDialog::getOpenUrl(KUrl(), allExtensions, this, i18n("Load Image")); //"*.svg *.png *.jpg *.jpeg *.gif *.raw"
-    if (!url.isEmpty()) {
-        if (url.path().endsWith(".svg")) {
+    if(!url.isEmpty()) {
+        if(url.path().endsWith(".svg")) {
             QGraphicsSvgItem *svg = new QGraphicsSvgItem(url.toLocalFile());
             svg->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
             svg->setZValue(m_count++);
@@ -648,7 +662,7 @@ void TitleWidget::enableToolbars(TITLETOOL toolType)
 {
     // TITLETOOL is defined in graphicsscenerectmove.h
     bool enable = false;
-    if (toolType == TITLE_RECTANGLE || toolType == TITLE_IMAGE) enable = true;
+    if(toolType == TITLE_RECTANGLE || toolType == TITLE_IMAGE) enable = true;
     value_w->setEnabled(enable);
     value_h->setEnabled(enable);
 }
@@ -660,7 +674,7 @@ void TitleWidget::checkButton(TITLETOOL toolType)
     bool bRect = false;
     bool bImage = false;
 
-    switch (toolType) {
+    switch(toolType) {
     case TITLE_SELECT:
         bSelect = true;
         break;
@@ -685,7 +699,7 @@ void TitleWidget::checkButton(TITLETOOL toolType)
 
 void TitleWidget::displayBackgroundFrame()
 {
-    if (!displayBg->isChecked()) {
+    if(!displayBg->isChecked()) {
         QPixmap bg(m_frameWidth / 2, m_frameHeight / 2);
         QPixmap pattern(20, 20);
         pattern.fill();
@@ -741,7 +755,7 @@ void TitleWidget::slotUpdateZoom(int pos)
 void TitleWidget::slotZoom(bool up)
 {
     int pos = zoom_slider->value();
-    if (up) pos++;
+    if(up) pos++;
     else pos--;
     zoom_slider->setValue(pos);
 }
@@ -809,7 +823,7 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt)
 
     tt->setData(101, outlineWidth);
     tt->setData(102, outlineColor);
-    if (outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth));
+    if(outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth));
 
     cformat.setForeground(QBrush(color));
     cur.setCharFormat(cformat);
@@ -822,7 +836,7 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt)
 void TitleWidget::setFontBoxWeight(int weight)
 {
     int index = font_weight_box->findData(weight);
-    if (index < 0) {
+    if(index < 0) {
         index = font_weight_box->findData(QFont::Normal);
     }
     font_weight_box->setCurrentIndex(index);
@@ -836,17 +850,33 @@ void TitleWidget::setCurrentItem(QGraphicsItem *item)
 void TitleWidget::zIndexChanged(int v)
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         l[0]->setZValue(v);
     }
 }
 
 void TitleWidget::selectionChanged()
 {
-    if (m_scene->tool() != TITLE_SELECT) return;
-    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if(m_scene->tool() != TITLE_SELECT) return;
+
+    QList<QGraphicsItem *> l;
+
+    // mbt 1607: One text item might have grabbed the keyboard.
+    // Ungrab it for all items that are not selected, otherwise
+    // text input would only work for the text item that grabbed
+    // the keyboard last.
+    l = graphicsView->scene()->items();
+    foreach(QGraphicsItem * item, l) {
+        if(item->type() == TEXTITEM && !item->isSelected()) {
+            QGraphicsTextItem *i = static_cast<QGraphicsTextItem *>(item);
+            i->ungrabKeyboard();
+        }
+    }
+
+    l = graphicsView->scene()->selectedItems();
     //toolBox->setItemEnabled(2, false);
     //toolBox->setItemEnabled(3, false);
+    effect_list->blockSignals(true);
     value_x->blockSignals(true);
     value_y->blockSignals(true);
     value_w->blockSignals(true);
@@ -855,30 +885,30 @@ void TitleWidget::selectionChanged()
     itemrotatex->blockSignals(true);
     itemrotatey->blockSignals(true);
     itemrotatez->blockSignals(true);
-    if (l.size() == 0) {
+    if(l.size() == 0) {
         effect_stack->setHidden(true);
         effect_frame->setEnabled(false);
         effect_list->setCurrentIndex(0);
         bool blockX = !origin_x_left->signalsBlocked();
         bool blockY = !origin_y_top->signalsBlocked();
-        if (blockX) origin_x_left->blockSignals(true);
-        if (blockY) origin_y_top->blockSignals(true);
+        if(blockX) origin_x_left->blockSignals(true);
+        if(blockY) origin_y_top->blockSignals(true);
         origin_x_left->setChecked(false);
         origin_y_top->setChecked(false);
         updateTextOriginX();
         updateTextOriginY();
         enableToolbars(TITLE_SELECT);
-        if (blockX) origin_x_left->blockSignals(false);
-        if (blockY) origin_y_top->blockSignals(false);
+        if(blockX) origin_x_left->blockSignals(false);
+        if(blockY) origin_y_top->blockSignals(false);
         itemzoom->setEnabled(false);
         itemrotatex->setEnabled(false);
         itemrotatey->setEnabled(false);
         itemrotatez->setEnabled(false);
         frame_properties->setEnabled(false);
-    } else if (l.size() == 1) {
+    } else if(l.size() == 1) {
         effect_frame->setEnabled(true);
         frame_properties->setEnabled(true);
-        if (l.at(0) != m_startViewport && l.at(0) != m_endViewport) {
+        if(l.at(0) != m_startViewport && l.at(0) != m_endViewport) {
             itemzoom->setEnabled(true);
             itemrotatex->setEnabled(true);
             itemrotatey->setEnabled(true);
@@ -890,14 +920,14 @@ void TitleWidget::selectionChanged()
             itemrotatez->setEnabled(false);
             updateInfoText();
         }
-        if (l.at(0)->type() == TEXTITEM) {
+        if(l.at(0)->type() == TEXTITEM) {
             showToolbars(TITLE_TEXT);
             QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
-            if (!i->data(100).isNull()) {
+            if(!i->data(100).isNull()) {
                 // Item has an effect
                 QStringList effdata = i->data(100).toStringList();
                 QString effectName = effdata.takeFirst();
-                if (effectName == "typewriter") {
+                if(effectName == "typewriter") {
                     QStringList params = effdata.at(0).split(';');
                     typewriter_delay->setValue(params.at(0).toInt());
                     typewriter_start->setValue(params.at(1).toInt());
@@ -906,16 +936,16 @@ void TitleWidget::selectionChanged()
                 }
             } else {
 #if QT_VERSION >= 0x040600
-                if (i->graphicsEffect()) {
+                if(i->graphicsEffect()) {
                     QGraphicsBlurEffect *blur = static_cast <QGraphicsBlurEffect *>(i->graphicsEffect());
-                    if (blur) {
+                    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) {
+                        if(shad) {
                             effect_list->setCurrentIndex(effect_list->findData((int) SHADOWEFFECT));
                             shadow_radius->setValue(shad->blurRadius());
                             shadow_x->setValue(shad->xOffset());
@@ -924,15 +954,11 @@ void TitleWidget::selectionChanged()
                         }
                     }
                 } else {
-                    effect_list->blockSignals(true);
                     effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
-                    effect_list->blockSignals(false);
                     effect_stack->setHidden(true);
                 }
 #else
-                effect_list->blockSignals(true);
                 effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT));
-                effect_list->blockSignals(false);
                 effect_stack->setHidden(true);
 #endif
             }
@@ -966,12 +992,12 @@ void TitleWidget::selectionChanged()
             color.setAlpha(255);
             fontColorButton->setColor(color);
 
-            if (!i->data(101).isNull()) {
+            if(!i->data(101).isNull()) {
                 textOutline->blockSignals(true);
-                textOutline->setValue(i->data(101).toDouble()*10);
+                textOutline->setValue(i->data(101).toDouble() * 10);
                 textOutline->blockSignals(false);
             }
-            if (!i->data(102).isNull()) {
+            if(!i->data(102).isNull()) {
                 textOutlineColor->blockSignals(true);
                 textOutlineAlpha->blockSignals(true);
                 color = QColor(i->data(102).toString());
@@ -983,10 +1009,10 @@ void TitleWidget::selectionChanged()
             }
             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);
+            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);
@@ -1000,16 +1026,26 @@ void TitleWidget::selectionChanged()
             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);
             updateDimension(i);
             enableToolbars(TITLE_TEXT);
 
-        } else if ((l.at(0))->type() == RECTITEM) {
+        } else if((l.at(0))->type() == RECTITEM) {
             showToolbars(TITLE_RECTANGLE);
             settingUp = true;
             QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
-            if (rec == m_startViewport || rec == m_endViewport) {
+            if(rec == m_startViewport || rec == m_endViewport) {
                 /*toolBox->setCurrentIndex(3);
                 toolBox->widget(0)->setEnabled(false);
                 toolBox->widget(1)->setEnabled(false);*/
@@ -1037,7 +1073,7 @@ void TitleWidget::selectionChanged()
             updateCoordinates(rec);
             updateDimension(rec);
 
-        } else if (l.at(0)->type() == IMAGEITEM) {
+        } else if(l.at(0)->type() == IMAGEITEM) {
             showToolbars(TITLE_IMAGE);
 
             updateCoordinates(l.at(0));
@@ -1052,7 +1088,7 @@ void TitleWidget::selectionChanged()
             frame_properties->setEnabled(false);
         }
         zValue->setValue((int)l.at(0)->zValue());
-        if (!l.at(0)->data(ZOOMFACTOR).isNull()) itemzoom->setValue(l.at(0)->data(ZOOMFACTOR).toInt());
+        if(!l.at(0)->data(ZOOMFACTOR).isNull()) itemzoom->setValue(l.at(0)->data(ZOOMFACTOR).toInt());
         else itemzoom->setValue((int)(m_transformations.value(l.at(0)).scalex * 100.0 + 0.5));
         itemrotatex->setValue((int)(m_transformations.value(l.at(0)).rotatex));
         itemrotatey->setValue((int)(m_transformations.value(l.at(0)).rotatey));
@@ -1066,15 +1102,19 @@ void TitleWidget::selectionChanged()
         itemrotatey->blockSignals(false);
         itemrotatez->blockSignals(false);
     }
+    // Tools working on more than one element.
+    if(l.size() > 0)
+        effect_list->blockSignals(false);
+
 }
 
 void TitleWidget::slotValueChanged(int type)
 {
     QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
-    if (l.size() > 0 && l.at(0)->type() == IMAGEITEM) {
+    if(l.size() > 0 && l.at(0)->type() == IMAGEITEM) {
 
         int val = 0;
-        switch (type) {
+        switch(type) {
         case ValueWidth:
             val = value_w->value();
             break;
@@ -1097,7 +1137,7 @@ void TitleWidget::slotValueChanged(int type)
         // Scaling factor
         double scale = 1;
 
-        switch (type) {
+        switch(type) {
         case ValueWidth:
             // Add 0.5 because otherwise incrementing by 1 might have no effect
             length = val / (cos(alpha) + 1 / phi * sin(alpha)) + 0.5;
@@ -1124,28 +1164,25 @@ void TitleWidget::slotValueChanged(int type)
     }
 }
 
-/** \brief Updates position/size of the selected item when a value
- * of an item (coordinates, size) has changed */
 void TitleWidget::slotAdjustSelectedItem()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
-        if (l.at(0)->type() == RECTITEM) {
+    if(l.size() >= 1) {
+        if(l.at(0)->type() == RECTITEM) {
             //rect item
             QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
             updatePosition(rec);
             rec->setRect(QRect(0, 0, value_w->value(), value_h->value()));
-        } else if (l.at(0)->type() == TEXTITEM) {
+        } else if(l.at(0)->type() == TEXTITEM) {
             //text item
             updatePosition(l.at(0));
-        } else if (l.at(0)->type() == IMAGEITEM) {
+        } else if(l.at(0)->type() == IMAGEITEM) {
             //image item
             updatePosition(l.at(0));
         }
     }
 }
 
-/** \brief Updates width/height int the text fields, regarding transformation matrix */
 void TitleWidget::updateDimension(QGraphicsItem *i)
 {
     value_w->blockSignals(true);
@@ -1153,7 +1190,7 @@ void TitleWidget::updateDimension(QGraphicsItem *i)
     zValue->blockSignals(true);
 
     zValue->setValue((int) i->zValue());
-    if (i->type() == IMAGEITEM) {
+    if(i->type() == IMAGEITEM) {
         // Get multipliers for rotation/scaling
 
         /*Transform t = m_transformations.value(i);
@@ -1165,11 +1202,11 @@ void TitleWidget::updateDimension(QGraphicsItem *i)
 
         value_w->setValue(i->sceneBoundingRect().width());
         value_h->setValue(i->sceneBoundingRect().height());
-    } else if (i->type() == RECTITEM) {
+    } else if(i->type() == RECTITEM) {
         QGraphicsRectItem *r = static_cast <QGraphicsRectItem *>(i);
         value_w->setValue((int) r->rect().width());
         value_h->setValue((int) r->rect().height());
-    } else if (i->type() == TEXTITEM) {
+    } else if(i->type() == TEXTITEM) {
         QGraphicsTextItem *t = static_cast <QGraphicsTextItem *>(i);
         value_w->setValue((int) t->boundingRect().width());
         value_h->setValue((int) t->boundingRect().height());
@@ -1180,19 +1217,18 @@ void TitleWidget::updateDimension(QGraphicsItem *i)
     value_h->blockSignals(false);
 }
 
-/** \brief Updates the coordinates in the text fields from the item */
 void TitleWidget::updateCoordinates(QGraphicsItem *i)
 {
     // Block signals emitted by this method
     value_x->blockSignals(true);
     value_y->blockSignals(true);
 
-    if (i->type() == TEXTITEM) {
+    if(i->type() == TEXTITEM) {
 
         QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(i);
 
         // Set the correct x coordinate value
-        if (origin_x_left->isChecked()) {
+        if(origin_x_left->isChecked()) {
             // Origin (0 point) is at m_frameWidth, coordinate axis is inverted
             value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->boundingRect().width()));
         } else {
@@ -1201,17 +1237,17 @@ void TitleWidget::updateCoordinates(QGraphicsItem *i)
         }
 
         // Same for y
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->boundingRect().height()));
         } else {
             value_y->setValue((int) rec->pos().y());
         }
 
-    } else if (i->type() == RECTITEM) {
+    } else if(i->type() == RECTITEM) {
 
         QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(i);
 
-        if (origin_x_left->isChecked()) {
+        if(origin_x_left->isChecked()) {
             // Origin (0 point) is at m_frameWidth
             value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->rect().width()));
         } else {
@@ -1219,21 +1255,21 @@ void TitleWidget::updateCoordinates(QGraphicsItem *i)
             value_x->setValue((int) rec->pos().x());
         }
 
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->rect().height()));
         } else {
             value_y->setValue((int) rec->pos().y());
         }
 
-    } else if (i->type() == IMAGEITEM) {
+    } else if(i->type() == IMAGEITEM) {
 
-        if (origin_x_left->isChecked()) {
+        if(origin_x_left->isChecked()) {
             value_x->setValue((int)(m_frameWidth - i->pos().x() - i->sceneBoundingRect().width()));
         } else {
             value_x->setValue((int) i->pos().x());
         }
 
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             value_y->setValue((int)(m_frameHeight - i->pos().y() - i->sceneBoundingRect().height()));
         } else {
             value_y->setValue((int) i->pos().y());
@@ -1255,7 +1291,7 @@ void TitleWidget::updateRotZoom(QGraphicsItem *i)
 
     Transform t = m_transformations.value(i);
 
-    if (!i->data(ZOOMFACTOR).isNull()) itemzoom->setValue(i->data(ZOOMFACTOR).toInt());
+    if(!i->data(ZOOMFACTOR).isNull()) itemzoom->setValue(i->data(ZOOMFACTOR).toInt());
     else itemzoom->setValue((int)(t.scalex * 100.0 + 0.5));
 
     itemrotatex->setValue((int)(t.rotatex));
@@ -1268,18 +1304,17 @@ void TitleWidget::updateRotZoom(QGraphicsItem *i)
     itemrotatez->blockSignals(false);
 }
 
-/** \brief Updates the position of an item by reading coordinates from the text fields */
 void TitleWidget::updatePosition(QGraphicsItem *i)
 {
-    if (i->type() == TEXTITEM) {
+    if(i->type() == TEXTITEM) {
         QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(i);
 
         int posX;
-        if (origin_x_left->isChecked()) {
-            /* Origin of the x axis is at m_frameWidth,
-             * and distance from right border of the item to the right
-             * border of the frame is taken.
-             * See comment to slotOriginXClicked().
+        if(origin_x_left->isChecked()) {
+            /*
+             * Origin of the X axis is at m_frameWidth, and distance from right
+             * border of the item to the right border of the frame is taken. See
+             * comment to slotOriginXClicked().
              */
             posX = m_frameWidth - value_x->value() - rec->boundingRect().width();
         } else {
@@ -1287,7 +1322,7 @@ void TitleWidget::updatePosition(QGraphicsItem *i)
         }
 
         int posY;
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             /* Same for y axis */
             posY = m_frameHeight - value_y->value() - rec->boundingRect().height();
         } else {
@@ -1296,19 +1331,19 @@ void TitleWidget::updatePosition(QGraphicsItem *i)
 
         rec->setPos(posX, posY);
 
-    } else if (i->type() == RECTITEM) {
+    } else if(i->type() == RECTITEM) {
 
         QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(i);
 
         int posX;
-        if (origin_x_left->isChecked()) {
+        if(origin_x_left->isChecked()) {
             posX = m_frameWidth - value_x->value() - rec->rect().width();
         } else {
             posX = value_x->value();
         }
 
         int posY;
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             posY = m_frameHeight - value_y->value() - rec->rect().height();
         } else {
             posY = value_y->value();
@@ -1316,9 +1351,9 @@ void TitleWidget::updatePosition(QGraphicsItem *i)
 
         rec->setPos(posX, posY);
 
-    } else if (i->type() == IMAGEITEM) {
+    } else if(i->type() == IMAGEITEM) {
         int posX;
-        if (origin_x_left->isChecked()) {
+        if(origin_x_left->isChecked()) {
             // Use the sceneBoundingRect because this also regards transformations like zoom
             posX = m_frameWidth - value_x->value() - i->sceneBoundingRect().width();
         } else {
@@ -1326,7 +1361,7 @@ void TitleWidget::updatePosition(QGraphicsItem *i)
         }
 
         int posY;
-        if (origin_y_top->isChecked()) {
+        if(origin_y_top->isChecked()) {
             posY = m_frameHeight - value_y->value() - i->sceneBoundingRect().height();
         } else {
             posY = value_y->value();
@@ -1340,7 +1375,7 @@ void TitleWidget::updatePosition(QGraphicsItem *i)
 
 void TitleWidget::updateTextOriginX()
 {
-    if (origin_x_left->isChecked()) {
+    if(origin_x_left->isChecked()) {
         origin_x_left->setText(i18n("\u2212X"));
     } else {
         origin_x_left->setText(i18n("+X"));
@@ -1353,7 +1388,7 @@ void TitleWidget::slotOriginXClicked()
     updateTextOriginX();
 
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         updateCoordinates(l.at(0));
 
         // Remember x axis setting
@@ -1365,7 +1400,7 @@ void TitleWidget::slotOriginXClicked()
 
 void TitleWidget::updateTextOriginY()
 {
-    if (origin_y_top->isChecked()) {
+    if(origin_y_top->isChecked()) {
         origin_y_top->setText(i18n("\u2212Y"));
     } else {
         origin_y_top->setText(i18n("+Y"));
@@ -1378,7 +1413,7 @@ void TitleWidget::slotOriginYClicked()
     updateTextOriginY();
 
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         updateCoordinates(l.at(0));
 
         l.at(0)->setData(TitleDocument::OriginYTop, origin_y_top->isChecked() ?
@@ -1395,14 +1430,14 @@ void TitleWidget::updateAxisButtons(QGraphicsItem *i)
     origin_x_left->blockSignals(true);
     origin_y_top->blockSignals(true);
 
-    if (xAxis == TitleDocument::AxisInverted) {
+    if(xAxis == TitleDocument::AxisInverted) {
         origin_x_left->setChecked(true);
     } else {
         origin_x_left->setChecked(false);
     }
     updateTextOriginX();
 
-    if (yAxis == TitleDocument::AxisInverted) {
+    if(yAxis == TitleDocument::AxisInverted) {
         origin_y_top->setChecked(true);
     } else {
         origin_y_top->setChecked(false);
@@ -1420,44 +1455,51 @@ void TitleWidget::slotChangeBackground()
     m_frameBorder->setBrush(QBrush(color));
 }
 
-/**
- * Something (yeah) has changed in our QGraphicsScene.
- */
 void TitleWidget::slotChanged()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1 && l.at(0)->type() == TEXTITEM) {
+    if(l.size() >= 1 && l.at(0)->type() == TEXTITEM) {
         textChanged(static_cast <QGraphicsTextItem *>(l.at(0)));
     }
 }
 
-/**
- * If the user has set origin_x_left (everything also for y),
- * we need to look whether a text element has been selected. If yes,
- * we need to ensure that the right border of the text field
- * remains fixed also when some text has been entered.
- *
- * This is also known as right-justified, with the difference that
- * it is not valid for text but for its boundingRect. Text may still
- * be left-justified.
- */
 void TitleWidget::textChanged(QGraphicsTextItem *i)
 {
-
+    /*
+     * If the user has set origin_x_left (the same for y), we need to look
+     * whether a text element has been selected. If yes, we need to ensure that
+     * the right border of the text field remains fixed also when some text has
+     * been entered.
+     *
+     * This is also known as right-justified, with the difference that it is not
+     * valid for text but for its boundingRect. Text may still be
+     * left-justified.
+     */
     updateDimension(i);
 
-    if (origin_x_left->isChecked() || origin_y_top->isChecked()) {
-
-        if (!i->toPlainText().isEmpty()) {
+    if(origin_x_left->isChecked() || origin_y_top->isChecked()) {
+        if(!i->toPlainText().isEmpty())
             updatePosition(i);
-        } else {
+        else {
             /*
-             * Don't do anything if the string is empty. If the position
-             * would be updated here, a newly created text field would
-             * be set to the position of the last selected text field.
+             * Don't do anything if the string is empty. If the position were
+             * updated here, a newly created text field would be set to the
+             * position of the last selected text field.
              */
         }
     }
+
+    // mbt 1607: Template text has changed; don't auto-select content anymore.
+    if(i->property("isTemplate").isValid()) {
+        if(i->property("templateText").isValid()) {
+            if(i->property("templateText") == i->toHtml()) {
+                // Unchanged, do nothing.
+            } else {
+                i->setProperty("isTemplate", QVariant::Invalid);
+                i->setProperty("templateText", QVariant::Invalid);
+            }
+        }
+    }
 }
 
 void TitleWidget::slotInsertUnicode()
@@ -1468,8 +1510,8 @@ void TitleWidget::slotInsertUnicode()
 void TitleWidget::slotInsertUnicodeString(QString text)
 {
     QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
-    if (l.size() > 0) {
-        if (l.at(0)->type() == TEXTITEM) {
+    if(l.size() > 0) {
+        if(l.at(0)->type() == TEXTITEM) {
             QGraphicsTextItem *t = static_cast <QGraphicsTextItem *>(l.at(0));
             t->textCursor().insertText(text);
         }
@@ -1491,19 +1533,19 @@ void TitleWidget::slotUpdateText()
     double outlineWidth = textOutline->value() / 10.0;
     QGraphicsTextItem* item = NULL;
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1 && l.at(0)->type() == TEXTITEM) {
+    if(l.size() == 1 && l.at(0)->type() == TEXTITEM) {
         item = static_cast <QGraphicsTextItem *>(l.at(0));
     }
-    if (!item) return;
+    if(!item) return;
     //if (item->textCursor().selection ().isEmpty())
     QTextCursor cur(item->document());
     cur.select(QTextCursor::Document);
     QTextBlockFormat format = cur.blockFormat();
-    if (buttonAlignLeft->isChecked() || buttonAlignCenter->isChecked() || buttonAlignRight->isChecked()) {
+    if(buttonAlignLeft->isChecked() || buttonAlignCenter->isChecked() || buttonAlignRight->isChecked()) {
         item->setTextWidth(item->boundingRect().width());
-        if (buttonAlignCenter->isChecked()) format.setAlignment(Qt::AlignHCenter);
-        else if (buttonAlignRight->isChecked()) format.setAlignment(Qt::AlignRight);
-        else if (buttonAlignLeft->isChecked()) format.setAlignment(Qt::AlignLeft);
+        if(buttonAlignCenter->isChecked()) format.setAlignment(Qt::AlignHCenter);
+        else if(buttonAlignRight->isChecked()) format.setAlignment(Qt::AlignRight);
+        else if(buttonAlignLeft->isChecked()) format.setAlignment(Qt::AlignLeft);
     } else {
         format.setAlignment(Qt::AlignLeft);
         item->setTextWidth(-1);
@@ -1514,7 +1556,7 @@ void TitleWidget::slotUpdateText()
 
     item->setData(101, outlineWidth);
     item->setData(102, outlineColor);
-    if (outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+    if(outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
 
     cformat.setForeground(QBrush(color));
     cur.setCharFormat(cformat);
@@ -1527,7 +1569,7 @@ void TitleWidget::slotUpdateText()
 void TitleWidget::rectChanged()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1 && l.at(0)->type() == RECTITEM && !settingUp) {
+    if(l.size() == 1 && l.at(0)->type() == RECTITEM && !settingUp) {
         QGraphicsRectItem *rec = static_cast<QGraphicsRectItem *>(l.at(0));
         QColor f = rectFColor->color();
         f.setAlpha(rectFAlpha->value());
@@ -1544,7 +1586,7 @@ void TitleWidget::rectChanged()
 void TitleWidget::itemScaled(int val)
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         Transform x = m_transformations.value(l.at(0));
         x.scalex = (double)val / 100.0;
         x.scaley = (double)val / 100.0;
@@ -1578,9 +1620,9 @@ void TitleWidget::itemRotateZ(qreal val)
 void TitleWidget::itemRotate(qreal val, int axis)
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         Transform x = m_transformations[l.at(0)];
-        switch (axis) {
+        switch(axis) {
         case 0:
             x.rotatex = val;
             break;
@@ -1601,7 +1643,7 @@ void TitleWidget::itemRotate(qreal val, int axis)
         qtrans.rotate(x.rotatez, Qt::ZAxis);
         l[0]->setTransform(qtrans);
         m_transformations[l.at(0)] = x;
-        if (l[0]->data(ZOOMFACTOR).isNull()) l[0]->setData(ZOOMFACTOR, 100);
+        if(l[0]->data(ZOOMFACTOR).isNull()) l[0]->setData(ZOOMFACTOR, 100);
         updateDimension(l.at(0));
     }
 }
@@ -1609,7 +1651,7 @@ void TitleWidget::itemRotate(qreal val, int axis)
 void TitleWidget::itemHCenter()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         int width = (int)br.width();
@@ -1623,7 +1665,7 @@ void TitleWidget::itemHCenter()
 void TitleWidget::itemVCenter()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         int height = (int)br.height();
@@ -1637,11 +1679,11 @@ void TitleWidget::itemVCenter()
 void TitleWidget::itemTop()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         double diff;
-        if (br.top() > 0) diff = -br.top();
+        if(br.top() > 0) diff = -br.top();
         else diff = -br.bottom();
         item->moveBy(0, diff);
         updateCoordinates(item);
@@ -1651,11 +1693,11 @@ void TitleWidget::itemTop()
 void TitleWidget::itemBottom()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         double diff;
-        if (br.bottom() > m_frameHeight) diff = m_frameHeight - br.top();
+        if(br.bottom() > m_frameHeight) diff = m_frameHeight - br.top();
         else diff = m_frameHeight - br.bottom();
         item->moveBy(0, diff);
         updateCoordinates(item);
@@ -1665,11 +1707,11 @@ void TitleWidget::itemBottom()
 void TitleWidget::itemLeft()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         double diff;
-        if (br.left() > 0) diff = -br.left();
+        if(br.left() > 0) diff = -br.left();
         else diff = -br.right();
         item->moveBy(diff, 0);
         updateCoordinates(item);
@@ -1679,11 +1721,11 @@ void TitleWidget::itemLeft()
 void TitleWidget::itemRight()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsItem *item = l.at(0);
         QRectF br = item->sceneBoundingRect();
         double diff;
-        if (br.right() < m_frameWidth) diff = m_frameWidth - br.right();
+        if(br.right() < m_frameWidth) diff = m_frameWidth - br.right();
         else diff = m_frameWidth - br.left();
         item->moveBy(diff, 0);
         updateCoordinates(item);
@@ -1716,19 +1758,19 @@ void TitleWidget::setupViewports()
 
 void TitleWidget::loadTitle(KUrl url)
 {
-    if (url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title"));
-    if (!url.isEmpty()) {
+    if(url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title"));
+    if(!url.isEmpty()) {
         QList<QGraphicsItem *> items = m_scene->items();
-        for (int i = 0; i < items.size(); i++) {
-            if (items.at(i)->zValue() > -1000) delete items.at(i);
+        for(int i = 0; i < items.size(); i++) {
+            if(items.at(i)->zValue() > -1000) delete items.at(i);
         }
         m_scene->clearTextSelection();
         QDomDocument doc;
         QString tmpfile;
 
-        if (KIO::NetAccess::download(url, tmpfile, 0)) {
+        if(KIO::NetAccess::download(url, tmpfile, 0)) {
             QFile file(tmpfile);
-            if (file.open(QIODevice::ReadOnly)) {
+            if(file.open(QIODevice::ReadOnly)) {
                 doc.setContent(&file, false);
                 file.close();
             } else return;
@@ -1756,9 +1798,9 @@ void TitleWidget::loadTitle(KUrl url)
 
 void TitleWidget::saveTitle(KUrl url)
 {
-    if (anim_start->isChecked()) slotAnimStart(false);
-    if (anim_end->isChecked()) slotAnimEnd(false);
-    if (url.isEmpty()) {
+    if(anim_start->isChecked()) slotAnimStart(false);
+    if(anim_end->isChecked()) slotAnimEnd(false);
+    if(url.isEmpty()) {
         KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this);
         fs->setOperationMode(KFileDialog::Saving);
         fs->setMode(KFile::File);
@@ -1770,8 +1812,8 @@ void TitleWidget::saveTitle(KUrl url)
         url = fs->selectedUrl();
         delete fs;
     }
-    if (!url.isEmpty()) {
-        if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1) == false)
+    if(!url.isEmpty()) {
+        if(m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1) == false)
             KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
     }
 }
@@ -1804,14 +1846,14 @@ void TitleWidget::setXml(QDomDocument doc)
     m_transformations.clear();
     QList <QGraphicsItem *> items = graphicsView->scene()->items();
     const double PI = 4.0 * atan(1.0);
-    for (int i = 0; i < items.count(); i++) {
+    for(int i = 0; i < items.count(); i++) {
         QTransform t = items.at(i)->transform();
         Transform x;
         x.scalex = t.m11();
         x.scaley = t.m22();
-        if (!items.at(i)->data(ROTATEFACTOR).isNull()) {
+        if(!items.at(i)->data(ROTATEFACTOR).isNull()) {
             QList<QVariant> rotlist = items.at(i)->data(ROTATEFACTOR).toList();
-            if (rotlist.count() >= 3) {
+            if(rotlist.count() >= 3) {
                 x.rotatex = rotlist[0].toDouble();
                 x.rotatey = rotlist[1].toDouble();
                 x.rotatez = rotlist[2].toDouble();
@@ -1856,15 +1898,13 @@ void TitleWidget::setXml(QDomDocument doc)
     selectionChanged();
 }
 
-/** \brief Connected to the accepted signal - calls writeChoices */
 void TitleWidget::slotAccepted()
 {
-    if (anim_start->isChecked()) slotAnimStart(false);
-    if (anim_end->isChecked()) slotAnimEnd(false);
+    if(anim_start->isChecked()) slotAnimStart(false);
+    if(anim_end->isChecked()) slotAnimEnd(false);
     writeChoices();
 }
 
-/** \brief Store the current choices of font, background and rect values */
 void TitleWidget::writeChoices()
 {
     // Get a pointer to a shared configuration instance, then get the TitleWidget group.
@@ -1897,7 +1937,6 @@ void TitleWidget::writeChoices()
 
 }
 
-/** \brief Read the last stored choices into the dialog */
 void TitleWidget::readChoices()
 {
     // Get a pointer to a shared configuration instance, then get the TitleWidget group.
@@ -1915,7 +1954,7 @@ void TitleWidget::readChoices()
     textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value()));
 
     int weight;
-    if (titleConfig.readEntry("font_bold", false)) weight = QFont::Bold;
+    if(titleConfig.readEntry("font_bold", false)) weight = QFont::Bold;
     else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     setFontBoxWeight(weight);
     buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked()));
@@ -1941,15 +1980,15 @@ void TitleWidget::adjustFrameSize()
 
 void TitleWidget::slotAnimStart(bool anim)
 {
-    if (anim && anim_end->isChecked()) {
+    if(anim && anim_end->isChecked()) {
         anim_end->setChecked(false);
         m_endViewport->setZValue(-1000);
         m_endViewport->setBrush(QBrush());
     }
     slotSelectTool();
     QList<QGraphicsItem *> list = m_scene->items();
-    for (int i = 0; i < list.count(); i++) {
-        if (list.at(i)->zValue() > -1000) {
+    for(int i = 0; i < list.count(); i++) {
+        if(list.at(i)->zValue() > -1000) {
             list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
             list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
         }
@@ -1961,7 +2000,7 @@ void TitleWidget::slotAnimStart(bool anim)
     itemrotatez->setEnabled(!anim);
     frame_toolbar->setEnabled(!anim);
     toolbar_stack->setEnabled(!anim);
-    if (anim) {
+    if(anim) {
         keep_aspect->setChecked(!m_startViewport->data(0).isNull());
         m_startViewport->setZValue(1100);
         QColor col = m_startViewport->pen().color();
@@ -1971,27 +2010,27 @@ void TitleWidget::slotAnimStart(bool anim)
         m_startViewport->setSelected(true);
         selectionChanged();
         slotSelectTool();
-        if (m_startViewport->childItems().isEmpty()) addAnimInfoText();
+        if(m_startViewport->childItems().isEmpty()) addAnimInfoText();
     } else {
         m_startViewport->setZValue(-1000);
         m_startViewport->setBrush(QBrush());
         m_startViewport->setFlags(0);
-        if (!anim_end->isChecked()) deleteAnimInfoText();
+        if(!anim_end->isChecked()) deleteAnimInfoText();
     }
 
 }
 
 void TitleWidget::slotAnimEnd(bool anim)
 {
-    if (anim && anim_start->isChecked()) {
+    if(anim && anim_start->isChecked()) {
         anim_start->setChecked(false);
         m_startViewport->setZValue(-1000);
         m_startViewport->setBrush(QBrush());
     }
     slotSelectTool();
     QList<QGraphicsItem *> list = m_scene->items();
-    for (int i = 0; i < list.count(); i++) {
-        if (list.at(i)->zValue() > -1000) {
+    for(int i = 0; i < list.count(); i++) {
+        if(list.at(i)->zValue() > -1000) {
             list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
             list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
         }
@@ -2003,7 +2042,7 @@ void TitleWidget::slotAnimEnd(bool anim)
     itemrotatez->setEnabled(!anim);
     frame_toolbar->setEnabled(!anim);
     toolbar_stack->setEnabled(!anim);
-    if (anim) {
+    if(anim) {
         keep_aspect->setChecked(!m_endViewport->data(0).isNull());
         m_endViewport->setZValue(1100);
         QColor col = m_endViewport->pen().color();
@@ -2013,12 +2052,12 @@ void TitleWidget::slotAnimEnd(bool anim)
         m_endViewport->setSelected(true);
         selectionChanged();
         slotSelectTool();
-        if (m_endViewport->childItems().isEmpty()) addAnimInfoText();
+        if(m_endViewport->childItems().isEmpty()) addAnimInfoText();
     } else {
         m_endViewport->setZValue(-1000);
         m_endViewport->setBrush(QBrush());
         m_endViewport->setFlags(0);
-        if (!anim_start->isChecked()) deleteAnimInfoText();
+        if(!anim_start->isChecked()) deleteAnimInfoText();
     }
 }
 
@@ -2043,17 +2082,17 @@ void TitleWidget::addAnimInfoText()
 void TitleWidget::updateInfoText()
 {
     // update info text font
-    if (!m_startViewport->childItems().isEmpty()) {
+    if(!m_startViewport->childItems().isEmpty()) {
         QGraphicsTextItem *item = static_cast <QGraphicsTextItem *>(m_startViewport->childItems().at(0));
-        if (item) {
+        if(item) {
             QFont font = item->font();
             font.setPixelSize(m_startViewport->rect().width() / 10);
             item->setFont(font);
         }
     }
-    if (!m_endViewport->childItems().isEmpty()) {
+    if(!m_endViewport->childItems().isEmpty()) {
         QGraphicsTextItem *item = static_cast <QGraphicsTextItem *>(m_endViewport->childItems().at(0));
-        if (item) {
+        if(item) {
             QFont font = item->font();
             font.setPixelSize(m_endViewport->rect().width() / 10);
             item->setFont(font);
@@ -2064,22 +2103,21 @@ void TitleWidget::updateInfoText()
 void TitleWidget::deleteAnimInfoText()
 {
     // end animation editing, remove info text
-    while (!m_startViewport->childItems().isEmpty()) {
+    while(!m_startViewport->childItems().isEmpty()) {
         QGraphicsItem *item = m_startViewport->childItems().at(0);
         m_scene->removeItem(item);
         delete item;
     }
-    while (!m_endViewport->childItems().isEmpty()) {
+    while(!m_endViewport->childItems().isEmpty()) {
         QGraphicsItem *item = m_endViewport->childItems().at(0);
         m_scene->removeItem(item);
         delete item;
     }
 }
 
-
 void TitleWidget::slotKeepAspect(bool keep)
 {
-    if (m_endViewport->zValue() == 1100) {
+    if(m_endViewport->zValue() == 1100) {
         m_endViewport->setData(0, keep == true ? m_frameWidth : QVariant());
         m_endViewport->setData(1, keep == true ? m_frameHeight : QVariant());
     } else {
@@ -2090,78 +2128,87 @@ void TitleWidget::slotKeepAspect(bool keep)
 
 void TitleWidget::slotResize50()
 {
-    if (m_endViewport->zValue() == 1100) {
+    if(m_endViewport->zValue() == 1100) {
         m_endViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
     } else m_startViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
 }
 
 void TitleWidget::slotResize100()
 {
-    if (m_endViewport->zValue() == 1100) {
+    if(m_endViewport->zValue() == 1100) {
         m_endViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
     } else m_startViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
 }
 
 void TitleWidget::slotResize200()
 {
-    if (m_endViewport->zValue() == 1100) {
+    if(m_endViewport->zValue() == 1100) {
         m_endViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
     } else m_startViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
 }
 
 void TitleWidget::slotAddEffect(int ix)
 {
-    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    QList<QGraphicsItem *> list = graphicsView->scene()->selectedItems();
     int effect = effect_list->itemData(ix).toInt();
-    if (effect == NOEFFECT) {
-        if (l.size() == 1) l[0]->setData(100, QVariant());
-        effect_stack->setHidden(true);
-        return;
-    }
-    effect_stack->setCurrentIndex(effect - 1);
-    effect_stack->setHidden(false);
-    if (effect == TYPEWRITEREFFECT) {
-        if (l.size() == 1 && l.at(0)->type() == TEXTITEM) {
-            QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value());
-            l[0]->setData(100, effdata);
-        }
-    }
-#if QT_VERSION < 0x040600
-    return;
-#else
-    if (effect == BLUREFFECT) {
-        // Blur effect
-        if (l.size() == 1) {
-            QGraphicsEffect *eff = new QGraphicsBlurEffect();
-            l[0]->setGraphicsEffect(eff);
-        }
-    } else if (effect == SHADOWEFFECT) {
-        if (l.size() == 1) {
-            QGraphicsEffect *eff = new QGraphicsDropShadowEffect();
-            l[0]->setGraphicsEffect(eff);
+
+    if(list.size() == 1) {
+        if(effect == NOEFFECT)
+            effect_stack->setHidden(true);
+        else {
+            effect_stack->setCurrentIndex(effect - 1);
+            effect_stack->setHidden(false);
         }
-    }
+    } else // Hide the effects stack when more than one element is selected.
+        effect_stack->setHidden(true);
 
+    foreach(QGraphicsItem * item, list) {
+        switch(effect) {
+        case NOEFFECT:
+            item->setData(100, QVariant());
+#if QT_VERSION >= 0x040600
+            item->setGraphicsEffect(0);
 #endif
+            break;
+        case TYPEWRITEREFFECT:
+            /*
+             * Allow the user to set the typewriter effect to more than one
+             * element, but do not add it to non-text elements.
+             */
+            if(item->type() == TEXTITEM) {
+                QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value());
+                item->setData(100, effdata);
+            }
+            break;
+#if QT_VERSION >= 0x040600
+            // Do not remove the non-QGraphicsEffects.
+        case BLUREFFECT:
+            item->setGraphicsEffect(new QGraphicsBlurEffect());
+            break;
+        case SHADOWEFFECT:
+            item->setGraphicsEffect(new QGraphicsDropShadowEffect());
+            break;
+#endif
+        }
+    }
 }
 
-
 void TitleWidget::slotFontText(const QString& s)
 {
     const QFont f(s);
-    if (f.exactMatch()) {
+    if(f.exactMatch()) {
         // Font really exists (could also just be a «d» if the user
         // starts typing «dejavu» for example).
         font_family->setCurrentFont(f);
     }
     // Note: Typing dejavu serif does not recognize the font (takes sans)
-    // in older Qt versions.
+    // in older Qt versions. Case must match there (except for first letter)
 }
 
 void TitleWidget::slotEditTypewriter(int /*ix*/)
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value());
         l[0]->setData(100, effdata);
     }
@@ -2173,10 +2220,10 @@ void TitleWidget::slotEditBlur(int ix)
     return;
 #else
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsEffect *eff = l[0]->graphicsEffect();
         QGraphicsBlurEffect *blur = static_cast <QGraphicsBlurEffect *>(eff);
-        if (blur) blur->setBlurRadius(ix);
+        if(blur) blur->setBlurRadius(ix);
     }
 #endif
 }
@@ -2187,10 +2234,10 @@ void TitleWidget::slotEditShadow()
     return;
 #else
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1) {
+    if(l.size() == 1) {
         QGraphicsEffect *eff = l[0]->graphicsEffect();
         QGraphicsDropShadowEffect *shadow = static_cast <QGraphicsDropShadowEffect *>(eff);
-        if (shadow) {
+        if(shadow) {
             shadow->setBlurRadius(shadow_radius->value());
             shadow->setOffset(shadow_x->value(), shadow_y->value());
         }
@@ -2202,29 +2249,29 @@ qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly)
 {
     qreal bound = maxBound ? -99 : 99;
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() > 0) {
+    if(l.size() > 0) {
         QList<QGraphicsItem*> lItems;
         // Get items (all or intersecting only)
-        if (intersectingOnly) {
+        if(intersectingOnly) {
             lItems = graphicsView->scene()->items(l[0]->sceneBoundingRect(), Qt::IntersectsItemShape);
         } else {
             lItems = graphicsView->scene()->items();
         }
-        if (lItems.size() > 0) {
+        if(lItems.size() > 0) {
             int n = lItems.size();
             qreal z;
-            if (maxBound) {
-                for (int i = 0; i < n; i++) {
+            if(maxBound) {
+                for(int i = 0; i < n; i++) {
                     z = lItems[i]->zValue();
-                    if (z > bound && !lItems[i]->isSelected()) {
+                    if(z > bound && !lItems[i]->isSelected()) {
                         bound = z;
                     }
                 }
             } else {
                 // Get minimum z index.
-                for (int i = 0; i < n; i++) {
+                for(int i = 0; i < n; i++) {
                     z = lItems[i]->zValue();
-                    if (z < bound && !lItems[i]->isSelected() && z > -999) {
+                    if(z < bound && !lItems[i]->isSelected() && z > -999) {
                         // There are items at the very bottom (background e.g.) with z-index < -1000.
                         bound = z;
                     }
@@ -2238,10 +2285,10 @@ qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly)
 void TitleWidget::slotZIndexUp()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         qreal currentZ = l[0]->zValue();
         qreal max = zIndexBounds(true, true);
-        if (currentZ <= max) {
+        if(currentZ <= max) {
             l[0]->setZValue(currentZ + 1);
             updateDimension(l[0]);
         }
@@ -2251,10 +2298,10 @@ void TitleWidget::slotZIndexUp()
 void TitleWidget::slotZIndexTop()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         qreal currentZ = l[0]->zValue();
         qreal max = zIndexBounds(true, false);
-        if (currentZ <= max) {
+        if(currentZ <= max) {
             l[0]->setZValue(max + 1);
             updateDimension(l[0]);
         }
@@ -2264,10 +2311,10 @@ void TitleWidget::slotZIndexTop()
 void TitleWidget::slotZIndexDown()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         qreal currentZ = l[0]->zValue();
         qreal min = zIndexBounds(false, true);
-        if (currentZ >= min) {
+        if(currentZ >= min) {
             l[0]->setZValue(currentZ - 1);
             updateDimension(l[0]);
         }
@@ -2277,10 +2324,10 @@ void TitleWidget::slotZIndexDown()
 void TitleWidget::slotZIndexBottom()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() >= 1) {
+    if(l.size() >= 1) {
         qreal currentZ = l[0]->zValue();
         qreal min = zIndexBounds(false, false);
-        if (currentZ >= min) {
+        if(currentZ >= min) {
             l[0]->setZValue(min - 1);
             updateDimension(l[0]);
         }