X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=ccef836098657448b7b362e00fcdba1c9e704e93;hb=8fc16957ff5417b21e68ca5d84de89bec38c5a1c;hp=5a9387491edcd1d7668cd8df8ecea27767ac6a83;hpb=563a57ad4786d528755a99973cf3bffbdce96bcf;p=kdenlive diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 5a938749..ccef8360 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -104,8 +104,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render 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())); + 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); @@ -119,8 +119,8 @@ 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())); + connect(textAlpha, SIGNAL(valueChanged(qreal,bool)), this, SLOT(slotUpdateText())); + connect(textOutlineAlpha, SIGNAL(valueChanged(qreal,bool)), this, SLOT(slotUpdateText())); #endif textOutline->setMinimum(0); @@ -170,21 +170,21 @@ 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(changed(const QColor &)), this, SLOT(slotChangeBackground())) ; - connect(backgroundAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotChangeBackground())) ; + connect(backgroundColor, SIGNAL(changed(QColor)), this, SLOT(slotChangeBackground())) ; + connect(backgroundAlpha, SIGNAL(valueChanged(qreal,bool)), this, SLOT(slotChangeBackground())) ; - 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(fontColorButton, SIGNAL(changed(QColor)), this, SLOT(slotUpdateText())) ; + connect(textOutlineColor, SIGNAL(changed(QColor)), this, SLOT(slotUpdateText())) ; + connect(font_family, SIGNAL(currentFontChanged(QFont)), this, SLOT(slotUpdateText())) ; connect(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ; - connect(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); + connect(textOutline, 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(font_family, SIGNAL(editTextChanged(QString)), this, SLOT(slotFontText(QString))); - 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(rectFColor, SIGNAL(changed(QColor)), this, SLOT(rectChanged())); + connect(rectBColor, SIGNAL(changed(QColor)), this, SLOT(rectChanged())); + connect(rectLineWidth, SIGNAL(valueChanged(qreal,bool)), this, SLOT(rectChanged())); /*connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports())); connect(startViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports())); @@ -201,9 +201,9 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(zValue, SIGNAL(valueChanged(int)), this, SLOT(zIndexChanged(int))); connect(itemzoom, SIGNAL(valueChanged(int)), this, SLOT(itemScaled(int))); - connect(itemrotatex, SIGNAL(valueChanged(qreal, bool)), this, SLOT(itemRotateX(qreal))); - connect(itemrotatey, SIGNAL(valueChanged(qreal, bool)), this, SLOT(itemRotateY(qreal))); - connect(itemrotatez, SIGNAL(valueChanged(qreal, bool)), this, SLOT(itemRotateZ(qreal))); + connect(itemrotatex, SIGNAL(valueChanged(qreal,bool)), this, SLOT(itemRotateX(qreal))); + connect(itemrotatey, SIGNAL(valueChanged(qreal,bool)), this, SLOT(itemRotateY(qreal))); + connect(itemrotatez, SIGNAL(valueChanged(qreal,bool)), this, SLOT(itemRotateZ(qreal))); connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter())); connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter())); connect(itemtop, SIGNAL(clicked()), this, SLOT(itemTop())); @@ -447,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); @@ -477,8 +477,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(m_scene, SIGNAL(sceneZoom(bool)), this , SLOT(slotZoom(bool))); connect(m_scene, SIGNAL(actionFinished()), this , SLOT(slotSelectTool())); //connect(m_scene, SIGNAL(actionFinished()), this , SLOT(selectionChanged())); - connect(m_scene, SIGNAL(newRect(QGraphicsRectItem *)), this , SLOT(slotNewRect(QGraphicsRectItem *))); - connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *))); + 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))); @@ -492,7 +492,10 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height(); //toolBox->setItemEnabled(2, false); m_startViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight)); + // Setting data at -1 so that the item is recognized as undeletable by graphicsscenerectmove + m_startViewport->setData(-1, -1); m_endViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight)); + m_endViewport->setData(-1, -1); m_startViewport->setData(0, m_frameWidth); m_startViewport->setData(1, m_frameHeight); m_endViewport->setData(0, m_frameWidth); @@ -502,7 +505,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(); @@ -737,6 +741,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); @@ -745,6 +750,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); @@ -910,6 +916,7 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) rect->setBrush(QBrush(b)); rect->setZValue(m_count++); rect->setData(ZOOMFACTOR, 100); + prepareTools(rect); //setCurrentItem(rect); //graphicsView->setFocus(); } @@ -950,6 +957,7 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) tt->setTextCursor(cur); tt->setZValue(m_count++); setCurrentItem(tt); + prepareTools(tt); } void TitleWidget::setFontBoxWeight(int weight) @@ -1849,9 +1857,20 @@ 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()) { QPointer fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this); @@ -1872,21 +1891,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)); @@ -2143,8 +2162,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(); @@ -2552,124 +2571,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); - QVariant variant = i->data(102); - color = variant.value(); + 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);