From: <fre...@us...> - 2009-01-02 00:16:22
|
Revision: 2864 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2864&view=rev Author: freefrag Date: 2009-01-02 00:16:16 +0000 (Fri, 02 Jan 2009) Log Message: ----------- Fix 551: The titlewidget (add/edit text clip dialog) should remember the last used values when adding a new clip (http://www.kdenlive.org/mantis/view.php?id=551) Modified Paths: -------------- branches/KDE4/src/titledocument.cpp branches/KDE4/src/titledocument.h branches/KDE4/src/titlewidget.cpp Modified: branches/KDE4/src/titledocument.cpp =================================================================== --- branches/KDE4/src/titledocument.cpp 2009-01-01 23:34:47 UTC (rev 2863) +++ branches/KDE4/src/titledocument.cpp 2009-01-02 00:16:16 UTC (rev 2864) @@ -113,21 +113,30 @@ main.appendChild(endp); } QDomElement backgr = doc.createElement("background"); - QList<QGraphicsItem *> items = scene->items(); - QColor color(0, 0, 0, 0); - for (int i = 0; i < items.size(); i++) { - if (items.at(i)->zValue() == -1100) { - color = ((QGraphicsRectItem *)items.at(i))->brush().color(); - break; - } - } + QColor color = getBackgroundColor(); backgr.setAttribute("color", colorToString(color)); main.appendChild(backgr); return doc; } +/** \brief Get the background color (incl. alpha) from the document, if possibly + * \returns The background color of the document, inclusive alpha. If none found, returns (0,0,0,0) */ +QColor TitleDocument::getBackgroundColor() { + QColor color(0, 0, 0, 0); + if ( scene ) { + QList<QGraphicsItem *> items = scene->items(); + for (int i = 0; i < items.size(); i++) { + if (items.at(i)->zValue() == -1100) { + color = ((QGraphicsRectItem *)items.at(i))->brush().color(); + return color; + } + } + } + return color; +} + bool TitleDocument::saveDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv) { if (!scene) return false; Modified: branches/KDE4/src/titledocument.h =================================================================== --- branches/KDE4/src/titledocument.h 2009-01-01 23:34:47 UTC (rev 2863) +++ branches/KDE4/src/titledocument.h 2009-01-02 00:16:16 UTC (rev 2864) @@ -33,6 +33,9 @@ int loadDocument(const KUrl& url, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv); QDomDocument xml(QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv); int loadFromXml(QDomDocument doc, QGraphicsPolygonItem* startv, QGraphicsPolygonItem* endv); + /** \brief Get the background color (incl. alpha) from the document, if possibly + * \returns The background color of the document, inclusive alpha. If none found, returns (0,0,0,0) */ + QColor getBackgroundColor(); private: QString colorToString(const QColor&); Modified: branches/KDE4/src/titlewidget.cpp =================================================================== --- branches/KDE4/src/titlewidget.cpp 2009-01-01 23:34:47 UTC (rev 2863) +++ branches/KDE4/src/titlewidget.cpp 2009-01-02 00:16:16 UTC (rev 2864) @@ -364,6 +364,11 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) { QFont font = font_family->currentFont(); font.setPointSize(font_size->value()); + // mbd: issue 551: + font.setBold(buttonBold->isChecked()); + font.setItalic(buttonItalic->isChecked()); + font.setUnderline(buttonUnder->isChecked()); + tt->setFont(font); QColor color = fontColorButton->color(); color.setAlpha(textAlpha->value()); @@ -659,6 +664,16 @@ void TitleWidget::setXml(QDomDocument doc) { m_count = m_titledocument.loadFromXml(doc, startViewport, endViewport); + // mbd: Update the GUI color selectors to match the stuff from the loaded document + QColor background_color = m_titledocument.getBackgroundColor(); + horizontalSlider->blockSignals(true); + kcolorbutton->blockSignals(true); + horizontalSlider->setValue(background_color.alpha()); + background_color.setAlpha(255); + kcolorbutton->setColor(background_color); + horizontalSlider->blockSignals(false); + kcolorbutton->blockSignals(false); + slotSelectTool(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |