#include <QTextCursor>
#include <QComboBox>
#include <QCryptographicHash>
+#include <QKeyEvent>
#if QT_VERSION >= 0x040600
#include <QGraphicsEffect>
const int SHADOWEFFECT = 2;
const int TYPEWRITEREFFECT = 3;
-TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent) :
+TitleWidget::TitleWidget(const KUrl &url, Timecode tc, const QString &projectTitlePath, Render *render, QWidget *parent) :
QDialog(parent),
Ui::TitleWidget_UI(),
m_startViewport(NULL),
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);
m_frameHeight = render->renderHeight();
showToolbars(TITLE_SELECT);
+ splitter->setStretchFactor(0, 20);
+
//If project is drop frame, set the input mask as such.
- title_duration->setInputMask("");
- title_duration->setValidator(m_tc.validator());
+ title_duration->setInputMask(m_tc.mask());
title_duration->setText(m_tc.reformatSeparators(KdenliveSettings::title_duration()));
- connect(backgroundColor, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
- connect(backgroundAlpha, SIGNAL(valueChanged(qreal, bool)), this, SLOT(slotChangeBackground())) ;
+ connect(backgroundColor, SIGNAL(changed(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(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ;
+ connect(fontColorButton, SIGNAL(changed(QColor)), this, SLOT(slotUpdateText())) ;
+ connect(textOutlineColor, SIGNAL(changed(QColor)), this, SLOT(slotUpdateText())) ;
+ connect(font_family, SIGNAL(currentFontChanged(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(textOutline, 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(font_family, SIGNAL(editTextChanged(QString)), this, SLOT(slotFontText(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(rectLineWidth, SIGNAL(valueChanged(qreal, bool)), this, SLOT(rectChanged()));
+ connect(rectFColor, SIGNAL(changed(QColor)), this, SLOT(rectChanged()));
+ connect(rectBColor, SIGNAL(changed(QColor)), 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(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(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()));
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 = 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);
m_titledocument.setScene(m_scene, m_frameWidth, m_frameHeight);
connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(slotChanged()));
connect(font_size, SIGNAL(valueChanged(int)), m_scene, SLOT(slotUpdateFontSize(int)));
-
+
// a gradient background
/*QRadialGradient *gradient = new QRadialGradient(0, 0, 10);
gradient->setSpread(QGradient::ReflectSpread);
scene->setBackgroundBrush(*gradient);*/
+ QPen framepen(Qt::DotLine);
+ framepen.setColor(Qt::red);
+
+ m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+ m_frameBorder->setPen(framepen);
+ m_frameBorder->setZValue(-1100);
+ m_frameBorder->setBrush(Qt::transparent);
+ m_frameBorder->setFlags(0);
+ graphicsView->scene()->addItem(m_frameBorder);
+
m_frameImage = new QGraphicsPixmapItem();
QTransform qtrans;
qtrans.scale(2.0, 2.0);
connect(m_scene, SIGNAL(sceneZoom(bool)), this , SLOT(slotZoom(bool)));
connect(m_scene, SIGNAL(actionFinished()), this , SLOT(slotSelectTool()));
//connect(m_scene, SIGNAL(actionFinished()), this , SLOT(selectionChanged()));
- connect(m_scene, SIGNAL(newRect(QGraphicsRectItem *)), this , SLOT(slotNewRect(QGraphicsRectItem *)));
- connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *)));
+ 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)));
-
- QPen framepen(Qt::DotLine);
- framepen.setColor(Qt::red);
-
- m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
- m_frameBorder->setPen(framepen);
- m_frameBorder->setZValue(-1100);
- m_frameBorder->setBrush(Qt::transparent);
- m_frameBorder->setFlags(0);
- graphicsView->scene()->addItem(m_frameBorder);
+ connect(zoom_spin, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateZoom(int)));
// mbd: load saved settings
readChoices();
kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
//toolBox->setItemEnabled(2, false);
m_startViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+ // Setting data at -1 so that the item is recognized as undeletable by graphicsscenerectmove
+ m_startViewport->setData(-1, -1);
m_endViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+ m_endViewport->setData(-1, -1);
m_startViewport->setData(0, m_frameWidth);
m_startViewport->setData(1, m_frameHeight);
m_endViewport->setData(0, m_frameWidth);
m_endViewport->setData(1, m_frameHeight);
+ // scale the view so that the title widget is not too big at startup
+ graphicsView->scale(.5, .5);
if (!url.isEmpty()) loadTitle(url);
else {
- slotTextTool();
+ prepareTools(NULL);
+ slotTextTool();
QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
}
initAnimation();
//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();
+ 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)
{
}
// static
-QStringList TitleWidget::extractImageList(QString xml)
+QStringList TitleWidget::extractImageList(const QString& xml)
{
QStringList result;
if (xml.isEmpty()) return result;
}
// static
-QStringList TitleWidget::extractFontList(QString xml)
+QStringList TitleWidget::extractFontList(const QString& xml)
{
QStringList result;
if (xml.isEmpty()) return result;
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);
svg->setZValue(m_count++);
svg->setData(Qt::UserRole, url.path());
graphicsView->scene()->addItem(svg);
+ prepareTools(svg);
} else {
QPixmap pix(url.path());
QGraphicsPixmapItem *image = new QGraphicsPixmapItem(pix);
image->setData(Qt::UserRole, url.path());
image->setZValue(m_count++);
graphicsView->scene()->addItem(image);
+ prepareTools(image);
}
}
m_scene->setTool(TITLE_SELECT);
void TitleWidget::displayBackgroundFrame()
{
+ QRectF r = m_frameBorder->sceneBoundingRect();
if (!displayBg->isChecked()) {
- QPixmap bg(m_frameWidth / 2, m_frameHeight / 2);
QPixmap pattern(20, 20);
pattern.fill();
QColor bgcolor(210, 210, 210);
- QPainter p;
- p.begin(&pattern);
+ QPainter p(&pattern);
p.fillRect(QRect(0, 0, 10, 10), bgcolor);
p.fillRect(QRect(10, 10, 20, 20), bgcolor);
p.end();
QBrush br(pattern);
-
- p.begin(&bg);
- p.fillRect(bg.rect(), br);
- p.end();
+ QPixmap bg((int) (r.width() / 2), (int) (r.height()/ 2));
+ QPainter p2(&bg);
+ p2.fillRect(bg.rect(), br);
+ p2.end();
m_frameImage->setPixmap(bg);
} else {
- m_frameImage->setPixmap(QPixmap::fromImage(m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), m_frameWidth / 2, m_frameHeight / 2)));
+ QImage img = m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), QString(), m_render->frameRenderWidth() / 2, m_render->renderHeight() / 2);
+ m_frameImage->setPixmap(QPixmap::fromImage(img.scaled(r.width() / 2, r.height() / 2)));
}
}
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)
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);
+ prepareTools(rect);
//setCurrentItem(rect);
//graphicsView->setFocus();
}
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);
tt->setTextCursor(cur);
tt->setZValue(m_count++);
setCurrentItem(tt);
+ prepareTools(tt);
}
void TitleWidget::setFontBoxWeight(int weight)
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;
// item->setTextCursor(cur);
cur.clearSelection();
item->setTextCursor(cur);
+ item->setDefaultTextColor(color);
}
}
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));
}
}
{
if (anim_start->isChecked()) slotAnimStart(false);
if (anim_end->isChecked()) slotAnimEnd(false);
+ bool embed_image=false;
+
+ // If we have images in the title, ask for embed
+ QList <QGraphicsItem *> list = graphicsView->scene()->items();
+ QGraphicsPixmapItem pix;
+ int pixmapType = pix.type();
+ foreach(const QGraphicsItem *item, list) {
+ if (item->type() == pixmapType && item != m_frameImage) {
+ embed_image = true;
+ break;
+ }
+ }
+ if (embed_image && KMessageBox::questionYesNo(this, i18n("Do you want to embed Images into this TitleDocument?\nThis is most needed for sharing Titles.")) != KMessageBox::Yes)
+ {
+ embed_image=false;
+ }
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);
-#if KDE_IS_VERSION(4,2,0)
fs->setConfirmOverwrite(true);
-#endif
fs->setKeepLocation(true);
fs->exec();
- url = fs->selectedUrl();
+ if (fs) url = fs->selectedUrl();
delete fs;
}
if (!url.isEmpty()) {
- if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1) == false)
+ if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()), embed_image) == false)
KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
}
}
QDomDocument TitleWidget::xml()
{
QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport);
- doc.documentElement().setAttribute("out", m_tc.getFrameCount(title_duration->text()) - 1);
+ doc.documentElement().setAttribute("duration", m_tc.getFrameCount(title_duration->text()));
return doc;
}
-int TitleWidget::outPoint() const
+int TitleWidget::duration() const
{
- return m_tc.getFrameCount(title_duration->text()) - 1;
+ return m_tc.getFrameCount(title_duration->text());
}
-void TitleWidget::setXml(QDomDocument doc)
+void TitleWidget::setXml(const QDomDocument &doc)
{
- int out;
- m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out);
+ int duration;
+ m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &duration, m_projectTitlePath);
adjustFrameSize();
- title_duration->setText(m_tc.getTimecode(GenTime(out + 1, m_render->fps())));
+ title_duration->setText(m_tc.getTimecode(GenTime(duration, 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));
//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_foreground_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()));
void TitleWidget::addAnimInfoText()
{
// add text to anim viewport
- QGraphicsTextItem *t = new QGraphicsTextItem(i18n("Start"), m_startViewport);
- QGraphicsTextItem *t2 = new QGraphicsTextItem(i18n("End"), m_endViewport);
+ QGraphicsTextItem *t = new QGraphicsTextItem(i18nc("Indicates the start of an animation", "Start"), m_startViewport);
+ QGraphicsTextItem *t2 = new QGraphicsTextItem(i18nc("Indicates the end of an animation", "End"), m_endViewport);
QFont font = t->font();
font.setPixelSize(m_startViewport->rect().width() / 10);
QColor col = m_startViewport->pen().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);
}
}
selectionChanged();
}
-QString TitleWidget::getTooltipWithShortcut(const QString text, QAction *button)
+QString TitleWidget::getTooltipWithShortcut(const QString &text, QAction *button)
{
return text + " <b>" + button->shortcut().toString() + "</b>";
}
if (referenceItem->type() == TEXTITEM) {
showToolbars(TITLE_TEXT);
QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(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 (!i->toPlainText().isEmpty()) {
+ // We have an existing text item selected
+ 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 <QGraphicsBlurEffect *>(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 <QGraphicsDropShadowEffect *>(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);
- }
+ if (i->graphicsEffect()) {
+ QGraphicsBlurEffect *blur = static_cast <QGraphicsBlurEffect *>(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 <QGraphicsDropShadowEffect *>(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);
+ 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);
- }
+ }
+ font_size->blockSignals(true);
+ font_family->blockSignals(true);
+ font_weight_box->blockSignals(true);
+ 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);
+ 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();
+#if not KDE_IS_VERSION(4,5,0)
+ textAlpha->setValue(color.alpha());
+ color.setAlpha(255);
+#endif
+ 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);
+ QVariant variant = i->data(102);
+ color = variant.value<QColor>();
+#if not KDE_IS_VERSION(4,5,0)
+ textOutlineAlpha->blockSignals(true);
+ textOutlineAlpha->setValue(color.alpha());
+ color.setAlpha(255);
+ textOutlineAlpha->blockSignals(false);
+#endif
+ textOutlineColor->setColor(color);
+ textOutlineColor->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);
+#if not KDE_IS_VERSION(4,5,0)
+ textAlpha->blockSignals(false);
+#endif
+ 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);
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