X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=034e98e76415647b1fa7d63f8281386caf2f4781;hb=10c313e92dd181422b684852f1501f1b7e647810;hp=03157251c493fc77371b6f0c3f0577195cd86413;hpb=c5c958f38a4097290f38d155ed4f98fce7517538;p=kdenlive diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 03157251..034e98e7 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -17,7 +17,8 @@ #include "titlewidget.h" #include "kdenlivesettings.h" - +#include "KoSliderCombo.h" +#include "kthumb.h" #include #include @@ -37,6 +38,8 @@ #include #include #include +#include +#include #if QT_VERSION >= 0x040600 #include @@ -44,12 +47,22 @@ #include #endif +#include + +static QList titletemplates; + +// What exactly is this variable good for? int settingUp = false; const int IMAGEITEM = 7; const int RECTITEM = 3; const int TEXTITEM = 8; +const int NOEFFECT = 0; +const int BLUREFFECT = 1; +const int SHADOWEFFECT = 2; +const int TYPEWRITEREFFECT = 3; + TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent) : QDialog(parent), Ui::TitleWidget_UI(), @@ -64,36 +77,113 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render setupUi(this); setFont(KGlobalSettings::toolBarFont()); frame_properties->setEnabled(false); - rect_properties->setFixedHeight(frame_properties->height() + 4); - no_properties->setFixedHeight(frame_properties->height() + 4); - image_properties->setFixedHeight(frame_properties->height() + 4); - text_properties->setFixedHeight(frame_properties->height() + 4); 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); + textAlpha->setMaximum(255); + textAlpha->setDecimals(0); + textAlpha->setValue(255); + textAlpha->setToolTip(i18n("Font color opacity")); + + textOutlineAlpha->setMinimum(0); + textOutlineAlpha->setMaximum(255); + 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); + textOutline->setDecimals(0); + textOutline->setValue(0); + textOutline->setToolTip(i18n("Outline width")); + + backgroundAlpha->setMinimum(0); + backgroundAlpha->setMaximum(255); + backgroundAlpha->setDecimals(0); + backgroundAlpha->setValue(0); + backgroundAlpha->setToolTip(i18n("Background color opacity")); + + itemrotatex->setMinimum(-360); + itemrotatex->setMaximum(360); + itemrotatex->setDecimals(0); + itemrotatex->setValue(0); + itemrotatex->setToolTip(i18n("Rotation around the X axis")); + + itemrotatey->setMinimum(-360); + itemrotatey->setMaximum(360); + itemrotatey->setDecimals(0); + itemrotatey->setValue(0); + itemrotatey->setToolTip(i18n("Rotation around the Y axis")); + + itemrotatez->setMinimum(-360); + itemrotatez->setMaximum(360); + itemrotatez->setDecimals(0); + itemrotatez->setValue(0); + itemrotatez->setToolTip(i18n("Rotation around the Z axis")); + + rectLineWidth->setMinimum(0); + rectLineWidth->setMaximum(100); + rectLineWidth->setDecimals(0); + rectLineWidth->setValue(0); + rectLineWidth->setToolTip(i18n("Border width")); itemzoom->setSuffix(i18n("%")); m_frameWidth = render->renderWidth(); m_frameHeight = render->renderHeight(); - showToolbars(TITLE_NONE); + showToolbars(TITLE_SELECT); - //TODO: get default title duration instead of hardcoded one - title_duration->setText(m_tc.getTimecode(GenTime(5000 / 1000.0))); + splitter->setStretchFactor(0, 20); - connect(kcolorbutton, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ; - connect(horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotChangeBackground())) ; + //If project is drop frame, set the input mask as such. + title_duration->setInputMask(m_tc.mask()); + title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration())); - connect(fontColorButton, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ; + connect(backgroundColor, SIGNAL(changed(const 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(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ; - connect(textAlpha, SIGNAL(valueChanged(int)), 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(rectFAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged())); - connect(rectBAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged())); - connect(rectFColor, SIGNAL(clicked()), this, SLOT(rectChanged())); - connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged())); - connect(rectLineWidth, SIGNAL(valueChanged(int)), 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())); connect(startViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports())); @@ -102,9 +192,17 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(endViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports())); connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));*/ + // Fill effects + effect_list->addItem(i18n("None"), NOEFFECT); + effect_list->addItem(i18n("Typewriter"), TYPEWRITEREFFECT); + effect_list->addItem(i18n("Blur"), BLUREFFECT); + + connect(zValue, SIGNAL(valueChanged(int)), this, SLOT(zIndexChanged(int))); connect(itemzoom, SIGNAL(valueChanged(int)), this, SLOT(itemScaled(int))); - connect(itemrotate, SIGNAL(valueChanged(int)), this, SLOT(itemRotate(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(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter())); connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter())); connect(itemtop, SIGNAL(clicked()), this, SLOT(itemTop())); @@ -113,27 +211,29 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(itemright, SIGNAL(clicked()), this, SLOT(itemRight())); connect(effect_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotAddEffect(int))); connect(typewriter_delay, SIGNAL(valueChanged(int)), this, SLOT(slotEditTypewriter(int))); + connect(typewriter_start, SIGNAL(valueChanged(int)), this, SLOT(slotEditTypewriter(int))); connect(blur_radius, SIGNAL(valueChanged(int)), this, SLOT(slotEditBlur(int))); connect(shadow_radius, SIGNAL(valueChanged(int)), this, SLOT(slotEditShadow())); connect(shadow_x, SIGNAL(valueChanged(int)), this, SLOT(slotEditShadow())); connect(shadow_y, SIGNAL(valueChanged(int)), this, SLOT(slotEditShadow())); effect_stack->setHidden(true); - effect_list->setEnabled(false); + effect_frame->setEnabled(false); connect(origin_x_left, SIGNAL(clicked()), this, SLOT(slotOriginXClicked())); connect(origin_y_top, SIGNAL(clicked()), this, SLOT(slotOriginYClicked())); + // Position and size m_signalMapper = new QSignalMapper(this); m_signalMapper->setMapping(value_w, ValueWidth); m_signalMapper->setMapping(value_h, ValueHeight); + m_signalMapper->setMapping(value_x, ValueX); + m_signalMapper->setMapping(value_y, ValueY); connect(value_w, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map())); connect(value_h, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map())); + connect(value_x, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map())); + connect(value_y, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map())); connect(m_signalMapper, SIGNAL(mapped(int)), this, SLOT(slotValueChanged(int))); - connect(value_x, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem())); - connect(value_y, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem())); - connect(value_w, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem())); - connect(value_h, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem())); connect(buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotAdjustZoom())); connect(buttonRealSize, SIGNAL(clicked()), this, SLOT(slotZoomOneToOne())); connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText())); @@ -142,7 +242,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(buttonAlignRight, SIGNAL(clicked()), this, SLOT(slotUpdateText())); connect(buttonAlignCenter, SIGNAL(clicked()), this, SLOT(slotUpdateText())); connect(buttonAlignNone, SIGNAL(clicked()), this, SLOT(slotUpdateText())); - //connect(buttonInsertUnicode, SIGNAL(clicked()), this, SLOT(slotInsertUnicode())); connect(displayBg, SIGNAL(stateChanged(int)), this, SLOT(displayBackgroundFrame())); connect(m_unicodeDialog, SIGNAL(charSelected(QString)), this, SLOT(slotInsertUnicodeString(QString))); @@ -160,6 +259,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")); @@ -176,22 +284,99 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render m_unicodeAction = new QAction(KIcon("kdenlive-insert-unicode"), QString(), this); m_unicodeAction->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_U); - m_unicodeAction->setToolTip(i18n("Insert Unicode character") + ' ' + m_unicodeAction->shortcut().toString()); + m_unicodeAction->setToolTip(getTooltipWithShortcut(i18n("Insert Unicode character"), m_unicodeAction)); connect(m_unicodeAction, SIGNAL(triggered()), this, SLOT(slotInsertUnicode())); buttonInsertUnicode->setDefaultAction(m_unicodeAction); + m_zUp = new QAction(KIcon("kdenlive-zindex-up"), QString(), this); + m_zUp->setShortcut(Qt::Key_PageUp); + m_zUp->setToolTip(i18n("Raise object")); + connect(m_zUp, SIGNAL(triggered()), this, SLOT(slotZIndexUp())); + zUp->setDefaultAction(m_zUp); + + m_zDown = new QAction(KIcon("kdenlive-zindex-down"), QString(), this); + m_zDown->setShortcut(Qt::Key_PageDown); + m_zDown->setToolTip(i18n("Lower object")); + connect(m_zDown, SIGNAL(triggered()), this, SLOT(slotZIndexDown())); + zDown->setDefaultAction(m_zDown); + + m_zTop = new QAction(KIcon("kdenlive-zindex-top"), QString(), this); + // TODO mbt 1414: Shortcut should change z index only if + // cursor is NOT in a text field ... + //m_zTop->setShortcut(Qt::Key_Home); + m_zTop->setToolTip(i18n("Raise object to top")); + connect(m_zTop, SIGNAL(triggered()), this, SLOT(slotZIndexTop())); + zTop->setDefaultAction(m_zTop); + + m_zBottom = new QAction(KIcon("kdenlive-zindex-bottom"), QString(), this); + // TODO mbt 1414 + //m_zBottom->setShortcut(Qt::Key_End); + m_zBottom->setToolTip(i18n("Lower object to bottom")); + connect(m_zBottom, SIGNAL(triggered()), this, SLOT(slotZIndexBottom())); + zBottom->setDefaultAction(m_zBottom); + + m_selectAll = new QAction(KIcon("kdenlive-select-all"), QString(), this); + m_selectAll->setShortcut(Qt::CTRL + Qt::Key_A); + connect(m_selectAll, SIGNAL(triggered()), this, SLOT(slotSelectAll())); + buttonSelectAll->setDefaultAction(m_selectAll); + + m_selectText = new QAction(KIcon("kdenlive-select-texts"), QString(), this); + m_selectText->setShortcut(Qt::CTRL + Qt::Key_T); + connect(m_selectText, SIGNAL(triggered()), this, SLOT(slotSelectText())); + buttonSelectText->setDefaultAction(m_selectText); + buttonSelectText->setEnabled(false); + + m_selectRects = new QAction(KIcon("kdenlive-select-rects"), QString(), this); + m_selectRects->setShortcut(Qt::CTRL + Qt::Key_R); + connect(m_selectRects, SIGNAL(triggered()), this, SLOT(slotSelectRects())); + buttonSelectRects->setDefaultAction(m_selectRects); + buttonSelectRects->setEnabled(false); + + m_selectImages = new QAction(KIcon("kdenlive-select-images"), QString(), this); + m_selectImages->setShortcut(Qt::CTRL + Qt::Key_I); + connect(m_selectImages, SIGNAL(triggered()), this, SLOT(slotSelectImages())); + buttonSelectImages->setDefaultAction(m_selectImages); + buttonSelectImages->setEnabled(false); + + m_unselectAll = new QAction(KIcon("kdenlive-unselect-all"), QString(), this); + m_unselectAll->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_A); + connect(m_unselectAll, SIGNAL(triggered()), this, SLOT(slotSelectNone())); + 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")); + connect(zDown, SIGNAL(clicked()), this, SLOT(slotZIndexDown())); + connect(zTop, SIGNAL(clicked()), this, SLOT(slotZIndexTop())); + connect(zBottom, SIGNAL(clicked()), this, SLOT(slotZIndexBottom())); + origin_x_left->setToolTip(i18n("Invert x axis and change 0 point")); 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 transparency")); - rectFAlpha->setToolTip(i18n("Border transparency")); zoom_slider->setToolTip(i18n("Zoom")); buttonRealSize->setToolTip(i18n("Original size (1:1)")); buttonFitZoom->setToolTip(i18n("Fit zoom")); - kcolorbutton->setToolTip(i18n("Select background color")); - horizontalSlider->setToolTip(i18n("Background Transparency")); - + backgroundColor->setToolTip(i18n("Select background color")); + backgroundAlpha->setToolTip(i18n("Background opacity")); + buttonSelectAll->setToolTip(getTooltipWithShortcut(i18n("Select all"), m_selectAll)); + buttonSelectText->setToolTip(getTooltipWithShortcut(i18n("Select text items in current selection"), m_selectText)); + buttonSelectRects->setToolTip(getTooltipWithShortcut(i18n("Select rect items in current selection"), m_selectRects)); + 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")); @@ -208,8 +393,9 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render QHBoxLayout *layout = new QHBoxLayout; frame_toolbar->setLayout(layout); - layout->setContentsMargins(2, 2, 2, 2); + layout->setContentsMargins(0, 0, 0, 0); QToolBar *m_toolbar = new QToolBar("titleToolBar", this); + m_toolbar->setIconSize(iconSize); m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString()); m_buttonCursor->setCheckable(true); @@ -252,14 +438,28 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render // initialize graphic scene m_scene = new GraphicsSceneRectMove(this); graphicsView->setScene(m_scene); + graphicsView->setMouseTracking(true); + graphicsView->setDragMode(QGraphicsView::RubberBandDrag); + graphicsView->setRubberBandSelectionMode(Qt::ContainsItemBoundingRect); 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); scene->setBackgroundBrush(*gradient);*/ + QPen framepen(Qt::DotLine); + framepen.setColor(Qt::red); + + m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight)); + m_frameBorder->setPen(framepen); + m_frameBorder->setZValue(-1100); + m_frameBorder->setBrush(Qt::transparent); + m_frameBorder->setFlags(0); + graphicsView->scene()->addItem(m_frameBorder); + m_frameImage = new QGraphicsPixmapItem(); QTransform qtrans; qtrans.scale(2.0, 2.0); @@ -278,15 +478,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *))); connect(zoom_slider, SIGNAL(valueChanged(int)), this , SLOT(slotUpdateZoom(int))); - QPen framepen(Qt::DotLine); - framepen.setColor(Qt::red); - - m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight)); - m_frameBorder->setPen(framepen); - m_frameBorder->setZValue(-1100); - m_frameBorder->setBrush(Qt::transparent); - m_frameBorder->setFlags(0); - graphicsView->scene()->addItem(m_frameBorder); // mbd: load saved settings readChoices(); @@ -304,6 +495,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render m_endViewport->setData(0, m_frameWidth); m_endViewport->setData(1, m_frameHeight); + // scale the view so that the title widget is not too big at startup + graphicsView->scale(.5, .5); if (!url.isEmpty()) loadTitle(url); else { slotTextTool(); @@ -312,8 +505,18 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render initAnimation(); connect(anim_start, SIGNAL(toggled(bool)), this, SLOT(slotAnimStart(bool))); connect(anim_end, SIGNAL(toggled(bool)), this, SLOT(slotAnimEnd(bool))); + connect(templateBox, SIGNAL(currentIndexChanged(int)), this, SLOT(templateIndexChanged(int))); buttonBox->button(QDialogButtonBox::Ok)->setEnabled(KdenliveSettings::hastitleproducer()); + refreshTitleTemplates(); + //templateBox->setIconSize(QSize(60,60)); + templateBox->clear(); + templateBox->addItem(""); + 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() @@ -325,6 +528,15 @@ TitleWidget::~TitleWidget() delete m_buttonSave; delete m_buttonLoad; delete m_unicodeAction; + delete m_zUp; + delete m_zDown; + delete m_zTop; + delete m_zBottom; + delete m_selectAll; + delete m_selectText; + delete m_selectRects; + delete m_selectImages; + delete m_unselectAll; delete m_unicodeDialog; delete m_frameBorder; @@ -335,6 +547,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) { @@ -377,7 +595,67 @@ QStringList TitleWidget::extractImageList(QString xml) return result; } +// static +QStringList TitleWidget::extractFontList(QString xml) +{ + QStringList result; + if (xml.isEmpty()) return result; + QDomDocument doc; + doc.setContent(xml); + QDomNodeList images = doc.elementsByTagName("content"); + for (int i = 0; i < images.count(); i++) { + if (images.at(i).toElement().hasAttribute("font")) + result.append(images.at(i).toElement().attribute("font")); + } + return result; +} +//static +void TitleWidget::refreshTitleTemplates() +{ + QStringList titlenamelist = QStringList() << i18n("None"); + QStringList titlefiles = QStringList() << QString(); + QStringList filters; + filters << "*.kdenlivetitle" ; + titletemplates.clear(); + QStringList titleTemplates = KGlobal::dirs()->findDirs("appdata", "titles"); + foreach(const QString & folder, titleTemplates) { + QStringList filesnames = QDir(folder).entryList(filters, QDir::Files); + foreach(const QString & fname, filesnames) { + //titlenamelist.append(fname); + //titlefiles.append(KUrl(folder).path(KUrl::AddTrailingSlash) + fname); + TitleTemplate t; + t.name = fname; + t.file = KUrl(folder).path(KUrl::AddTrailingSlash) + fname; + t.icon = QIcon(KThumb::getImage(t.file, 0, 60, 60)); + titletemplates.append(t); + } + } + kDebug() << titlenamelist << titlefiles; +} +void TitleWidget::templateIndexChanged(int index) +{ + QString item = templateBox->itemData(index).toString(); + 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; + } + loadTitle(item); + + // mbt 1607: Add property to distinguish between unchanged template titles and user titles. + // Text of unchanged template titles should be selected when clicked. + QList list = graphicsView->scene()->items(); + foreach(QGraphicsItem * qgItem, list) { + if (qgItem->type() == TEXTITEM) { + QGraphicsTextItem *i; + i = static_cast(qgItem); + i->setProperty("isTemplate", "true"); + i->setProperty("templateText", i->toHtml()); + } + } + lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex(); + } +} //virtual void TitleWidget::resizeEvent(QResizeEvent * /*event*/) { @@ -396,12 +674,18 @@ void TitleWidget::slotRectTool() m_scene->setTool(TITLE_RECTANGLE); showToolbars(TITLE_RECTANGLE); checkButton(TITLE_RECTANGLE); + + // Disable dragging mode, would make dragging a rect impossible otherwise ;) + graphicsView->setDragMode(QGraphicsView::NoDrag); } void TitleWidget::slotSelectTool() { m_scene->setTool(TITLE_SELECT); + // Enable rubberband selecting mode. + graphicsView->setDragMode(QGraphicsView::RubberBandDrag); + // Find out which toolbars need to be shown, depending on selected item TITLETOOL t = TITLE_SELECT; QList l = graphicsView->scene()->selectedItems(); @@ -422,7 +706,7 @@ void TitleWidget::slotSelectTool() enableToolbars(t); if (t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) { //graphicsView->centerOn(l.at(0)); - t = TITLE_NONE; + t = TITLE_SELECT; } showToolbars(t); @@ -459,35 +743,23 @@ void TitleWidget::slotImageTool() } m_scene->setTool(TITLE_SELECT); showToolbars(TITLE_SELECT); - checkButton(TITLE_NONE); + checkButton(TITLE_SELECT); } void TitleWidget::showToolbars(TITLETOOL toolType) { switch (toolType) { - case TITLE_TEXT: - rect_properties->setHidden(true); - image_properties->setHidden(true); - no_properties->setHidden(true); - text_properties->setHidden(false); - break; - case TITLE_RECTANGLE: - image_properties->setHidden(true); - no_properties->setHidden(true); - text_properties->setHidden(true); - rect_properties->setHidden(false); + case TITLE_SELECT: + toolbar_stack->setCurrentIndex(0); break; case TITLE_IMAGE: - no_properties->setHidden(true); - text_properties->setHidden(true); - rect_properties->setHidden(true); - image_properties->setHidden(false); + toolbar_stack->setCurrentIndex(3); break; - default: - text_properties->setHidden(true); - rect_properties->setHidden(true); - image_properties->setHidden(true); - no_properties->setHidden(false); + case TITLE_RECTANGLE: + toolbar_stack->setCurrentIndex(1); + break; + case TITLE_TEXT: + toolbar_stack->setCurrentIndex(2); break; } } @@ -495,41 +767,10 @@ void TitleWidget::showToolbars(TITLETOOL toolType) void TitleWidget::enableToolbars(TITLETOOL toolType) { // TITLETOOL is defined in graphicsscenerectmove.h - bool bFrame = false; - bool bText = false; - bool bRect = false; - bool bImage = false; - bool bValue_w = false; - bool bValue_h = false; - - switch (toolType) { - case TITLE_SELECT: - break; - case TITLE_TEXT: - bFrame = true; - bText = true; - break; - case TITLE_RECTANGLE: - bFrame = true; - bRect = true; - bValue_w = true; - bValue_h = true; - break; - case TITLE_IMAGE: - bFrame = true; - bValue_w = true; - bValue_h = true; - bImage = true; - break; - default: - break; - } - frame_properties->setEnabled(bFrame); - text_properties->setEnabled(bText); - rect_properties->setEnabled(bRect); - image_properties->setEnabled(bImage); - value_w->setEnabled(bValue_w); - value_h->setEnabled(bValue_h); + bool enable = false; + if (toolType == TITLE_RECTANGLE || toolType == TITLE_IMAGE) enable = true; + value_w->setEnabled(enable); + value_h->setEnabled(enable); } void TitleWidget::checkButton(TITLETOOL toolType) @@ -552,7 +793,7 @@ void TitleWidget::checkButton(TITLETOOL toolType) case TITLE_IMAGE: bImage = true; break; - case TITLE_NONE: + default: break; } @@ -564,24 +805,24 @@ void TitleWidget::checkButton(TITLETOOL toolType) void TitleWidget::displayBackgroundFrame() { + QRectF r = m_frameBorder->sceneBoundingRect(); if (!displayBg->isChecked()) { - QPixmap bg(m_frameWidth / 2, m_frameHeight / 2); QPixmap pattern(20, 20); pattern.fill(); QColor bgcolor(210, 210, 210); - QPainter p; - p.begin(&pattern); + QPainter p(&pattern); p.fillRect(QRect(0, 0, 10, 10), bgcolor); p.fillRect(QRect(10, 10, 20, 20), bgcolor); p.end(); QBrush br(pattern); - - p.begin(&bg); - p.fillRect(bg.rect(), br); - p.end(); + QPixmap bg((int) (r.width() / 2), (int) (r.height()/ 2)); + QPainter p2(&bg); + p2.fillRect(bg.rect(), br); + p2.end(); m_frameImage->setPixmap(bg); } else { - m_frameImage->setPixmap(QPixmap::fromImage(m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), m_frameWidth / 2, m_frameHeight / 2))); + QImage img = m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), QString(), m_render->frameRenderWidth() / 2, m_render->renderHeight() / 2); + m_frameImage->setPixmap(QPixmap::fromImage(img.scaled(r.width() / 2, r.height() / 2))); } } @@ -648,14 +889,20 @@ 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); //setCurrentItem(rect); //graphicsView->setFocus(); } @@ -673,8 +920,27 @@ 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(); + double outlineWidth = textOutline->value() / 10.0; + + tt->setData(101, outlineWidth); + tt->setData(102, outlineColor); + if (outlineWidth > 0.0) cformat.setTextOutline(QPen(outlineColor, outlineWidth)); + + cformat.setForeground(QBrush(color)); + cur.setCharFormat(cformat); + cur.setBlockFormat(format); + tt->setTextCursor(cur); tt->setZValue(m_count++); setCurrentItem(tt); } @@ -696,254 +962,249 @@ void TitleWidget::setCurrentItem(QGraphicsItem *item) void TitleWidget::zIndexChanged(int v) { QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { - l[0]->setZValue(v); + for (int i = 0; i < l.size(); i++) { + l[i]->setZValue(v); } } void TitleWidget::selectionChanged() { if (m_scene->tool() != TITLE_SELECT) return; - QList l = graphicsView->scene()->selectedItems(); - //toolBox->setItemEnabled(2, false); - //toolBox->setItemEnabled(3, false); - value_x->blockSignals(true); - value_y->blockSignals(true); - value_w->blockSignals(true); - value_h->blockSignals(true); - itemzoom->blockSignals(true); - itemrotate->blockSignals(true); - if (l.size() == 0) { - effect_stack->setHidden(true); - effect_list->setEnabled(false); - effect_list->setCurrentIndex(0); - bool blockX = !origin_x_left->signalsBlocked(); - bool blockY = !origin_y_top->signalsBlocked(); - if (blockX) origin_x_left->blockSignals(true); - if (blockY) origin_y_top->blockSignals(true); - origin_x_left->setChecked(false); - origin_y_top->setChecked(false); - updateTextOriginX(); - updateTextOriginY(); - enableToolbars(TITLE_NONE); - if (blockX) origin_x_left->blockSignals(false); - if (blockY) origin_y_top->blockSignals(false); - itemzoom->setEnabled(false); - itemrotate->setEnabled(false); - } else if (l.size() == 1) { - effect_list->setEnabled(true); - if (l.at(0) != m_startViewport && l.at(0) != m_endViewport) { - itemzoom->setEnabled(true); - itemrotate->setEnabled(true); - } else { - itemzoom->setEnabled(false); - itemrotate->setEnabled(false); - updateInfoText(); - } - if (l.at(0)->type() == TEXTITEM) { - showToolbars(TITLE_TEXT); - QGraphicsTextItem* i = static_cast (l.at(0)); - if (!i->data(100).isNull()) { - // Item has an effect - QStringList effdata = i->data(100).toStringList(); - if (effdata.at(0) == "typewriter") { - typewriter_delay->setValue(effdata.at(1).toInt()); - effect_list->setCurrentIndex(3); - effect_stack->setHidden(false); - } - } - else effect_stack->setHidden(true); - //if (l[0]->hasFocus()) - //toolBox->setCurrentIndex(0); - //toolBox->setItemEnabled(2, true); - font_size->blockSignals(true); - font_family->blockSignals(true); - font_weight_box->blockSignals(true); - buttonItalic->blockSignals(true); - buttonUnder->blockSignals(true); - fontColorButton->blockSignals(true); - textAlpha->blockSignals(true); - 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()); - buttonItalic->setChecked(font.italic()); - buttonUnder->setChecked(font.underline()); - setFontBoxWeight(font.weight()); + std::cout << "Number of selected items: " << graphicsView->scene()->selectedItems().length() << "\n"; - QColor color = i->defaultTextColor(); - fontColorButton->setColor(color); - textAlpha->setValue(color.alpha()); + QList l; - 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); + // mbt 1607: One text item might have grabbed the keyboard. + // Ungrab it for all items that are not selected, otherwise + // text input would only work for the text item that grabbed + // the keyboard last. + l = graphicsView->scene()->items(); + foreach(QGraphicsItem * item, l) { + if (item->type() == TEXTITEM && !item->isSelected()) { + QGraphicsTextItem *i = static_cast(item); + i->ungrabKeyboard(); + } + } - font_size->blockSignals(false); - font_family->blockSignals(false); - font_weight_box->blockSignals(false); - buttonItalic->blockSignals(false); - buttonUnder->blockSignals(false); - fontColorButton->blockSignals(false); - textAlpha->blockSignals(false); - buttonAlignLeft->blockSignals(false); - buttonAlignRight->blockSignals(false); - buttonAlignNone->blockSignals(false); - buttonAlignCenter->blockSignals(false); + l = graphicsView->scene()->selectedItems(); - updateAxisButtons(i); - updateCoordinates(i); - updateDimension(i); - enableToolbars(TITLE_TEXT); + if (l.size() > 0) { + buttonUnselectAll->setEnabled(true); + // Enable all z index buttons if items selected. + // We can selectively disable them later. + zUp->setEnabled(true); + zDown->setEnabled(true); + zTop->setEnabled(true); + zBottom->setEnabled(true); + } else { + buttonUnselectAll->setEnabled(false); + } + if (l.size() >= 2) { + buttonSelectText->setEnabled(true); + buttonSelectRects->setEnabled(true); + buttonSelectImages->setEnabled(true); + } else { + buttonSelectText->setEnabled(false); + buttonSelectRects->setEnabled(false); + buttonSelectImages->setEnabled(false); + } - } else if ((l.at(0))->type() == RECTITEM) { - showToolbars(TITLE_RECTANGLE); - settingUp = true; - QGraphicsRectItem *rec = static_cast (l.at(0)); - if (rec == m_startViewport || rec == m_endViewport) { - /*toolBox->setCurrentIndex(3); - toolBox->widget(0)->setEnabled(false); - toolBox->widget(1)->setEnabled(false);*/ - enableToolbars(TITLE_NONE); - } else { - /*toolBox->widget(0)->setEnabled(true); - toolBox->widget(1)->setEnabled(true); - toolBox->setCurrentIndex(0);*/ - //toolBox->setItemEnabled(3, true); - rectFAlpha->setValue(rec->pen().color().alpha()); - rectBAlpha->setValue(rec->brush().color().alpha()); - //kDebug() << rec->brush().color().alpha(); - QColor fcol = rec->pen().color(); - QColor bcol = rec->brush().color(); - //fcol.setAlpha(255); - //bcol.setAlpha(255); - rectFColor->setColor(fcol); - rectBColor->setColor(bcol); - settingUp = false; - rectLineWidth->setValue(rec->pen().width()); - enableToolbars(TITLE_RECTANGLE); + if (l.size() == 0) { + prepareTools(NULL); + } else if (l.size() == 1) { + prepareTools(l.at(0)); + } else { + /* + For multiple selected objects we need to decide which tools to show. + */ + int firstType = l.at(0)->type(); + bool allEqual = true; + for (int i = 0; i < l.size(); i++) { + if (l.at(i)->type() != firstType) { + allEqual = false; + break; } + } + std::cout << "All equal? " << allEqual << ".\n"; + if (allEqual) { + prepareTools(l.at(0)); + } else { + // Get the default toolset, but enable the property frame (x,y,w,h) + prepareTools(NULL); + frame_properties->setEnabled(true); + + // Enable x/y/w/h if it makes sense. + value_x->setEnabled(true); + value_y->setEnabled(true); + bool containsTextitem = false; + for (int i = 0; i < l.size(); i++) { + if (l.at(i)->type() == TEXTITEM) { + containsTextitem = true; + break; + } + } + if (!containsTextitem) { + value_w->setEnabled(true); + value_h->setEnabled(true); + } + } - updateAxisButtons(l.at(0)); - updateCoordinates(rec); - updateDimension(rec); - - } else if (l.at(0)->type() == IMAGEITEM) { - showToolbars(TITLE_IMAGE); - - updateCoordinates(l.at(0)); - updateDimension(l.at(0)); + // Disable z index buttons if they don't make sense for the current selection + int firstZindex = l.at(0)->zValue(); + allEqual = true; + for (int i = 0; i < l.size(); i++) { + if (l[i]->zValue() != firstZindex) { + allEqual = false; + break; + } + } + if (!allEqual) { + zUp->setEnabled(false); + zDown->setEnabled(false); + } - enableToolbars(TITLE_IMAGE); - } else { - //toolBox->setCurrentIndex(0); - showToolbars(TITLE_NONE); - enableToolbars(TITLE_NONE); - /*frame_properties->setEnabled(false); - text_properties->setEnabled(false); - rect_properties->setEnabled(false);*/ - } - zValue->setValue((int)l.at(0)->zValue()); - itemzoom->setValue((int)(m_transformations.value(l.at(0)).scalex * 100.0 + 0.5)); - itemrotate->setValue((int)(m_transformations.value(l.at(0)).rotate)); - value_x->blockSignals(false); - value_y->blockSignals(false); - value_w->blockSignals(false); - value_h->blockSignals(false); - itemzoom->blockSignals(false); - itemrotate->blockSignals(false); } + } void TitleWidget::slotValueChanged(int type) { + /* + type tells us which QSpinBox value has changed. + */ + QList l = graphicsView->scene()->selectedItems(); - if (l.size() > 0 && l.at(0)->type() == IMAGEITEM) { + std::cout << l.size() << " items to be resized\n"; - int val = 0; - switch (type) { - case ValueWidth: - val = value_w->value(); - break; - case ValueHeight: - val = value_h->value(); - break; - } + // Get the updated value here already to do less coding afterwards + int val = 0; + switch (type) { + case ValueWidth: + val = value_w->value(); + break; + case ValueHeight: + val = value_h->value(); + break; + case ValueX: + val = value_x->value(); + break; + case ValueY: + val = value_y->value(); + break; + } - QGraphicsItem *i = l.at(0); - Transform t = m_transformations.value(i); + for (int k = 0; k < l.size(); k++) { + std::cout << "Type of item " << k << ": " << l.at(k)->type() << "\n"; + + if (l.at(k)->type() == TEXTITEM) { + // Just update the position. We don't allow setting width/height for text items yet. + switch (type) { + case ValueX: + updatePosition(l.at(k), val, l.at(k)->pos().y()); + break; + case ValueY: + updatePosition(l.at(k), l.at(k)->pos().x(), val); + break; + } - // Ratio width:height - double phi = (double) i->boundingRect().width() / i->boundingRect().height(); - double alpha = (double) t.rotate / 180.0 * M_PI; + } else if (l.at(k)->type() == RECTITEM) { + QGraphicsRectItem *rec = static_cast (l.at(k)); + switch (type) { + case ValueX: + updatePosition(l.at(k), val, l.at(k)->pos().y()); + break; + case ValueY: + updatePosition(l.at(k), l.at(k)->pos().x(), val); + break; + case ValueWidth: + rec->setRect(QRect(0, 0, val, rec->rect().height())); + break; + case ValueHeight: + rec->setRect(QRect(0, 0, rec->rect().width(), val)); + break; + } - // New length - double length = val; + } else if (l.at(k)->type() == IMAGEITEM) { - // Scaling factor - double scale = 1; - switch (type) { - case ValueWidth: - // Add 0.5 because otherwise incrementing by 1 might have no effect - length = val / (cos(alpha) + 1 / phi * sin(alpha)) + 0.5; - scale = length / i->boundingRect().width(); - break; - case ValueHeight: - length = val / (phi * sin(alpha) + cos(alpha)) + 0.5; - scale = length / i->boundingRect().height(); - break; - } + if (type == ValueX) { + updatePosition(l.at(k), val, l.at(k)->pos().y()); - t.scalex = scale; - t.scaley = scale; - QTransform qtrans; - qtrans.scale(scale, scale); - qtrans.rotate(t.rotate); - i->setTransform(qtrans); - m_transformations[i] = t; + } else if (type == ValueY) { + updatePosition(l.at(k), l.at(k)->pos().x(), val); - updateDimension(i); - updateRotZoom(i); - } -} + } else { + // Width/height has changed. This is more complex. + + QGraphicsItem *i = l.at(k); + Transform t = m_transformations.value(i); + + // Ratio width:height + double phi = (double) i->boundingRect().width() / i->boundingRect().height(); + // TODO: proper calculation for rotation around 3 axes + double alpha = (double) t.rotatez / 180.0 * M_PI; + + // New length + double length = val; + + // Scaling factor + double scale = 1; + + // We want to keep the aspect ratio of the image as the user does not yet have the possibility + // to restore the original ratio. You rarely want to change it anyway. + switch (type) { + case ValueWidth: + // Add 0.5 because otherwise incrementing by 1 might have no effect + length = val / (cos(alpha) + 1 / phi * sin(alpha)) + 0.5; + scale = length / i->boundingRect().width(); + break; + case ValueHeight: + length = val / (phi * sin(alpha) + cos(alpha)) + 0.5; + scale = length / i->boundingRect().height(); + break; + } + + t.scalex = scale; + t.scaley = scale; + QTransform qtrans; + qtrans.scale(scale, scale); + qtrans.rotate(t.rotatex, Qt::XAxis); + qtrans.rotate(t.rotatey, Qt::YAxis); + qtrans.rotate(t.rotatez, Qt::ZAxis); + i->setTransform(qtrans); + std::cout << "scale is: " << scale << "\n"; + std::cout << i->boundingRect().width() << ": new width\n"; + m_transformations[i] = t; + + if (l.size() == 1) { + // Only update the w/h values if the selection contains just one item. + // Otherwise, what should we do? ;) + // (Use the values of the first item? Of the second? Of the x-th?) + updateDimension(i); + // Update rotation/zoom values. + // These values are not yet able to handle multiple items! + updateRotZoom(i); + } + } -/** \brief Updates position/size of the selected item when a value - * of an item (coordinates, size) has changed */ -void TitleWidget::slotAdjustSelectedItem() -{ - QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { - if (l.at(0)->type() == RECTITEM) { - //rect item - QGraphicsRectItem *rec = static_cast (l.at(0)); - updatePosition(rec); - rec->setRect(QRect(0, 0, value_w->value(), value_h->value())); - } else if (l.at(0)->type() == TEXTITEM) { - //text item - updatePosition(l.at(0)); - } else if (l.at(0)->type() == IMAGEITEM) { - //image item - updatePosition(l.at(0)); } } + + } -/** \brief Updates width/height int the text fields, regarding transformation matrix */ void TitleWidget::updateDimension(QGraphicsItem *i) { + bool wBlocked = value_w->signalsBlocked(); + bool hBlocked = value_h->signalsBlocked(); + bool zBlocked = zValue->signalsBlocked(); value_w->blockSignals(true); value_h->blockSignals(true); + zValue->blockSignals(true); - + zValue->setValue((int) i->zValue()); if (i->type() == IMAGEITEM) { // Get multipliers for rotation/scaling @@ -958,6 +1219,7 @@ void TitleWidget::updateDimension(QGraphicsItem *i) value_h->setValue(i->sceneBoundingRect().height()); } else if (i->type() == RECTITEM) { QGraphicsRectItem *r = static_cast (i); + std::cout << "Rect width is: " << r->rect().width() << ", was: " << value_w->value() << "\n"; value_w->setValue((int) r->rect().width()); value_h->setValue((int) r->rect().height()); } else if (i->type() == TEXTITEM) { @@ -966,11 +1228,11 @@ void TitleWidget::updateDimension(QGraphicsItem *i) value_h->setValue((int) t->boundingRect().height()); } - value_w->blockSignals(false); - value_h->blockSignals(false); + zValue->blockSignals(zBlocked); + value_w->blockSignals(wBlocked); + value_h->blockSignals(hBlocked); } -/** \brief Updates the coordinates in the text fields from the item */ void TitleWidget::updateCoordinates(QGraphicsItem *i) { // Block signals emitted by this method @@ -1039,40 +1301,53 @@ void TitleWidget::updateCoordinates(QGraphicsItem *i) void TitleWidget::updateRotZoom(QGraphicsItem *i) { itemzoom->blockSignals(true); - itemrotate->blockSignals(false); + itemrotatex->blockSignals(true); + itemrotatey->blockSignals(true); + itemrotatez->blockSignals(true); Transform t = m_transformations.value(i); - itemzoom->setValue((int)(t.scalex * 100.0 + 0.5)); - itemrotate->setValue((int)(t.rotate)); + + if (!i->data(ZOOMFACTOR).isNull()) itemzoom->setValue(i->data(ZOOMFACTOR).toInt()); + else itemzoom->setValue((int)(t.scalex * 100.0 + 0.5)); + + itemrotatex->setValue((int)(t.rotatex)); + itemrotatey->setValue((int)(t.rotatey)); + itemrotatez->setValue((int)(t.rotatez)); itemzoom->blockSignals(false); - itemrotate->blockSignals(false); + itemrotatex->blockSignals(false); + itemrotatey->blockSignals(false); + itemrotatez->blockSignals(false); } -/** \brief Updates the position of an item by reading coordinates from the text fields */ void TitleWidget::updatePosition(QGraphicsItem *i) +{ + updatePosition(i, value_x->value(), value_y->value()); +} + +void TitleWidget::updatePosition(QGraphicsItem *i, int x, int y) { if (i->type() == TEXTITEM) { QGraphicsTextItem *rec = static_cast (i); int posX; if (origin_x_left->isChecked()) { - /* Origin of the x axis is at m_frameWidth, - * and distance from right border of the item to the right - * border of the frame is taken. - * See comment to slotOriginXClicked(). + /* + * Origin of the X axis is at m_frameWidth, and distance from right + * border of the item to the right border of the frame is taken. See + * comment to slotOriginXClicked(). */ - posX = m_frameWidth - value_x->value() - rec->boundingRect().width(); + posX = m_frameWidth - x - rec->boundingRect().width(); } else { - posX = value_x->value(); + posX = x; } int posY; if (origin_y_top->isChecked()) { /* Same for y axis */ - posY = m_frameHeight - value_y->value() - rec->boundingRect().height(); + posY = m_frameHeight - y - rec->boundingRect().height(); } else { - posY = value_y->value(); + posY = y; } rec->setPos(posX, posY); @@ -1083,16 +1358,16 @@ void TitleWidget::updatePosition(QGraphicsItem *i) int posX; if (origin_x_left->isChecked()) { - posX = m_frameWidth - value_x->value() - rec->rect().width(); + posX = m_frameWidth - x - rec->rect().width(); } else { - posX = value_x->value(); + posX = x; } int posY; if (origin_y_top->isChecked()) { - posY = m_frameHeight - value_y->value() - rec->rect().height(); + posY = m_frameHeight - y - rec->rect().height(); } else { - posY = value_y->value(); + posY = y; } rec->setPos(posX, posY); @@ -1101,16 +1376,16 @@ void TitleWidget::updatePosition(QGraphicsItem *i) int posX; if (origin_x_left->isChecked()) { // Use the sceneBoundingRect because this also regards transformations like zoom - posX = m_frameWidth - value_x->value() - i->sceneBoundingRect().width(); + posX = m_frameWidth - x - i->sceneBoundingRect().width(); } else { - posX = value_x->value(); + posX = x; } int posY; if (origin_y_top->isChecked()) { - posY = m_frameHeight - value_y->value() - i->sceneBoundingRect().height(); + posY = m_frameHeight - y - i->sceneBoundingRect().height(); } else { - posY = value_y->value(); + posY = y; } i->setPos(posX, posY); @@ -1196,14 +1471,12 @@ void TitleWidget::updateAxisButtons(QGraphicsItem *i) void TitleWidget::slotChangeBackground() { - QColor color = kcolorbutton->color(); - color.setAlpha(horizontalSlider->value()); + QColor color = backgroundColor->color(); + m_scene->setBackgroundBrush(QBrush(color)); + color.setAlpha(backgroundAlpha->value()); m_frameBorder->setBrush(QBrush(color)); } -/** - * Something (yeah) has changed in our QGraphicsScene. - */ void TitleWidget::slotChanged() { QList l = graphicsView->scene()->selectedItems(); @@ -1212,33 +1485,43 @@ void TitleWidget::slotChanged() } } -/** - * If the user has set origin_x_left (everything also for y), - * we need to look whether a text element has been selected. If yes, - * we need to ensure that the right border of the text field - * remains fixed also when some text has been entered. - * - * This is also known as right-justified, with the difference that - * it is not valid for text but for its boundingRect. Text may still - * be left-justified. - */ void TitleWidget::textChanged(QGraphicsTextItem *i) { - + /* + * If the user has set origin_x_left (the same for y), we need to look + * whether a text element has been selected. If yes, we need to ensure that + * the right border of the text field remains fixed also when some text has + * been entered. + * + * This is also known as right-justified, with the difference that it is not + * valid for text but for its boundingRect. Text may still be + * left-justified. + */ updateDimension(i); if (origin_x_left->isChecked() || origin_y_top->isChecked()) { - - if (!i->toPlainText().isEmpty()) { + if (!i->toPlainText().isEmpty()) updatePosition(i); - } else { + else { /* - * Don't do anything if the string is empty. If the position - * would be updated here, a newly created text field would - * be set to the position of the last selected text field. + * Don't do anything if the string is empty. If the position were + * updated here, a newly created text field would be set to the + * position of the last selected text field. */ } } + + // mbt 1607: Template text has changed; don't auto-select content anymore. + if (i->property("isTemplate").isValid()) { + if (i->property("templateText").isValid()) { + if (i->property("templateText") == i->toHtml()) { + // Unchanged, do nothing. + } else { + i->setProperty("isTemplate", QVariant::Invalid); + i->setProperty("templateText", QVariant::Invalid); + } + } + } } void TitleWidget::slotInsertUnicode() @@ -1265,52 +1548,79 @@ void TitleWidget::slotUpdateText() font.setUnderline(buttonUnder->isChecked()); font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt()); 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 - QGraphicsTextItem* item = NULL; - QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1 && l.at(0)->type() == TEXTITEM) { - item = static_cast (l.at(0)); - } - if (!item) return; - //if (item->textCursor().selection ().isEmpty()) - QTextCursor cur = item->textCursor(); - 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); - } + double outlineWidth = textOutline->value() / 10.0; - { - item->setFont(font); - item->setDefaultTextColor(color); + 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); +// item->setTextCursor(cur); cur.clearSelection(); item->setTextCursor(cur); - + item->setDefaultTextColor(color); } } 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()); - 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(); +#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)); + } } } @@ -1323,24 +1633,58 @@ void TitleWidget::itemScaled(int val) x.scaley = (double)val / 100.0; QTransform qtrans; qtrans.scale(x.scalex, x.scaley); - qtrans.rotate(x.rotate); + qtrans.rotate(x.rotatex, Qt::XAxis); + qtrans.rotate(x.rotatey, Qt::YAxis); + qtrans.rotate(x.rotatez, Qt::ZAxis); l[0]->setTransform(qtrans); + l[0]->setData(ZOOMFACTOR, val); m_transformations[l.at(0)] = x; updateDimension(l.at(0)); } } -void TitleWidget::itemRotate(int val) +void TitleWidget::itemRotateX(qreal val) +{ + itemRotate(val, 0); +} + +void TitleWidget::itemRotateY(qreal val) +{ + itemRotate(val, 1); +} + +void TitleWidget::itemRotateZ(qreal val) +{ + itemRotate(val, 2); +} + +void TitleWidget::itemRotate(qreal val, int axis) { QList l = graphicsView->scene()->selectedItems(); if (l.size() == 1) { Transform x = m_transformations[l.at(0)]; - x.rotate = (double)val; + switch (axis) { + case 0: + x.rotatex = val; + break; + case 1: + x.rotatey = val; + break; + case 2: + x.rotatez = val; + break; + } + + l[0]->setData(ROTATEFACTOR, QList() << QVariant(x.rotatex) << QVariant(x.rotatey) << QVariant(x.rotatez)); + QTransform qtrans; qtrans.scale(x.scalex, x.scaley); - qtrans.rotate(x.rotate); + qtrans.rotate(x.rotatex, Qt::XAxis); + qtrans.rotate(x.rotatey, Qt::YAxis); + qtrans.rotate(x.rotatez, Qt::ZAxis); l[0]->setTransform(qtrans); m_transformations[l.at(0)] = x; + if (l[0]->data(ZOOMFACTOR).isNull()) l[0]->setData(ZOOMFACTOR, 100); updateDimension(l.at(0)); } } @@ -1497,20 +1841,23 @@ 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) + { + embed_image=true; + } 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); -#if KDE_IS_VERSION(4,2,0) fs->setConfirmOverwrite(true); -#endif fs->setKeepLocation(true); fs->exec(); - url = fs->selectedUrl(); + if (fs) url = fs->selectedUrl(); delete fs; } if (!url.isEmpty()) { - if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text())) == false) + if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()), embed_image) == false) KMessageBox::error(this, i18n("Cannot write to file %1", url.path())); } } @@ -1522,7 +1869,7 @@ QDomDocument TitleWidget::xml() return doc; } -int TitleWidget::duration() const +int TitleWidget::outPoint() const { return m_tc.getFrameCount(title_duration->text()); } @@ -1530,7 +1877,7 @@ int TitleWidget::duration() const void TitleWidget::setXml(QDomDocument doc) { int out; - m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out); + m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out, m_projectTitlePath); adjustFrameSize(); title_duration->setText(m_tc.getTimecode(GenTime(out, m_render->fps()))); /*if (doc.documentElement().hasAttribute("out")) { @@ -1548,18 +1895,40 @@ void TitleWidget::setXml(QDomDocument doc) Transform x; x.scalex = t.m11(); x.scaley = t.m22(); - x.rotate = 180. / PI * atan2(-t.m21(), t.m11()); + if (!items.at(i)->data(ROTATEFACTOR).isNull()) { + QList rotlist = items.at(i)->data(ROTATEFACTOR).toList(); + if (rotlist.count() >= 3) { + x.rotatex = rotlist[0].toDouble(); + x.rotatey = rotlist[1].toDouble(); + x.rotatez = rotlist[2].toDouble(); + + // Try to adjust zoom + t.rotate(x.rotatex *(-1), Qt::XAxis); + t.rotate(x.rotatey *(-1), Qt::YAxis); + t.rotate(x.rotatez *(-1), Qt::ZAxis); + x.scalex = t.m11(); + x.scaley = t.m22(); + } else { + x.rotatex = 0; + x.rotatey = 0; + x.rotatez = 0; + } + } else { + x.rotatex = 0; + x.rotatey = 0; + x.rotatez = 180. / PI * atan2(-t.m21(), t.m11()); + } m_transformations[items.at(i)] = x; } // 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()); + backgroundAlpha->blockSignals(true); + backgroundColor->blockSignals(true); + backgroundAlpha->setValue(background_color.alpha()); background_color.setAlpha(255); - kcolorbutton->setColor(background_color); - horizontalSlider->blockSignals(false); - kcolorbutton->blockSignals(false); + backgroundColor->setColor(background_color); + backgroundAlpha->blockSignals(false); + backgroundColor->blockSignals(false); /*startViewportX->setValue(m_startViewport->data(0).toInt()); startViewportY->setValue(m_startViewport->data(1).toInt()); @@ -1570,9 +1939,9 @@ void TitleWidget::setXml(QDomDocument doc) QTimer::singleShot(200, this, SLOT(slotAdjustZoom())); slotSelectTool(); + selectionChanged(); } -/** \brief Connected to the accepted signal - calls writeChoices */ void TitleWidget::slotAccepted() { if (anim_start->isChecked()) slotAnimStart(false); @@ -1580,7 +1949,6 @@ void TitleWidget::slotAccepted() writeChoices(); } -/** \brief Store the current choices of font, background and rect values */ void TitleWidget::writeChoices() { // Get a pointer to a shared configuration instance, then get the TitleWidget group. @@ -1591,26 +1959,41 @@ 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_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", kcolorbutton->color()); - titleConfig.writeEntry("background_alpha", horizontalSlider->value()); + titleConfig.writeEntry("background_color", backgroundColor->color()); + titleConfig.writeEntry("background_alpha", backgroundAlpha->value()); //! \todo Not sure if I should sync - it is probably safe to do it config->sync(); } -/** \brief Read the last stored choices into the dialog */ void TitleWidget::readChoices() { // Get a pointer to a shared configuration instance, then get the TitleWidget group. @@ -1619,8 +2002,20 @@ void TitleWidget::readChoices() // read the entries font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont())); font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value())); - fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color())); + m_scene->slotUpdateFontSize(font_size->value()); + 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 + fontColorButton->setColor(fontColor); + textOutlineColor->setColor(outlineColor); + textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value())); + int weight; if (titleConfig.readEntry("font_bold", false)) weight = QFont::Bold; else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt()); @@ -1628,14 +2023,23 @@ 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_background_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())); - kcolorbutton->setColor(titleConfig.readEntry("background_color", kcolorbutton->color())); - horizontalSlider->setValue(titleConfig.readEntry("background_alpha", horizontalSlider->value())); + backgroundColor->setColor(titleConfig.readEntry("background_color", backgroundColor->color())); + backgroundAlpha->setValue(titleConfig.readEntry("background_alpha", backgroundAlpha->value())); } void TitleWidget::adjustFrameSize() @@ -1663,9 +2067,11 @@ void TitleWidget::slotAnimStart(bool anim) } align_box->setEnabled(anim); itemzoom->setEnabled(!anim); - itemrotate->setEnabled(!anim); + itemrotatex->setEnabled(!anim); + itemrotatey->setEnabled(!anim); + itemrotatez->setEnabled(!anim); frame_toolbar->setEnabled(!anim); - rect_properties->setEnabled(!anim); + toolbar_stack->setEnabled(!anim); if (anim) { keep_aspect->setChecked(!m_startViewport->data(0).isNull()); m_startViewport->setZValue(1100); @@ -1703,9 +2109,11 @@ void TitleWidget::slotAnimEnd(bool anim) } align_box->setEnabled(anim); itemzoom->setEnabled(!anim); - itemrotate->setEnabled(!anim); + itemrotatex->setEnabled(!anim); + itemrotatey->setEnabled(!anim); + itemrotatez->setEnabled(!anim); frame_toolbar->setEnabled(!anim); - rect_properties->setEnabled(!anim); + toolbar_stack->setEnabled(!anim); if (anim) { keep_aspect->setChecked(!m_endViewport->data(0).isNull()); m_endViewport->setZValue(1100); @@ -1779,7 +2187,6 @@ void TitleWidget::deleteAnimInfoText() } } - void TitleWidget::slotKeepAspect(bool keep) { if (m_endViewport->zValue() == 1100) { @@ -1814,39 +2221,50 @@ void TitleWidget::slotResize200() void TitleWidget::slotAddEffect(int ix) { - if (ix == 0) { - effect_stack->setHidden(true); - return; - } - effect_stack->setCurrentIndex(ix -1); - effect_stack->setHidden(false); - QList l = graphicsView->scene()->selectedItems(); - if (ix == 3) { - if (l.size() == 1) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()); - l[0]->setData(100, effdata); - } - } -#if QT_VERSION < 0x040600 - return; -#else - if (ix == 1) { - // Blur effect - if (l.size() == 1) { - QGraphicsEffect *eff = new QGraphicsBlurEffect(); - l[0]->setGraphicsEffect(eff); - } - } else if (ix == 2) { - if (l.size() == 1) { - QGraphicsEffect *eff = new QGraphicsDropShadowEffect(); - l[0]->setGraphicsEffect(eff); - } - } + QList list = graphicsView->scene()->selectedItems(); + int effect = effect_list->itemData(ix).toInt(); + + if (list.size() == 1) { + if (effect == NOEFFECT) + effect_stack->setHidden(true); + else { + effect_stack->setCurrentIndex(effect - 1); + effect_stack->setHidden(false); + } + } else // Hide the effects stack when more than one element is selected. + effect_stack->setHidden(true); + foreach(QGraphicsItem * item, list) { + switch (effect) { + case NOEFFECT: + item->setData(100, QVariant()); +#if QT_VERSION >= 0x040600 + item->setGraphicsEffect(0); #endif + break; + case TYPEWRITEREFFECT: + /* + * Allow the user to set the typewriter effect to more than one + * 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()); + item->setData(100, effdata); + } + break; +#if QT_VERSION >= 0x040600 + // Do not remove the non-QGraphicsEffects. + case BLUREFFECT: + item->setGraphicsEffect(new QGraphicsBlurEffect()); + break; + case SHADOWEFFECT: + item->setGraphicsEffect(new QGraphicsDropShadowEffect()); + break; +#endif + } + } } - void TitleWidget::slotFontText(const QString& s) { const QFont f(s); @@ -1855,15 +2273,15 @@ void TitleWidget::slotFontText(const QString& s) // starts typing «dejavu» for example). font_family->setCurrentFont(f); } - // TODO: typing dejavu serif does not recognize the font (takes sans). - // upper/lowercase problem? + // Note: Typing dejavu serif does not recognize the font (takes sans) + // in older Qt versions. Case must match there (except for first letter) } -void TitleWidget::slotEditTypewriter(int ix) +void TitleWidget::slotEditTypewriter(int /*ix*/) { QList l = graphicsView->scene()->selectedItems(); if (l.size() == 1) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()); + QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value()); l[0]->setData(100, effdata); } } @@ -1898,3 +2316,425 @@ void TitleWidget::slotEditShadow() } #endif } + +qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly) +{ + qreal bound = maxBound ? -99 : 99; + QList l = graphicsView->scene()->selectedItems(); + if (l.size() > 0) { + QList lItems; + // Get items (all or intersecting only) + if (intersectingOnly) { + lItems = graphicsView->scene()->items(l[0]->sceneBoundingRect(), Qt::IntersectsItemShape); + } else { + lItems = graphicsView->scene()->items(); + } + if (lItems.size() > 0) { + int n = lItems.size(); + qreal z; + if (maxBound) { + for (int i = 0; i < n; i++) { + z = lItems[i]->zValue(); + if (z > bound && !lItems[i]->isSelected()) { + bound = z; + } else if (z - 1 > bound) { + // To get the maximum index even if it is of an item of the current selection. + // Used when updating multiple items, to get all to the same level. + // Otherwise, the maximum would stay at -99 if the highest item is in the selection. + bound = z - 1; + } + } + } else { + // Get minimum z index. + for (int i = 0; i < n; i++) { + z = lItems[i]->zValue(); + if (z < bound && !lItems[i]->isSelected() && z > -999) { + // There are items at the very bottom (background e.g.) with z-index < -1000. + bound = z; + } else if (z + 1 < bound && z > -999) { + bound = z + 1; + } + } + } + } + } + return bound; +} + +void TitleWidget::slotZIndexUp() +{ + QList l = graphicsView->scene()->selectedItems(); + if (l.size() >= 1) { + qreal currentZ = l[0]->zValue(); + qreal max = zIndexBounds(true, true); + if (currentZ <= max) { + l[0]->setZValue(currentZ + 1); + updateDimension(l[0]); + } + } +} + +void TitleWidget::slotZIndexTop() +{ + QList l = graphicsView->scene()->selectedItems(); + qreal max = zIndexBounds(true, false); + std::cout << "Max z-index is " << max << ".\n"; + for (int i = 0; i < l.size(); i++) { + qreal currentZ = l[i]->zValue(); + if (currentZ <= max) { + std::cout << "Updating item " << i << ", is " << currentZ << ".\n"; + l[i]->setZValue(max + 1); + } else { + std::cout << "Not updating " << i << ", is " << currentZ << ".\n"; + } + } + // Update the z index value in the GUI + if (l.size() > 0) { + updateDimension(l[0]); + } +} + +void TitleWidget::slotZIndexDown() +{ + QList l = graphicsView->scene()->selectedItems(); + if (l.size() >= 1) { + qreal currentZ = l[0]->zValue(); + qreal min = zIndexBounds(false, true); + if (currentZ >= min) { + l[0]->setZValue(currentZ - 1); + updateDimension(l[0]); + } + } +} + +void TitleWidget::slotZIndexBottom() +{ + QList l = graphicsView->scene()->selectedItems(); + qreal min = zIndexBounds(false, false); + for (int i = 0; i < l.size(); i++) { + qreal currentZ = l[i]->zValue(); + if (currentZ >= min) { + l[i]->setZValue(min - 1); + } + } + // Update the z index value in the GUI + if (l.size() > 0) { + updateDimension(l[0]); + } +} + +void TitleWidget::slotSelectAll() +{ + QList l = graphicsView->scene()->items(); + for (int i = 0; i < l.size(); i++) { + l.at(i)->setSelected(true); + } +} + +void TitleWidget::selectItems(int itemType) +{ + QList l; + if (graphicsView->scene()->selectedItems().size() > 0) { + l = graphicsView->scene()->selectedItems(); + for (int i = 0; i < l.size(); i++) { + if (l.at(i)->type() != itemType) { + l.at(i)->setSelected(false); + } + } + } else { + l = graphicsView->scene()->items(); + for (int i = 0; i < l.size(); i++) { + if (l.at(i)->type() == itemType) { + l.at(i)->setSelected(true); + } + } + } +} + +void TitleWidget::slotSelectText() +{ + selectItems(TEXTITEM); +} + +void TitleWidget::slotSelectRects() +{ + selectItems(RECTITEM); +} + +void TitleWidget::slotSelectImages() +{ + selectItems(IMAGEITEM); +} + +void TitleWidget::slotSelectNone() +{ + graphicsView->blockSignals(true); + QList l = graphicsView->scene()->items(); + for (int i = 0; i < l.size(); i++) { + l.at(i)->setSelected(false); + } + graphicsView->blockSignals(false); + selectionChanged(); +} + +QString TitleWidget::getTooltipWithShortcut(const QString &text, QAction *button) +{ + return text + " " + button->shortcut().toString() + ""; +} + +void TitleWidget::prepareTools(QGraphicsItem *referenceItem) +{ + // Let some GUI elements block signals. We may want to change their values without any sideeffects. + // Additionally, store the previous blocking state to avoid side effects when this function is called from within another one. + // Note: Disabling an element also blocks signals. So disabled elements don't need to be set to blocking too. + bool blockOX = origin_x_left->signalsBlocked(); + bool blockOY = origin_y_top->signalsBlocked(); + bool blockEff = effect_list->signalsBlocked(); + bool blockRX = itemrotatex->signalsBlocked(); + bool blockRY = itemrotatey->signalsBlocked(); + bool blockRZ = itemrotatez->signalsBlocked(); + bool blockZoom = itemzoom->signalsBlocked(); + bool blockX = value_x->signalsBlocked(); + bool blockY = value_y->signalsBlocked(); + bool blockW = value_w->signalsBlocked(); + bool blockH = value_h->signalsBlocked(); + origin_x_left->blockSignals(true); + origin_y_top->blockSignals(true); + effect_list->blockSignals(true); + itemrotatex->blockSignals(true); + itemrotatey->blockSignals(true); + itemrotatez->blockSignals(true); + itemzoom->blockSignals(true); + value_x->blockSignals(true); + value_y->blockSignals(true); + value_w->blockSignals(true); + value_h->blockSignals(true); + + if (referenceItem == NULL) { + std::cout << "NULL item.\n"; + effect_stack->setHidden(true); + effect_frame->setEnabled(false); + effect_list->setCurrentIndex(0); + origin_x_left->setChecked(false); + origin_y_top->setChecked(false); + updateTextOriginX(); + updateTextOriginY(); + enableToolbars(TITLE_SELECT); + showToolbars(TITLE_SELECT); + + itemzoom->setEnabled(false); + itemrotatex->setEnabled(false); + itemrotatey->setEnabled(false); + itemrotatez->setEnabled(false); + frame_properties->setEnabled(false); + } else { + effect_frame->setEnabled(true); + frame_properties->setEnabled(true); + if (referenceItem != m_startViewport && referenceItem != m_endViewport) { + itemzoom->setEnabled(true); + itemrotatex->setEnabled(true); + itemrotatey->setEnabled(true); + itemrotatez->setEnabled(true); + } else { + itemzoom->setEnabled(false); + itemrotatex->setEnabled(false); + itemrotatey->setEnabled(false); + itemrotatez->setEnabled(false); + updateInfoText(); + } + 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 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); + } +#else + 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); +#if not KDE_IS_VERSION(4,5,0) + 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(); +#if not KDE_IS_VERSION(4,5,0) + 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(); +#if not KDE_IS_VERSION(4,5,0) + 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); +#if not KDE_IS_VERSION(4,5,0) + 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); + } + + updateAxisButtons(i); + updateCoordinates(i); + updateDimension(i); + enableToolbars(TITLE_TEXT); + + } else if ((referenceItem)->type() == RECTITEM) { + showToolbars(TITLE_RECTANGLE); + settingUp = true; + QGraphicsRectItem *rec = static_cast (referenceItem); + if (rec == m_startViewport || rec == m_endViewport) { + /*toolBox->setCurrentIndex(3); + toolBox->widget(0)->setEnabled(false); + toolBox->widget(1)->setEnabled(false);*/ + enableToolbars(TITLE_SELECT); + } else { + /*toolBox->widget(0)->setEnabled(true); + 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(); + //fcol.setAlpha(255); + //bcol.setAlpha(255); + rectFColor->setColor(fcol); + rectBColor->setColor(bcol); + settingUp = false; + rectLineWidth->setValue(rec->pen().width()); + enableToolbars(TITLE_RECTANGLE); + } + + updateAxisButtons(referenceItem); + updateCoordinates(rec); + updateDimension(rec); + + } else if (referenceItem->type() == IMAGEITEM) { + showToolbars(TITLE_IMAGE); + + updateCoordinates(referenceItem); + updateDimension(referenceItem); + + enableToolbars(TITLE_IMAGE); + + } else { + //toolBox->setCurrentIndex(0); + showToolbars(TITLE_SELECT); + enableToolbars(TITLE_SELECT); + frame_properties->setEnabled(false); + } + zValue->setValue((int)referenceItem->zValue()); + if (!referenceItem->data(ZOOMFACTOR).isNull()) itemzoom->setValue(referenceItem->data(ZOOMFACTOR).toInt()); + else itemzoom->setValue((int)(m_transformations.value(referenceItem).scalex * 100.0 + 0.5)); + itemrotatex->setValue((int)(m_transformations.value(referenceItem).rotatex)); + itemrotatey->setValue((int)(m_transformations.value(referenceItem).rotatey)); + itemrotatez->setValue((int)(m_transformations.value(referenceItem).rotatez)); + } + + + effect_list->blockSignals(blockEff); + itemrotatex->blockSignals(blockRX); + itemrotatey->blockSignals(blockRY); + itemrotatez->blockSignals(blockRZ); + itemzoom->blockSignals(blockZoom); + origin_x_left->blockSignals(blockOX); + origin_y_top->blockSignals(blockOY); + value_x->blockSignals(blockX); + value_y->blockSignals(blockY); + value_w->blockSignals(blockW); + value_h->blockSignals(blockH); +}