]> git.sesse.net Git - kdenlive/blobdiff - src/titlewidget.cpp
Fix several title clips problems, including:
[kdenlive] / src / titlewidget.cpp
index 02c89a2e153259112f9cc0b354e7bf9f95db5787..5a108065da7b2da712a5b835ba7cc7097a506bfd 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "titlewidget.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KFileDialog>
+#include <KStandardDirs>
+#include <KMessageBox>
 
-#include <QGraphicsView>
 #include <QDomDocument>
-#include <KDebug>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
-#include <KFileDialog>
-
-#include "titlewidget.h"
-
+#include <QTimer>
+#include <QToolBar>
+#include <QMenu>
 
 int settingUp = false;
 
-TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent) {
+TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent) :
+        QDialog(parent),
+        Ui::TitleWidget_UI(),
+        startViewport(NULL),
+        endViewport(NULL),
+        m_render(render),
+        m_count(0),
+        m_projectPath(projectPath)
+{
     setupUi(this);
-    connect(newTextButton, SIGNAL(clicked()), this, SLOT(slotNewText()));
-    connect(newRectButton, SIGNAL(clicked()), this, SLOT(slotNewRect()));
+    setFont(KGlobalSettings::toolBarFont());
+    //toolBox->setFont(KGlobalSettings::toolBarFont());
+    frame_properties->setEnabled(false);
+    rect_properties->setFixedHeight(frame_properties->height() + 4);
+    text_properties->setFixedHeight(frame_properties->height() + 4);
+    m_frameWidth = render->renderWidth();
+    m_frameHeight = render->renderHeight();
+    //connect(newTextButton, SIGNAL(clicked()), this, SLOT(slotNewText()));
+    //connect(newRectButton, SIGNAL(clicked()), this, SLOT(slotNewRect()));
+    // kcolorbutton == The color of the background
     connect(kcolorbutton, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
+    // horizontalslider == The alpha of the background
     connect(horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotChangeBackground())) ;
-    connect(ktextedit, SIGNAL(textChanged()), this , SLOT(textChanged()));
-    connect(fontColorButton, SIGNAL(clicked()), this, SLOT(textChanged())) ;
+    //connect(ktextedit, SIGNAL(textChanged()), this , SLOT(textChanged()));
     //connect (fontBold, SIGNAL ( clicked()), this, SLOT( setBold()) ) ;
-    connect(loadButton, SIGNAL(clicked()), this, SLOT(loadTitle())) ;
-    connect(saveButton, SIGNAL(clicked()), this, SLOT(saveTitle())) ;
 
 
-    connect(kfontrequester, SIGNAL(fontSelected(const QFont &)), this, SLOT(textChanged())) ;
-    connect(textAlpha, SIGNAL(valueChanged(int)), this, SLOT(textChanged()));
+    //ktextedit->setHidden(true);
+    connect(fontColorButton, 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 (ktextedit, SIGNAL(selectionChanged()), this , SLOT (textChanged()));
 
     connect(rectFAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
@@ -60,59 +81,250 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent) {
     connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
 
     connect(zValue, SIGNAL(valueChanged(int)), this, SLOT(zIndexChanged(int)));
-    connect(svgfilename, SIGNAL(urlSelected(const KUrl&)), this, SLOT(svgSelected(const KUrl &)));
     connect(itemzoom, SIGNAL(valueChanged(int)), this, SLOT(itemScaled(int)));
     connect(itemrotate, SIGNAL(valueChanged(int)), this, SLOT(itemRotate(int)));
-
+    connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter()));
+    connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter()));
+
+    connect(value_x, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
+    connect(value_y, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
+    connect(value_w, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
+    connect(value_h, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
+    connect(buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotAdjustZoom()));
+    connect(buttonRealSize, SIGNAL(clicked()), this, SLOT(slotZoomOneToOne()));
+    connect(buttonBold, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonUnder, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(displayBg, SIGNAL(stateChanged(int)), this, SLOT(displayBackgroundFrame()));
+
+    // mbd
+    connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
+
+    buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
+    buttonRealSize->setIcon(KIcon("zoom-original"));
+    buttonBold->setIcon(KIcon("format-text-bold"));
+    buttonItalic->setIcon(KIcon("format-text-italic"));
+    buttonUnder->setIcon(KIcon("format-text-underline"));
+
+    itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
+    itemhcenter->setToolTip(i18n("Align item horizontally"));
+    itemvcenter->setIcon(KIcon("kdenlive-align-vert"));
+    itemvcenter->setToolTip(i18n("Align item vertically"));
+
+    QHBoxLayout *layout = new QHBoxLayout;
+    frame_toolbar->setLayout(layout);
+    layout->setContentsMargins(2, 2, 2, 2);
+    QToolBar *m_toolbar = new QToolBar("titleToolBar", this);
+
+    m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), i18n("Add Rectangle"));
+    m_buttonRect->setCheckable(true);
+    connect(m_buttonRect, SIGNAL(triggered()), this, SLOT(slotRectTool()));
+
+    m_buttonText = m_toolbar->addAction(KIcon("insert-text"), i18n("Add Text"));
+    m_buttonText->setCheckable(true);
+    connect(m_buttonText, SIGNAL(triggered()), this, SLOT(slotTextTool()));
+
+    m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), i18n("Add Image"));
+    m_buttonImage->setCheckable(false);
+    connect(m_buttonImage, SIGNAL(triggered()), this, SLOT(slotImageTool()));
+
+    m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), i18n("Selection Tool"));
+    m_buttonCursor->setCheckable(true);
+    connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool()));
+
+    m_buttonLoad = m_toolbar->addAction(KIcon("document-open"), i18n("Open Document"));
+    m_buttonLoad->setCheckable(false);
+    connect(m_buttonLoad, SIGNAL(triggered()), this, SLOT(loadTitle()));
+
+    m_buttonSave = m_toolbar->addAction(KIcon("document-save-as"), i18n("Save As"));
+    m_buttonSave->setCheckable(false);
+    connect(m_buttonSave, SIGNAL(triggered()), this, SLOT(saveTitle()));
+
+    layout->addWidget(m_toolbar);
+    text_properties->setHidden(true);
+
+    // initialize graphic scene
     m_scene = new GraphicsSceneRectMove(this);
+    graphicsView->setScene(m_scene);
+    m_titledocument.setScene(m_scene);
 
     // a gradient background
-    QRadialGradient *gradient = new QRadialGradient(0, 0, 10);
+    /*QRadialGradient *gradient = new QRadialGradient(0, 0, 10);
     gradient->setSpread(QGradient::ReflectSpread);
-    //scene->setBackgroundBrush(*gradient);
-
-
-    graphicsView->setScene(m_scene);
-    m_titledocument.setScene(m_scene);
-    connect(graphicsView->scene(), SIGNAL(selectionChanged()), this , SLOT(selectionChanged()));
+    scene->setBackgroundBrush(*gradient);*/
+
+    m_frameImage = new QGraphicsPixmapItem();
+    QTransform qtrans;
+    qtrans.scale(2.0, 2.0);
+    m_frameImage->setTransform(qtrans);
+    m_frameImage->setZValue(-1200);
+    m_frameImage->setFlags(QGraphicsItem::ItemClipsToShape);
+    displayBackgroundFrame();
+    graphicsView->scene()->addItem(m_frameImage);
+
+    connect(m_scene, SIGNAL(selectionChanged()), this , SLOT(selectionChanged()));
+    connect(m_scene, SIGNAL(itemMoved()), this , SLOT(selectionChanged()));
+    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(zoom_slider, SIGNAL(valueChanged(int)), this , SLOT(slotUpdateZoom(int)));
 
     QPen framepen(Qt::DotLine);
     framepen.setColor(Qt::red);
-    m_frameWidth = render->renderWidth();
-    m_frameHeight = render->renderHeight();
+
     m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
     m_frameBorder->setPen(framepen);
-    m_frameBorder->setZValue(-1000);
+    m_frameBorder->setZValue(-1100);
+    m_frameBorder->setBrush(Qt::transparent);
     m_frameBorder->setFlags(QGraphicsItem::ItemClipsToShape);
     graphicsView->scene()->addItem(m_frameBorder);
-    initViewports();
 
+    // mbd: load saved settings
+    readChoices();
+
+    initViewports();
+    QTimer::singleShot(500, this, SLOT(slotAdjustZoom()));
     graphicsView->show();
-    graphicsView->setRenderHint(QPainter::Antialiasing);
+    //graphicsView->setRenderHint(QPainter::Antialiasing);
     graphicsView->setInteractive(true);
-    graphicsView->resize(400, 300);
+    //graphicsView->resize(400, 300);
     kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
+    toolBox->setItemEnabled(2, false);
+    if (!url.isEmpty()) {
+        m_count = m_titledocument.loadDocument(url, startViewport, endViewport) + 1;
+        slotSelectTool();
+    } else {
+        slotRectTool();
+    }
+}
 
-    graphicsView->centerOn(m_frameBorder);
+TitleWidget::~TitleWidget()
+{
+    delete m_buttonRect;
+    delete m_buttonText;
+    delete m_buttonImage;
+    delete m_buttonCursor;
+    delete m_buttonSave;
+    delete m_buttonLoad;
+
+    delete m_frameBorder;
+    delete m_frameImage;
+    if (startViewport) delete startViewport;
+    if (endViewport) delete endViewport;
+    delete m_scene;
+}
 
-    toolBox->setItemEnabled(2, false);
-    toolBox->setItemEnabled(3, false);
+//static
+QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl)
+{
+    QStringList result;
+    QString titlePath = projectUrl.path() + "/titles/";
+    KStandardDirs::makeDir(titlePath);
+    QString titleName = "title";
+    int counter = 0;
+    QString path = titlePath + titleName + QString::number(counter).rightJustified(3, '0', false);
+    while (QFile::exists(path + ".png")) {
+        counter++;
+        path = titlePath + titleName + QString::number(counter).rightJustified(3, '0', false);
+    }
+    result.append(titleName + QString::number(counter).rightJustified(3, '0', false));
+    result.append(path + ".png");
+    return result;
 }
 
+QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QString &titleName)
+{
+    QStringList result;
+    QString titlePath = projectUrl.path() + "/titles/";
+    KStandardDirs::makeDir(titlePath);
+    return titlePath + titleName + ".png";
+}
 
 //virtual
-void TitleWidget::resizeEvent(QResizeEvent * event) {
-    kDebug() << "// TITLE WIDGET:-- " << graphicsView->width() << "x" << graphicsView->height();
-    kDebug() << "// FRAME WIDGET:-- " << graphicsView->mapFromScene(QPointF(m_frameBorder->rect().width() + 50, 0)).x() << "x" << graphicsView->mapFromScene(QPointF(m_frameBorder->rect().height() + 50, 0)).x();
-    double scalex = graphicsView->width() / (double) graphicsView->mapFromScene(QPointF(m_frameBorder->rect().width() + 50, 0)).x();
-    double scaley = graphicsView->height() / (double)graphicsView->mapFromScene(QPointF(m_frameBorder->rect().height() + 50, 0)).x();
-    kDebug() << "-- SCALES: " << scalex << "x" << scaley;
-    if (scalex < scaley) m_scene->setScale(scalex);
-    else m_scene->setScale(scaley);
-    graphicsView->centerOn(m_frameBorder);
+void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
+{
+    //slotAdjustZoom();
+}
+
+void TitleWidget::slotTextTool()
+{
+    rect_properties->setHidden(true);
+    text_properties->setHidden(false);
+    m_scene->setTool(TITLE_TEXT);
+    m_buttonRect->setChecked(false);
+    m_buttonCursor->setChecked(false);
 }
 
-void TitleWidget::initViewports() {
+void TitleWidget::slotRectTool()
+{
+    text_properties->setHidden(true);
+    rect_properties->setHidden(false);
+    m_scene->setTool(TITLE_RECTANGLE);
+    m_buttonText->setChecked(false);
+    m_buttonCursor->setChecked(false);
+    m_buttonRect->setChecked(true);
+}
+
+void TitleWidget::slotSelectTool()
+{
+    m_scene->setTool(TITLE_SELECT);
+    m_buttonCursor->setChecked(true);
+    m_buttonText->setChecked(false);
+    m_buttonRect->setChecked(false);
+}
+
+void TitleWidget::slotImageTool()
+{
+    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.svg *.png *.jpg *.jpeg *.gif *.raw", this, i18n("Load Image"));
+    if (!url.isEmpty()) {
+        if (url.path().endsWith(".svg")) {
+            QGraphicsSvgItem *svg = new QGraphicsSvgItem(url.toLocalFile());
+            svg->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+            svg->setZValue(m_count++);
+            svg->setData(Qt::UserRole, url.path());
+            graphicsView->scene()->addItem(svg);
+        } else {
+            QPixmap pix(url.path());
+            QGraphicsPixmapItem *image = new QGraphicsPixmapItem(pix);
+            image->setShapeMode(QGraphicsPixmapItem::BoundingRectShape);
+            image->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+            image->setData(Qt::UserRole, url.path());
+            image->setZValue(m_count++);
+            graphicsView->scene()->addItem(image);
+        }
+    }
+    m_scene->setTool(TITLE_SELECT);
+    m_buttonRect->setChecked(false);
+    m_buttonCursor->setChecked(true);
+    m_buttonText->setChecked(false);
+}
+
+void TitleWidget::displayBackgroundFrame()
+{
+    if (!displayBg->isChecked()) {
+        QPixmap bg(m_frameWidth / 2, m_frameHeight / 2);
+        QPixmap pattern(20, 20);
+        pattern.fill();
+        QPainter p;
+        p.begin(&pattern);
+        p.fillRect(QRect(0, 0, 10, 10), QColor(210, 210, 210));
+        p.fillRect(QRect(10, 10, 20, 20), QColor(210, 210, 210));
+        p.end();
+        QBrush br(pattern);
+
+        p.begin(&bg);
+        p.fillRect(bg.rect(), br);
+        p.end();
+        m_frameImage->setPixmap(bg);
+    } else {
+        m_frameImage->setPixmap(m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), m_frameWidth / 2, m_frameHeight / 2));
+    }
+}
+
+void TitleWidget::initViewports()
+{
     startViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
     endViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
 
@@ -137,92 +349,247 @@ void TitleWidget::initViewports() {
     graphicsView->scene()->addItem(endViewport);
 }
 
-void TitleWidget::slotNewRect() {
+void TitleWidget::slotUpdateZoom(int pos)
+{
+    m_scene->setZoom((double) pos / 100);
+    zoom_label->setText(QString::number(pos) + '%');
+}
+
+void TitleWidget::slotZoom(bool up)
+{
+    int pos = zoom_slider->value();
+    if (up) pos++;
+    else pos--;
+    zoom_slider->setValue(pos);
+}
+
+void TitleWidget::slotAdjustZoom()
+{
+    /*double scalex = graphicsView->width() / (double)(m_frameWidth * 1.2);
+    double scaley = graphicsView->height() / (double)(m_frameHeight * 1.2);
+    if (scalex > scaley) scalex = scaley;
+    int zoompos = (int)(scalex * 7 + 0.5);*/
+    graphicsView->fitInView(m_frameBorder, Qt::KeepAspectRatio);
+    int zoompos = graphicsView->matrix().m11() * 100;
+    zoom_slider->setValue(zoompos);
+    graphicsView->centerOn(m_frameBorder);
+}
+
+void TitleWidget::slotZoomOneToOne()
+{
+    zoom_slider->setValue(100);
+    graphicsView->centerOn(m_frameBorder);
+}
 
-    QGraphicsRectItem * ri = graphicsView->scene()->addRect(m_frameWidth / 2, m_frameHeight / 2, 100, 100);
-    ri->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
+{
     QColor f = rectFColor->color();
     f.setAlpha(rectFAlpha->value());
     QPen penf(f);
     penf.setWidth(rectLineWidth->value());
-    ri->setPen(penf);
+    rect->setPen(penf);
     QColor b = rectBColor->color();
     b.setAlpha(rectBAlpha->value());
-    ri->setBrush(QBrush(b));
+    rect->setBrush(QBrush(b));
+    rect->setZValue(m_count++);
+    //setCurrentItem(rect);
+    //graphicsView->setFocus();
 }
 
-void TitleWidget::slotNewText() {
-    QGraphicsTextItem *tt = graphicsView->scene()->addText("Text here");
-    tt->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-    tt->setTextInteractionFlags(Qt::NoTextInteraction);
-    tt->setPos(m_frameWidth / 2, m_frameHeight / 2);
-    tt->setFont(kfontrequester->font());
-    connect(tt->document(), SIGNAL(contentsChanged()), this, SLOT(selectionChanged()));
-    kDebug() << tt->metaObject()->className();
-    /*QGraphicsRectItem * ri=graphicsView->scene()->addRect(-50,-50,100,100);
-    ri->setFlags(QGraphicsItem::ItemIsMovable|QGraphicsItem::ItemIsSelectable);*/
+void TitleWidget::slotNewText(QGraphicsTextItem *tt)
+{
+    QFont font = font_family->currentFont();
+    font.setPixelSize(font_size->value());
+    // mbd: issue 551:
+    font.setBold(buttonBold->isChecked());
+    font.setItalic(buttonItalic->isChecked());
+    font.setUnderline(buttonUnder->isChecked());
+
+    tt->setFont(font);
+    QColor color = fontColorButton->color();
+    color.setAlpha(textAlpha->value());
+    tt->setDefaultTextColor(color);
+    tt->setZValue(m_count++);
+    setCurrentItem(tt);
+}
 
+void TitleWidget::setCurrentItem(QGraphicsItem *item)
+{
+    m_scene->setSelectedItem(item);
 }
 
-void TitleWidget::zIndexChanged(int v) {
+void TitleWidget::zIndexChanged(int v)
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() >= 1) {
         l[0]->setZValue(v);
     }
 }
 
-void TitleWidget::selectionChanged() {
+void TitleWidget::selectionChanged()
+{
+    if (m_scene->tool() != TITLE_SELECT) return;
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    toolBox->setItemEnabled(2, false);
-    toolBox->setItemEnabled(3, false);
+    //toolBox->setItemEnabled(2, false);
+    //toolBox->setItemEnabled(3, false);
+    value_x->blockSignals(true);
+    value_y->blockSignals(true);
+    value_w->blockSignals(true);
+    value_h->blockSignals(true);
+    //kDebug() << "////////  SELECTION CHANGED; ITEMS: " << l.size();
     if (l.size() == 1) {
         if ((l[0])->type() == 8) {
+            rect_properties->setHidden(true);
+            text_properties->setHidden(false);
             QGraphicsTextItem* i = ((QGraphicsTextItem*)l[0]);
-            if (l[0]->hasFocus())
-                ktextedit->setHtml(i->toHtml());
-            toolBox->setCurrentIndex(2);
-            toolBox->setItemEnabled(2, true);
-        } else
-            if ((l[0])->type() == 3) {
-                settingUp = true;
-                QGraphicsRectItem *rec = ((QGraphicsRectItem*)l[0]);
-                toolBox->setCurrentIndex(3);
-                toolBox->setItemEnabled(3, true);
-                rectFAlpha->setValue(rec->pen().color().alpha());
-                rectBAlpha->setValue(rec->brush().color().alpha());
-                kDebug() << rec->brush().color().alpha();
-                QColor fcol = rec->pen().color();
-                QColor bcol = rec->brush().color();
-                //fcol.setAlpha(255);
-                //bcol.setAlpha(255);
-                rectFColor->setColor(fcol);
-                rectBColor->setColor(bcol);
-                settingUp = false;
-                rectLineWidth->setValue(rec->pen().width());
-            } else {
-                //toolBox->setCurrentIndex(0);
-            }
+            //if (l[0]->hasFocus())
+            //ktextedit->setHtml(i->toHtml());
+            toolBox->setCurrentIndex(0);
+            //toolBox->setItemEnabled(2, true);
+            font_size->blockSignals(true);
+            font_family->blockSignals(true);
+            buttonBold->blockSignals(true);
+            buttonItalic->blockSignals(true);
+            buttonUnder->blockSignals(true);
+            fontColorButton->blockSignals(true);
+            textAlpha->blockSignals(true);
+
+            QFont font = i->font();
+            font_family->setCurrentFont(font);
+            font_size->setValue(font.pixelSize());
+            buttonBold->setChecked(font.bold());
+            buttonItalic->setChecked(font.italic());
+            buttonUnder->setChecked(font.underline());
+
+            QColor color = i->defaultTextColor();
+            fontColorButton->setColor(color);
+            textAlpha->setValue(color.alpha());
+
+            font_size->blockSignals(false);
+            font_family->blockSignals(false);
+            buttonBold->blockSignals(false);
+            buttonItalic->blockSignals(false);
+            buttonUnder->blockSignals(false);
+            fontColorButton->blockSignals(false);
+            textAlpha->blockSignals(false);
+
+            value_x->setValue((int) i->pos().x());
+            value_y->setValue((int) i->pos().y());
+            value_w->setValue((int) i->boundingRect().width());
+            value_h->setValue((int) i->boundingRect().height());
+            frame_properties->setEnabled(true);
+            value_w->setEnabled(false);
+            value_h->setEnabled(false);
+        } else if ((l[0])->type() == 3) {
+            rect_properties->setHidden(false);
+            text_properties->setHidden(true);
+            settingUp = true;
+            QGraphicsRectItem *rec = ((QGraphicsRectItem*)l[0]);
+            toolBox->setCurrentIndex(0);
+            //toolBox->setItemEnabled(3, true);
+            rectFAlpha->setValue(rec->pen().color().alpha());
+            rectBAlpha->setValue(rec->brush().color().alpha());
+            //kDebug() << rec->brush().color().alpha();
+            QColor fcol = rec->pen().color();
+            QColor bcol = rec->brush().color();
+            //fcol.setAlpha(255);
+            //bcol.setAlpha(255);
+            rectFColor->setColor(fcol);
+            rectBColor->setColor(bcol);
+            settingUp = false;
+            rectLineWidth->setValue(rec->pen().width());
+            value_x->setValue((int) rec->pos().x());
+            value_y->setValue((int) rec->pos().y());
+            value_w->setValue((int) rec->rect().width());
+            value_h->setValue((int) rec->rect().height());
+            frame_properties->setEnabled(true);
+            value_w->setEnabled(true);
+            value_h->setEnabled(true);
+        } else {
+            //toolBox->setCurrentIndex(0);
+            frame_properties->setEnabled(false);
+        }
         zValue->setValue((int)l[0]->zValue());
-        itemzoom->setValue((int)transformations[l[0]].scalex*100);
-        itemrotate->setValue((int)transformations[l[0]].rotate);
+        itemzoom->setValue((int)(transformations[l[0]].scalex * 100));
+        itemrotate->setValue((int)(transformations[l[0]].rotate));
+        value_x->blockSignals(false);
+        value_y->blockSignals(false);
+        value_w->blockSignals(false);
+        value_h->blockSignals(false);
+    } else frame_properties->setEnabled(false);
+}
+
+void TitleWidget::slotAdjustSelectedItem()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+        if (l[0]->type() == 3) {
+            //rect item
+            QGraphicsRectItem *rec = ((QGraphicsRectItem*)l[0]);
+            rec->setPos(value_x->value(), value_y->value());
+            rec->setRect(QRect(0, 0, value_w->value(), value_h->value()));
+        } else if (l[0]->type() == 8) {
+            //text item
+            QGraphicsTextItem *rec = ((QGraphicsTextItem*)l[0]);
+            rec->setPos(value_x->value(), value_y->value());
+        }
     }
 }
 
-void TitleWidget::slotChangeBackground() {
+void TitleWidget::slotChangeBackground()
+{
     QColor color = kcolorbutton->color();
     color.setAlpha(horizontalSlider->value());
-    graphicsView->scene()->setBackgroundBrush(QBrush(color));
+    m_frameBorder->setBrush(QBrush(color));
 }
 
-void TitleWidget::textChanged() {
+void TitleWidget::textChanged()
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1 && (l[0])->type() == 8 && !l[0]->hasFocus()) {
-        kDebug() << ktextedit->document()->toHtml();
-        ((QGraphicsTextItem*)l[0])->setHtml(ktextedit->toHtml());
+        //kDebug() << ktextedit->document()->toHtml();
+        //((QGraphicsTextItem*)l[0])->setHtml(ktextedit->toHtml());
     }
 }
 
-void TitleWidget::rectChanged() {
+void TitleWidget::slotUpdateText()
+{
+    QFont font = font_family->currentFont();
+    font.setPixelSize(font_size->value());
+    font.setBold(buttonBold->isChecked());
+    font.setItalic(buttonItalic->isChecked());
+    font.setUnderline(buttonUnder->isChecked());
+    QColor color = fontColorButton->color();
+    color.setAlpha(textAlpha->value());
+
+    QGraphicsTextItem* item = NULL;
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1 && (l[0])->type() == 8) {
+        item = (QGraphicsTextItem*)l[0];
+    }
+    if (!item) return;
+    //if (item->textCursor().selection ().isEmpty())
+    {
+        item->setFont(font);
+        item->setDefaultTextColor(color);
+    }
+    /*else {
+    QTextDocumentFragment selec = item->textCursor().selection ();
+    selec.set
+    }*/
+    //if (ktextedit->textCursor().selectedText().isEmpty()) ktextedit->selectAll();
+
+    //ktextedit->setCurrentFont(font);
+    //ktextedit->setTextColor(color);
+    /*QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1 && (l[0])->type() == 8 && l[0]->hasFocus()) {
+    QGraphicsTextItem* item = static_cast <QGraphicsTextItem*> (l[0]);
+    //item-
+    }*/
+}
+
+void TitleWidget::rectChanged()
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1 && (l[0])->type() == 3 && !settingUp) {
         QGraphicsRectItem *rec = (QGraphicsRectItem*)l[0];
@@ -237,20 +604,16 @@ void TitleWidget::rectChanged() {
     }
 }
 
-void TitleWidget::fontBold() {
+void TitleWidget::fontBold()
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1 && (l[0])->type() == 8 && !l[0]->hasFocus()) {
         //ktextedit->document()->setTextOption();
     }
 }
 
-void TitleWidget::svgSelected(const KUrl& u) {
-    QGraphicsSvgItem *svg = new QGraphicsSvgItem(u.toLocalFile());
-    svg->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
-    graphicsView->scene()->addItem(svg);
-}
-
-void TitleWidget::itemScaled(int val) {
+void TitleWidget::itemScaled(int val)
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1) {
         Transform x = transformations[l[0]];
@@ -264,7 +627,8 @@ void TitleWidget::itemScaled(int val) {
     }
 }
 
-void TitleWidget::itemRotate(int val) {
+void TitleWidget::itemRotate(int val)
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1) {
         Transform x = transformations[l[0]];
@@ -277,8 +641,38 @@ void TitleWidget::itemRotate(int val) {
     }
 }
 
+void TitleWidget::itemHCenter()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l[0];
+        QRectF br;
+        if (item->type() == 3) {
+            br = ((QGraphicsRectItem*)item)->rect();
+        } else br = item->boundingRect();
+        int width = (int) br.width();
+        int newPos = (int)((m_frameWidth - width) / 2);
+        item->setPos(newPos, item->pos().y());
+    }
+}
 
-void TitleWidget::setupViewports() {
+void TitleWidget::itemVCenter()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l[0];
+        QRectF br;
+        if (item->type() == 3) {
+            br = ((QGraphicsRectItem*)item)->rect();
+        } else br = item->boundingRect();
+        int height = (int) br.height();
+        int newPos = (int)((m_frameHeight - height) / 2);
+        item->setPos(item->pos().x(), newPos);
+    }
+}
+
+void TitleWidget::setupViewports()
+{
     double aspect_ratio = 4.0 / 3.0;//read from project
 
     QRectF sp(0, 0, 0, 0);
@@ -297,15 +691,128 @@ void TitleWidget::setupViewports() {
 
 }
 
-void TitleWidget::loadTitle() {
-    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlivetitle", this, tr("Save Title"));
-    m_titledocument.loadDocument(url, startViewport, endViewport);
+void TitleWidget::loadTitle()
+{
+    KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectPath), "*.kdenlivetitle", this, i18n("Load Title"));
+    if (!url.isEmpty()) {
+        QList<QGraphicsItem *> items = m_scene->items();
+        for (int i = 0; i < items.size(); i++) {
+            if (items.at(i)->zValue() > -1000) delete items.at(i);
+        }
+        m_count = m_titledocument.loadDocument(url, startViewport, endViewport) + 1;
+        slotSelectTool();
+    }
+}
+
+void TitleWidget::saveTitle(KUrl url)
+{
+    if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectPath), "*.kdenlivetitle", this, i18n("Save Title"));
+    if (!url.isEmpty()) {
+        if (m_titledocument.saveDocument(url, startViewport, endViewport) == false)
+            KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
+    }
+}
+
+QDomDocument TitleWidget::xml()
+{
+    return m_titledocument.xml(startViewport, endViewport);
+}
+
+void TitleWidget::setXml(QDomDocument doc)
+{
+    m_count = m_titledocument.loadFromXml(doc, startViewport, endViewport);
+    // 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());
+    background_color.setAlpha(255);
+    kcolorbutton->setColor(background_color);
+    horizontalSlider->blockSignals(false);
+    kcolorbutton->blockSignals(false);
+
+    slotSelectTool();
 }
 
-void TitleWidget::saveTitle() {
-    KUrl url = KFileDialog::getSaveUrl(KUrl(), "*.kdenlivetitle", this, tr("Save Title"));
-    m_titledocument.saveDocument(url, startViewport, endViewport);
+QImage TitleWidget::renderedPixmap()
+{
+    QImage pix(m_frameWidth, m_frameHeight, QImage::Format_ARGB32);
+    pix.fill(Qt::transparent);
+    QPainter painter(&pix);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
+    m_scene->clearTextSelection();
+    QPen framepen = m_frameBorder->pen();
+    m_frameBorder->setPen(Qt::NoPen);
+    startViewport->setVisible(false);
+    endViewport->setVisible(false);
+    m_frameImage->setVisible(false);
+
+    m_scene->render(&painter, QRectF(), QRectF(0, 0, m_frameWidth, m_frameHeight));
+    painter.end();
+    m_frameBorder->setPen(framepen);
+    startViewport->setVisible(true);
+    endViewport->setVisible(true);
+    m_frameImage->setVisible(true);
+    return pix;
 }
 
-#include "moc_titlewidget.cpp"
+/** \brief Connected to the accepted signal - calls writeChoices */
+void TitleWidget::slotAccepted()
+{
+    writeChoices();
+}
+
+/** \brief Store the current choices of font, background and rect values */
+void TitleWidget::writeChoices()
+{
+    // Get a pointer to a shared configuration instance, then get the TitleWidget group.
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup titleConfig(config, "TitleWidget");
+    // Write the entries
+    titleConfig.writeEntry("font_family", font_family->currentFont());
+    //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_bold", buttonBold->isChecked());
+    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_background_alpha", rectBAlpha->value());
+    titleConfig.writeEntry("rect_line_width", rectLineWidth->value());
+
+    titleConfig.writeEntry("background_color", kcolorbutton->color());
+    titleConfig.writeEntry("background_alpha", horizontalSlider->value());
+    //! \todo Not sure if I should sync - it is probably safe to do it
+    config->sync();
+
+}
+
+/** \brief Read the last stored choices into the dialog */
+void TitleWidget::readChoices()
+{
+    // Get a pointer to a shared configuration instance, then get the TitleWidget group.
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup titleConfig(config, "TitleWidget");
+    // read the entries
+    font_family->setCurrentFont(titleConfig.readEntry("font_family", font_family->currentFont()));
+    font_size->setValue(titleConfig.readEntry("font_pixel_size", font_size->value()));
+    fontColorButton->setColor(titleConfig.readEntry("font_color", fontColorButton->color()));
+    textAlpha->setValue(titleConfig.readEntry("font_alpha", textAlpha->value()));
+    buttonBold->setChecked(titleConfig.readEntry("font_bold", buttonBold->isChecked()));
+    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()));
+    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()));
+    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()));
+}