From 123e0a2871f509992f7ff4e3f6e1d79106d5b0c3 Mon Sep 17 00:00:00 2001 From: "Simon A. Eugster" Date: Fri, 28 May 2010 15:39:59 +0000 Subject: [PATCH] =?utf8?q?=20r6466@lapL:=20=20simon=20|=202010-05-28=2017:?= =?utf8?q?39:22=20+0200=20=20http://www.kdenlive.org/mantis/view.php=3Fid?= =?utf8?q?=3D1610=20=20*=20Multiple=20rectangles=20can=20be=20changed=20to?= =?utf8?q?o=20=20*=20reindent.sh=20...=20=20*=20Please=20document=20the=20?= =?utf8?q?=C2=ABint=20settingUp=20=3D=20false;=C2=BB=20in=20titlewidget.cp?= =?utf8?q?p=20if=20you=20know=20what=20it=20does?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit svn path=/trunk/kdenlive/; revision=4486 --- src/titlewidget.cpp | 110 +++++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 10da04ce..4cc1e63f 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -51,6 +51,7 @@ static QList 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 l = graphicsView->scene()->selectedItems(); - if(l.at(i)->type() == TEXTITEM) { - item = static_cast (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 l = graphicsView->scene()->selectedItems(); + if(l.at(i)->type() == TEXTITEM) { + item = static_cast (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 l = graphicsView->scene()->selectedItems(); - if(l.size() == 1 && l.at(0)->type() == RECTITEM && !settingUp) { - QGraphicsRectItem *rec = static_cast(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(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)); + } } } -- 2.39.5