X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftitlewidget.cpp;h=212f99e1161ec4a02017128e31a73726d1a63387;hb=8ef6284b4cf4fef311a46d123f407eade73ab987;hp=1b1384b5cdc69ad2194dfbaefab5ab42a994a16d;hpb=84f3c046e0d2bcb13a77533581a01df75ad6101a;p=kdenlive diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 1b1384b5..212f99e1 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,6 +47,11 @@ #include #endif +#include + +static QList titletemplates; + +// What exactly is this variable good for? int settingUp = false; const int IMAGEITEM = 7; @@ -56,48 +64,111 @@ 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(), - m_startViewport(NULL), - m_endViewport(NULL), - m_render(render), - m_count(0), - m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)), - m_projectTitlePath(projectTitlePath), - m_tc(tc) + QDialog(parent), + Ui::TitleWidget_UI(), + m_startViewport(NULL), + m_endViewport(NULL), + m_render(render), + m_count(0), + m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)), + m_projectTitlePath(projectTitlePath), + m_tc(tc) { setupUi(this); setFont(KGlobalSettings::toolBarFont()); frame_properties->setEnabled(false); frame_properties->setFixedHeight(frame_toolbar->height()); + // 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")); + + 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")); + + rectBAlpha->setMinimum(0); + rectBAlpha->setMaximum(255); + rectBAlpha->setDecimals(0); + rectBAlpha->setValue(255); + rectBAlpha->setToolTip(i18n("Color opacity")); + + rectFAlpha->setMinimum(0); + rectFAlpha->setMaximum(255); + rectFAlpha->setDecimals(0); + rectFAlpha->setValue(255); + rectFAlpha->setToolTip(i18n("Border opacity")); + + rectLineWidth->setMinimum(0); + rectLineWidth->setMaximum(100); + rectLineWidth->setDecimals(0); + rectLineWidth->setValue(0); + rectLineWidth->setToolTip(i18n("Border width")); + itemzoom->setSuffix(i18n("%")); m_frameWidth = render->renderWidth(); m_frameHeight = render->renderHeight(); showToolbars(TITLE_SELECT); - //TODO: get default title duration instead of hardcoded one - title_duration->setText(m_tc.getTimecode(GenTime(5000 / 1000.0))); + //If project is drop frame, set the input mask as such. + title_duration->setInputMask(""); + title_duration->setValidator(m_tc.validator()); + title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration())); - connect(kcolorbutton, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ; - connect(horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotChangeBackground())) ; + connect(backgroundColor, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ; + connect(backgroundAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotChangeBackground())) ; connect(fontColorButton, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ; connect(textOutlineColor, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ; connect(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(int)), this, SLOT(slotUpdateText())); - connect(textOutlineAlpha, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())); + connect(textAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); + connect(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); + connect(textOutlineAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText())); connect(font_weight_box, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateText())); connect(font_family, SIGNAL(editTextChanged(const QString &)), this, SLOT(slotFontText(const QString&))); - connect(rectFAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged())); - connect(rectBAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged())); + connect(rectFAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); + connect(rectBAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged())); connect(rectFColor, SIGNAL(clicked()), this, SLOT(rectChanged())); connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged())); - connect(rectLineWidth, SIGNAL(valueChanged(int)), 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())); @@ -114,7 +185,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(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())); @@ -134,17 +207,18 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render 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())); @@ -153,7 +227,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))); @@ -187,7 +260,7 @@ 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); @@ -204,17 +277,49 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render zDown->setDefaultAction(m_zDown); m_zTop = new QAction(KIcon("kdenlive-zindex-top"), QString(), this); - m_zTop->setShortcut(Qt::Key_Home); + // 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); - m_zBottom->setShortcut(Qt::Key_End); + // 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->setIcon(KIcon("kdenlive-zindex-down")); zTop->setIcon(KIcon("kdenlive-zindex-top")); zBottom->setIcon(KIcon("kdenlive-zindex-bottom")); @@ -226,13 +331,18 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render origin_y_top->setToolTip(i18n("Invert y axis and change 0 point")); rectBColor->setToolTip(i18n("Select fill color")); rectFColor->setToolTip(i18n("Select border color")); - rectBAlpha->setToolTip(i18n("Fill transparency")); - rectFAlpha->setToolTip(i18n("Border transparency")); + rectBAlpha->setToolTip(i18n("Fill opacity")); + rectFAlpha->setToolTip(i18n("Border opacity")); zoom_slider->setToolTip(i18n("Zoom")); buttonRealSize->setToolTip(i18n("Original size (1:1)")); buttonFitZoom->setToolTip(i18n("Fit zoom")); - 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->setIcon(KIcon("kdenlive-align-hor")); itemhcenter->setToolTip(i18n("Align item horizontally")); @@ -296,6 +406,9 @@ 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))); @@ -349,7 +462,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render m_endViewport->setData(0, m_frameWidth); m_endViewport->setData(1, m_frameHeight); - if (!url.isEmpty()) loadTitle(url); + if(!url.isEmpty()) loadTitle(url); else { slotTextTool(); QTimer::singleShot(200, this, SLOT(slotAdjustZoom())); @@ -357,8 +470,17 @@ 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(TitleTemplate t, titletemplates) { + templateBox->addItem(t.icon, t.name, t.file); + } + lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex(); } TitleWidget::~TitleWidget() @@ -374,6 +496,11 @@ TitleWidget::~TitleWidget() 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; @@ -393,7 +520,7 @@ QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl, bool isClone) titlePath.append((isClone == false) ? "title" : "clone"); int counter = 0; QString path; - while (path.isEmpty() || QFile::exists(path)) { + while(path.isEmpty() || QFile::exists(path)) { counter++; path = titlePath + QString::number(counter).rightJustified(3, '0', false) + ".png"; } @@ -415,18 +542,78 @@ QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QStr QStringList TitleWidget::extractImageList(QString xml) { QStringList result; - if (xml.isEmpty()) return 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("url")) + for(int i = 0; i < images.count(); i++) { + if(images.at(i).toElement().hasAttribute("url")) result.append(images.at(i).toElement().attribute("url")); } 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 != "") { + 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*/) { @@ -445,17 +632,23 @@ 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(); - if (l.size() > 0) { - switch (l.at(0)->type()) { + if(l.size() > 0) { + switch(l.at(0)->type()) { case TEXTITEM: t = TITLE_TEXT; break; @@ -469,13 +662,13 @@ void TitleWidget::slotSelectTool() } enableToolbars(t); - if (t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) { + if(t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) { //graphicsView->centerOn(l.at(0)); t = TITLE_SELECT; } showToolbars(t); - if (l.size() > 0) { + if(l.size() > 0) { updateCoordinates(l.at(0)); updateDimension(l.at(0)); updateRotZoom(l.at(0)); @@ -489,8 +682,8 @@ void TitleWidget::slotImageTool() // TODO: find a way to get a list of all supported image types... QString allExtensions = "image/gif image/jpeg image/png image/x-tga image/x-bmp image/svg+xml image/tiff image/x-xcf-gimp image/x-vnd.adobe.photoshop image/x-pcx image/x-exr"; KUrl url = KFileDialog::getOpenUrl(KUrl(), allExtensions, this, i18n("Load Image")); //"*.svg *.png *.jpg *.jpeg *.gif *.raw" - if (!url.isEmpty()) { - if (url.path().endsWith(".svg")) { + if(!url.isEmpty()) { + if(url.path().endsWith(".svg")) { QGraphicsSvgItem *svg = new QGraphicsSvgItem(url.toLocalFile()); svg->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); svg->setZValue(m_count++); @@ -513,14 +706,27 @@ void TitleWidget::slotImageTool() void TitleWidget::showToolbars(TITLETOOL toolType) { - toolbar_stack->setCurrentIndex((int) toolType); + switch (toolType) { + case TITLE_SELECT: + toolbar_stack->setCurrentIndex(0); + break; + case TITLE_IMAGE: + toolbar_stack->setCurrentIndex(3); + break; + case TITLE_RECTANGLE: + toolbar_stack->setCurrentIndex(1); + break; + case TITLE_TEXT: + toolbar_stack->setCurrentIndex(2); + break; + } } void TitleWidget::enableToolbars(TITLETOOL toolType) { // TITLETOOL is defined in graphicsscenerectmove.h bool enable = false; - if (toolType == TITLE_RECTANGLE || toolType == TITLE_IMAGE) enable = true; + if(toolType == TITLE_RECTANGLE || toolType == TITLE_IMAGE) enable = true; value_w->setEnabled(enable); value_h->setEnabled(enable); } @@ -532,7 +738,7 @@ void TitleWidget::checkButton(TITLETOOL toolType) bool bRect = false; bool bImage = false; - switch (toolType) { + switch(toolType) { case TITLE_SELECT: bSelect = true; break; @@ -557,7 +763,7 @@ void TitleWidget::checkButton(TITLETOOL toolType) void TitleWidget::displayBackgroundFrame() { - if (!displayBg->isChecked()) { + if(!displayBg->isChecked()) { QPixmap bg(m_frameWidth / 2, m_frameHeight / 2); QPixmap pattern(20, 20); pattern.fill(); @@ -613,7 +819,7 @@ void TitleWidget::slotUpdateZoom(int pos) void TitleWidget::slotZoom(bool up) { int pos = zoom_slider->value(); - if (up) pos++; + if(up) pos++; else pos--; zoom_slider->setValue(pos); } @@ -644,11 +850,13 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) f.setAlpha(rectFAlpha->value()); QPen penf(f); penf.setWidth(rectLineWidth->value()); + penf.setJoinStyle(Qt::RoundJoin); rect->setPen(penf); QColor b = rectBColor->color(); b.setAlpha(rectBAlpha->value()); rect->setBrush(QBrush(b)); rect->setZValue(m_count++); + rect->setData(ZOOMFACTOR, 100); //setCurrentItem(rect); //graphicsView->setFocus(); } @@ -668,6 +876,23 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) QColor color = fontColorButton->color(); color.setAlpha(textAlpha->value()); tt->setDefaultTextColor(color); + + QTextCursor cur(tt->document()); + cur.select(QTextCursor::Document); + QTextBlockFormat format = cur.blockFormat(); + QTextCharFormat cformat = cur.charFormat(); + QColor outlineColor = textOutlineColor->color(); + outlineColor.setAlpha(textOutlineAlpha->value()); + double outlineWidth = textOutline->value() / 10.0; + + tt->setData(101, outlineWidth); + 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); } @@ -675,7 +900,7 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) void TitleWidget::setFontBoxWeight(int weight) { int index = font_weight_box->findData(weight); - if (index < 0) { + if(index < 0) { index = font_weight_box->findData(QFont::Normal); } font_weight_box->setCurrentIndex(index); @@ -689,306 +914,250 @@ 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_frame->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_SELECT); - if (blockX) origin_x_left->blockSignals(false); - if (blockY) origin_y_top->blockSignals(false); - itemzoom->setEnabled(false); - itemrotate->setEnabled(false); - frame_properties->setEnabled(false); - } else if (l.size() == 1) { - effect_frame->setEnabled(true); - frame_properties->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(); - 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->blockSignals(true); - effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT)); - effect_list->blockSignals(false); - effect_stack->setHidden(true); - } -#else - effect_list->blockSignals(true); - effect_list->setCurrentIndex(effect_list->findData((int) NOEFFECT)); - effect_list->blockSignals(false); - effect_stack->setHidden(true); -#endif - } - //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); + if(m_scene->tool() != TITLE_SELECT) return; - 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()); + std::cout << "Number of selected items: " << graphicsView->scene()->selectedItems().length() << "\n"; - QColor color = i->defaultTextColor(); - QTextCursor cursor(i->document()); - cursor.select(QTextCursor::Document); - color = cursor.charFormat().foreground().color(); - fontColorButton->setColor(color); - textAlpha->setValue(color.alpha()); + QList l; - 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); - textOutlineAlpha->blockSignals(true); - textOutlineColor->setColor(i->data(102).toString()); - textOutlineAlpha->setValue(QColor(i->data(102).toString()).alpha()); - textOutlineColor->blockSignals(false); - textOutlineAlpha->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); - textAlpha->blockSignals(false); - buttonAlignLeft->blockSignals(false); - buttonAlignRight->blockSignals(false); - buttonAlignNone->blockSignals(false); - buttonAlignCenter->blockSignals(false); + // 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(); + } + } - updateAxisButtons(i); - updateCoordinates(i); - updateDimension(i); - enableToolbars(TITLE_TEXT); + l = graphicsView->scene()->selectedItems(); - } 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_SELECT); - } 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) { + 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); + } + + 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; } - - 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)); - - enableToolbars(TITLE_IMAGE); - + } + std::cout << "All equal? " << allEqual << ".\n"; + if (allEqual) { + prepareTools(l.at(0)); } else { - //toolBox->setCurrentIndex(0); - showToolbars(TITLE_SELECT); - enableToolbars(TITLE_SELECT); - frame_properties->setEnabled(false); + // 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); + } + } + + // 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); } - 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) { - - int val = 0; - switch (type) { + std::cout << l.size() << " items to be resized\n"; + + // 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; - } - - QGraphicsItem *i = l.at(0); - Transform t = m_transformations.value(i); - - // Ratio width:height - double phi = (double) i->boundingRect().width() / i->boundingRect().height(); - double alpha = (double) t.rotate / 180.0 * M_PI; - - // New length - double length = val; - - // 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(); + case ValueX: + val = value_x->value(); break; - case ValueHeight: - length = val / (phi * sin(alpha) + cos(alpha)) + 0.5; - scale = length / i->boundingRect().height(); + case ValueY: + val = value_y->value(); break; - } - - t.scalex = scale; - t.scaley = scale; - QTransform qtrans; - qtrans.scale(scale, scale); - qtrans.rotate(t.rotate); - i->setTransform(qtrans); - m_transformations[i] = t; - - updateDimension(i); - updateRotZoom(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; + } -/** \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)); + } 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; + } + + } else if(l.at(k)->type() == IMAGEITEM) { + + + if (type == ValueX) { + updatePosition(l.at(k), val, l.at(k)->pos().y()); + + } else if (type == ValueY) { + updatePosition(l.at(k), l.at(k)->pos().x(), val); + + } 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 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) { + if(i->type() == IMAGEITEM) { // Get multipliers for rotation/scaling /*Transform t = m_transformations.value(i); @@ -1000,34 +1169,34 @@ void TitleWidget::updateDimension(QGraphicsItem *i) value_w->setValue(i->sceneBoundingRect().width()); value_h->setValue(i->sceneBoundingRect().height()); - } else if (i->type() == RECTITEM) { + } 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) { + } else if(i->type() == TEXTITEM) { QGraphicsTextItem *t = static_cast (i); value_w->setValue((int) t->boundingRect().width()); value_h->setValue((int) t->boundingRect().height()); } - zValue->blockSignals(false); - 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 value_x->blockSignals(true); value_y->blockSignals(true); - if (i->type() == TEXTITEM) { + if(i->type() == TEXTITEM) { QGraphicsTextItem *rec = static_cast (i); // Set the correct x coordinate value - if (origin_x_left->isChecked()) { + if(origin_x_left->isChecked()) { // Origin (0 point) is at m_frameWidth, coordinate axis is inverted value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->boundingRect().width())); } else { @@ -1036,17 +1205,17 @@ void TitleWidget::updateCoordinates(QGraphicsItem *i) } // Same for y - if (origin_y_top->isChecked()) { + if(origin_y_top->isChecked()) { value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->boundingRect().height())); } else { value_y->setValue((int) rec->pos().y()); } - } else if (i->type() == RECTITEM) { + } else if(i->type() == RECTITEM) { QGraphicsRectItem *rec = static_cast (i); - if (origin_x_left->isChecked()) { + if(origin_x_left->isChecked()) { // Origin (0 point) is at m_frameWidth value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->rect().width())); } else { @@ -1054,21 +1223,21 @@ void TitleWidget::updateCoordinates(QGraphicsItem *i) value_x->setValue((int) rec->pos().x()); } - if (origin_y_top->isChecked()) { + if(origin_y_top->isChecked()) { value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->rect().height())); } else { value_y->setValue((int) rec->pos().y()); } - } else if (i->type() == IMAGEITEM) { + } else if(i->type() == IMAGEITEM) { - if (origin_x_left->isChecked()) { + if(origin_x_left->isChecked()) { value_x->setValue((int)(m_frameWidth - i->pos().x() - i->sceneBoundingRect().width())); } else { value_x->setValue((int) i->pos().x()); } - if (origin_y_top->isChecked()) { + if(origin_y_top->isChecked()) { value_y->setValue((int)(m_frameHeight - i->pos().y() - i->sceneBoundingRect().height())); } else { value_y->setValue((int) i->pos().y()); @@ -1084,78 +1253,90 @@ 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) +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) { + 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(). + 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(). */ - 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()) { + 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); - } else if (i->type() == RECTITEM) { + } else if(i->type() == RECTITEM) { QGraphicsRectItem *rec = static_cast (i); int posX; - if (origin_x_left->isChecked()) { - posX = m_frameWidth - value_x->value() - rec->rect().width(); + if(origin_x_left->isChecked()) { + 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(); + if(origin_y_top->isChecked()) { + posY = m_frameHeight - y - rec->rect().height(); } else { - posY = value_y->value(); + posY = y; } rec->setPos(posX, posY); - } else if (i->type() == IMAGEITEM) { + } else if(i->type() == IMAGEITEM) { int posX; - if (origin_x_left->isChecked()) { + 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(); + if(origin_y_top->isChecked()) { + posY = m_frameHeight - y - i->sceneBoundingRect().height(); } else { - posY = value_y->value(); + posY = y; } i->setPos(posX, posY); @@ -1166,7 +1347,7 @@ void TitleWidget::updatePosition(QGraphicsItem *i) void TitleWidget::updateTextOriginX() { - if (origin_x_left->isChecked()) { + if(origin_x_left->isChecked()) { origin_x_left->setText(i18n("\u2212X")); } else { origin_x_left->setText(i18n("+X")); @@ -1179,7 +1360,7 @@ void TitleWidget::slotOriginXClicked() updateTextOriginX(); QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { + if(l.size() >= 1) { updateCoordinates(l.at(0)); // Remember x axis setting @@ -1191,7 +1372,7 @@ void TitleWidget::slotOriginXClicked() void TitleWidget::updateTextOriginY() { - if (origin_y_top->isChecked()) { + if(origin_y_top->isChecked()) { origin_y_top->setText(i18n("\u2212Y")); } else { origin_y_top->setText(i18n("+Y")); @@ -1204,7 +1385,7 @@ void TitleWidget::slotOriginYClicked() updateTextOriginY(); QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { + if(l.size() >= 1) { updateCoordinates(l.at(0)); l.at(0)->setData(TitleDocument::OriginYTop, origin_y_top->isChecked() ? @@ -1221,14 +1402,14 @@ void TitleWidget::updateAxisButtons(QGraphicsItem *i) origin_x_left->blockSignals(true); origin_y_top->blockSignals(true); - if (xAxis == TitleDocument::AxisInverted) { + if(xAxis == TitleDocument::AxisInverted) { origin_x_left->setChecked(true); } else { origin_x_left->setChecked(false); } updateTextOriginX(); - if (yAxis == TitleDocument::AxisInverted) { + if(yAxis == TitleDocument::AxisInverted) { origin_y_top->setChecked(true); } else { origin_y_top->setChecked(false); @@ -1241,49 +1422,56 @@ void TitleWidget::updateAxisButtons(QGraphicsItem *i) void TitleWidget::slotChangeBackground() { - QColor color = kcolorbutton->color(); - color.setAlpha(horizontalSlider->value()); + QColor color = backgroundColor->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(); - if (l.size() >= 1 && l.at(0)->type() == TEXTITEM) { + if(l.size() >= 1 && l.at(0)->type() == TEXTITEM) { textChanged(static_cast (l.at(0))); } } -/** - * 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(origin_x_left->isChecked() || origin_y_top->isChecked()) { + 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() @@ -1294,8 +1482,8 @@ void TitleWidget::slotInsertUnicode() void TitleWidget::slotInsertUnicodeString(QString text) { QList l = graphicsView->scene()->selectedItems(); - if (l.size() > 0) { - if (l.at(0)->type() == TEXTITEM) { + if(l.size() > 0) { + if(l.at(0)->type() == TEXTITEM) { QGraphicsTextItem *t = static_cast (l.at(0)); t->textCursor().insertText(text); } @@ -1315,91 +1503,131 @@ void TitleWidget::slotUpdateText() QColor outlineColor = textOutlineColor->color(); outlineColor.setAlpha(textOutlineAlpha->value()); double outlineWidth = textOutline->value() / 10.0; - 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); - } - { - item->setFont(font); - if (outlineWidth > 0.0) { - item->setData(101, outlineWidth); - item->setData(102, outlineColor); - QTextCursor cursor(item->document()); - cursor.select(QTextCursor::Document); - QTextCharFormat format; - format.setTextOutline(QPen(outlineColor, outlineWidth)); - format.setForeground(QBrush(color)); - cursor.mergeCharFormat(format); - } else { - 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); - } } 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(); + f.setAlpha(rectFAlpha->value()); + QPen penf(f); + penf.setWidth(rectLineWidth->value()); + penf.setJoinStyle(Qt::RoundJoin); + rec->setPen(penf); + QColor b = rectBColor->color(); + b.setAlpha(rectBAlpha->value()); + rec->setBrush(QBrush(b)); + } } } void TitleWidget::itemScaled(int val) { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { Transform x = m_transformations.value(l.at(0)); x.scalex = (double)val / 100.0; 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) { + 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)); } } @@ -1407,7 +1635,7 @@ void TitleWidget::itemRotate(int val) void TitleWidget::itemHCenter() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); int width = (int)br.width(); @@ -1421,7 +1649,7 @@ void TitleWidget::itemHCenter() void TitleWidget::itemVCenter() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); int height = (int)br.height(); @@ -1435,11 +1663,11 @@ void TitleWidget::itemVCenter() void TitleWidget::itemTop() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); double diff; - if (br.top() > 0) diff = -br.top(); + if(br.top() > 0) diff = -br.top(); else diff = -br.bottom(); item->moveBy(0, diff); updateCoordinates(item); @@ -1449,11 +1677,11 @@ void TitleWidget::itemTop() void TitleWidget::itemBottom() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); double diff; - if (br.bottom() > m_frameHeight) diff = m_frameHeight - br.top(); + if(br.bottom() > m_frameHeight) diff = m_frameHeight - br.top(); else diff = m_frameHeight - br.bottom(); item->moveBy(0, diff); updateCoordinates(item); @@ -1463,11 +1691,11 @@ void TitleWidget::itemBottom() void TitleWidget::itemLeft() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); double diff; - if (br.left() > 0) diff = -br.left(); + if(br.left() > 0) diff = -br.left(); else diff = -br.right(); item->moveBy(diff, 0); updateCoordinates(item); @@ -1477,11 +1705,11 @@ void TitleWidget::itemLeft() void TitleWidget::itemRight() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsItem *item = l.at(0); QRectF br = item->sceneBoundingRect(); double diff; - if (br.right() < m_frameWidth) diff = m_frameWidth - br.right(); + if(br.right() < m_frameWidth) diff = m_frameWidth - br.right(); else diff = m_frameWidth - br.left(); item->moveBy(diff, 0); updateCoordinates(item); @@ -1514,19 +1742,19 @@ void TitleWidget::setupViewports() void TitleWidget::loadTitle(KUrl url) { - if (url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title")); - if (!url.isEmpty()) { + if(url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Load Title")); + if(!url.isEmpty()) { QList items = m_scene->items(); - for (int i = 0; i < items.size(); i++) { - if (items.at(i)->zValue() > -1000) delete items.at(i); + for(int i = 0; i < items.size(); i++) { + if(items.at(i)->zValue() > -1000) delete items.at(i); } m_scene->clearTextSelection(); QDomDocument doc; QString tmpfile; - if (KIO::NetAccess::download(url, tmpfile, 0)) { + if(KIO::NetAccess::download(url, tmpfile, 0)) { QFile file(tmpfile); - if (file.open(QIODevice::ReadOnly)) { + if(file.open(QIODevice::ReadOnly)) { doc.setContent(&file, false); file.close(); } else return; @@ -1554,9 +1782,9 @@ void TitleWidget::loadTitle(KUrl url) void TitleWidget::saveTitle(KUrl url) { - if (anim_start->isChecked()) slotAnimStart(false); - if (anim_end->isChecked()) slotAnimEnd(false); - if (url.isEmpty()) { + if(anim_start->isChecked()) slotAnimStart(false); + if(anim_end->isChecked()) slotAnimEnd(false); + if(url.isEmpty()) { KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); @@ -1568,8 +1796,8 @@ void TitleWidget::saveTitle(KUrl url) 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(!url.isEmpty()) { + if(m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1) == false) KMessageBox::error(this, i18n("Cannot write to file %1", url.path())); } } @@ -1577,13 +1805,13 @@ 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("out", m_tc.getFrameCount(title_duration->text()) - 1); return doc; } -int TitleWidget::duration() const +int TitleWidget::outPoint() const { - return m_tc.getFrameCount(title_duration->text()); + return m_tc.getFrameCount(title_duration->text()) - 1; } void TitleWidget::setXml(QDomDocument doc) @@ -1591,7 +1819,7 @@ void TitleWidget::setXml(QDomDocument doc) int out; m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out); adjustFrameSize(); - title_duration->setText(m_tc.getTimecode(GenTime(out, m_render->fps()))); + title_duration->setText(m_tc.getTimecode(GenTime(out + 1, 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)); @@ -1602,23 +1830,45 @@ void TitleWidget::setXml(QDomDocument doc) m_transformations.clear(); QList items = graphicsView->scene()->items(); const double PI = 4.0 * atan(1.0); - for (int i = 0; i < items.count(); i++) { + for(int i = 0; i < items.count(); i++) { QTransform t = items.at(i)->transform(); 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()); @@ -1629,17 +1879,16 @@ 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); - if (anim_end->isChecked()) slotAnimEnd(false); + if(anim_start->isChecked()) slotAnimStart(false); + if(anim_end->isChecked()) slotAnimEnd(false); 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. @@ -1651,6 +1900,9 @@ void TitleWidget::writeChoices() titleConfig.writeEntry("font_pixel_size", font_size->value()); titleConfig.writeEntry("font_color", fontColorButton->color()); titleConfig.writeEntry("font_alpha", textAlpha->value()); + titleConfig.writeEntry("font_outline", textOutline->value()); + titleConfig.writeEntry("font_outline_color", textOutlineColor->color()); + titleConfig.writeEntry("font_outline_alpha", textOutlineAlpha->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()); @@ -1661,15 +1913,14 @@ void TitleWidget::writeChoices() titleConfig.writeEntry("rect_background_alpha", rectBAlpha->value()); 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. @@ -1681,8 +1932,13 @@ void TitleWidget::readChoices() m_scene->slotUpdateFontSize(font_size->value()); fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color())); textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value())); + + textOutlineColor->setColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color())); + textOutlineAlpha->setValue(titleConfig.readEntry("font_outline_alpha", textOutlineAlpha->value())); + textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value())); + int weight; - if (titleConfig.readEntry("font_bold", false)) weight = QFont::Bold; + if(titleConfig.readEntry("font_bold", false)) weight = QFont::Bold; else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt()); setFontBoxWeight(weight); buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked())); @@ -1694,8 +1950,8 @@ void TitleWidget::readChoices() rectBAlpha->setValue(titleConfig.readEntry("rect_background_alpha", rectBAlpha->value())); 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() @@ -1708,25 +1964,27 @@ void TitleWidget::adjustFrameSize() void TitleWidget::slotAnimStart(bool anim) { - if (anim && anim_end->isChecked()) { + if(anim && anim_end->isChecked()) { anim_end->setChecked(false); m_endViewport->setZValue(-1000); m_endViewport->setBrush(QBrush()); } slotSelectTool(); QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { - if (list.at(i)->zValue() > -1000) { + for(int i = 0; i < list.count(); i++) { + if(list.at(i)->zValue() > -1000) { list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim); list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim); } } align_box->setEnabled(anim); itemzoom->setEnabled(!anim); - itemrotate->setEnabled(!anim); + itemrotatex->setEnabled(!anim); + itemrotatey->setEnabled(!anim); + itemrotatez->setEnabled(!anim); frame_toolbar->setEnabled(!anim); toolbar_stack->setEnabled(!anim); - if (anim) { + if(anim) { keep_aspect->setChecked(!m_startViewport->data(0).isNull()); m_startViewport->setZValue(1100); QColor col = m_startViewport->pen().color(); @@ -1736,37 +1994,39 @@ void TitleWidget::slotAnimStart(bool anim) m_startViewport->setSelected(true); selectionChanged(); slotSelectTool(); - if (m_startViewport->childItems().isEmpty()) addAnimInfoText(); + if(m_startViewport->childItems().isEmpty()) addAnimInfoText(); } else { m_startViewport->setZValue(-1000); m_startViewport->setBrush(QBrush()); m_startViewport->setFlags(0); - if (!anim_end->isChecked()) deleteAnimInfoText(); + if(!anim_end->isChecked()) deleteAnimInfoText(); } } void TitleWidget::slotAnimEnd(bool anim) { - if (anim && anim_start->isChecked()) { + if(anim && anim_start->isChecked()) { anim_start->setChecked(false); m_startViewport->setZValue(-1000); m_startViewport->setBrush(QBrush()); } slotSelectTool(); QList list = m_scene->items(); - for (int i = 0; i < list.count(); i++) { - if (list.at(i)->zValue() > -1000) { + for(int i = 0; i < list.count(); i++) { + if(list.at(i)->zValue() > -1000) { list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim); list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim); } } align_box->setEnabled(anim); itemzoom->setEnabled(!anim); - itemrotate->setEnabled(!anim); + itemrotatex->setEnabled(!anim); + itemrotatey->setEnabled(!anim); + itemrotatez->setEnabled(!anim); frame_toolbar->setEnabled(!anim); toolbar_stack->setEnabled(!anim); - if (anim) { + if(anim) { keep_aspect->setChecked(!m_endViewport->data(0).isNull()); m_endViewport->setZValue(1100); QColor col = m_endViewport->pen().color(); @@ -1776,12 +2036,12 @@ void TitleWidget::slotAnimEnd(bool anim) m_endViewport->setSelected(true); selectionChanged(); slotSelectTool(); - if (m_endViewport->childItems().isEmpty()) addAnimInfoText(); + if(m_endViewport->childItems().isEmpty()) addAnimInfoText(); } else { m_endViewport->setZValue(-1000); m_endViewport->setBrush(QBrush()); m_endViewport->setFlags(0); - if (!anim_start->isChecked()) deleteAnimInfoText(); + if(!anim_start->isChecked()) deleteAnimInfoText(); } } @@ -1806,17 +2066,17 @@ void TitleWidget::addAnimInfoText() void TitleWidget::updateInfoText() { // update info text font - if (!m_startViewport->childItems().isEmpty()) { + if(!m_startViewport->childItems().isEmpty()) { QGraphicsTextItem *item = static_cast (m_startViewport->childItems().at(0)); - if (item) { + if(item) { QFont font = item->font(); font.setPixelSize(m_startViewport->rect().width() / 10); item->setFont(font); } } - if (!m_endViewport->childItems().isEmpty()) { + if(!m_endViewport->childItems().isEmpty()) { QGraphicsTextItem *item = static_cast (m_endViewport->childItems().at(0)); - if (item) { + if(item) { QFont font = item->font(); font.setPixelSize(m_endViewport->rect().width() / 10); item->setFont(font); @@ -1827,22 +2087,21 @@ void TitleWidget::updateInfoText() void TitleWidget::deleteAnimInfoText() { // end animation editing, remove info text - while (!m_startViewport->childItems().isEmpty()) { + while(!m_startViewport->childItems().isEmpty()) { QGraphicsItem *item = m_startViewport->childItems().at(0); m_scene->removeItem(item); delete item; } - while (!m_endViewport->childItems().isEmpty()) { + while(!m_endViewport->childItems().isEmpty()) { QGraphicsItem *item = m_endViewport->childItems().at(0); m_scene->removeItem(item); delete item; } } - void TitleWidget::slotKeepAspect(bool keep) { - if (m_endViewport->zValue() == 1100) { + if(m_endViewport->zValue() == 1100) { m_endViewport->setData(0, keep == true ? m_frameWidth : QVariant()); m_endViewport->setData(1, keep == true ? m_frameHeight : QVariant()); } else { @@ -1853,78 +2112,87 @@ void TitleWidget::slotKeepAspect(bool keep) void TitleWidget::slotResize50() { - if (m_endViewport->zValue() == 1100) { + if(m_endViewport->zValue() == 1100) { m_endViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2); } else m_startViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2); } void TitleWidget::slotResize100() { - if (m_endViewport->zValue() == 1100) { + if(m_endViewport->zValue() == 1100) { m_endViewport->setRect(0, 0, m_frameWidth, m_frameHeight); } else m_startViewport->setRect(0, 0, m_frameWidth, m_frameHeight); } void TitleWidget::slotResize200() { - if (m_endViewport->zValue() == 1100) { + if(m_endViewport->zValue() == 1100) { m_endViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2); } else m_startViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2); } void TitleWidget::slotAddEffect(int ix) { - QList l = graphicsView->scene()->selectedItems(); + QList list = graphicsView->scene()->selectedItems(); int effect = effect_list->itemData(ix).toInt(); - if (effect == NOEFFECT) { - if (l.size() == 1) l[0]->setData(100, QVariant()); - effect_stack->setHidden(true); - return; - } - effect_stack->setCurrentIndex(effect - 1); - effect_stack->setHidden(false); - if (effect == TYPEWRITEREFFECT) { - if (l.size() == 1 && l.at(0)->type() == TEXTITEM) { - QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value()); - l[0]->setData(100, effdata); - } - } -#if QT_VERSION < 0x040600 - return; -#else - if (effect == BLUREFFECT) { - // Blur effect - if (l.size() == 1) { - QGraphicsEffect *eff = new QGraphicsBlurEffect(); - l[0]->setGraphicsEffect(eff); - } - } else if (effect == SHADOWEFFECT) { - if (l.size() == 1) { - QGraphicsEffect *eff = new QGraphicsDropShadowEffect(); - l[0]->setGraphicsEffect(eff); + + 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); - if (f.exactMatch()) { + if(f.exactMatch()) { // Font really exists (could also just be a «d» if the user // starts typing «dejavu» for example). font_family->setCurrentFont(f); } // Note: Typing dejavu serif does not recognize the font (takes sans) - // in older Qt versions. + // 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) { + if(l.size() == 1) { QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value()); l[0]->setData(100, effdata); } @@ -1936,10 +2204,10 @@ void TitleWidget::slotEditBlur(int ix) return; #else QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsEffect *eff = l[0]->graphicsEffect(); QGraphicsBlurEffect *blur = static_cast (eff); - if (blur) blur->setBlurRadius(ix); + if(blur) blur->setBlurRadius(ix); } #endif } @@ -1950,10 +2218,10 @@ void TitleWidget::slotEditShadow() return; #else QList l = graphicsView->scene()->selectedItems(); - if (l.size() == 1) { + if(l.size() == 1) { QGraphicsEffect *eff = l[0]->graphicsEffect(); QGraphicsDropShadowEffect *shadow = static_cast (eff); - if (shadow) { + if(shadow) { shadow->setBlurRadius(shadow_radius->value()); shadow->setOffset(shadow_x->value(), shadow_y->value()); } @@ -1961,29 +2229,42 @@ void TitleWidget::slotEditShadow() #endif } -qreal TitleWidget::zIndexBounds(bool maxBound) +qreal TitleWidget::zIndexBounds(bool maxBound, bool intersectingOnly) { qreal bound = maxBound ? -99 : 99; QList l = graphicsView->scene()->selectedItems(); - if (l.size() > 0) { - QList lItems = graphicsView->scene()->items(l[0]->sceneBoundingRect(), Qt::IntersectsItemShape); - if (lItems.size() > 0) { + 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++) { + if(maxBound) { + for(int i = 0; i < n; i++) { z = lItems[i]->zValue(); - if (z > bound && !lItems[i]->isSelected()) { + 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++) { + for(int i = 0; i < n; i++) { z = lItems[i]->zValue(); - if (z < bound && !lItems[i]->isSelected() && z > -999) { + 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; } } } @@ -1995,10 +2276,10 @@ qreal TitleWidget::zIndexBounds(bool maxBound) void TitleWidget::slotZIndexUp() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { + if(l.size() >= 1) { qreal currentZ = l[0]->zValue(); - qreal max = zIndexBounds(true); - if (currentZ <= max) { + qreal max = zIndexBounds(true, true); + if(currentZ <= max) { l[0]->setZValue(currentZ + 1); updateDimension(l[0]); } @@ -2008,23 +2289,31 @@ void TitleWidget::slotZIndexUp() void TitleWidget::slotZIndexTop() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { - qreal currentZ = l[0]->zValue(); - qreal max = zIndexBounds(true); - if (currentZ <= max) { - l[0]->setZValue(max + 1); - updateDimension(l[0]); + 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) { + if(l.size() >= 1) { qreal currentZ = l[0]->zValue(); - qreal min = zIndexBounds(false); - if (currentZ >= min) { + qreal min = zIndexBounds(false, true); + if(currentZ >= min) { l[0]->setZValue(currentZ - 1); updateDimension(l[0]); } @@ -2034,12 +2323,320 @@ void TitleWidget::slotZIndexDown() void TitleWidget::slotZIndexBottom() { QList l = graphicsView->scene()->selectedItems(); - if (l.size() >= 1) { - qreal currentZ = l[0]->zValue(); - qreal min = zIndexBounds(false); - if (currentZ >= min) { - l[0]->setZValue(min - 1); - updateDimension(l[0]); + 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); + 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()); + 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(); + textAlpha->setValue(color.alpha()); + color.setAlpha(255); + 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); + textOutlineAlpha->blockSignals(true); + color = QColor(i->data(102).toString()); + textOutlineAlpha->setValue(color.alpha()); + color.setAlpha(255); + textOutlineColor->setColor(color); + textOutlineColor->blockSignals(false); + textOutlineAlpha->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); + textAlpha->blockSignals(false); + 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); + 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); + } + + 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); +} \ No newline at end of file