#include <QTextCursor>
#include <QComboBox>
#include <QCryptographicHash>
+#include <QKeyEvent>
#if QT_VERSION >= 0x040600
#include <QGraphicsEffect>
delete textOutlineAlpha;
#else
- rectBColor->setAlphaChannelEnabled(false);
- rectFColor->setAlphaChannelEnabled(false);
- fontColorButton->setAlphaChannelEnabled(false);
- textOutlineColor->setAlphaChannelEnabled(false);
-
rectBAlpha->setMinimum(0);
rectBAlpha->setMaximum(255);
rectBAlpha->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(textOutline, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotUpdateText()));
connect(font_family, SIGNAL(editTextChanged(const QString &)), this, SLOT(slotFontText(const QString&)));
- 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()));
QToolBar *m_toolbar = new QToolBar("titleToolBar", this);
m_toolbar->setIconSize(iconSize);
- m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString());
+ m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), i18n("Selection Tool"));
m_buttonCursor->setCheckable(true);
m_buttonCursor->setShortcut(Qt::ALT + Qt::Key_S);
m_buttonCursor->setToolTip(i18n("Selection Tool") + ' ' + m_buttonCursor->shortcut().toString());
connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool()));
- m_buttonText = m_toolbar->addAction(KIcon("insert-text"), QString());
+ m_buttonText = m_toolbar->addAction(KIcon("insert-text"), i18n("Add Text"));
m_buttonText->setCheckable(true);
m_buttonText->setShortcut(Qt::ALT + Qt::Key_T);
m_buttonText->setToolTip(i18n("Add Text") + ' ' + m_buttonText->shortcut().toString());
connect(m_buttonText, SIGNAL(triggered()), this, SLOT(slotTextTool()));
- m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), QString());
+ m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), i18n("Add Rectangle"));
m_buttonRect->setCheckable(true);
m_buttonRect->setShortcut(Qt::ALT + Qt::Key_R);
m_buttonRect->setToolTip(i18n("Add Rectangle") + ' ' + m_buttonRect->shortcut().toString());
connect(m_buttonRect, SIGNAL(triggered()), this, SLOT(slotRectTool()));
- m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), QString());
+ m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), i18n("Add Image"));
m_buttonImage->setCheckable(false);
m_buttonImage->setShortcut(Qt::ALT + Qt::Key_I);
m_buttonImage->setToolTip(i18n("Add Image") + ' ' + m_buttonImage->shortcut().toString());
m_buttonLoad = m_toolbar->addAction(KIcon("document-open"), i18n("Open Document"));
m_buttonLoad->setCheckable(false);
m_buttonLoad->setShortcut(Qt::CTRL + Qt::Key_O);
+ m_buttonLoad->setToolTip(i18n("Open Document") + ' ' + m_buttonImage->shortcut().toString());
connect(m_buttonLoad, SIGNAL(triggered()), this, SLOT(loadTitle()));
m_buttonSave = m_toolbar->addAction(KIcon("document-save-as"), i18n("Save As"));
m_buttonSave->setCheckable(false);
m_buttonSave->setShortcut(Qt::CTRL + Qt::Key_S);
+ m_buttonSave->setToolTip(i18n("Save As") + ' ' + m_buttonImage->shortcut().toString());
connect(m_buttonSave, SIGNAL(triggered()), this, SLOT(saveTitle()));
layout->addWidget(m_toolbar);
connect(m_scene, SIGNAL(newRect(QGraphicsRectItem *)), this , SLOT(slotNewRect(QGraphicsRectItem *)));
connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *)));
connect(zoom_slider, SIGNAL(valueChanged(int)), this , SLOT(slotUpdateZoom(int)));
-
+ connect(zoom_spin, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateZoom(int)));
// mbd: load saved settings
readChoices();
//templateBox->setIconSize(QSize(60,60));
templateBox->clear();
templateBox->addItem("");
- foreach(TitleTemplate t, titletemplates) {
+ foreach(const TitleTemplate &t, titletemplates) {
templateBox->addItem(t.icon, t.name, t.file);
}
lastDocumentHash = QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex();
void TitleWidget::templateIndexChanged(int index)
{
QString item = templateBox->itemData(index).toString();
- if (item != "") {
+ if (!item.isEmpty()) {
if (lastDocumentHash != QCryptographicHash::hash(xml().toString().toAscii(), QCryptographicHash::Md5).toHex()) {
if (KMessageBox::questionYesNo(this, i18n("Do you really want to load a new template? Changes in this title will be lost!")) == KMessageBox::No) return;
}
{
//slotAdjustZoom();
}
-
+//virtual
+void TitleWidget::keyPressEvent(QKeyEvent *e){
+ if(e->key()!=Qt::Key_Escape && e->key()!=Qt::Key_Return && e->key()!=Qt::Key_Enter) QDialog::keyPressEvent(e);
+}
void TitleWidget::slotTextTool()
{
m_scene->setTool(TITLE_TEXT);
void TitleWidget::slotUpdateZoom(int pos)
{
+ zoom_spin->setValue(pos);
+ zoom_slider->setValue(pos);
m_scene->setZoom((double) pos / 100);
- zoom_label->setText(QString::number(pos) + '%');
}
void TitleWidget::slotZoom(bool up)
void TitleWidget::slotChangeBackground()
{
QColor color = backgroundColor->color();
+ m_scene->setBackgroundBrush(QBrush(color));
color.setAlpha(backgroundAlpha->value());
m_frameBorder->setBrush(QBrush(color));
}
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);
fs->setKeepLocation(true);
fs->exec();
- url = fs->selectedUrl();
+ if (fs) url = fs->selectedUrl();
delete fs;
}
if (!url.isEmpty()) {
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());
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;
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()));
* 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());
+ QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value());
item->setData(100, effdata);
}
break;
{
QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
if (l.size() == 1) {
- QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ";" + QString::number(typewriter_start->value());
+ QStringList effdata = QStringList() << "typewriter" << QString::number(typewriter_delay->value()) + ';' + QString::number(typewriter_start->value());
l[0]->setData(100, effdata);
}
}
}
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());
projects / kdenlive / blobdiff