]> git.sesse.net Git - kdenlive/blobdiff - src/titlewidget.cpp
reindent
[kdenlive] / src / titlewidget.cpp
index 89870d6102474f2720fa32a5b782fd7b61556b49..72c5ff984193502648876a6fc0954790bc61ba92 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          titlewidget.h  -  description
+                          titlewidget.cpp  -  description
                              -------------------
     begin                : Feb 28 2008
     copyright            : (C) 2008 by Marco Gittler
@@ -18,6 +18,8 @@
 #include "titlewidget.h"
 #include "kdenlivesettings.h"
 
+#include <cmath>
+
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KFileDialog>
@@ -30,6 +32,7 @@
 #include <QTimer>
 #include <QToolBar>
 #include <QMenu>
+#include <QSignalMapper>
 #include <QTextBlockFormat>
 #include <QTextCursor>
 
@@ -38,15 +41,17 @@ int settingUp = false;
 const int IMAGEITEM = 7;
 const int RECTITEM = 3;
 const int TEXTITEM = 8;
+static bool insertingValues = false;
 
-TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent) :
+TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWidget *parent) :
         QDialog(parent),
         Ui::TitleWidget_UI(),
         m_startViewport(NULL),
         m_endViewport(NULL),
         m_render(render),
         m_count(0),
-        m_projectPath(projectPath)
+        m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)),
+        m_projectTitlePath(projectTitlePath)
 {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());
@@ -56,13 +61,9 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     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(fontColorButton, SIGNAL(clicked()), this, SLOT(slotUpdateText())) ;
     connect(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ;
@@ -88,8 +89,15 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter()));
     connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter()));
 
-       connect(origin_x_left, SIGNAL(clicked()), this, SLOT(slotOriginXClicked()));
-       connect(origin_y_top, SIGNAL(clicked()), this, SLOT(slotOriginYClicked()));
+    connect(origin_x_left, SIGNAL(clicked()), this, SLOT(slotOriginXClicked()));
+    connect(origin_y_top, SIGNAL(clicked()), this, SLOT(slotOriginYClicked()));
+
+    m_signalMapper = new QSignalMapper(this);
+    m_signalMapper->setMapping(value_w, ValueWidth);
+    m_signalMapper->setMapping(value_h, ValueHeight);
+    connect(value_w, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map()));
+    connect(value_h, SIGNAL(valueChanged(int)), m_signalMapper, SLOT(map()));
+    connect(m_signalMapper, SIGNAL(mapped(int)), this, SLOT(slotValueChanged(int)));
 
     connect(value_x, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
     connect(value_y, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
@@ -104,8 +112,11 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     connect(buttonAlignRight, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonAlignCenter, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonAlignNone, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
+    //connect(buttonInsertUnicode, SIGNAL(clicked()), this, SLOT(slotInsertUnicode()));
     connect(displayBg, SIGNAL(stateChanged(int)), this, SLOT(displayBackgroundFrame()));
 
+    connect(m_unicodeDialog, SIGNAL(charSelected(QString)), this, SLOT(slotInsertUnicodeString(QString)));
+
     // mbd
     connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
 
@@ -117,21 +128,30 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     buttonAlignCenter->setIcon(KIcon("format-justify-center"));
     buttonAlignLeft->setIcon(KIcon("format-justify-left"));
     buttonAlignRight->setIcon(KIcon("format-justify-right"));
+    buttonAlignNone->setIcon(KIcon("kdenlive-align-none"));
+
     buttonAlignNone->setToolTip(i18n("No alignment"));
     buttonAlignRight->setToolTip(i18n("Align right"));
     buttonAlignLeft->setToolTip(i18n("Align left"));
     buttonAlignCenter->setToolTip(i18n("Align center"));
-       origin_x_left->setToolTip(i18n("Invert x axis and change 0 point"));
-       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 transparency"));
-       rectFAlpha->setToolTip(i18n("Border transparency"));
-       zoom_slider->setToolTip(i18n("Zoom"));
-       buttonRealSize->setToolTip(i18n("Original size (1:1)"));
-       buttonFitZoom->setToolTip(i18n("Fit zoom"));
-       kcolorbutton->setToolTip(i18n("Select background color"));
-       horizontalSlider->setToolTip(i18n("Background Transparency"));
+
+    m_unicodeAction = new QAction(KIcon("kdenlive-insert-unicode"), QString(), this);
+    m_unicodeAction->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_U);
+    m_unicodeAction->setToolTip(i18n("Insert Unicode character") + ' ' + m_unicodeAction->shortcut().toString());
+    connect(m_unicodeAction, SIGNAL(triggered()), this, SLOT(slotInsertUnicode()));
+    buttonInsertUnicode->setDefaultAction(m_unicodeAction);
+
+    origin_x_left->setToolTip(i18n("Invert x axis and change 0 point"));
+    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 transparency"));
+    rectFAlpha->setToolTip(i18n("Border transparency"));
+    zoom_slider->setToolTip(i18n("Zoom"));
+    buttonRealSize->setToolTip(i18n("Original size (1:1)"));
+    buttonFitZoom->setToolTip(i18n("Fit zoom"));
+    kcolorbutton->setToolTip(i18n("Select background color"));
+    horizontalSlider->setToolTip(i18n("Background Transparency"));
 
     itemhcenter->setIcon(KIcon("kdenlive-align-hor"));
     itemhcenter->setToolTip(i18n("Align item horizontally"));
@@ -143,44 +163,49 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     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 (Alt+R)"));
-    m_buttonRect->setCheckable(true);
-       m_buttonRect->setShortcut(Qt::ALT + Qt::Key_R);
-    connect(m_buttonRect, SIGNAL(triggered()), this, SLOT(slotRectTool()));
+    m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), QString());
+    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"), i18n("Add Text (Alt+T)"));
+    m_buttonText = m_toolbar->addAction(KIcon("insert-text"), QString());
     m_buttonText->setCheckable(true);
-       m_buttonText->setShortcut(Qt::ALT + Qt::Key_T);
+    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_buttonImage = m_toolbar->addAction(KIcon("insert-image"), i18n("Add Image (Alt+I)"));
+    m_buttonRect = m_toolbar->addAction(KIcon("kdenlive-insert-rect"), QString());
+    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->setCheckable(false);
-       m_buttonImage->setShortcut(Qt::ALT + Qt::Key_I);
+    m_buttonImage->setShortcut(Qt::ALT + Qt::Key_I);
+    m_buttonImage->setToolTip(i18n("Add Image") + ' ' + m_buttonImage->shortcut().toString());
     connect(m_buttonImage, SIGNAL(triggered()), this, SLOT(slotImageTool()));
 
-    m_buttonCursor = m_toolbar->addAction(KIcon("transform-move"), i18n("Selection Tool (Alt+S)"));
-    m_buttonCursor->setCheckable(true);
-       m_buttonCursor->setShortcut(Qt::ALT + Qt::Key_S);
-    connect(m_buttonCursor, SIGNAL(triggered()), this, SLOT(slotSelectTool()));
+    m_toolbar->addSeparator();
 
     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->setShortcut(Qt::CTRL + Qt::Key_O);
     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->setShortcut(Qt::CTRL + Qt::Key_S);
     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);
-       connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(slotChanged()));
+    connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(slotChanged()));
 
     // a gradient background
     /*QRadialGradient *gradient = new QRadialGradient(0, 0, 10);
@@ -200,7 +225,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     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(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)));
@@ -225,13 +250,15 @@ TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget
     graphicsView->setInteractive(true);
     //graphicsView->resize(400, 300);
     kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
-    toolBox->setItemEnabled(2, false);
+    //toolBox->setItemEnabled(2, false);
     if (!url.isEmpty()) {
         m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
         slotSelectTool();
     } else {
-        slotRectTool();
+        slotTextTool();
     }
+
+    showToolbars(TITLE_NONE);
 }
 
 TitleWidget::~TitleWidget()
@@ -242,36 +269,39 @@ TitleWidget::~TitleWidget()
     delete m_buttonCursor;
     delete m_buttonSave;
     delete m_buttonLoad;
+    delete m_unicodeAction;
 
+    delete m_unicodeDialog;
     delete m_frameBorder;
     delete m_frameImage;
     delete m_startViewport;
     delete m_endViewport;
     delete m_scene;
+    delete m_signalMapper;
 }
 
 //static
-QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl)
+QStringList TitleWidget::getFreeTitleInfo(const KUrl &projectUrl, bool isClone)
 {
     QStringList result;
-    QString titlePath = projectUrl.path() + "/titles/";
+    QString titlePath = projectUrl.path(KUrl::AddTrailingSlash) + "titles/";
     KStandardDirs::makeDir(titlePath);
-    QString titleName = "title";
+    titlePath.append((isClone == false) ? "title" : "clone");
     int counter = 0;
-    QString path = titlePath + titleName + QString::number(counter).rightJustified(3, '0', false);
-    while (QFile::exists(path + ".png")) {
+    QString path;
+    while (path.isEmpty() || QFile::exists(path)) {
         counter++;
-        path = titlePath + titleName + QString::number(counter).rightJustified(3, '0', false);
+        path = titlePath + QString::number(counter).rightJustified(3, '0', false) + ".png";
     }
-    result.append(titleName + QString::number(counter).rightJustified(3, '0', false));
-    result.append(path + ".png");
+    result.append(((isClone == false) ? i18n("Title") : i18n("Clone")) + ' ' + QString::number(counter).rightJustified(3, '0', false));
+    result.append(path);
     return result;
 }
 
 QString TitleWidget::getTitleResourceFromName(const KUrl &projectUrl, const QString &titleName)
 {
     QStringList result;
-    QString titlePath = projectUrl.path() + "/titles/";
+    QString titlePath = projectUrl.path(KUrl::AddTrailingSlash) + "titles/";
     KStandardDirs::makeDir(titlePath);
     return titlePath + titleName + ".png";
 }
@@ -284,29 +314,48 @@ void TitleWidget::resizeEvent(QResizeEvent * /*event*/)
 
 void TitleWidget::slotTextTool()
 {
-    rect_properties->setHidden(true);
-    text_properties->setHidden(false);
     m_scene->setTool(TITLE_TEXT);
-    m_buttonRect->setChecked(false);
-    m_buttonCursor->setChecked(false);
+    showToolbars(TITLE_TEXT);
+    checkButton(TITLE_TEXT);
 }
 
 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);
+    showToolbars(TITLE_RECTANGLE);
+    checkButton(TITLE_RECTANGLE);
 }
 
 void TitleWidget::slotSelectTool()
 {
     m_scene->setTool(TITLE_SELECT);
-    m_buttonCursor->setChecked(true);
-    m_buttonText->setChecked(false);
-    m_buttonRect->setChecked(false);
+
+    // Find out which toolbars need to be shown, depending on selected item
+    TITLETOOL t = TITLE_SELECT;
+    QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
+    if (l.size() > 0) {
+        switch (l.at(0)->type()) {
+        case TEXTITEM:
+            t = TITLE_TEXT;
+            break;
+        case RECTITEM:
+            t = TITLE_RECTANGLE;
+            break;
+        case IMAGEITEM:
+            t = TITLE_IMAGE;
+            break;
+        }
+    }
+    enableToolbars(t);
+    showToolbars(t);
+
+    if (l.size() > 0) {
+        updateCoordinates(l.at(0));
+        updateDimension(l.at(0));
+        updateRotZoom(l.at(0));
+    }
+
+    checkButton(TITLE_SELECT);
 }
 
 void TitleWidget::slotImageTool()
@@ -330,9 +379,105 @@ void TitleWidget::slotImageTool()
         }
     }
     m_scene->setTool(TITLE_SELECT);
-    m_buttonRect->setChecked(false);
-    m_buttonCursor->setChecked(true);
-    m_buttonText->setChecked(false);
+    showToolbars(TITLE_SELECT);
+    checkButton(TITLE_NONE);
+}
+
+void TitleWidget::showToolbars(TITLETOOL toolType)
+{
+    bool bText = false;
+    bool bRect = false;
+    bool bImage = false;
+    bool bNone = false;
+
+    switch (toolType) {
+    case TITLE_TEXT:
+        bText = true;
+        break;
+    case TITLE_RECTANGLE:
+        bRect = true;
+        break;
+    case TITLE_IMAGE:
+        bImage = true;
+        break;
+    default:
+        bNone = true;
+        break;
+    }
+    text_properties->setHidden(!bText);
+    rect_properties->setHidden(!bRect);
+    image_properties->setHidden(!bImage);
+    no_properties->setHidden(!bNone);
+}
+
+void TitleWidget::enableToolbars(TITLETOOL toolType)
+{
+    // TITLETOOL is defined in graphicsscenerectmove.h
+    bool bFrame = false;
+    bool bText = false;
+    bool bRect = false;
+    bool bImage = false;
+    bool bValue_w = false;
+    bool bValue_h = false;
+
+    switch (toolType) {
+    case TITLE_SELECT:
+        break;
+    case TITLE_TEXT:
+        bFrame = true;
+        bText = true;
+        break;
+    case TITLE_RECTANGLE:
+        bFrame = true;
+        bRect = true;
+        bValue_w = true;
+        bValue_h = true;
+        break;
+    case TITLE_IMAGE:
+        bFrame = true;
+        bValue_w = true;
+        bValue_h = true;
+        bImage = true;
+        break;
+    default:
+        break;
+    }
+    frame_properties->setEnabled(bFrame);
+    text_properties->setEnabled(bText);
+    rect_properties->setEnabled(bRect);
+    image_properties->setEnabled(bImage);
+    value_w->setEnabled(bValue_w);
+    value_h->setEnabled(bValue_h);
+}
+
+void TitleWidget::checkButton(TITLETOOL toolType)
+{
+    bool bSelect = false;
+    bool bText = false;
+    bool bRect = false;
+    bool bImage = false;
+
+    switch (toolType) {
+    case TITLE_SELECT:
+        bSelect = true;
+        break;
+    case TITLE_TEXT:
+        bText = true;
+        break;
+    case TITLE_RECTANGLE:
+        bRect = true;
+        break;
+    case TITLE_IMAGE:
+        bImage = true;
+        break;
+    case TITLE_NONE:
+        break;
+    }
+
+    m_buttonCursor->setChecked(bSelect);
+    m_buttonText->setChecked(bText);
+    m_buttonRect->setChecked(bRect);
+    m_buttonImage->setChecked(bImage);
 }
 
 void TitleWidget::displayBackgroundFrame()
@@ -370,8 +515,8 @@ void TitleWidget::initViewports()
     m_startViewport->setPen(startpen);
     m_endViewport->setPen(endpen);
 
-    startViewportSize->setValue(40);
-    endViewportSize->setValue(40);
+    startViewportSize->setValue(100);
+    endViewportSize->setValue(100);
 
     m_startViewport->setZValue(-1000);
     m_endViewport->setZValue(-1000);
@@ -417,6 +562,8 @@ void TitleWidget::slotZoomOneToOne()
 
 void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
 {
+    updateAxisButtons(rect); // back to default
+
     QColor f = rectFColor->color();
     f.setAlpha(rectFAlpha->value());
     QPen penf(f);
@@ -432,6 +579,8 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
 
 void TitleWidget::slotNewText(QGraphicsTextItem *tt)
 {
+    updateAxisButtons(tt); // back to default
+
     QFont font = font_family->currentFont();
     font.setPixelSize(font_size->value());
     // mbd: issue 551:
@@ -473,21 +622,20 @@ void TitleWidget::selectionChanged()
     itemzoom->blockSignals(true);
     itemrotate->blockSignals(true);
     if (l.size() == 0) {
-               bool blockX = !origin_x_left->signalsBlocked();
-               bool blockY = !origin_y_top->signalsBlocked();
-               if (blockX) origin_x_left->blockSignals(true);
-               if (blockY) origin_y_top->blockSignals(true);
-               origin_x_left->setChecked(false);
-               origin_y_top->setChecked(false);
-               updateTextOriginX();
-               updateTextOriginY();
-               frame_properties->setEnabled(false);
-               if (blockX) origin_x_left->blockSignals(false);
-               if (blockY) origin_y_top->blockSignals(false);
-       } else if (l.size() == 1) {
+        bool blockX = !origin_x_left->signalsBlocked();
+        bool blockY = !origin_y_top->signalsBlocked();
+        if (blockX) origin_x_left->blockSignals(true);
+        if (blockY) origin_y_top->blockSignals(true);
+        origin_x_left->setChecked(false);
+        origin_y_top->setChecked(false);
+        updateTextOriginX();
+        updateTextOriginY();
+        enableToolbars(TITLE_NONE);
+        if (blockX) origin_x_left->blockSignals(false);
+        if (blockY) origin_y_top->blockSignals(false);
+    } else if (l.size() == 1) {
         if (l.at(0)->type() == TEXTITEM) {
-            rect_properties->setHidden(true);
-            text_properties->setHidden(false);
+            showToolbars(TITLE_TEXT);
             QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
             //if (l[0]->hasFocus())
             toolBox->setCurrentIndex(0);
@@ -534,18 +682,13 @@ void TitleWidget::selectionChanged()
             buttonAlignNone->blockSignals(false);
             buttonAlignCenter->blockSignals(false);
 
-                       updateAxisButtons(i);
-                       updateCoordinates(i);
-                       updateDimension(i);
-            //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);
-                       
+            updateAxisButtons(i);
+            updateCoordinates(i);
+            updateDimension(i);
+            enableToolbars(TITLE_TEXT);
+
         } else if ((l.at(0))->type() == RECTITEM) {
-            rect_properties->setHidden(false);
-            text_properties->setHidden(true);
+            showToolbars(TITLE_RECTANGLE);
             settingUp = true;
             QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
             toolBox->setCurrentIndex(0);
@@ -561,28 +704,27 @@ void TitleWidget::selectionChanged()
             rectBColor->setColor(bcol);
             settingUp = false;
             rectLineWidth->setValue(rec->pen().width());
-                       
-                       updateAxisButtons(l.at(0));
-                       updateCoordinates(rec);
+
+            updateAxisButtons(l.at(0));
+            updateCoordinates(rec);
             updateDimension(rec);
-                       //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);
+            enableToolbars(TITLE_RECTANGLE);
+
         } else if (l.at(0)->type() == IMAGEITEM) {
-                       // TODO
-                       
-                       updateCoordinates(l.at(0));
-                       updateDimension(l.at(0));
-                       
-                       frame_properties->setEnabled(true);
-                       value_x->setEnabled(true);
-                       value_w->setEnabled(false);
-                       value_h->setEnabled(false);
-               } else {
+            showToolbars(TITLE_IMAGE);
+
+            updateCoordinates(l.at(0));
+            updateDimension(l.at(0));
+
+            enableToolbars(TITLE_IMAGE);
+
+        } else {
             //toolBox->setCurrentIndex(0);
-            frame_properties->setEnabled(false);
+            showToolbars(TITLE_NONE);
+            enableToolbars(TITLE_NONE);
+            /*frame_properties->setEnabled(false);
+            text_properties->setEnabled(false);
+            rect_properties->setEnabled(false);*/
         }
         zValue->setValue((int)l.at(0)->zValue());
         itemzoom->setValue((int)(m_transformations.value(l.at(0)).scalex * 100.0 + 0.5));
@@ -596,6 +738,59 @@ void TitleWidget::selectionChanged()
     }
 }
 
+void TitleWidget::slotValueChanged(int type)
+{
+    QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
+    if (l.size() > 0 && l.at(0)->type() == IMAGEITEM) {
+
+        int val = 0;
+        switch (type) {
+        case ValueWidth:
+            val = value_w->value();
+            break;
+        case ValueHeight:
+            val = value_h->value();
+            break;
+        }
+
+        QGraphicsItem *i = l.at(0);
+        Transform t = m_transformations.value(i);
+
+        // Ratio width:height
+        double phi = (double) i->boundingRect().width() / i->boundingRect().height();
+        double alpha = (double) t.rotate / 180.0 * M_PI;
+
+        // New length
+        double length = val;
+
+        // Scaling factor
+        double scale = 1;
+
+        switch (type) {
+        case ValueWidth:
+            // Add 0.5 because otherwise incrementing by 1 might have no effect
+            length = val / (cos(alpha) + 1 / phi * sin(alpha)) + 0.5;
+            scale = length / i->boundingRect().width();
+            break;
+        case ValueHeight:
+            length = val / (phi * sin(alpha) + cos(alpha)) + 0.5;
+            scale = length / i->boundingRect().height();
+            break;
+        }
+
+        t.scalex = scale;
+        t.scaley = scale;
+        QTransform qtrans;
+        qtrans.scale(scale, scale);
+        qtrans.rotate(t.rotate);
+        i->setTransform(qtrans);
+        m_transformations[i] = t;
+
+        updateDimension(i);
+        updateRotZoom(i);
+    }
+}
+
 /** \brief Updates position/size of the selected item when a value
  * of an item (coordinates, size) has changed */
 void TitleWidget::slotAdjustSelectedItem()
@@ -605,266 +800,273 @@ void TitleWidget::slotAdjustSelectedItem()
         if (l.at(0)->type() == RECTITEM) {
             //rect item
             QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(l.at(0));
-                       updatePosition(rec);
-                       rec->setRect(QRect(0, 0, value_w->value(), value_h->value()));
+            updatePosition(rec);
+            rec->setRect(QRect(0, 0, value_w->value(), value_h->value()));
         } else if (l.at(0)->type() == TEXTITEM) {
             //text item
             updatePosition(l.at(0));
         } else if (l.at(0)->type() == IMAGEITEM) {
-                       //image item
-                       updatePosition(l.at(0));
-               }
+            //image item
+            updatePosition(l.at(0));
+        }
     }
 }
 
 /** \brief Updates width/height int the text fields, regarding transformation matrix */
-void TitleWidget::updateDimension(QGraphicsItem *i) 
+void TitleWidget::updateDimension(QGraphicsItem *i)
 {
-       bool blockW = !value_w->signalsBlocked();
-       bool blockH = !value_h->signalsBlocked();
-       
-       if (blockW) value_w->blockSignals(true);
-       if (blockH) value_h->blockSignals(true);
-       
-       
-       if (i->type() == IMAGEITEM) {
-               // Get multipliers for rotation/scaling
-               
-               /*Transform t = m_transformations.value(i);
-               QRectF r = i->boundingRect();
-               int width = (int) ( abs(r.width()*t.scalex * cos(t.rotate/180.0*M_PI))
-                                       + abs(r.height()*t.scaley * sin(t.rotate/180.0*M_PI)) );
-               int height = (int) ( abs(r.height()*t.scaley * cos(t.rotate/180*M_PI))
-                                       + abs(r.width()*t.scalex * sin(t.rotate/180*M_PI)) );*/
-               
-               value_w->setValue(i->sceneBoundingRect().width());
-               value_h->setValue(i->sceneBoundingRect().height());
-       } else if (i->type() == RECTITEM) {
-               QGraphicsRectItem *r = static_cast <QGraphicsRectItem *> (i);
-               value_w->setValue((int) r->rect().width());
-               value_h->setValue((int) r->rect().height());
-       } else if (i->type() == TEXTITEM) {
-               QGraphicsTextItem *t = static_cast <QGraphicsTextItem *> (i);
-               value_w->setValue((int) t->boundingRect().width());
-               value_h->setValue((int) t->boundingRect().height());
-       }
-       
-       if (blockW) value_w->blockSignals(false);
-       if (blockH) value_h->blockSignals(false);
+    value_w->blockSignals(true);
+    value_h->blockSignals(true);
+
+
+    if (i->type() == IMAGEITEM) {
+        // Get multipliers for rotation/scaling
+
+        /*Transform t = m_transformations.value(i);
+        QRectF r = i->boundingRect();
+        int width = (int) ( abs(r.width()*t.scalex * cos(t.rotate/180.0*M_PI))
+                    + abs(r.height()*t.scaley * sin(t.rotate/180.0*M_PI)) );
+        int height = (int) ( abs(r.height()*t.scaley * cos(t.rotate/180*M_PI))
+                    + abs(r.width()*t.scalex * sin(t.rotate/180*M_PI)) );*/
+
+        value_w->setValue(i->sceneBoundingRect().width());
+        value_h->setValue(i->sceneBoundingRect().height());
+    } else if (i->type() == RECTITEM) {
+        QGraphicsRectItem *r = static_cast <QGraphicsRectItem *>(i);
+        value_w->setValue((int) r->rect().width());
+        value_h->setValue((int) r->rect().height());
+    } else if (i->type() == TEXTITEM) {
+        QGraphicsTextItem *t = static_cast <QGraphicsTextItem *>(i);
+        value_w->setValue((int) t->boundingRect().width());
+        value_h->setValue((int) t->boundingRect().height());
+    }
+
+    value_w->blockSignals(false);
+    value_h->blockSignals(false);
 }
 
 /** \brief Updates the coordinates in the text fields from the item */
-void TitleWidget::updateCoordinates(QGraphicsItem *i) 
+void TitleWidget::updateCoordinates(QGraphicsItem *i)
 {
-       
-       bool blockX = !value_x->signalsBlocked();
-       bool blockY = !value_y->signalsBlocked();
-       
-       // Block signals emitted by this method
-       if (blockX) value_x->blockSignals(true);
-       if (blockY) value_y->blockSignals(true);
-       
-       if (i->type() == TEXTITEM) {
-               
-               QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *> (i);
-               
-               // Set the correct x coordinate value
-               if (origin_x_left->isChecked()) {
-                       // Origin (0 point) is at m_frameWidth, coordinate axis is inverted
-                       value_x->setValue((int) (m_frameWidth - rec->pos().x() - rec->boundingRect().width())); 
-               } else {
-                       // Origin is at 0 (default)
-                       value_x->setValue((int) rec->pos().x());
-               }
-               
-               // Same for y
-               if (origin_y_top->isChecked()) {
-                       value_y->setValue((int) (m_frameHeight - rec->pos().y() - rec->boundingRect().height()));
-               } else {
-                       value_y->setValue((int) rec->pos().y());
-               }
-               
-       } else if (i->type() == RECTITEM) {
-               
-               QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *> (i);
-               
-               if (origin_x_left->isChecked()) {
-                       // Origin (0 point) is at m_frameWidth
-                       value_x->setValue((int) (m_frameWidth - rec->pos().x() - rec->rect().width())); 
-               } else {
-                       // Origin is at 0 (default)
-                       value_x->setValue((int) rec->pos().x());
-               }
-               
-               if (origin_y_top->isChecked()) {
-                       value_y->setValue((int) (m_frameHeight - rec->pos().y() - rec->rect().height()));
-               } else {
-                       value_y->setValue((int) rec->pos().y());
-               }
-               
-       } else if (i->type() == IMAGEITEM) {
-               
-               if (origin_x_left->isChecked()) {
-                       value_x->setValue((int) (m_frameWidth - i->pos().x() - i->sceneBoundingRect().width()));
-               } else {                
-                       value_x->setValue((int) i->pos().x());
-               }
-               
-               if (origin_y_top->isChecked()) {
-                       value_y->setValue((int) (m_frameHeight - i->pos().y() - i->sceneBoundingRect().height()));
-               } else {
-                       value_y->setValue((int) i->pos().y());
-               }
-               
-       }
-       
-       // Stop blocking signals now
-       if (!blockX) value_x->blockSignals(false);
-       if (!blockY) value_y->blockSignals(false);
+    // Block signals emitted by this method
+    value_x->blockSignals(true);
+    value_y->blockSignals(true);
+
+    if (i->type() == TEXTITEM) {
+
+        QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(i);
+
+        // Set the correct x coordinate value
+        if (origin_x_left->isChecked()) {
+            // Origin (0 point) is at m_frameWidth, coordinate axis is inverted
+            value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->boundingRect().width()));
+        } else {
+            // Origin is at 0 (default)
+            value_x->setValue((int) rec->pos().x());
+        }
+
+        // Same for y
+        if (origin_y_top->isChecked()) {
+            value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->boundingRect().height()));
+        } else {
+            value_y->setValue((int) rec->pos().y());
+        }
+
+    } else if (i->type() == RECTITEM) {
+
+        QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(i);
+
+        if (origin_x_left->isChecked()) {
+            // Origin (0 point) is at m_frameWidth
+            value_x->setValue((int)(m_frameWidth - rec->pos().x() - rec->rect().width()));
+        } else {
+            // Origin is at 0 (default)
+            value_x->setValue((int) rec->pos().x());
+        }
+
+        if (origin_y_top->isChecked()) {
+            value_y->setValue((int)(m_frameHeight - rec->pos().y() - rec->rect().height()));
+        } else {
+            value_y->setValue((int) rec->pos().y());
+        }
+
+    } else if (i->type() == IMAGEITEM) {
+
+        if (origin_x_left->isChecked()) {
+            value_x->setValue((int)(m_frameWidth - i->pos().x() - i->sceneBoundingRect().width()));
+        } else {
+            value_x->setValue((int) i->pos().x());
+        }
+
+        if (origin_y_top->isChecked()) {
+            value_y->setValue((int)(m_frameHeight - i->pos().y() - i->sceneBoundingRect().height()));
+        } else {
+            value_y->setValue((int) i->pos().y());
+        }
+
+    }
+
+    // Stop blocking signals now
+    value_x->blockSignals(false);
+    value_y->blockSignals(false);
+}
+
+void TitleWidget::updateRotZoom(QGraphicsItem *i)
+{
+    itemzoom->blockSignals(true);
+    itemrotate->blockSignals(false);
+
+    Transform t = m_transformations.value(i);
+    itemzoom->setValue((int)(t.scalex * 100.0 + 0.5));
+    itemrotate->setValue((int)(t.rotate));
+
+    itemzoom->blockSignals(false);
+    itemrotate->blockSignals(false);
 }
 
 /** \brief Updates the position of an item by reading coordinates from the text fields */
-void TitleWidget::updatePosition(QGraphicsItem *i) {
-       
-       if (i->type() == TEXTITEM) {
-               QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(i);
-               
-               int posX;
-               if (origin_x_left->isChecked()) {
-                       /* Origin of the x axis is at m_frameWidth,
-                        * and distance from right border of the item to the right
-                        * border of the frame is taken.
-                        * See comment to slotOriginXClicked().
-                        */
-                       posX = m_frameWidth - value_x->value() - rec->boundingRect().width();
-               } else {
-                       posX = value_x->value();
-               }
-       
-               int posY;
-               if (origin_y_top->isChecked()) {
-                       /* Same for y axis */
-                       posY = m_frameHeight - value_y->value() - rec->boundingRect().height();
-               } else {
-                       posY = value_y->value();
-               }
-               
-               rec->setPos(posX, posY);
-               
-       } else if (i->type() == RECTITEM) {
-               
-               QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *> (i);
-               
-               int posX;
-               if (origin_x_left->isChecked()) {
-                       posX = m_frameWidth - value_x->value() - rec->rect().width();
-               } else {
-                       posX = value_x->value();
-               }
-               
-               int posY;
-               if (origin_y_top->isChecked()) {
-                       posY = m_frameHeight - value_y->value() - rec->rect().height();
-               } else {
-                       posY = value_y->value();
-               }
-               
-               rec->setPos(posX, posY);
-               
-       } else if (i->type() == IMAGEITEM) {
-               
-               int posX;
-               if (origin_x_left->isChecked()) {
-                       // Use the sceneBoundingRect because this also regards transformations like zoom
-                       posX = m_frameWidth - value_x->value() - i->sceneBoundingRect().width();
-               } else {
-                       posX = value_x->value();
-               }
-               
-               int posY;
-               if (origin_y_top->isChecked()) {
-                       posY = m_frameHeight - value_y->value() - i->sceneBoundingRect().height();
-               } else {
-                       posY = value_y->value();
-               }
-               
-               i->setPos(posX, posY);
-               
-       }
-       
+void TitleWidget::updatePosition(QGraphicsItem *i)
+{
+    if (i->type() == TEXTITEM) {
+        QGraphicsTextItem *rec = static_cast <QGraphicsTextItem *>(i);
+
+        int posX;
+        if (origin_x_left->isChecked()) {
+            /* Origin of the x axis is at m_frameWidth,
+             * and distance from right border of the item to the right
+             * border of the frame is taken.
+             * See comment to slotOriginXClicked().
+             */
+            posX = m_frameWidth - value_x->value() - rec->boundingRect().width();
+        } else {
+            posX = value_x->value();
+        }
+
+        int posY;
+        if (origin_y_top->isChecked()) {
+            /* Same for y axis */
+            posY = m_frameHeight - value_y->value() - rec->boundingRect().height();
+        } else {
+            posY = value_y->value();
+        }
+
+        rec->setPos(posX, posY);
+
+    } else if (i->type() == RECTITEM) {
+
+        QGraphicsRectItem *rec = static_cast <QGraphicsRectItem *>(i);
+
+        int posX;
+        if (origin_x_left->isChecked()) {
+            posX = m_frameWidth - value_x->value() - rec->rect().width();
+        } else {
+            posX = value_x->value();
+        }
+
+        int posY;
+        if (origin_y_top->isChecked()) {
+            posY = m_frameHeight - value_y->value() - rec->rect().height();
+        } else {
+            posY = value_y->value();
+        }
+
+        rec->setPos(posX, posY);
+
+    } else if (i->type() == IMAGEITEM) {
+        int posX;
+        if (origin_x_left->isChecked()) {
+            // Use the sceneBoundingRect because this also regards transformations like zoom
+            posX = m_frameWidth - value_x->value() - i->sceneBoundingRect().width();
+        } else {
+            posX = value_x->value();
+        }
+
+        int posY;
+        if (origin_y_top->isChecked()) {
+            posY = m_frameHeight - value_y->value() - i->sceneBoundingRect().height();
+        } else {
+            posY = value_y->value();
+        }
+
+        i->setPos(posX, posY);
+
+    }
+
 }
 
-void TitleWidget::updateTextOriginX() 
+void TitleWidget::updateTextOriginX()
 {
-       if (origin_x_left->isChecked()) {
-               origin_x_left->setText(i18n("\u2212X"));
-       } else {
-               origin_x_left->setText(i18n("+X"));
-       }
+    if (origin_x_left->isChecked()) {
+        origin_x_left->setText(i18n("\u2212X"));
+    } else {
+        origin_x_left->setText(i18n("+X"));
+    }
 }
 
 void TitleWidget::slotOriginXClicked()
 {
-       // Update the text displayed on the button.
-       updateTextOriginX();
-       
-       QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-       if (l.size() >= 1) {
-               updateCoordinates(l.at(0));
-               
-               // Remember x axis setting
-               l.at(0)->setData(TitleDocument::OriginXLeft, origin_x_left->isChecked()? 
-                       TitleDocument::AxisInverted : TitleDocument::AxisDefault);
-       }
+    // Update the text displayed on the button.
+    updateTextOriginX();
+
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+        updateCoordinates(l.at(0));
+
+        // Remember x axis setting
+        l.at(0)->setData(TitleDocument::OriginXLeft, origin_x_left->isChecked() ?
+                         TitleDocument::AxisInverted : TitleDocument::AxisDefault);
+    }
+    graphicsView->setFocus();
 }
 
 void TitleWidget::updateTextOriginY()
 {
-       if (origin_y_top->isChecked()) {
-               origin_y_top->setText(i18n("\u2212Y"));
-       } else {
-               origin_y_top->setText(i18n("+Y"));
-       }
+    if (origin_y_top->isChecked()) {
+        origin_y_top->setText(i18n("\u2212Y"));
+    } else {
+        origin_y_top->setText(i18n("+Y"));
+    }
 }
 
 void TitleWidget::slotOriginYClicked()
 {
-       // Update the text displayed on the button.
-       updateTextOriginY();
-       
-       QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-       if (l.size() >= 1) {
-               updateCoordinates(l.at(0));
-               
-               l.at(0)->setData(TitleDocument::OriginYTop, origin_y_top->isChecked()? 
-                       TitleDocument::AxisInverted : TitleDocument::AxisDefault);
-                       
-       }
+    // Update the text displayed on the button.
+    updateTextOriginY();
+
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+        updateCoordinates(l.at(0));
+
+        l.at(0)->setData(TitleDocument::OriginYTop, origin_y_top->isChecked() ?
+                         TitleDocument::AxisInverted : TitleDocument::AxisDefault);
+
+    }
+    graphicsView->setFocus();
 }
 
-void TitleWidget::updateAxisButtons(QGraphicsItem *i) 
+void TitleWidget::updateAxisButtons(QGraphicsItem *i)
 {
-       int xAxis = i->data(TitleDocument::OriginXLeft).toInt();
-       int yAxis = i->data(TitleDocument::OriginYTop).toInt();
-       origin_x_left->blockSignals(true);
-       origin_y_top->blockSignals(true);
-       
-       if (xAxis == TitleDocument::AxisInverted) {
-               origin_x_left->setChecked(true);
-       } else {
-               origin_x_left->setChecked(false);
-       }
-       updateTextOriginX();
-       
-       if (yAxis == TitleDocument::AxisInverted) {
-               origin_y_top->setChecked(true);
-       } else {
-               origin_y_top->setChecked(false);
-       }
-       updateTextOriginY();
-       
-       origin_x_left->blockSignals(false);
-       origin_y_top->blockSignals(false);
+    int xAxis = i->data(TitleDocument::OriginXLeft).toInt();
+    int yAxis = i->data(TitleDocument::OriginYTop).toInt();
+    origin_x_left->blockSignals(true);
+    origin_y_top->blockSignals(true);
+
+    if (xAxis == TitleDocument::AxisInverted) {
+        origin_x_left->setChecked(true);
+    } else {
+        origin_x_left->setChecked(false);
+    }
+    updateTextOriginX();
+
+    if (yAxis == TitleDocument::AxisInverted) {
+        origin_y_top->setChecked(true);
+    } else {
+        origin_y_top->setChecked(false);
+    }
+    updateTextOriginY();
+
+    origin_x_left->blockSignals(false);
+    origin_y_top->blockSignals(false);
 }
 
 void TitleWidget::slotChangeBackground()
@@ -877,39 +1079,57 @@ void TitleWidget::slotChangeBackground()
 /**
  * Something (yeah) has changed in our QGraphicsScene.
  */
-void TitleWidget::slotChanged() {
-       QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
-       if (l.size() >= 1 && l.at(0)->type() == TEXTITEM) {
-               textChanged(static_cast <QGraphicsTextItem *> (l.at(0)));
-       }
+void TitleWidget::slotChanged()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1 && l.at(0)->type() == TEXTITEM) {
+        textChanged(static_cast <QGraphicsTextItem *>(l.at(0)));
+    }
 }
 
 /**
  * If the user has set origin_x_left (everything also for y),
- * we need to look whether a text element has been selected. If yes, 
- * we need to ensure that the right border of the text field 
+ * we need to look whether a text element has been selected. If yes,
+ * we need to ensure that the right border of the text field
  * remains fixed also when some text has been entered.
- * 
+ *
  * This is also known as right-justified, with the difference that
- * it is not valid for text but for its boundingRect. Text may still 
+ * it is not valid for text but for its boundingRect. Text may still
  * be left-justified.
  */
-void TitleWidget::textChanged(QGraphicsTextItem *i) {
-       
-       updateDimension(i);
-       
-       if (origin_x_left->isChecked() || origin_y_top->isChecked()) {
-                       
-               if (!i->toPlainText().isEmpty()) {
-                       updatePosition(i);
-               } else {
-                       /*
-                        * Don't do anything if the string is empty. If the position
-                        * would be updated here, a newly created text field would 
-                        * be set to the position of the last selected text field.
-                        */
-               }
-       }
+void TitleWidget::textChanged(QGraphicsTextItem *i)
+{
+
+    updateDimension(i);
+
+    if (origin_x_left->isChecked() || origin_y_top->isChecked()) {
+
+        if (!i->toPlainText().isEmpty()) {
+            updatePosition(i);
+        } else {
+            /*
+             * Don't do anything if the string is empty. If the position
+             * would be updated here, a newly created text field would
+             * be set to the position of the last selected text field.
+             */
+        }
+    }
+}
+
+void TitleWidget::slotInsertUnicode()
+{
+    m_unicodeDialog->exec();
+}
+
+void TitleWidget::slotInsertUnicodeString(QString text)
+{
+    QList<QGraphicsItem *> l = graphicsView->scene()->selectedItems();
+    if (l.size() > 0) {
+        if (l.at(0)->type() == TEXTITEM) {
+            QGraphicsTextItem *t = static_cast <QGraphicsTextItem *>(l.at(0));
+            t->textCursor().insertText(text);
+        }
+    }
 }
 
 void TitleWidget::slotUpdateText()
@@ -981,7 +1201,7 @@ void TitleWidget::itemScaled(int val)
         qtrans.rotate(x.rotate);
         l[0]->setTransform(qtrans);
         m_transformations[l.at(0)] = x;
-               updateDimension(l.at(0));
+        updateDimension(l.at(0));
     }
 }
 
@@ -996,7 +1216,7 @@ void TitleWidget::itemRotate(int val)
         qtrans.rotate(x.rotate);
         l[0]->setTransform(qtrans);
         m_transformations[l.at(0)] = x;
-               updateDimension(l.at(0));
+        updateDimension(l.at(0));
     }
 }
 
@@ -1006,13 +1226,12 @@ void TitleWidget::itemHCenter()
     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();
+        br = item->sceneBoundingRect();
+        int width = (int)br.width();
         int newPos = (int)((m_frameWidth - width) / 2);
+        newPos += item->pos().x() - br.left(); // Check item transformation
         item->setPos(newPos, item->pos().y());
-               updateCoordinates(item);
+        updateCoordinates(item);
     }
 }
 
@@ -1022,52 +1241,63 @@ void TitleWidget::itemVCenter()
     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();
+        br = item->sceneBoundingRect();
+        int height = (int)br.height();
         int newPos = (int)((m_frameHeight - height) / 2);
+        newPos += item->pos().y() - br.top(); // Check item transformation
         item->setPos(item->pos().x(), newPos);
-               updateCoordinates(item);
+        updateCoordinates(item);
     }
 }
 
 void TitleWidget::setupViewports()
 {
-    double aspect_ratio = 4.0 / 3.0;//read from project
-
-    QRectF sp(0, 0, 0, 0);
-    QRectF ep(0, 0, 0, 0);
-
-    double sv_size = startViewportSize->value();
-    double ev_size = endViewportSize->value();
-    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);
-
-    m_startViewport->setPos(startViewportX->value(), startViewportY->value());
-    m_endViewport->setPos(endViewportX->value(), endViewportY->value());
-
-    m_startViewport->setPolygon(QPolygonF(sp));
-    m_endViewport->setPolygon(QPolygonF(ep));
-
+    //double aspect_ratio = 4.0 / 3.0;//read from project
+    //better zoom centered, but render uses only the created rect, so no problem to change the zoom function
+    QRectF sp(0, 0, startViewportSize->value() * m_frameWidth / 100.0 , startViewportSize->value()* m_frameHeight / 100.0);
+    QRectF ep(0, 0, endViewportSize->value() * m_frameWidth / 100.0, endViewportSize->value() * m_frameHeight / 100.0);
+    // use a polygon thiat uses 16:9 and 4:3 rects forpreview the size in all aspect ratios ?
+    QPolygonF spoly(sp);
+    QPolygonF epoly(ep);
+    spoly.translate(startViewportX->value(), startViewportY->value());
+    epoly.translate(endViewportX->value(), endViewportY->value());
+    m_startViewport->setPolygon(spoly);
+    m_endViewport->setPolygon(epoly);
+    if (! insertingValues) {
+        m_startViewport->setData(0, startViewportX->value());
+        m_startViewport->setData(1, startViewportY->value());
+        m_startViewport->setData(2, startViewportSize->value());
+
+        m_endViewport->setData(0, endViewportX->value());
+        m_endViewport->setData(1, endViewportY->value());
+        m_endViewport->setData(2, endViewportSize->value());
+    }
 }
 
 void TitleWidget::loadTitle()
 {
-    KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectPath), "*.kdenlivetitle", this, i18n("Load Title"));
+    KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "*.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, m_startViewport, m_endViewport) + 1;
+        insertingValues = true;
+        startViewportX->setValue(m_startViewport->data(0).toInt());
+        startViewportY->setValue(m_startViewport->data(1).toInt());
+        startViewportSize->setValue(m_startViewport->data(2).toInt());
+        endViewportX->setValue(m_endViewport->data(0).toInt());
+        endViewportY->setValue(m_endViewport->data(1).toInt());
+        endViewportSize->setValue(m_endViewport->data(2).toInt());
+        insertingValues = false;
         slotSelectTool();
     }
 }
 
 void TitleWidget::saveTitle(KUrl url)
 {
-    if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectPath), "*.kdenlivetitle", this, i18n("Save Title"));
+    if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectTitlePath), "*.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()));
@@ -1112,7 +1342,7 @@ void TitleWidget::setXml(QDomDocument doc)
     slotSelectTool();
 }
 
-QImage TitleWidget::renderedPixmap()
+const QRect TitleWidget::renderedRect()
 {
     int minX = 0;
     int minY = 0;
@@ -1133,8 +1363,14 @@ QImage TitleWidget::renderedPixmap()
             maxY = maxY - minY;
         }
     }
+    QRect rect(minX, minY, maxX, maxY);
+    return rect;
+}
 
-    QImage pix(maxX, maxY, QImage::Format_ARGB32);
+QImage TitleWidget::renderedPixmap()
+{
+    QRect rect = renderedRect();
+    QImage pix(rect.width(), rect.height(), QImage::Format_ARGB32);
     pix.fill(Qt::transparent);
     QPainter painter(&pix);
     painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::HighQualityAntialiasing);
@@ -1145,7 +1381,7 @@ QImage TitleWidget::renderedPixmap()
     m_endViewport->setVisible(false);
     m_frameImage->setVisible(false);
 
-    m_scene->render(&painter, QRectF(), QRectF(minX, minY, maxX - minX, maxY - minY));
+    m_scene->render(&painter, QRectF(), rect); //QRectF(minX, minY, maxX - minX, maxY - minY));
     painter.end();
     m_frameBorder->setPen(framepen);
     m_startViewport->setVisible(true);
@@ -1186,6 +1422,7 @@ void TitleWidget::writeChoices()
     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();