r6466@lapL: simon | 2010-05-28 17:39:22 +0200

 http://www.kdenlive.org/mantis/view.php?id=1610
 * Multiple rectangles can be changed too
 * reindent.sh ...
 * Please document the «int settingUp = false;» in titlewidget.cpp if you know what it does

svn path=/trunk/kdenlive/; revision=4486

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 10da04ce51782e7945c7d0271f93e58591029024..4cc1e63f950fff31b15590edd9c6a5de3a0c13fb 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -51,6 +51,7 @@
 
 static QList<TitleTemplate> titletemplates;
 
+// What exactly is this variable good for?
 int settingUp = false;
 
 const int IMAGEITEM = 7;
@@ -1106,8 +1107,8 @@ void TitleWidget::selectionChanged()
         itemrotatey->blockSignals(false);
         itemrotatez->blockSignals(false);
     } else {
-       // More than one item selected
-       //TODO
+        // More than one item selected
+        //TODO
     }
     // Tools working on more than one element.
     if(l.size() > 0)
@@ -1538,64 +1539,67 @@ void TitleWidget::slotUpdateText()
     QColor outlineColor = textOutlineColor->color();
     outlineColor.setAlpha(textOutlineAlpha->value());
     double outlineWidth = textOutline->value() / 10.0;
-    
+
     int i;
-    for (i = 0; i < graphicsView->scene()->selectedItems().length(); i++) {
-       QGraphicsTextItem* item = NULL;
-       QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-       if(l.at(i)->type() == TEXTITEM) {
-           item = static_cast <QGraphicsTextItem *>(l.at(i));
-       }
-       if(!item) {
-           // No text item, try next one.
-           continue;
-       }
-       
-       // Set alignment of all text in the text item
-       QTextCursor cur(item->document());
-       cur.select(QTextCursor::Document);
-       QTextBlockFormat format = cur.blockFormat();
-       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);
-       } else {
-           format.setAlignment(Qt::AlignLeft);
-           item->setTextWidth(-1);
-       }
-       
-       // Set font properties
-       item->setFont(font);
-       QTextCharFormat cformat = cur.charFormat();
-
-       item->setData(101, outlineWidth);
-       item->setData(102, outlineColor);
-       if(outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-
-       cformat.setForeground(QBrush(color));
-       cur.setCharFormat(cformat);
-       cur.setBlockFormat(format);
-//     item->setTextCursor(cur);
-       cur.clearSelection();
-       item->setTextCursor(cur);
+    for(i = 0; i < graphicsView->scene()->selectedItems().length(); i++) {
+        QGraphicsTextItem* item = NULL;
+        QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+        if(l.at(i)->type() == TEXTITEM) {
+            item = static_cast <QGraphicsTextItem *>(l.at(i));
+        }
+        if(!item) {
+            // No text item, try next one.
+            continue;
+        }
+
+        // Set alignment of all text in the text item
+        QTextCursor cur(item->document());
+        cur.select(QTextCursor::Document);
+        QTextBlockFormat format = cur.blockFormat();
+        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);
+        } else {
+            format.setAlignment(Qt::AlignLeft);
+            item->setTextWidth(-1);
+        }
+
+        // Set font properties
+        item->setFont(font);
+        QTextCharFormat cformat = cur.charFormat();
+
+        item->setData(101, outlineWidth);
+        item->setData(102, outlineColor);
+        if(outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+
+        cformat.setForeground(QBrush(color));
+        cur.setCharFormat(cformat);
+        cur.setBlockFormat(format);
+//  item->setTextCursor(cur);
+        cur.clearSelection();
+        item->setTextCursor(cur);
     }
 }
 
 void TitleWidget::rectChanged()
 {
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    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());
-        QPen penf(f);
-        penf.setWidth(rectLineWidth->value());
-        penf.setJoinStyle(Qt::RoundJoin);
-        rec->setPen(penf);
-        QColor b = rectBColor->color();
-        b.setAlpha(rectBAlpha->value());
-        rec->setBrush(QBrush(b));
+    int i;
+    for(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();
+            f.setAlpha(rectFAlpha->value());
+            QPen penf(f);
+            penf.setWidth(rectLineWidth->value());
+            penf.setJoinStyle(Qt::RoundJoin);
+            rec->setPen(penf);
+            QColor b = rectBColor->color();
+            b.setAlpha(rectBAlpha->value());
+            rec->setBrush(QBrush(b));
+        }
     }
 }