#include "titlewidget.h"
#include "kdenlivesettings.h"
+#include "KoSliderCombo.h"
#include <cmath>
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"));
+
+ itemrotate->setMinimum(-360);
+ itemrotate->setMaximum(360);
+ itemrotate->setDecimals(0);
+ itemrotate->setValue(0);
+ itemrotate->setToolTip(i18n("Rotation"));
+
+ 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();
//TODO: get default title duration instead of hardcoded one
title_duration->setText(m_tc.getTimecode(GenTime(5000 / 1000.0)));
- 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(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()));
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(itemrotate, SIGNAL(valueChanged(qreal, bool)), this, SLOT(itemRotate(qreal)));
connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter()));
connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter()));
connect(itemtop, SIGNAL(clicked()), this, SLOT(itemTop()));
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 Transparency"));
itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
itemhcenter->setToolTip(i18n("Align item horizontally"));
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);
}
buttonUnder->setChecked(font.underline());
setFontBoxWeight(font.weight());
- QColor color = i->defaultTextColor();
- fontColorButton->setColor(color);
+ 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);
void TitleWidget::slotChangeBackground()
{
- QColor color = kcolorbutton->color();
- color.setAlpha(horizontalSlider->value());
+ QColor color = backgroundColor->color();
+ color.setAlpha(backgroundAlpha->value());
m_frameBorder->setBrush(QBrush(color));
}
QColor color = fontColorButton->color();
color.setAlpha(textAlpha->value());
+ QColor outlineColor = textOutlineColor->color();
+ outlineColor.setAlpha(textOutlineAlpha->value());
+ double outlineWidth = textOutline->value() / 10.0;
QGraphicsTextItem* item = NULL;
QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
if (l.size() == 1 && l.at(0)->type() == TEXTITEM) {
}
if (!item) return;
//if (item->textCursor().selection ().isEmpty())
- QTextCursor cur = item->textCursor();
+ QTextCursor cur(item->document());
+ cur.select(QTextCursor::Document);
QTextBlockFormat format = cur.blockFormat();
if (buttonAlignLeft->isChecked() || buttonAlignCenter->isChecked() || buttonAlignRight->isChecked()) {
item->setTextWidth(item->boundingRect().width());
item->setTextWidth(-1);
}
- {
- item->setFont(font);
- item->setDefaultTextColor(color);
- cur.select(QTextCursor::Document);
- cur.setBlockFormat(format);
- item->setTextCursor(cur);
- cur.clearSelection();
- item->setTextCursor(cur);
+ 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);
+ cur.clearSelection();
+ item->setTextCursor(cur);
}
void TitleWidget::rectChanged()
}
}
-void TitleWidget::itemRotate(int val)
+void TitleWidget::itemRotate(qreal val)
{
QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
if (l.size() == 1) {
Transform x = m_transformations[l.at(0)];
- x.rotate = (double)val;
+ x.rotate = val;
QTransform qtrans;
qtrans.scale(x.scalex, x.scaley);
qtrans.rotate(x.rotate);
}
// 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());
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());
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();
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;
else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
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()
projects / kdenlive / blobdiff