Merge branch 'master' into stabilize

[kdenlive] / src / titlewidget.cpp

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index b123a826a959574b3cae69e26d3657f4659e271c..e82db1259ea47431e83f01596f5867abf8c986bc 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -78,6 +78,8 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     setFont(KGlobalSettings::toolBarFont());
     frame_properties->setEnabled(false);
     frame_properties->setFixedHeight(frame_toolbar->height());
+    int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
+    QSize iconSize(size, size);
 
 #if KDE_IS_VERSION(4,5,0)
     rectBColor->setAlphaChannelEnabled(true);
@@ -90,11 +92,6 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     delete textOutlineAlpha;
     
 #else
-    rectBColor->setAlphaChannelEnabled(false);
-    rectFColor->setAlphaChannelEnabled(false);
-    fontColorButton->setAlphaChannelEnabled(false);
-    textOutlineColor->setAlphaChannelEnabled(false);
-
     rectBAlpha->setMinimum(0);
     rectBAlpha->setMaximum(255);
     rectBAlpha->setDecimals(0);
@@ -262,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"));
@@ -338,6 +344,10 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     buttonUnselectAll->setDefaultAction(m_unselectAll);
     buttonUnselectAll->setEnabled(false);
 
+    zDown->setIconSize(iconSize);
+    zTop->setIconSize(iconSize);
+    zBottom->setIconSize(iconSize);
+    
     zDown->setIcon(KIcon("kdenlive-zindex-down"));
     zTop->setIcon(KIcon("kdenlive-zindex-top"));
     zBottom->setIcon(KIcon("kdenlive-zindex-bottom"));
@@ -360,6 +370,13 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     buttonSelectImages->setToolTip(getTooltipWithShortcut(i18n("Select image items in current selection"), m_selectImages));
     buttonUnselectAll->setToolTip(getTooltipWithShortcut(i18n("Unselect all"), m_unselectAll));
 
+    itemhcenter->setIconSize(iconSize);
+    itemvcenter->setIconSize(iconSize);
+    itemtop->setIconSize(iconSize);
+    itembottom->setIconSize(iconSize);
+    itemright->setIconSize(iconSize);
+    itemleft->setIconSize(iconSize);
+    
     itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
     itemhcenter->setToolTip(i18n("Align item horizontally"));
     itemvcenter->setIcon(KIcon("kdenlive-align-vert"));
@@ -378,8 +395,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     frame_toolbar->setLayout(layout);
     layout->setContentsMargins(0, 0, 0, 0);
     QToolBar *m_toolbar = new QToolBar("titleToolBar", this);
-    int s = style()->pixelMetric(QStyle::PM_SmallIconSize);
-    m_toolbar->setIconSize(QSize(s, s));
+    m_toolbar->setIconSize(iconSize);
 
     m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString());
     m_buttonCursor->setCheckable(true);
@@ -500,6 +516,7 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
         templateBox->addItem(t.icon, t.name, t.file);
     }
     lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
+    adjustSize();
 }
 
 TitleWidget::~TitleWidget()
@@ -530,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)
 {
@@ -1943,23 +1966,23 @@ void TitleWidget::writeChoices()
     titleConfig.writeEntry("font_alpha", textAlpha->value());
     titleConfig.writeEntry("font_outline_alpha", textOutlineAlpha->value());
 #endif
+   
     titleConfig.writeEntry("font_outline", textOutline->value());
     titleConfig.writeEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     titleConfig.writeEntry("font_italic", buttonItalic->isChecked());
     titleConfig.writeEntry("font_underlined", buttonUnder->isChecked());
 
-    titleConfig.writeEntry("rect_foreground_color", rectFColor->color());
-#if KDE_IS_VERSION(4,5,0)
-    titleConfig.writeEntry("rect_foreground_alpha", rectFColor->color().alpha());
-#else
-    titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value());
-#endif
     titleConfig.writeEntry("rect_background_color", rectBColor->color());
+    titleConfig.writeEntry("rect_foreground_color", rectFColor->color());
+
 #if KDE_IS_VERSION(4,5,0)
     titleConfig.writeEntry("rect_background_alpha", rectBColor->color().alpha());
+    titleConfig.writeEntry("rect_foreground_alpha", rectFColor->color().alpha());
 #else
     titleConfig.writeEntry("rect_background_alpha", rectBAlpha->value());
+    titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value());
 #endif
+
     titleConfig.writeEntry("rect_line_width", rectLineWidth->value());
 
     titleConfig.writeEntry("background_color", backgroundColor->color());
@@ -1979,12 +2002,17 @@ void TitleWidget::readChoices()
     font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont()));
     font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value()));
     m_scene->slotUpdateFontSize(font_size->value());
-    fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color()));
-#if not KDE_IS_VERSION(4,5,0)    
+    QColor fontColor = QColor(titleConfig.readEntry("font_color", fontColorButton->color()));
+    QColor outlineColor = QColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color()));
+#if KDE_IS_VERSION(4,5,0)
+    fontColor.setAlpha(titleConfig.readEntry("font_alpha", fontColor.alpha()));
+    outlineColor.setAlpha(titleConfig.readEntry("font_outline_alpha", outlineColor.alpha()));
+#else
     textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value()));
     textOutlineAlpha->setValue(titleConfig.readEntry("font_outline_alpha", textOutlineAlpha->value()));
 #endif
-    textOutlineColor->setColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color()));
+    fontColorButton->setColor(fontColor);
+    textOutlineColor->setColor(outlineColor);
     textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value()));
 
     int weight;
@@ -1995,20 +2023,18 @@ void TitleWidget::readChoices()
     buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked()));
 
     QColor fgColor = QColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color()));
-#if KDE_IS_VERSION(4,5,0)
-    fgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", rectFColor->color().alpha()));
-#else
-    rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value()));
-#endif
-    rectFColor->setColor(fgColor);
-    
     QColor bgColor = QColor(titleConfig.readEntry("rect_background_color", rectBColor->color()));
+
 #if KDE_IS_VERSION(4,5,0)
-    bgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", rectBColor->color().alpha()));
+    fgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", fgColor.alpha()));
+    bgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", bgColor.alpha()));
 #else
+    rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value()));
     rectBAlpha->setValue(titleConfig.readEntry("rect_background_alpha", rectBAlpha->value()));
 #endif
+    rectFColor->setColor(fgColor);
     rectBColor->setColor(bgColor);
+
     rectLineWidth->setValue(titleConfig.readEntry("rect_line_width", rectLineWidth->value()));
 
     backgroundColor->setColor(titleConfig.readEntry("background_color", backgroundColor->color()));
@@ -2595,7 +2621,8 @@ void TitleWidget::prepareTools(QGraphicsItem *referenceItem)
             }
             if (!i->data(102).isNull()) {
                 textOutlineColor->blockSignals(true);
-                color = QColor(i->data(102).toString());
+                QVariant variant = i->data(102);
+                color = variant.value<QColor>();
 #if not KDE_IS_VERSION(4,5,0)
                 textOutlineAlpha->blockSignals(true);
                 textOutlineAlpha->setValue(color.alpha());