setFont(KGlobalSettings::toolBarFont());
frame_properties->setEnabled(false);
frame_properties->setFixedHeight(frame_toolbar->height());
+ int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
+ QSize iconSize(size, size);
+
+#if KDE_IS_VERSION(4,5,0)
+ rectBColor->setAlphaChannelEnabled(true);
+ delete rectBAlpha;
+ rectFColor->setAlphaChannelEnabled(true);
+ delete rectFAlpha;
+ fontColorButton->setAlphaChannelEnabled(true);
+ delete textAlpha;
+ textOutlineColor->setAlphaChannelEnabled(true);
+ delete textOutlineAlpha;
+
+#else
+ rectBAlpha->setMinimum(0);
+ rectBAlpha->setMaximum(255);
+ rectBAlpha->setDecimals(0);
+ rectBAlpha->setValue(255);
+ rectBAlpha->setToolTip(i18n("Color opacity"));
+
+ rectFAlpha->setMinimum(0);
+ rectFAlpha->setMaximum(255);
+ rectFAlpha->setDecimals(0);
+ rectFAlpha->setValue(255);
+ rectFAlpha->setToolTip(i18n("Border opacity"));
+ connect(rectFAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
+ connect(rectBAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
// Set combo sliders values
textAlpha->setMinimum(0);
textOutlineAlpha->setDecimals(0);
textOutlineAlpha->setValue(255);
textOutlineAlpha->setToolTip(i18n("Outline color opacity"));
+ connect(textAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
+ connect(textOutlineAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
+#endif
textOutline->setMinimum(0);
textOutline->setMaximum(200);
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);
title_duration->setInputMask(m_tc.mask());
title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration()));
- connect(backgroundColor, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
+ connect(backgroundColor, SIGNAL(changed(const QColor &)), this, SLOT(slotChangeBackground())) ;
connect(backgroundAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotChangeBackground())) ;
- connect(fontColorButton, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ;
- connect(textOutlineColor, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ;
+ connect(fontColorButton, SIGNAL(changed(const QColor &)), this, SLOT(slotUpdateText())) ;
+ connect(textOutlineColor, SIGNAL(changed(const QColor &)), this, SLOT(slotUpdateText())) ;
connect(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ;
connect(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ;
- connect(textAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
connect(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
- connect(textOutlineAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
connect(font_weight_box, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateText()));
connect(font_family, SIGNAL(editTextChanged(const QString &)), this, SLOT(slotFontText(const QString&)));
- connect(rectFAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
- connect(rectBAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
- connect(rectFColor, SIGNAL(clicked()), this, SLOT(rectChanged()));
- connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged()));
+ connect(rectFColor, SIGNAL(changed(const QColor &)), this, SLOT(rectChanged()));
+ connect(rectBColor, SIGNAL(changed(const QColor &)), this, SLOT(rectChanged()));
connect(rectLineWidth, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
/*connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
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"));
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"));
origin_y_top->setToolTip(i18n("Invert y axis and change 0 point"));
rectBColor->setToolTip(i18n("Select fill color"));
rectFColor->setToolTip(i18n("Select border color"));
- rectBAlpha->setToolTip(i18n("Fill opacity"));
- rectFAlpha->setToolTip(i18n("Border opacity"));
zoom_slider->setToolTip(i18n("Zoom"));
buttonRealSize->setToolTip(i18n("Original size (1:1)"));
buttonFitZoom->setToolTip(i18n("Fit zoom"));
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"));
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);
templateBox->addItem(t.icon, t.name, t.file);
}
lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
+ adjustSize();
}
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)
{
updateAxisButtons(rect); // back to default
QColor f = rectFColor->color();
+#if not KDE_IS_VERSION(4,5,0)
f.setAlpha(rectFAlpha->value());
+#endif
QPen penf(f);
penf.setWidth(rectLineWidth->value());
penf.setJoinStyle(Qt::RoundJoin);
rect->setPen(penf);
QColor b = rectBColor->color();
+#if not KDE_IS_VERSION(4,5,0)
b.setAlpha(rectBAlpha->value());
+#endif
rect->setBrush(QBrush(b));
rect->setZValue(m_count++);
rect->setData(ZOOMFACTOR, 100);
tt->setFont(font);
QColor color = fontColorButton->color();
+ QColor outlineColor = textOutlineColor->color();
+#if not KDE_IS_VERSION(4,5,0)
color.setAlpha(textAlpha->value());
+ outlineColor.setAlpha(textOutlineAlpha->value());
+#endif
tt->setDefaultTextColor(color);
QTextCursor cur(tt->document());
cur.select(QTextCursor::Document);
QTextBlockFormat format = cur.blockFormat();
QTextCharFormat cformat = cur.charFormat();
- QColor outlineColor = textOutlineColor->color();
- outlineColor.setAlpha(textOutlineAlpha->value());
double outlineWidth = textOutline->value() / 10.0;
tt->setData(101, outlineWidth);
void TitleWidget::slotChangeBackground()
{
QColor color = backgroundColor->color();
+ m_scene->setBackgroundBrush(QBrush(color));
color.setAlpha(backgroundAlpha->value());
m_frameBorder->setBrush(QBrush(color));
}
font.setUnderline(buttonUnder->isChecked());
font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
QColor color = fontColorButton->color();
- color.setAlpha(textAlpha->value());
-
QColor outlineColor = textOutlineColor->color();
+#if not KDE_IS_VERSION(4,5,0)
+ color.setAlpha(textAlpha->value());
outlineColor.setAlpha(textOutlineAlpha->value());
+#endif
+
double outlineWidth = textOutline->value() / 10.0;
int i;
if (l.at(i)->type() == RECTITEM && !settingUp) {
QGraphicsRectItem *rec = static_cast<QGraphicsRectItem *>(l.at(i));
QColor f = rectFColor->color();
+#if not KDE_IS_VERSION(4,5,0)
f.setAlpha(rectFAlpha->value());
+#endif
QPen penf(f);
penf.setWidth(rectLineWidth->value());
penf.setJoinStyle(Qt::RoundJoin);
rec->setPen(penf);
QColor b = rectBColor->color();
+#if not KDE_IS_VERSION(4,5,0)
b.setAlpha(rectBAlpha->value());
+#endif
rec->setBrush(QBrush(b));
}
}
embed_image=true;
}
if (url.isEmpty()) {
- KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this);
+ QPointer<KFileDialog> fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this);
fs->setOperationMode(KFileDialog::Saving);
fs->setMode(KFile::File);
fs->setConfirmOverwrite(true);
//titleConfig.writeEntry("font_size", font_size->value());
titleConfig.writeEntry("font_pixel_size", font_size->value());
titleConfig.writeEntry("font_color", fontColorButton->color());
- titleConfig.writeEntry("font_alpha", textAlpha->value());
- titleConfig.writeEntry("font_outline", textOutline->value());
titleConfig.writeEntry("font_outline_color", textOutlineColor->color());
+#if KDE_IS_VERSION(4,5,0)
+ titleConfig.writeEntry("font_alpha", fontColorButton->color().alpha());
+ titleConfig.writeEntry("font_outline_alpha", textOutlineColor->color().alpha());
+#else
+ titleConfig.writeEntry("font_alpha", textAlpha->value());
titleConfig.writeEntry("font_outline_alpha", textOutlineAlpha->value());
+#endif
+
+ titleConfig.writeEntry("font_outline", textOutline->value());
titleConfig.writeEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
titleConfig.writeEntry("font_italic", buttonItalic->isChecked());
titleConfig.writeEntry("font_underlined", buttonUnder->isChecked());
- titleConfig.writeEntry("rect_foreground_color", rectFColor->color());
- titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value());
titleConfig.writeEntry("rect_background_color", rectBColor->color());
+ titleConfig.writeEntry("rect_foreground_color", rectFColor->color());
+
+#if KDE_IS_VERSION(4,5,0)
+ titleConfig.writeEntry("rect_background_alpha", rectBColor->color().alpha());
+ titleConfig.writeEntry("rect_foreground_alpha", rectFColor->color().alpha());
+#else
titleConfig.writeEntry("rect_background_alpha", rectBAlpha->value());
+ titleConfig.writeEntry("rect_foreground_alpha", rectFAlpha->value());
+#endif
+
titleConfig.writeEntry("rect_line_width", rectLineWidth->value());
titleConfig.writeEntry("background_color", backgroundColor->color());
font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont()));
font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value()));
m_scene->slotUpdateFontSize(font_size->value());
- fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color()));
+ QColor fontColor = QColor(titleConfig.readEntry("font_color", fontColorButton->color()));
+ QColor outlineColor = QColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color()));
+#if KDE_IS_VERSION(4,5,0)
+ fontColor.setAlpha(titleConfig.readEntry("font_alpha", fontColor.alpha()));
+ outlineColor.setAlpha(titleConfig.readEntry("font_outline_alpha", outlineColor.alpha()));
+#else
textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value()));
-
- textOutlineColor->setColor(titleConfig.readEntry("font_outline_color", textOutlineColor->color()));
textOutlineAlpha->setValue(titleConfig.readEntry("font_outline_alpha", textOutlineAlpha->value()));
+#endif
+ fontColorButton->setColor(fontColor);
+ textOutlineColor->setColor(outlineColor);
textOutline->setValue(titleConfig.readEntry("font_outline", textOutline->value()));
int weight;
buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked()));
buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked()));
- rectFColor->setColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color()));
+ QColor fgColor = QColor(titleConfig.readEntry("rect_foreground_color", rectFColor->color()));
+ QColor bgColor = QColor(titleConfig.readEntry("rect_background_color", rectBColor->color()));
+
+#if KDE_IS_VERSION(4,5,0)
+ fgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", fgColor.alpha()));
+ bgColor.setAlpha(titleConfig.readEntry("rect_background_alpha", bgColor.alpha()));
+#else
rectFAlpha->setValue(titleConfig.readEntry("rect_foreground_alpha", rectFAlpha->value()));
- rectBColor->setColor(titleConfig.readEntry("rect_background_color", rectBColor->color()));
rectBAlpha->setValue(titleConfig.readEntry("rect_background_alpha", rectBAlpha->value()));
+#endif
+ rectFColor->setColor(fgColor);
+ rectBColor->setColor(bgColor);
+
rectLineWidth->setValue(titleConfig.readEntry("rect_line_width", rectLineWidth->value()));
backgroundColor->setColor(titleConfig.readEntry("background_color", backgroundColor->color()));
buttonItalic->blockSignals(true);
buttonUnder->blockSignals(true);
fontColorButton->blockSignals(true);
+#if not KDE_IS_VERSION(4,5,0)
textAlpha->blockSignals(true);
+#endif
buttonAlignLeft->blockSignals(true);
buttonAlignRight->blockSignals(true);
buttonAlignNone->blockSignals(true);
QTextCursor cursor(i->document());
cursor.select(QTextCursor::Document);
QColor color = cursor.charFormat().foreground().color();
+#if not KDE_IS_VERSION(4,5,0)
textAlpha->setValue(color.alpha());
color.setAlpha(255);
+#endif
fontColorButton->setColor(color);
if (!i->data(101).isNull()) {
}
if (!i->data(102).isNull()) {
textOutlineColor->blockSignals(true);
+ QVariant variant = i->data(102);
+ color = variant.value<QColor>();
+#if not KDE_IS_VERSION(4,5,0)
textOutlineAlpha->blockSignals(true);
- color = QColor(i->data(102).toString());
textOutlineAlpha->setValue(color.alpha());
color.setAlpha(255);
+ textOutlineAlpha->blockSignals(false);
+#endif
textOutlineColor->setColor(color);
textOutlineColor->blockSignals(false);
- textOutlineAlpha->blockSignals(false);
}
QTextCursor cur = i->textCursor();
QTextBlockFormat format = cur.blockFormat();
buttonItalic->blockSignals(false);
buttonUnder->blockSignals(false);
fontColorButton->blockSignals(false);
+#if not KDE_IS_VERSION(4,5,0)
textAlpha->blockSignals(false);
+#endif
buttonAlignLeft->blockSignals(false);
buttonAlignRight->blockSignals(false);
buttonAlignNone->blockSignals(false);
toolBox->widget(1)->setEnabled(true);
toolBox->setCurrentIndex(0);*/
//toolBox->setItemEnabled(3, true);
+#if not KDE_IS_VERSION(4,5,0)
rectFAlpha->setValue(rec->pen().color().alpha());
rectBAlpha->setValue(rec->brush().color().alpha());
+#endif
//kDebug() << rec->brush().color().alpha();
QColor fcol = rec->pen().color();
QColor bcol = rec->brush().color();
projects / kdenlive / blobdiff