]> git.sesse.net Git - kdenlive/blobdiff - src/titlewidget.cpp
New features: Titles can now be larger than the frame size. Then, you can add a compo...
[kdenlive] / src / titlewidget.cpp
index d0ebab329083d685e9bd593cd162ad3e2ab24420..e3d1f8251405bc17c9033068787b8267aa88aa71 100644 (file)
  *                                                                         *
  ***************************************************************************/
 
+#include "titlewidget.h"
+#include "kdenlivesettings.h"
 
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KFileDialog>
+#include <KStandardDirs>
+#include <KMessageBox>
 
-#include <QGraphicsView>
 #include <QDomDocument>
 #include <QGraphicsItem>
 #include <QGraphicsSvgItem>
 #include <QTimer>
-
 #include <QToolBar>
 #include <QMenu>
-
-#include <KDebug>
-#include <KGlobalSettings>
-#include <KFileDialog>
-
-#include "titlewidget.h"
-#include "kdenlivesettings.h"
+#include <QTextBlockFormat>
+#include <QTextCursor>
 
 int settingUp = false;
 
-TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_frameImage(NULL), m_render(render), m_count(0) {
+const int IMAGEITEM = 7;
+const int RECTITEM = 3;
+const int TEXTITEM = 8;
+
+TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent) :
+        QDialog(parent),
+        Ui::TitleWidget_UI(),
+        m_startViewport(NULL),
+        m_endViewport(NULL),
+        m_render(render),
+        m_count(0),
+        m_projectPath(projectPath)
+{
     setupUi(this);
-    //frame_properties->
     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 (fontBold, SIGNAL ( clicked()), this, SLOT( setBold()) ) ;
@@ -70,9 +87,10 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_fr
     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()));
@@ -83,20 +101,39 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_fr
     connect(buttonBold, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonUnder, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonAlignLeft, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonAlignRight, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonAlignCenter, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    connect(buttonAlignNone, 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"));
+    buttonAlignCenter->setIcon(KIcon("format-justify-center"));
+    buttonAlignLeft->setIcon(KIcon("format-justify-left"));
+    buttonAlignRight->setIcon(KIcon("format-justify-right"));
+    buttonAlignNone->setToolTip(i18n("No alignment"));
+    buttonAlignRight->setToolTip(i18n("Align right"));
+    buttonAlignLeft->setToolTip(i18n("Align left"));
+    buttonAlignCenter->setToolTip(i18n("Align center"));
+
+    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("insert-rect"), i18n("Add Rectangle"));
+    m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), i18n("Add Rectangle"));
     m_buttonRect->setCheckable(true);
     connect(m_buttonRect, SIGNAL(triggered()), this, SLOT(slotRectTool()));
 
@@ -105,10 +142,10 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_fr
     connect(m_buttonText, SIGNAL(triggered()), this, SLOT(slotTextTool()));
 
     m_buttonImage = m_toolbar->addAction(KIcon("insert-image"), i18n("Add Image"));
-    m_buttonImage->setCheckable(true);
+    m_buttonImage->setCheckable(false);
     connect(m_buttonImage, SIGNAL(triggered()), this, SLOT(slotImageTool()));
 
-    m_buttonCursor = m_toolbar->addAction(KIcon("select-rectangular"), i18n("Selection Tool"));
+    m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), i18n("Selection Tool"));
     m_buttonCursor->setCheckable(true);
     connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool()));
 
@@ -123,12 +160,24 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_fr
     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);
+    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()));
@@ -139,132 +188,218 @@ TitleWidget::TitleWidget(Render *render, QWidget *parent): QDialog(parent), m_fr
     connect(m_scene, SIGNAL(newText(QGraphicsTextItem *)), this , SLOT(slotNewText(QGraphicsTextItem *)));
     connect(zoom_slider, SIGNAL(valueChanged(int)), this , SLOT(slotUpdateZoom(int)));
 
-    graphicsView->setScene(m_scene);
-    m_titledocument.setScene(m_scene);
-
     QPen framepen(Qt::DotLine);
     framepen.setColor(Qt::red);
-    m_frameWidth = render->renderWidth();
-    m_frameHeight = render->renderHeight();
-    slotRectTool();
 
     m_frameBorder = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
     m_frameBorder->setPen(framepen);
     m_frameBorder->setZValue(-1100);
-    m_frameBorder->setBrush(QColor(0, 0, 0, 0));
+    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);
-    QTimer::singleShot(500, this, SLOT(slotAdjustZoom()));
     //graphicsView->resize(400, 300);
     kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
     toolBox->setItemEnabled(2, false);
-    toolBox->setItemEnabled(3, false);
+    if (!url.isEmpty()) {
+        m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
+        slotSelectTool();
+    } else {
+        slotRectTool();
+    }
 }
 
+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;
+    delete m_startViewport;
+    delete m_endViewport;
+    delete m_scene;
+}
+
+//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) {
+void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
+{
     //slotAdjustZoom();
 }
 
-void TitleWidget::slotTextTool() {
+void TitleWidget::slotTextTool()
+{
     rect_properties->setHidden(true);
     text_properties->setHidden(false);
     m_scene->setTool(TITLE_TEXT);
     m_buttonRect->setChecked(false);
     m_buttonCursor->setChecked(false);
-    m_buttonImage->setChecked(false);
 }
 
-void TitleWidget::slotRectTool() {
+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_buttonImage->setChecked(false);
+    m_buttonRect->setChecked(true);
 }
 
-void TitleWidget::slotSelectTool() {
+void TitleWidget::slotSelectTool()
+{
     m_scene->setTool(TITLE_SELECT);
     m_buttonCursor->setChecked(true);
     m_buttonText->setChecked(false);
     m_buttonRect->setChecked(false);
-    m_buttonImage->setChecked(false);
 }
 
-void TitleWidget::displayBackgroundFrame() {
-    if (m_frameImage) delete m_frameImage;
-    m_frameImage = NULL;
-    if (!displayBg->isChecked()) return;
-    QPixmap bg = m_render->extractFrame((int) m_render->seekPosition().frames(m_render->fps()), m_frameWidth / 2, m_frameHeight / 2);
-    m_frameImage = new QGraphicsPixmapItem(bg);
-    QTransform qtrans;
-    qtrans.scale(2.0, 2.0);
-    m_frameImage->setTransform(qtrans);
-    m_frameImage->setZValue(-1200);
-    m_frameImage->setFlags(QGraphicsItem::ItemClipsToShape);
-    graphicsView->scene()->addItem(m_frameImage);
+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)));
+void TitleWidget::initViewports()
+{
+    m_startViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
+    m_endViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
 
     QPen startpen(Qt::DotLine);
     QPen endpen(Qt::DashDotLine);
     startpen.setColor(QColor(100, 200, 100, 140));
     endpen.setColor(QColor(200, 100, 100, 140));
 
-    startViewport->setPen(startpen);
-    endViewport->setPen(endpen);
+    m_startViewport->setPen(startpen);
+    m_endViewport->setPen(endpen);
 
     startViewportSize->setValue(40);
     endViewportSize->setValue(40);
 
-    startViewport->setZValue(-1000);
-    endViewport->setZValue(-1000);
+    m_startViewport->setZValue(-1000);
+    m_endViewport->setZValue(-1000);
 
-    startViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
-    endViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
+    m_startViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
+    m_endViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
 
-    graphicsView->scene()->addItem(startViewport);
-    graphicsView->scene()->addItem(endViewport);
+    graphicsView->scene()->addItem(m_startViewport);
+    graphicsView->scene()->addItem(m_endViewport);
 }
 
-void TitleWidget::slotUpdateZoom(int pos) {
-    m_scene->setZoom((double) pos / 7);
-    zoom_label->setText("x" + QString::number((double) pos / 7, 'g', 2));
+void TitleWidget::slotUpdateZoom(int pos)
+{
+    m_scene->setZoom((double) pos / 100);
+    zoom_label->setText(QString::number(pos) + '%');
 }
 
-void TitleWidget::slotZoom(bool up) {
+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);
+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);
+    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(7);
+void TitleWidget::slotZoomOneToOne()
+{
+    zoom_slider->setValue(100);
     graphicsView->centerOn(m_frameBorder);
 }
 
-void TitleWidget::slotNewRect(QGraphicsRectItem * rect) {
+void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
+{
     QColor f = rectFColor->color();
     f.setAlpha(rectFAlpha->value());
     QPen penf(f);
@@ -278,9 +413,15 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect) {
     //graphicsView->setFocus();
 }
 
-void TitleWidget::slotNewText(QGraphicsTextItem *tt) {
+void TitleWidget::slotNewText(QGraphicsTextItem *tt)
+{
     QFont font = font_family->currentFont();
-    font.setPointSize(font_size->value());
+    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());
@@ -289,18 +430,21 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt) {
     setCurrentItem(tt);
 }
 
-void TitleWidget::setCurrentItem(QGraphicsItem *item) {
+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);
@@ -309,12 +453,13 @@ void TitleWidget::selectionChanged() {
     value_y->blockSignals(true);
     value_w->blockSignals(true);
     value_h->blockSignals(true);
-    kDebug() << "////////  SELECTION CHANGED; ITEMS: " << l.size();
+    itemzoom->blockSignals(true);
+    itemrotate->blockSignals(true);
     if (l.size() == 1) {
-        if ((l[0])->type() == 8) {
+        if (l.at(0)->type() == TEXTITEM) {
             rect_properties->setHidden(true);
             text_properties->setHidden(false);
-            QGraphicsTextItem* i = ((QGraphicsTextItem*)l[0]);
+            QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
             //if (l[0]->hasFocus())
             //ktextedit->setHtml(i->toHtml());
             toolBox->setCurrentIndex(0);
@@ -326,10 +471,14 @@ void TitleWidget::selectionChanged() {
             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.pointSize());
+            font_size->setValue(font.pixelSize());
             buttonBold->setChecked(font.bold());
             buttonItalic->setChecked(font.italic());
             buttonUnder->setChecked(font.underline());
@@ -338,6 +487,13 @@ void TitleWidget::selectionChanged() {
             fontColorButton->setColor(color);
             textAlpha->setValue(color.alpha());
 
+            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);
             buttonBold->blockSignals(false);
@@ -345,6 +501,10 @@ void TitleWidget::selectionChanged() {
             buttonUnder->blockSignals(false);
             fontColorButton->blockSignals(false);
             textAlpha->blockSignals(false);
+            buttonAlignLeft->blockSignals(false);
+            buttonAlignRight->blockSignals(false);
+            buttonAlignNone->blockSignals(false);
+            buttonAlignCenter->blockSignals(false);
 
             value_x->setValue((int) i->pos().x());
             value_y->setValue((int) i->pos().y());
@@ -353,16 +513,16 @@ void TitleWidget::selectionChanged() {
             frame_properties->setEnabled(true);
             value_w->setEnabled(false);
             value_h->setEnabled(false);
-        } else if ((l[0])->type() == 3) {
+        } else if ((l.at(0))->type() == RECTITEM) {
             rect_properties->setHidden(false);
             text_properties->setHidden(true);
             settingUp = true;
-            QGraphicsRectItem *rec = ((QGraphicsRectItem*)l[0]);
+            QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(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();
+            //kDebug() << rec->brush().color().alpha();
             QColor fcol = rec->pen().color();
             QColor bcol = rec->brush().color();
             //fcol.setAlpha(255);
@@ -382,49 +542,55 @@ void TitleWidget::selectionChanged() {
             //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);
+        zValue->setValue((int)l.at(0)->zValue());
+        itemzoom->setValue((int)(m_transformations.value(l.at(0)).scalex * 100.0 + 0.5));
+        itemrotate->setValue((int)(m_transformations.value(l.at(0)).rotate));
         value_x->blockSignals(false);
         value_y->blockSignals(false);
         value_w->blockSignals(false);
         value_h->blockSignals(false);
+        itemzoom->blockSignals(false);
+        itemrotate->blockSignals(false);
     } else frame_properties->setEnabled(false);
 }
 
-void TitleWidget::slotAdjustSelectedItem() {
+void TitleWidget::slotAdjustSelectedItem()
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() >= 1) {
-        if (l[0]->type() == 3) {
+        if (l.at(0)->type() == RECTITEM) {
             //rect item
-            QGraphicsRectItem *rec = ((QGraphicsRectItem*)l[0]);
+            QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(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) {
+        } else if (l.at(0)->type() == TEXTITEM) {
             //text item
-            QGraphicsTextItem *rec = ((QGraphicsTextItem*)l[0]);
+            QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(l.at(0));
             rec->setPos(value_x->value(), value_y->value());
         }
     }
 }
 
-void TitleWidget::slotChangeBackground() {
+void TitleWidget::slotChangeBackground()
+{
     QColor color = kcolorbutton->color();
     color.setAlpha(horizontalSlider->value());
     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()) {
+    if (l.size() == 1 && l.at(0)->type() == TEXTITEM && !l.at(0)->hasFocus()) {
         //kDebug() << ktextedit->document()->toHtml();
         //((QGraphicsTextItem*)l[0])->setHtml(ktextedit->toHtml());
     }
 }
 
-void TitleWidget::slotUpdateText() {
+void TitleWidget::slotUpdateText()
+{
     QFont font = font_family->currentFont();
-    font.setPointSize(font_size->value());
+    font.setPixelSize(font_size->value());
     font.setBold(buttonBold->isChecked());
     font.setItalic(buttonItalic->isChecked());
     font.setUnderline(buttonUnder->isChecked());
@@ -433,14 +599,32 @@ void TitleWidget::slotUpdateText() {
 
     QGraphicsTextItem* item = NULL;
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1 && (l[0])->type() == 8) {
-        item = (QGraphicsTextItem*)l[0];
+    if (l.size() == 1 && l.at(0)->type() == TEXTITEM) {
+        item = static_cast <QGraphicsTextItem *>(l.at(0));
     }
     if (!item) return;
     //if (item->textCursor().selection ().isEmpty())
+    QTextCursor cur = item->textCursor();
+    QTextBlockFormat format = cur.blockFormat();
+    if (buttonAlignLeft->isChecked() || buttonAlignCenter->isChecked() || buttonAlignRight->isChecked()) {
+        item->setTextWidth(item->boundingRect().width());
+        if (buttonAlignCenter->isChecked()) format.setAlignment(Qt::AlignHCenter);
+        else if (buttonAlignRight->isChecked()) format.setAlignment(Qt::AlignRight);
+        else if (buttonAlignLeft->isChecked()) format.setAlignment(Qt::AlignLeft);
+    } else {
+        format.setAlignment(Qt::AlignLeft);
+        item->setTextWidth(-1);
+    }
+
     {
         item->setFont(font);
         item->setDefaultTextColor(color);
+        cur.select(QTextCursor::Document);
+        cur.setBlockFormat(format);
+        item->setTextCursor(cur);
+        cur.clearSelection();
+        item->setTextCursor(cur);
+
     }
     /*else {
     QTextDocumentFragment selec = item->textCursor().selection ();
@@ -457,10 +641,11 @@ void TitleWidget::slotUpdateText() {
     }*/
 }
 
-void TitleWidget::rectChanged() {
+void TitleWidget::rectChanged()
+{
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-    if (l.size() == 1 && (l[0])->type() == 3 && !settingUp) {
-        QGraphicsRectItem *rec = (QGraphicsRectItem*)l[0];
+    if (l.size() == 1 && l.at(0)->type() == RECTITEM && !settingUp) {
+        QGraphicsRectItem *rec = static_cast<QGraphicsRectItem *>(l.at(0));
         QColor f = rectFColor->color();
         f.setAlpha(rectFAlpha->value());
         QPen penf(f);
@@ -472,48 +657,75 @@ 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()) {
+    if (l.size() == 1 && l.at(0)->type() == TEXTITEM && !l.at(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]];
+        Transform x = m_transformations.value(l.at(0));
         x.scalex = (double)val / 100.0;
         x.scaley = (double)val / 100.0;
         QTransform qtrans;
         qtrans.scale(x.scalex, x.scaley);
         qtrans.rotate(x.rotate);
         l[0]->setTransform(qtrans);
-        transformations[l[0]] = x;
+        m_transformations[l.at(0)] = x;
     }
 }
 
-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]];
+        Transform x = m_transformations[l.at(0)];
         x.rotate = (double)val;
         QTransform qtrans;
         qtrans.scale(x.scalex, x.scaley);
         qtrans.rotate(x.rotate);
         l[0]->setTransform(qtrans);
-        transformations[l[0]] = x;
+        m_transformations[l.at(0)] = x;
     }
 }
 
+void TitleWidget::itemHCenter()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l.at(0);
+        QRectF br;
+        if (item->type() == RECTITEM) {
+            br = ((QGraphicsRectItem*)item)->rect();
+        } else br = item->sceneBoundingRect();
+        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.at(0);
+        QRectF br;
+        if (item->type() == RECTITEM) {
+            br = ((QGraphicsRectItem*)item)->rect();
+        } else br = item->sceneBoundingRect();
+        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);
@@ -524,52 +736,177 @@ void TitleWidget::setupViewports() {
     sp.adjust(-sv_size, -sv_size / aspect_ratio, sv_size, sv_size / aspect_ratio);
     ep.adjust(-ev_size, -ev_size / aspect_ratio, ev_size, ev_size / aspect_ratio);
 
-    startViewport->setPos(startViewportX->value(), startViewportY->value());
-    endViewport->setPos(endViewportX->value(), endViewportY->value());
+    m_startViewport->setPos(startViewportX->value(), startViewportY->value());
+    m_endViewport->setPos(endViewportX->value(), endViewportY->value());
 
-    startViewport->setPolygon(QPolygonF(sp));
-    endViewport->setPolygon(QPolygonF(ep));
+    m_startViewport->setPolygon(QPolygonF(sp));
+    m_endViewport->setPolygon(QPolygonF(ep));
 
 }
 
-void TitleWidget::loadTitle() {
-    KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlivetitle", this, tr("Save Title"));
+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;
+        m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
         slotSelectTool();
     }
 }
 
-void TitleWidget::saveTitle() {
-    KUrl url = KFileDialog::getSaveUrl(KUrl(), "*.kdenlivetitle", this, tr("Save Title"));
-    m_titledocument.saveDocument(url, startViewport, endViewport);
+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, m_startViewport, m_endViewport) == false)
+            KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
+    }
 }
 
-QPixmap TitleWidget::renderedPixmap() {
-    QPixmap pix(m_frameWidth, m_frameHeight);
+QDomDocument TitleWidget::xml()
+{
+    QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport);
+    if (cropImage->isChecked()) {
+        doc.documentElement().setAttribute("crop", 1);
+    }
+    return doc;
+}
+
+void TitleWidget::setXml(QDomDocument doc)
+{
+    m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport);
+    QDomElement e = doc.documentElement();
+    cropImage->setChecked(e.hasAttribute("crop"));
+    m_transformations.clear();
+    QList <QGraphicsItem *> items = graphicsView->scene()->items();
+    const double PI = 4.0 * atan(1.0);
+    for (int i = 0; i < items.count(); i++) {
+        QTransform t = items.at(i)->transform();
+        Transform x;
+        x.scalex = t.m11();
+        x.scaley = t.m22();
+        x.rotate = 180. / PI * atan2(-t.m21(), t.m11());
+        m_transformations[items.at(i)] = x;
+    }
+    // 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();
+}
+
+QImage TitleWidget::renderedPixmap()
+{
+    int minX = 0;
+    int minY = 0;
+    int maxX = m_frameWidth;
+    int maxY = m_frameHeight;
+    if (!cropImage->isChecked()) {
+        m_scene->removeItem(m_startViewport);
+        m_scene->removeItem(m_endViewport);
+        QRect boundingRect = m_scene->itemsBoundingRect().toRect();
+        if (boundingRect.left() < 0) minX = boundingRect.left();
+        if (boundingRect.top() < 0) minY = boundingRect.top();
+        if (boundingRect.right() > maxX) maxX = boundingRect.right();
+        if (boundingRect.bottom() > maxY) maxY = boundingRect.bottom();
+        if (minX < 0) {
+            maxX = maxX - minX;
+        }
+        if (minY < 0) {
+            maxY = maxY - minY;
+        }
+    }
+
+    QImage pix(maxX, maxY, QImage::Format_ARGB32);
     pix.fill(Qt::transparent);
     QPainter painter(&pix);
-
-    m_scene->clearSelection();
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
+    m_scene->clearTextSelection();
     QPen framepen = m_frameBorder->pen();
     m_frameBorder->setPen(Qt::NoPen);
-    QPen startpen = startViewport->pen();
-    QPen endpen = endViewport->pen();
-    startViewport->setPen(Qt::NoPen);
-    endViewport->setPen(Qt::NoPen);
-    if (m_frameImage) delete m_frameImage;
-    m_frameImage = NULL;
-    m_scene->render(&painter, QRectF(), QRectF(0, 0, m_frameWidth, m_frameHeight));
+    m_startViewport->setVisible(false);
+    m_endViewport->setVisible(false);
+    m_frameImage->setVisible(false);
+
+    m_scene->render(&painter, QRectF(), QRectF(minX, minY, maxX - minX, maxY - minY));
+    painter.end();
     m_frameBorder->setPen(framepen);
-    startViewport->setPen(startpen);
-    endViewport->setPen(endpen);
-    displayBackgroundFrame();
+    m_startViewport->setVisible(true);
+    m_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());
+
+    titleConfig.writeEntry("crop_image", cropImage->isChecked());
+    //! \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()));
+
+    cropImage->setChecked(titleConfig.readEntry("crop_image", cropImage->isChecked()));
+}