X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=609e8a99eb6d1f210960e7203c075b8bb6a3a9af;hb=8dd4d6bee4a7c249caadfc78de377dd488495b19;hp=777d0325223f8b5734563f85a493b42a7be1a71a;hpb=418c2384ea5da966e62473bc9960e3a6dfc644d7;p=kdenlive diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 777d0325..609e8a99 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #if QT_VERSION >= 0x040600 #include @@ -92,11 +93,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render delete textOutlineAlpha; #else - rectBColor->setAlphaChannelEnabled(false); - rectFColor->setAlphaChannelEnabled(false); - fontColorButton->setAlphaChannelEnabled(false); - textOutlineColor->setAlphaChannelEnabled(false); - rectBAlpha->setMinimum(0); rectBAlpha->setMaximum(255); rectBAlpha->setDecimals(0); @@ -174,11 +170,11 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render title_duration->setInputMask(m_tc.mask()); title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration())); - connect(backgroundColor, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ; + connect(backgroundColor, SIGNAL(changed(const QColor &)), this, SLOT(slotChangeBackground())) ; connect(backgroundAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotChangeBackground())) ; - connect(fontColorButton, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ; - connect(textOutlineColor, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ; + connect(fontColorButton, SIGNAL(changed(const QColor &)), this, SLOT(slotUpdateText())) ; + connect(textOutlineColor, SIGNAL(changed(const QColor &)), this, SLOT(slotUpdateText())) ; connect(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ; connect(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ; connect(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); @@ -186,8 +182,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(font_family, SIGNAL(editTextChanged(const QString &)), this, SLOT(slotFontText(const QString&))); - connect(rectFColor, SIGNAL(clicked()), this, SLOT(rectChanged())); - connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged())); + connect(rectFColor, SIGNAL(changed(const QColor &)), this, SLOT(rectChanged())); + connect(rectBColor, SIGNAL(changed(const QColor &)), this, SLOT(rectChanged())); connect(rectLineWidth, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); /*connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports())); @@ -402,25 +398,25 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render QToolBar *m_toolbar = new QToolBar("titleToolBar", this); m_toolbar->setIconSize(iconSize); - m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString()); + m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), i18n("Selection Tool")); m_buttonCursor->setCheckable(true); m_buttonCursor->setShortcut(Qt::ALT + Qt::Key_S); m_buttonCursor->setToolTip(i18n("Selection Tool") + ' ' + m_buttonCursor->shortcut().toString()); connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool())); - m_buttonText = m_toolbar->addAction(KIcon("insert-text"), QString()); + m_buttonText = m_toolbar->addAction(KIcon("insert-text"), i18n("Add Text")); m_buttonText->setCheckable(true); m_buttonText->setShortcut(Qt::ALT + Qt::Key_T); m_buttonText->setToolTip(i18n("Add Text") + ' ' + m_buttonText->shortcut().toString()); connect(m_buttonText, SIGNAL(triggered()), this, SLOT(slotTextTool())); - m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), QString()); + m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), i18n("Add Rectangle")); m_buttonRect->setCheckable(true); m_buttonRect->setShortcut(Qt::ALT + Qt::Key_R); m_buttonRect->setToolTip(i18n("Add Rectangle") + ' ' + m_buttonRect->shortcut().toString()); connect(m_buttonRect, SIGNAL(triggered()), this, SLOT(slotRectTool())); - m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), QString()); + m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), i18n("Add Image")); m_buttonImage->setCheckable(false); m_buttonImage->setShortcut(Qt::ALT + Qt::Key_I); m_buttonImage->setToolTip(i18n("Add Image") + ' ' + m_buttonImage->shortcut().toString()); @@ -431,11 +427,13 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render m_buttonLoad = m_toolbar->addAction(KIcon("document-open"), i18n("Open Document")); m_buttonLoad->setCheckable(false); m_buttonLoad->setShortcut(Qt::CTRL + Qt::Key_O); + m_buttonLoad->setToolTip(i18n("Open Document") + ' ' + m_buttonImage->shortcut().toString()); connect(m_buttonLoad, SIGNAL(triggered()), this, SLOT(loadTitle())); m_buttonSave = m_toolbar->addAction(KIcon("document-save-as"), i18n("Save As")); m_buttonSave->setCheckable(false); m_buttonSave->setShortcut(Qt::CTRL + Qt::Key_S); + m_buttonSave->setToolTip(i18n("Save As") + ' ' + m_buttonImage->shortcut().toString()); connect(m_buttonSave, SIGNAL(triggered()), this, SLOT(saveTitle())); layout->addWidget(m_toolbar); @@ -449,7 +447,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render m_titledocument.setScene(m_scene, m_frameWidth, m_frameHeight); connect(m_scene, SIGNAL(changed(QList)), this, SLOT(slotChanged())); connect(font_size, SIGNAL(valueChanged(int)), m_scene, SLOT(slotUpdateFontSize(int))); - + // a gradient background /*QRadialGradient *gradient = new QRadialGradient(0, 0, 10); gradient->setSpread(QGradient::ReflectSpread); @@ -482,7 +480,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(m_scene, SIGNAL(newRect(QGraphicsRectItem *)), this , SLOT(slotNewRect(QGraphicsRectItem *))); connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *))); connect(zoom_slider, SIGNAL(valueChanged(int)), this , SLOT(slotUpdateZoom(int))); - + connect(zoom_spin, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateZoom(int))); // mbd: load saved settings readChoices(); @@ -504,7 +502,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render graphicsView->scale(.5, .5); if (!url.isEmpty()) loadTitle(url); else { - slotTextTool(); + prepareTools(NULL); + slotTextTool(); QTimer::singleShot(200, this, SLOT(slotAdjustZoom())); } initAnimation(); @@ -517,7 +516,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render //templateBox->setIconSize(QSize(60,60)); templateBox->clear(); templateBox->addItem(""); - foreach(TitleTemplate t, titletemplates) { + foreach(const TitleTemplate &t, titletemplates) { templateBox->addItem(t.icon, t.name, t.file); } lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex(); @@ -640,7 +639,7 @@ void TitleWidget::refreshTitleTemplates() void TitleWidget::templateIndexChanged(int index) { QString item = templateBox->itemData(index).toString(); - if (item != "") { + 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; } @@ -666,7 +665,10 @@ void TitleWidget::resizeEvent(QResizeEvent * /*event*/) { //slotAdjustZoom(); } - +//virtual +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); @@ -736,6 +738,7 @@ void TitleWidget::slotImageTool() svg->setZValue(m_count++); svg->setData(Qt::UserRole, url.path()); graphicsView->scene()->addItem(svg); + prepareTools(svg); } else { QPixmap pix(url.path()); QGraphicsPixmapItem *image = new QGraphicsPixmapItem(pix); @@ -744,6 +747,7 @@ void TitleWidget::slotImageTool() image->setData(Qt::UserRole, url.path()); image->setZValue(m_count++); graphicsView->scene()->addItem(image); + prepareTools(image); } } m_scene->setTool(TITLE_SELECT); @@ -859,8 +863,9 @@ void TitleWidget::initAnimation() void TitleWidget::slotUpdateZoom(int pos) { + zoom_spin->setValue(pos); + zoom_slider->setValue(pos); m_scene->setZoom((double) pos / 100); - zoom_label->setText(QString::number(pos) + '%'); } void TitleWidget::slotZoom(bool up) @@ -908,6 +913,7 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) rect->setBrush(QBrush(b)); rect->setZValue(m_count++); rect->setData(ZOOMFACTOR, 100); + prepareTools(rect); //setCurrentItem(rect); //graphicsView->setFocus(); } @@ -948,6 +954,7 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) tt->setTextCursor(cur); tt->setZValue(m_count++); setCurrentItem(tt); + prepareTools(tt); } void TitleWidget::setFontBoxWeight(int weight) @@ -1477,6 +1484,7 @@ void TitleWidget::updateAxisButtons(QGraphicsItem *i) void TitleWidget::slotChangeBackground() { QColor color = backgroundColor->color(); + m_scene->setBackgroundBrush(QBrush(color)); color.setAlpha(backgroundAlpha->value()); m_frameBorder->setBrush(QBrush(color)); } @@ -1846,18 +1854,29 @@ void TitleWidget::saveTitle(KUrl url) if (anim_start->isChecked()) slotAnimStart(false); if (anim_end->isChecked()) slotAnimEnd(false); bool embed_image=false; - if (KMessageBox::questionYesNo(this, i18n("Do you want to embed Images into this TitleDocument?\nThis is most needed for sharing Titles.")) != KMessageBox::No) + + // If we have images in the title, ask for embed + QList list = graphicsView->scene()->items(); + QGraphicsPixmapItem pix; + int pixmapType = pix.type(); + foreach(const QGraphicsItem *item, list) { + 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) { - embed_image=true; + embed_image=false; } if (url.isEmpty()) { - KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this); + QPointer fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); fs->setConfirmOverwrite(true); fs->setKeepLocation(true); fs->exec(); - url = fs->selectedUrl(); + if (fs) url = fs->selectedUrl(); delete fs; } if (!url.isEmpty()) { @@ -1869,21 +1888,21 @@ void TitleWidget::saveTitle(KUrl url) QDomDocument TitleWidget::xml() { QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport); - doc.documentElement().setAttribute("out", m_tc.getFrameCount(title_duration->text())); + doc.documentElement().setAttribute("duration", m_tc.getFrameCount(title_duration->text())); return doc; } -int TitleWidget::outPoint() const +int TitleWidget::duration() const { return m_tc.getFrameCount(title_duration->text()); } void TitleWidget::setXml(QDomDocument doc) { - int out; - m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out, m_projectTitlePath); + int duration; + m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &duration, m_projectTitlePath); adjustFrameSize(); - title_duration->setText(m_tc.getTimecode(GenTime(out, m_render->fps()))); + title_duration->setText(m_tc.getTimecode(GenTime(duration, m_render->fps()))); /*if (doc.documentElement().hasAttribute("out")) { GenTime duration = GenTime(doc.documentElement().attribute("out").toDouble() / 1000.0); title_duration->setText(m_tc.getTimecode(duration)); @@ -1971,23 +1990,23 @@ 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()); titleConfig.writeEntry("font_underlined", buttonUnder->isChecked()); - titleConfig.writeEntry("rect_foreground_color", rectFColor->color()); -#if KDE_IS_VERSION(4,5,0) - titleConfig.writeEntry("rect_foreground_alpha", rectFColor->color().alpha()); -#else - titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value()); -#endif titleConfig.writeEntry("rect_background_color", rectBColor->color()); + titleConfig.writeEntry("rect_foreground_color", rectFColor->color()); + #if KDE_IS_VERSION(4,5,0) titleConfig.writeEntry("rect_background_alpha", rectBColor->color().alpha()); + titleConfig.writeEntry("rect_foreground_alpha", rectFColor->color().alpha()); #else titleConfig.writeEntry("rect_background_alpha", rectBAlpha->value()); + titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value()); #endif + titleConfig.writeEntry("rect_line_width", rectLineWidth->value()); titleConfig.writeEntry("background_color", backgroundColor->color()); @@ -2007,12 +2026,17 @@ void TitleWidget::readChoices() font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont())); font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value())); m_scene->slotUpdateFontSize(font_size->value()); - fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color())); -#if not KDE_IS_VERSION(4,5,0) + QColor fontColor = QColor(titleConfig.readEntry("font_color", fontColorButton->color())); + QColor outlineColor = QColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color())); +#if KDE_IS_VERSION(4,5,0) + fontColor.setAlpha(titleConfig.readEntry("font_alpha", fontColor.alpha())); + outlineColor.setAlpha(titleConfig.readEntry("font_outline_alpha", outlineColor.alpha())); +#else textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value())); textOutlineAlpha->setValue(titleConfig.readEntry("font_outline_alpha", textOutlineAlpha->value())); #endif - textOutlineColor->setColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color())); + fontColorButton->setColor(fontColor); + textOutlineColor->setColor(outlineColor); textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value())); int weight; @@ -2023,20 +2047,18 @@ void TitleWidget::readChoices() buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked())); QColor fgColor = QColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color())); -#if KDE_IS_VERSION(4,5,0) - fgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", rectFColor->color().alpha())); -#else - rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value())); -#endif - rectFColor->setColor(fgColor); - QColor bgColor = QColor(titleConfig.readEntry("rect_background_color", rectBColor->color())); + #if KDE_IS_VERSION(4,5,0) - bgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", rectBColor->color().alpha())); + fgColor.setAlpha(titleConfig.readEntry("rect_foreground_alpha", fgColor.alpha())); + bgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", bgColor.alpha())); #else + rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value())); rectBAlpha->setValue(titleConfig.readEntry("rect_background_alpha", rectBAlpha->value())); #endif + rectFColor->setColor(fgColor); rectBColor->setColor(bgColor); + rectLineWidth->setValue(titleConfig.readEntry("rect_line_width", rectLineWidth->value())); backgroundColor->setColor(titleConfig.readEntry("background_color", backgroundColor->color())); @@ -2137,8 +2159,8 @@ void TitleWidget::slotAnimEnd(bool anim) void TitleWidget::addAnimInfoText() { // add text to anim viewport - QGraphicsTextItem *t = new QGraphicsTextItem(i18n("Start"), m_startViewport); - QGraphicsTextItem *t2 = new QGraphicsTextItem(i18n("End"), m_endViewport); + QGraphicsTextItem *t = new QGraphicsTextItem(i18nc("Indicates the start of an animation", "Start"), m_startViewport); + QGraphicsTextItem *t2 = new QGraphicsTextItem(i18nc("Indicates the end of an animation", "End"), m_endViewport); QFont font = t->font(); font.setPixelSize(m_startViewport->rect().width() / 10); QColor col = m_startViewport->pen().color(); @@ -2249,7 +2271,7 @@ void TitleWidget::slotAddEffect(int ix) * 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()); + QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value()); item->setData(100, effdata); } break; @@ -2282,7 +2304,7 @@ void TitleWidget::slotEditTypewriter(int /*ix*/) { QList l = graphicsView->scene()->selectedItems(); if (l.size() == 1) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value()); + QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value()); l[0]->setData(100, effdata); } } @@ -2546,123 +2568,127 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) if (referenceItem->type() == TEXTITEM) { showToolbars(TITLE_TEXT); QGraphicsTextItem* i = static_cast (referenceItem); - 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 (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 (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 (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 (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); - color = QColor(i->data(102).toString()); + 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(); #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);