X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=53bec5d1fce107fe303c4ea833a4222c3ccba3a7;hb=c1d3481eb5b909af8f0a70c11693e1b656f441ed;hp=5a00bd44077f27038df4f335e848c44fc9fc666a;hpb=d428e8bbbc881f61872743893518f568401df958;p=kdenlive diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 5a00bd44..53bec5d1 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #if QT_VERSION >= 0x040600 #include @@ -78,6 +79,33 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render setFont(KGlobalSettings::toolBarFont()); frame_properties->setEnabled(false); frame_properties->setFixedHeight(frame_toolbar->height()); + int size = style()->pixelMetric(QStyle::PM_SmallIconSize); + QSize iconSize(size, size); + +#if KDE_IS_VERSION(4,5,0) + rectBColor->setAlphaChannelEnabled(true); + delete rectBAlpha; + rectFColor->setAlphaChannelEnabled(true); + delete rectFAlpha; + fontColorButton->setAlphaChannelEnabled(true); + delete textAlpha; + textOutlineColor->setAlphaChannelEnabled(true); + delete textOutlineAlpha; + +#else + rectBAlpha->setMinimum(0); + rectBAlpha->setMaximum(255); + rectBAlpha->setDecimals(0); + rectBAlpha->setValue(255); + rectBAlpha->setToolTip(i18n("Color opacity")); + + rectFAlpha->setMinimum(0); + rectFAlpha->setMaximum(255); + rectFAlpha->setDecimals(0); + rectFAlpha->setValue(255); + rectFAlpha->setToolTip(i18n("Border opacity")); + connect(rectFAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); + connect(rectBAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); // Set combo sliders values textAlpha->setMinimum(0); @@ -91,6 +119,9 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render textOutlineAlpha->setDecimals(0); textOutlineAlpha->setValue(255); textOutlineAlpha->setToolTip(i18n("Outline color opacity")); + connect(textAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); + connect(textOutlineAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); +#endif textOutline->setMinimum(0); textOutline->setMaximum(200); @@ -122,18 +153,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render itemrotatez->setValue(0); itemrotatez->setToolTip(i18n("Rotation around the Z axis")); - rectBAlpha->setMinimum(0); - rectBAlpha->setMaximum(255); - rectBAlpha->setDecimals(0); - rectBAlpha->setValue(255); - rectBAlpha->setToolTip(i18n("Color opacity")); - - rectFAlpha->setMinimum(0); - rectFAlpha->setMaximum(255); - rectFAlpha->setDecimals(0); - rectFAlpha->setValue(255); - rectFAlpha->setToolTip(i18n("Border opacity")); - rectLineWidth->setMinimum(0); rectLineWidth->setMaximum(100); rectLineWidth->setDecimals(0); @@ -148,28 +167,23 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render splitter->setStretchFactor(0, 20); //If project is drop frame, set the input mask as such. - title_duration->setInputMask(""); - title_duration->setValidator(m_tc.validator()); + 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(textAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); connect(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); - connect(textOutlineAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); connect(font_weight_box, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateText())); connect(font_family, SIGNAL(editTextChanged(const QString &)), this, SLOT(slotFontText(const QString&))); - connect(rectFAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); - connect(rectBAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); - 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())); @@ -246,6 +260,15 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render font_weight_box->setCurrentIndex(1); font_weight_box->blockSignals(false); + buttonFitZoom->setIconSize(iconSize); + buttonRealSize->setIconSize(iconSize); + buttonItalic->setIconSize(iconSize); + buttonUnder->setIconSize(iconSize); + buttonAlignCenter->setIconSize(iconSize); + buttonAlignLeft->setIconSize(iconSize); + buttonAlignRight->setIconSize(iconSize); + buttonAlignNone->setIconSize(iconSize); + buttonFitZoom->setIcon(KIcon("zoom-fit-best")); buttonRealSize->setIcon(KIcon("zoom-original")); buttonItalic->setIcon(KIcon("format-text-italic")); @@ -322,6 +345,10 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render buttonUnselectAll->setDefaultAction(m_unselectAll); buttonUnselectAll->setEnabled(false); + zDown->setIconSize(iconSize); + zTop->setIconSize(iconSize); + zBottom->setIconSize(iconSize); + zDown->setIcon(KIcon("kdenlive-zindex-down")); zTop->setIcon(KIcon("kdenlive-zindex-top")); zBottom->setIcon(KIcon("kdenlive-zindex-bottom")); @@ -333,8 +360,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render origin_y_top->setToolTip(i18n("Invert y axis and change 0 point")); rectBColor->setToolTip(i18n("Select fill color")); rectFColor->setToolTip(i18n("Select border color")); - rectBAlpha->setToolTip(i18n("Fill opacity")); - rectFAlpha->setToolTip(i18n("Border opacity")); zoom_slider->setToolTip(i18n("Zoom")); buttonRealSize->setToolTip(i18n("Original size (1:1)")); buttonFitZoom->setToolTip(i18n("Fit zoom")); @@ -346,6 +371,13 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render buttonSelectImages->setToolTip(getTooltipWithShortcut(i18n("Select image items in current selection"), m_selectImages)); buttonUnselectAll->setToolTip(getTooltipWithShortcut(i18n("Unselect all"), m_unselectAll)); + itemhcenter->setIconSize(iconSize); + itemvcenter->setIconSize(iconSize); + itemtop->setIconSize(iconSize); + itembottom->setIconSize(iconSize); + itemright->setIconSize(iconSize); + itemleft->setIconSize(iconSize); + itemhcenter->setIcon(KIcon("kdenlive-align-hor")); itemhcenter->setToolTip(i18n("Align item horizontally")); itemvcenter->setIcon(KIcon("kdenlive-align-vert")); @@ -364,28 +396,27 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render frame_toolbar->setLayout(layout); layout->setContentsMargins(0, 0, 0, 0); QToolBar *m_toolbar = new QToolBar("titleToolBar", this); - int s = style()->pixelMetric(QStyle::PM_SmallIconSize); - m_toolbar->setIconSize(QSize(s, s)); + 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()); @@ -396,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); @@ -414,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); @@ -447,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(); @@ -482,10 +515,11 @@ 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(); + adjustSize(); } TitleWidget::~TitleWidget() @@ -516,6 +550,12 @@ TitleWidget::~TitleWidget() delete m_signalMapper; } +QSize TitleWidget::sizeHint() const +{ + // Make sure the widget has minimum size on opening + return QSize(200, 200); +} + //static QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl, bool isClone) { @@ -598,7 +638,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; } @@ -624,7 +664,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); @@ -817,8 +860,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) @@ -852,13 +896,17 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) updateAxisButtons(rect); // back to default QColor f = rectFColor->color(); +#if not KDE_IS_VERSION(4,5,0) f.setAlpha(rectFAlpha->value()); +#endif QPen penf(f); penf.setWidth(rectLineWidth->value()); penf.setJoinStyle(Qt::RoundJoin); rect->setPen(penf); QColor b = rectBColor->color(); +#if not KDE_IS_VERSION(4,5,0) b.setAlpha(rectBAlpha->value()); +#endif rect->setBrush(QBrush(b)); rect->setZValue(m_count++); rect->setData(ZOOMFACTOR, 100); @@ -879,15 +927,17 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) tt->setFont(font); QColor color = fontColorButton->color(); + QColor outlineColor = textOutlineColor->color(); +#if not KDE_IS_VERSION(4,5,0) color.setAlpha(textAlpha->value()); + outlineColor.setAlpha(textOutlineAlpha->value()); +#endif tt->setDefaultTextColor(color); QTextCursor cur(tt->document()); cur.select(QTextCursor::Document); QTextBlockFormat format = cur.blockFormat(); QTextCharFormat cformat = cur.charFormat(); - QColor outlineColor = textOutlineColor->color(); - outlineColor.setAlpha(textOutlineAlpha->value()); double outlineWidth = textOutline->value() / 10.0; tt->setData(101, outlineWidth); @@ -1429,6 +1479,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)); } @@ -1504,10 +1555,12 @@ void TitleWidget::slotUpdateText() font.setUnderline(buttonUnder->isChecked()); font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt()); QColor color = fontColorButton->color(); - color.setAlpha(textAlpha->value()); - QColor outlineColor = textOutlineColor->color(); +#if not KDE_IS_VERSION(4,5,0) + color.setAlpha(textAlpha->value()); outlineColor.setAlpha(textOutlineAlpha->value()); +#endif + double outlineWidth = textOutline->value() / 10.0; int i; @@ -1562,13 +1615,17 @@ void TitleWidget::rectChanged() if (l.at(i)->type() == RECTITEM && !settingUp) { QGraphicsRectItem *rec = static_cast(l.at(i)); QColor f = rectFColor->color(); +#if not KDE_IS_VERSION(4,5,0) f.setAlpha(rectFAlpha->value()); +#endif QPen penf(f); penf.setWidth(rectLineWidth->value()); penf.setJoinStyle(Qt::RoundJoin); rec->setPen(penf); QColor b = rectBColor->color(); +#if not KDE_IS_VERSION(4,5,0) b.setAlpha(rectBAlpha->value()); +#endif rec->setBrush(QBrush(b)); } } @@ -1792,18 +1849,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()) { @@ -1815,21 +1883,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)); @@ -1909,18 +1977,31 @@ void TitleWidget::writeChoices() //titleConfig.writeEntry("font_size", font_size->value()); titleConfig.writeEntry("font_pixel_size", font_size->value()); titleConfig.writeEntry("font_color", fontColorButton->color()); - titleConfig.writeEntry("font_alpha", textAlpha->value()); - titleConfig.writeEntry("font_outline", textOutline->value()); titleConfig.writeEntry("font_outline_color", textOutlineColor->color()); +#if KDE_IS_VERSION(4,5,0) + titleConfig.writeEntry("font_alpha", fontColorButton->color().alpha()); + titleConfig.writeEntry("font_outline_alpha", textOutlineColor->color().alpha()); +#else + 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()); - titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value()); 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()); @@ -1940,11 +2021,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())); + 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())); - - textOutlineColor->setColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color())); textOutlineAlpha->setValue(titleConfig.readEntry("font_outline_alpha", textOutlineAlpha->value())); +#endif + fontColorButton->setColor(fontColor); + textOutlineColor->setColor(outlineColor); textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value())); int weight; @@ -1954,10 +2041,19 @@ void TitleWidget::readChoices() buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked())); buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked())); - rectFColor->setColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color())); + QColor fgColor = QColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color())); + QColor bgColor = QColor(titleConfig.readEntry("rect_background_color", rectBColor->color())); + +#if KDE_IS_VERSION(4,5,0) + 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())); - rectBColor->setColor(titleConfig.readEntry("rect_background_color", rectBColor->color())); 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())); @@ -2058,8 +2154,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(); @@ -2170,7 +2266,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; @@ -2203,7 +2299,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); } } @@ -2512,7 +2608,9 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) buttonItalic->blockSignals(true); buttonUnder->blockSignals(true); fontColorButton->blockSignals(true); +#if not KDE_IS_VERSION(4,5,0) textAlpha->blockSignals(true); +#endif buttonAlignLeft->blockSignals(true); buttonAlignRight->blockSignals(true); buttonAlignNone->blockSignals(true); @@ -2529,8 +2627,10 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) 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); +#endif fontColorButton->setColor(color); if (!i->data(101).isNull()) { @@ -2540,13 +2640,16 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) } 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); - color = QColor(i->data(102).toString()); textOutlineAlpha->setValue(color.alpha()); color.setAlpha(255); + textOutlineAlpha->blockSignals(false); +#endif textOutlineColor->setColor(color); textOutlineColor->blockSignals(false); - textOutlineAlpha->blockSignals(false); } QTextCursor cur = i->textCursor(); QTextBlockFormat format = cur.blockFormat(); @@ -2561,7 +2664,9 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) buttonItalic->blockSignals(false); buttonUnder->blockSignals(false); fontColorButton->blockSignals(false); +#if not KDE_IS_VERSION(4,5,0) textAlpha->blockSignals(false); +#endif buttonAlignLeft->blockSignals(false); buttonAlignRight->blockSignals(false); buttonAlignNone->blockSignals(false); @@ -2596,8 +2701,10 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem) toolBox->widget(1)->setEnabled(true); toolBox->setCurrentIndex(0);*/ //toolBox->setItemEnabled(3, true); +#if not KDE_IS_VERSION(4,5,0) rectFAlpha->setValue(rec->pen().color().alpha()); rectBAlpha->setValue(rec->brush().color().alpha()); +#endif //kDebug() << rec->brush().color().alpha(); QColor fcol = rec->pen().color(); QColor bcol = rec->brush().color();