]> git.sesse.net Git - kdenlive/blobdiff - src/titlewidget.cpp
Fix template title clips & some other title issues
[kdenlive] / src / titlewidget.cpp
index 8da43320429ebe929cc4d0c69697300b671159a9..17c7fb222fbb7534b893b1f7f0983b79c2941cc5 100644 (file)
@@ -25,6 +25,7 @@
 #include <KFileDialog>
 #include <KStandardDirs>
 #include <KMessageBox>
+#include <kio/netaccess.h>
 
 #include <QDomDocument>
 #include <QGraphicsItem>
@@ -41,9 +42,9 @@ int settingUp = false;
 const int IMAGEITEM = 7;
 const int RECTITEM = 3;
 const int TEXTITEM = 8;
-static bool insertingValues=false;
+static bool insertingValues = false;
 
-TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWidget *parent) :
+TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render *render, QWidget *parent) :
         QDialog(parent),
         Ui::TitleWidget_UI(),
         m_startViewport(NULL),
@@ -51,16 +52,24 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
         m_render(render),
         m_count(0),
         m_unicodeDialog(new UnicodeDialog(UnicodeDialog::InputHex)),
-        m_projectTitlePath(projectTitlePath)
+        m_projectTitlePath(projectTitlePath),
+        m_tc(tc)
 {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());
     //toolBox->setFont(KGlobalSettings::toolBarFont());
     frame_properties->setEnabled(false);
     rect_properties->setFixedHeight(frame_properties->height() + 4);
+    no_properties->setFixedHeight(frame_properties->height() + 4);
+    image_properties->setFixedHeight(frame_properties->height() + 4);
     text_properties->setFixedHeight(frame_properties->height() + 4);
+    frame_properties->setFixedHeight(frame_toolbar->height());
     m_frameWidth = render->renderWidth();
     m_frameHeight = render->renderHeight();
+    showToolbars(TITLE_NONE);
+
+    //TODO: get default title duration instead of hardcoded one
+    title_duration->setText(m_tc.getTimecode(GenTime(5000 / 1000.0)));
 
     connect(kcolorbutton, SIGNAL(clicked()), this, SLOT(slotChangeBackground())) ;
     connect(horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(slotChangeBackground())) ;
@@ -69,6 +78,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     connect(font_family, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(slotUpdateText())) ;
     connect(font_size, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText())) ;
     connect(textAlpha, SIGNAL(valueChanged(int)), this, SLOT(slotUpdateText()));
+    connect(font_weight_box, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateText()));
 
     connect(rectFAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
     connect(rectBAlpha, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
@@ -76,18 +86,22 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     connect(rectBColor, SIGNAL(clicked()), this, SLOT(rectChanged()));
     connect(rectLineWidth, SIGNAL(valueChanged(int)), this, SLOT(rectChanged()));
 
-    connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
+    /*connect(startViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
     connect(startViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
     connect(startViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
     connect(endViewportX, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
     connect(endViewportY, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
-    connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));
+    connect(endViewportSize, SIGNAL(valueChanged(int)), this, SLOT(setupViewports()));*/
 
     connect(zValue, SIGNAL(valueChanged(int)), this, SLOT(zIndexChanged(int)));
     connect(itemzoom, SIGNAL(valueChanged(int)), this, SLOT(itemScaled(int)));
     connect(itemrotate, SIGNAL(valueChanged(int)), this, SLOT(itemRotate(int)));
     connect(itemhcenter, SIGNAL(clicked()), this, SLOT(itemHCenter()));
     connect(itemvcenter, SIGNAL(clicked()), this, SLOT(itemVCenter()));
+    connect(itemtop, SIGNAL(clicked()), this, SLOT(itemTop()));
+    connect(itembottom, SIGNAL(clicked()), this, SLOT(itemBottom()));
+    connect(itemleft, SIGNAL(clicked()), this, SLOT(itemLeft()));
+    connect(itemright, SIGNAL(clicked()), this, SLOT(itemRight()));
 
     connect(origin_x_left, SIGNAL(clicked()), this, SLOT(slotOriginXClicked()));
     connect(origin_y_top, SIGNAL(clicked()), this, SLOT(slotOriginYClicked()));
@@ -105,7 +119,6 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     connect(value_h, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustSelectedItem()));
     connect(buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotAdjustZoom()));
     connect(buttonRealSize, SIGNAL(clicked()), this, SLOT(slotZoomOneToOne()));
-    connect(buttonBold, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonItalic, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonUnder, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
     connect(buttonAlignLeft, SIGNAL(clicked()), this, SLOT(slotUpdateText()));
@@ -120,9 +133,18 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     // mbd
     connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
 
+    font_weight_box->blockSignals(true);
+    font_weight_box->addItem(i18nc("Font style", "Light"), QFont::Light);
+    font_weight_box->addItem(i18nc("Font style", "Normal"), QFont::Normal);
+    font_weight_box->addItem(i18nc("Font style", "Demi-Bold"), QFont::DemiBold);
+    font_weight_box->addItem(i18nc("Font style", "Bold"), QFont::Bold);
+    font_weight_box->addItem(i18nc("Font style", "Black"), QFont::Black);
+    font_weight_box->setToolTip(i18n("Font weight"));
+    font_weight_box->setCurrentIndex(1);
+    font_weight_box->blockSignals(false);
+
     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"));
@@ -157,6 +179,15 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     itemhcenter->setToolTip(i18n("Align item horizontally"));
     itemvcenter->setIcon(KIcon("kdenlive-align-vert"));
     itemvcenter->setToolTip(i18n("Align item vertically"));
+    itemtop->setIcon(KIcon("kdenlive-align-top"));
+    itemtop->setToolTip(i18n("Align item to top"));
+    itembottom->setIcon(KIcon("kdenlive-align-bottom"));
+    itembottom->setToolTip(i18n("Align item to bottom"));
+    itemright->setIcon(KIcon("kdenlive-align-right"));
+    itemright->setToolTip(i18n("Align item to right"));
+    itemleft->setIcon(KIcon("kdenlive-align-left"));
+    itemleft->setToolTip(i18n("Align item to left"));
+
 
     QHBoxLayout *layout = new QHBoxLayout;
     frame_toolbar->setLayout(layout);
@@ -204,7 +235,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     // initialize graphic scene
     m_scene = new GraphicsSceneRectMove(this);
     graphicsView->setScene(m_scene);
-    m_titledocument.setScene(m_scene);
+    m_titledocument.setScene(m_scene, m_frameWidth, m_frameHeight);
     connect(m_scene, SIGNAL(changed(QList<QRectF>)), this, SLOT(slotChanged()));
 
     // a gradient background
@@ -217,7 +248,7 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     qtrans.scale(2.0, 2.0);
     m_frameImage->setTransform(qtrans);
     m_frameImage->setZValue(-1200);
-    m_frameImage->setFlags(QGraphicsItem::ItemClipsToShape);
+    m_frameImage->setFlags(0);
     displayBackgroundFrame();
     graphicsView->scene()->addItem(m_frameImage);
 
@@ -237,28 +268,33 @@ TitleWidget::TitleWidget(KUrl url, QString projectTitlePath, Render *render, QWi
     m_frameBorder->setPen(framepen);
     m_frameBorder->setZValue(-1100);
     m_frameBorder->setBrush(Qt::transparent);
-    m_frameBorder->setFlags(QGraphicsItem::ItemClipsToShape);
+    m_frameBorder->setFlags(0);
     graphicsView->scene()->addItem(m_frameBorder);
 
     // mbd: load saved settings
     readChoices();
 
-    initViewports();
-    QTimer::singleShot(500, this, SLOT(slotAdjustZoom()));
     graphicsView->show();
     //graphicsView->setRenderHint(QPainter::Antialiasing);
     graphicsView->setInteractive(true);
     //graphicsView->resize(400, 300);
     kDebug() << "// TITLE WIDGWT: " << graphicsView->viewport()->width() << "x" << graphicsView->viewport()->height();
     //toolBox->setItemEnabled(2, false);
-    if (!url.isEmpty()) {
-        m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport) + 1;
-        slotSelectTool();
-    } else {
+    m_startViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+    m_endViewport = new QGraphicsRectItem(QRectF(0, 0, m_frameWidth, m_frameHeight));
+    m_startViewport->setData(0, m_frameWidth);
+    m_startViewport->setData(1, m_frameHeight);
+    m_endViewport->setData(0, m_frameWidth);
+    m_endViewport->setData(1, m_frameHeight);
+
+    if (!url.isEmpty()) loadTitle(url);
+    else {
         slotTextTool();
+        QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
     }
-
-    showToolbars(TITLE_NONE);
+    initAnimation();
+    connect(anim_start, SIGNAL(toggled(bool)), this, SLOT(slotAnimStart(bool)));
+    connect(anim_end, SIGNAL(toggled(bool)), this, SLOT(slotAnimEnd(bool)));
 }
 
 TitleWidget::~TitleWidget()
@@ -316,14 +352,14 @@ void TitleWidget::slotTextTool()
 {
     m_scene->setTool(TITLE_TEXT);
     showToolbars(TITLE_TEXT);
-       checkButton(TITLE_TEXT);
+    checkButton(TITLE_TEXT);
 }
 
 void TitleWidget::slotRectTool()
 {
     m_scene->setTool(TITLE_RECTANGLE);
     showToolbars(TITLE_RECTANGLE);
-       checkButton(TITLE_RECTANGLE);
+    checkButton(TITLE_RECTANGLE);
 }
 
 void TitleWidget::slotSelectTool()
@@ -346,7 +382,12 @@ void TitleWidget::slotSelectTool()
             break;
         }
     }
+
     enableToolbars(t);
+    if (t == TITLE_RECTANGLE && (l.at(0) == m_endViewport || l.at(0) == m_startViewport)) {
+        //graphicsView->centerOn(l.at(0));
+        t = TITLE_NONE;
+    }
     showToolbars(t);
 
     if (l.size() > 0) {
@@ -355,7 +396,7 @@ void TitleWidget::slotSelectTool()
         updateRotZoom(l.at(0));
     }
 
-       checkButton(TITLE_SELECT);
+    checkButton(TITLE_SELECT);
 }
 
 void TitleWidget::slotImageTool()
@@ -380,34 +421,37 @@ void TitleWidget::slotImageTool()
     }
     m_scene->setTool(TITLE_SELECT);
     showToolbars(TITLE_SELECT);
-       checkButton(TITLE_NONE);
+    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;
+        rect_properties->setHidden(true);
+        image_properties->setHidden(true);
+        no_properties->setHidden(true);
+        text_properties->setHidden(false);
         break;
     case TITLE_RECTANGLE:
-        bRect = true;
+        image_properties->setHidden(true);
+        no_properties->setHidden(true);
+        text_properties->setHidden(true);
+        rect_properties->setHidden(false);
         break;
     case TITLE_IMAGE:
-        bImage = true;
-               break;
+        no_properties->setHidden(true);
+        text_properties->setHidden(true);
+        rect_properties->setHidden(true);
+        image_properties->setHidden(false);
+        break;
     default:
-               bNone = true;
+        text_properties->setHidden(true);
+        rect_properties->setHidden(true);
+        image_properties->setHidden(true);
+        no_properties->setHidden(false);
         break;
     }
-    text_properties->setHidden(!bText);
-    rect_properties->setHidden(!bRect);
-       image_properties->setHidden(!bImage);
-    no_properties->setHidden(!bNone);
 }
 
 void TitleWidget::enableToolbars(TITLETOOL toolType)
@@ -416,7 +460,7 @@ void TitleWidget::enableToolbars(TITLETOOL toolType)
     bool bFrame = false;
     bool bText = false;
     bool bRect = false;
-       bool bImage = false;
+    bool bImage = false;
     bool bValue_w = false;
     bool bValue_h = false;
 
@@ -437,7 +481,7 @@ void TitleWidget::enableToolbars(TITLETOOL toolType)
         bFrame = true;
         bValue_w = true;
         bValue_h = true;
-               bImage = true;
+        bImage = true;
         break;
     default:
         break;
@@ -445,39 +489,39 @@ void TitleWidget::enableToolbars(TITLETOOL toolType)
     frame_properties->setEnabled(bFrame);
     text_properties->setEnabled(bText);
     rect_properties->setEnabled(bRect);
-       image_properties->setEnabled(bImage);
+    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);
+    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()
@@ -486,10 +530,11 @@ void TitleWidget::displayBackgroundFrame()
         QPixmap bg(m_frameWidth / 2, m_frameHeight / 2);
         QPixmap pattern(20, 20);
         pattern.fill();
+        QColor bgcolor(210, 210, 210);
         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.fillRect(QRect(0, 0, 10, 10), bgcolor);
+        p.fillRect(QRect(10, 10, 20, 20), bgcolor);
         p.end();
         QBrush br(pattern);
 
@@ -502,11 +547,9 @@ void TitleWidget::displayBackgroundFrame()
     }
 }
 
-void TitleWidget::initViewports()
+void TitleWidget::initAnimation()
 {
-    m_startViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
-    m_endViewport = new QGraphicsPolygonItem(QPolygonF(QRectF(0, 0, 0, 0)));
-
+    align_box->setEnabled(false);
     QPen startpen(Qt::DotLine);
     QPen endpen(Qt::DashDotLine);
     startpen.setColor(QColor(100, 200, 100, 140));
@@ -515,17 +558,19 @@ void TitleWidget::initViewports()
     m_startViewport->setPen(startpen);
     m_endViewport->setPen(endpen);
 
-    startViewportSize->setValue(100);
-    endViewportSize->setValue(100);
-
     m_startViewport->setZValue(-1000);
     m_endViewport->setZValue(-1000);
 
-    m_startViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
-    m_endViewport->setFlags(/*QGraphicsItem::ItemIsMovable|*/QGraphicsItem::ItemIsSelectable);
+    m_startViewport->setFlags(0);
+    m_endViewport->setFlags(0);
 
     graphicsView->scene()->addItem(m_startViewport);
     graphicsView->scene()->addItem(m_endViewport);
+
+    connect(keep_aspect, SIGNAL(toggled(bool)), this, SLOT(slotKeepAspect(bool)));
+    connect(resize50, SIGNAL(clicked()), this, SLOT(slotResize50()));
+    connect(resize100, SIGNAL(clicked()), this, SLOT(slotResize100()));
+    connect(resize200, SIGNAL(clicked()), this, SLOT(slotResize200()));
 }
 
 void TitleWidget::slotUpdateZoom(int pos)
@@ -562,8 +607,8 @@ void TitleWidget::slotZoomOneToOne()
 
 void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
 {
-       updateAxisButtons(rect); // back to default
-       
+    updateAxisButtons(rect); // back to default
+
     QColor f = rectFColor->color();
     f.setAlpha(rectFAlpha->value());
     QPen penf(f);
@@ -579,12 +624,12 @@ void TitleWidget::slotNewRect(QGraphicsRectItem * rect)
 
 void TitleWidget::slotNewText(QGraphicsTextItem *tt)
 {
-       updateAxisButtons(tt); // back to default
-       
+    updateAxisButtons(tt); // back to default
+
     QFont font = font_family->currentFont();
     font.setPixelSize(font_size->value());
     // mbd: issue 551:
-    font.setBold(buttonBold->isChecked());
+    font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     font.setItalic(buttonItalic->isChecked());
     font.setUnderline(buttonUnder->isChecked());
 
@@ -596,6 +641,15 @@ void TitleWidget::slotNewText(QGraphicsTextItem *tt)
     setCurrentItem(tt);
 }
 
+void TitleWidget::setFontBoxWeight(int weight)
+{
+    int index = font_weight_box->findData(weight);
+    if (index < 0) {
+        index = font_weight_box->findData(QFont::Normal);
+    }
+    font_weight_box->setCurrentIndex(index);
+}
+
 void TitleWidget::setCurrentItem(QGraphicsItem *item)
 {
     m_scene->setSelectedItem(item);
@@ -633,16 +687,25 @@ void TitleWidget::selectionChanged()
         enableToolbars(TITLE_NONE);
         if (blockX) origin_x_left->blockSignals(false);
         if (blockY) origin_y_top->blockSignals(false);
+        itemzoom->setEnabled(false);
+        itemrotate->setEnabled(false);
     } else if (l.size() == 1) {
+        if (l.at(0) != m_startViewport && l.at(0) != m_endViewport) {
+            itemzoom->setEnabled(true);
+            itemrotate->setEnabled(true);
+        } else {
+            itemzoom->setEnabled(false);
+            itemrotate->setEnabled(false);
+        }
         if (l.at(0)->type() == TEXTITEM) {
             showToolbars(TITLE_TEXT);
             QGraphicsTextItem* i = static_cast <QGraphicsTextItem *>(l.at(0));
             //if (l[0]->hasFocus())
-            toolBox->setCurrentIndex(0);
+            //toolBox->setCurrentIndex(0);
             //toolBox->setItemEnabled(2, true);
             font_size->blockSignals(true);
             font_family->blockSignals(true);
-            buttonBold->blockSignals(true);
+            font_weight_box->blockSignals(true);
             buttonItalic->blockSignals(true);
             buttonUnder->blockSignals(true);
             fontColorButton->blockSignals(true);
@@ -655,9 +718,9 @@ void TitleWidget::selectionChanged()
             QFont font = i->font();
             font_family->setCurrentFont(font);
             font_size->setValue(font.pixelSize());
-            buttonBold->setChecked(font.bold());
             buttonItalic->setChecked(font.italic());
             buttonUnder->setChecked(font.underline());
+            setFontBoxWeight(font.weight());
 
             QColor color = i->defaultTextColor();
             fontColorButton->setColor(color);
@@ -672,7 +735,7 @@ void TitleWidget::selectionChanged()
 
             font_size->blockSignals(false);
             font_family->blockSignals(false);
-            buttonBold->blockSignals(false);
+            font_weight_box->blockSignals(false);
             buttonItalic->blockSignals(false);
             buttonUnder->blockSignals(false);
             fontColorButton->blockSignals(false);
@@ -691,28 +754,37 @@ void TitleWidget::selectionChanged()
             showToolbars(TITLE_RECTANGLE);
             settingUp = true;
             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();
-            QColor fcol = rec->pen().color();
-            QColor bcol = rec->brush().color();
-            //fcol.setAlpha(255);
-            //bcol.setAlpha(255);
-            rectFColor->setColor(fcol);
-            rectBColor->setColor(bcol);
-            settingUp = false;
-            rectLineWidth->setValue(rec->pen().width());
+            if (rec == m_startViewport || rec == m_endViewport) {
+                /*toolBox->setCurrentIndex(3);
+                toolBox->widget(0)->setEnabled(false);
+                toolBox->widget(1)->setEnabled(false);*/
+                enableToolbars(TITLE_NONE);
+            } else {
+                /*toolBox->widget(0)->setEnabled(true);
+                toolBox->widget(1)->setEnabled(true);
+                toolBox->setCurrentIndex(0);*/
+                //toolBox->setItemEnabled(3, true);
+                rectFAlpha->setValue(rec->pen().color().alpha());
+                rectBAlpha->setValue(rec->brush().color().alpha());
+                //kDebug() << rec->brush().color().alpha();
+                QColor fcol = rec->pen().color();
+                QColor bcol = rec->brush().color();
+                //fcol.setAlpha(255);
+                //bcol.setAlpha(255);
+                rectFColor->setColor(fcol);
+                rectBColor->setColor(bcol);
+                settingUp = false;
+                rectLineWidth->setValue(rec->pen().width());
+                enableToolbars(TITLE_RECTANGLE);
+            }
 
             updateAxisButtons(l.at(0));
             updateCoordinates(rec);
             updateDimension(rec);
-            enableToolbars(TITLE_RECTANGLE);
 
         } else if (l.at(0)->type() == IMAGEITEM) {
-                       showToolbars(TITLE_IMAGE);
-                       
+            showToolbars(TITLE_IMAGE);
+
             updateCoordinates(l.at(0));
             updateDimension(l.at(0));
 
@@ -720,7 +792,7 @@ void TitleWidget::selectionChanged()
 
         } else {
             //toolBox->setCurrentIndex(0);
-                       showToolbars(TITLE_NONE);
+            showToolbars(TITLE_NONE);
             enableToolbars(TITLE_NONE);
             /*frame_properties->setEnabled(false);
             text_properties->setEnabled(false);
@@ -1136,9 +1208,9 @@ void TitleWidget::slotUpdateText()
 {
     QFont font = font_family->currentFont();
     font.setPixelSize(font_size->value());
-    font.setBold(buttonBold->isChecked());
     font.setItalic(buttonItalic->isChecked());
     font.setUnderline(buttonUnder->isChecked());
+    font.setWeight(font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     QColor color = fontColorButton->color();
     color.setAlpha(textAlpha->value());
 
@@ -1225,8 +1297,7 @@ void TitleWidget::itemHCenter()
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1) {
         QGraphicsItem *item = l.at(0);
-        QRectF br;
-        br = item->sceneBoundingRect();
+        QRectF br = item->sceneBoundingRect();
         int width = (int)br.width();
         int newPos = (int)((m_frameWidth - width) / 2);
         newPos += item->pos().x() - br.left(); // Check item transformation
@@ -1240,8 +1311,7 @@ void TitleWidget::itemVCenter()
     QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
     if (l.size() == 1) {
         QGraphicsItem *item = l.at(0);
-        QRectF br;
-        br = item->sceneBoundingRect();
+        QRectF br = item->sceneBoundingRect();
         int height = (int)br.height();
         int newPos = (int)((m_frameHeight - height) / 2);
         newPos += item->pos().y() - br.top(); // Check item transformation
@@ -1250,56 +1320,133 @@ void TitleWidget::itemVCenter()
     }
 }
 
+void TitleWidget::itemTop()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l.at(0);
+        QRectF br = item->sceneBoundingRect();
+        double diff;
+        if (br.top() > 0) diff = -br.top();
+        else diff = -br.bottom();
+        item->moveBy(0, diff);
+        updateCoordinates(item);
+    }
+}
+
+void TitleWidget::itemBottom()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l.at(0);
+        QRectF br = item->sceneBoundingRect();
+        double diff;
+        if (br.bottom() > m_frameHeight) diff = m_frameHeight - br.top();
+        else diff = m_frameHeight - br.bottom();
+        item->moveBy(0, diff);
+        updateCoordinates(item);
+    }
+}
+
+void TitleWidget::itemLeft()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l.at(0);
+        QRectF br = item->sceneBoundingRect();
+        double diff;
+        if (br.left() > 0) diff = -br.left();
+        else diff = -br.right();
+        item->moveBy(diff, 0);
+        updateCoordinates(item);
+    }
+}
+
+void TitleWidget::itemRight()
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() == 1) {
+        QGraphicsItem *item = l.at(0);
+        QRectF br = item->sceneBoundingRect();
+        double diff;
+        if (br.right() < m_frameWidth) diff = m_frameWidth - br.right();
+        else diff = m_frameWidth - br.left();
+        item->moveBy(diff, 0);
+        updateCoordinates(item);
+    }
+}
+
 void TitleWidget::setupViewports()
 {
     //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);
+    //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() );
+    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());
-    }
+    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()
+void TitleWidget::loadTitle(KUrl url)
 {
-    KUrl url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "*.kdenlivetitle", this, i18n("Load Title"));
+    if (url.isEmpty()) url = KFileDialog::getOpenUrl(KUrl(m_projectTitlePath), "application/x-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;
+        m_scene->clearTextSelection();
+        QDomDocument doc;
+        QString tmpfile;
+
+        if (KIO::NetAccess::download(url, tmpfile, 0)) {
+            QFile file(tmpfile);
+            if (file.open(QIODevice::ReadOnly)) {
+                doc.setContent(&file, false);
+                file.close();
+            } else return;
+            KIO::NetAccess::removeTempFile(tmpfile);
+        }
+        setXml(doc);
+
+        /*int out;
+        m_count = m_titledocument.loadDocument(url, m_startViewport, m_endViewport, &out) + 1;
+        adjustFrameSize();
+        title_duration->setText(m_tc.getTimecode(GenTime(out, m_render->fps())));
+        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();
+        slotAdjustZoom();*/
     }
 }
 
 void TitleWidget::saveTitle(KUrl url)
 {
-    if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectTitlePath), "*.kdenlivetitle", this, i18n("Save Title"));
+    if (anim_start->isChecked()) slotAnimStart(false);
+    if (anim_end->isChecked()) slotAnimEnd(false);
+    if (url.isEmpty()) url = KFileDialog::getSaveUrl(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this, i18n("Save Title"));
     if (!url.isEmpty()) {
-        if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport) == false)
+        if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text())) == false)
             KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
     }
 }
@@ -1307,17 +1454,28 @@ void TitleWidget::saveTitle(KUrl url)
 QDomDocument TitleWidget::xml()
 {
     QDomDocument doc = m_titledocument.xml(m_startViewport, m_endViewport);
-    if (cropImage->isChecked()) {
-        doc.documentElement().setAttribute("crop", 1);
-    }
+    doc.documentElement().setAttribute("out", m_tc.getFrameCount(title_duration->text()));
     return doc;
 }
 
+int TitleWidget::duration() const
+{
+    return m_tc.getFrameCount(title_duration->text());
+}
+
 void TitleWidget::setXml(QDomDocument doc)
 {
-    m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport);
+    int out;
+    m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out);
+    adjustFrameSize();
+    title_duration->setText(m_tc.getTimecode(GenTime(out, m_render->fps())));
+    /*if (doc.documentElement().hasAttribute("out")) {
+    GenTime duration = GenTime(doc.documentElement().attribute("out").toDouble() / 1000.0);
+    title_duration->setText(m_tc.getTimecode(duration));
+    }
+    else title_duration->setText(m_tc.getTimecode(GenTime(5000)));*/
+
     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);
@@ -1339,60 +1497,22 @@ void TitleWidget::setXml(QDomDocument doc)
     horizontalSlider->blockSignals(false);
     kcolorbutton->blockSignals(false);
 
-    slotSelectTool();
-}
+    /*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());*/
 
-const QRect TitleWidget::renderedRect()
-{
-    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;
-        }
-    }
-    QRect rect(minX, minY, maxX, maxY);
-    return rect;
-}
-
-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);
-    m_scene->clearTextSelection();
-    QPen framepen = m_frameBorder->pen();
-    m_frameBorder->setPen(Qt::NoPen);
-    m_startViewport->setVisible(false);
-    m_endViewport->setVisible(false);
-    m_frameImage->setVisible(false);
-
-    m_scene->render(&painter, QRectF(), rect); //QRectF(minX, minY, maxX - minX, maxY - minY));
-    painter.end();
-    m_frameBorder->setPen(framepen);
-    m_startViewport->setVisible(true);
-    m_endViewport->setVisible(true);
-    m_frameImage->setVisible(true);
-    return pix;
+    QTimer::singleShot(200, this, SLOT(slotAdjustZoom()));
+    slotSelectTool();
 }
 
 /** \brief Connected to the accepted signal - calls writeChoices */
 void TitleWidget::slotAccepted()
 {
+    if (anim_start->isChecked()) slotAnimStart(false);
+    if (anim_end->isChecked()) slotAnimEnd(false);
     writeChoices();
 }
 
@@ -1408,7 +1528,7 @@ void TitleWidget::writeChoices()
     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_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
     titleConfig.writeEntry("font_italic", buttonItalic->isChecked());
     titleConfig.writeEntry("font_underlined", buttonUnder->isChecked());
 
@@ -1421,8 +1541,6 @@ void TitleWidget::writeChoices()
     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();
 
@@ -1439,7 +1557,10 @@ void TitleWidget::readChoices()
     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()));
+    int weight;
+    if (titleConfig.readEntry("font_bold", false)) weight = QFont::Bold;
+    else weight = titleConfig.readEntry("font_weight", font_weight_box->itemData(font_weight_box->currentIndex()).toInt());
+    setFontBoxWeight(weight);
     buttonItalic->setChecked(titleConfig.readEntry("font_italic", buttonItalic->isChecked()));
     buttonUnder->setChecked(titleConfig.readEntry("font_underlined", buttonUnder->isChecked()));
 
@@ -1451,7 +1572,122 @@ void TitleWidget::readChoices()
 
     kcolorbutton->setColor(titleConfig.readEntry("background_color", kcolorbutton->color()));
     horizontalSlider->setValue(titleConfig.readEntry("background_alpha", horizontalSlider->value()));
+}
 
-    cropImage->setChecked(titleConfig.readEntry("crop_image", cropImage->isChecked()));
+void TitleWidget::adjustFrameSize()
+{
+    m_frameWidth = m_titledocument.frameWidth();
+    m_frameHeight = m_titledocument.frameHeight();
+    m_frameBorder->setRect(0, 0, m_frameWidth, m_frameHeight);
+    displayBackgroundFrame();
 }
 
+void TitleWidget::slotAnimStart(bool anim)
+{
+    if (anim && anim_end->isChecked()) {
+        anim_end->setChecked(false);
+        m_endViewport->setZValue(-1000);
+        m_endViewport->setBrush(QBrush());
+    }
+    slotSelectTool();
+    QList<QGraphicsItem *> list = m_scene->items();
+    for (int i = 0; i < list.count(); i++) {
+        if (list.at(i)->zValue() > -1000) {
+            list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
+            list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
+        }
+    }
+    align_box->setEnabled(anim);
+    itemzoom->setEnabled(!anim);
+    itemrotate->setEnabled(!anim);
+    frame_toolbar->setEnabled(!anim);
+    rect_properties->setEnabled(!anim);
+    if (anim) {
+        keep_aspect->setChecked(!m_startViewport->data(0).isNull());
+        m_startViewport->setZValue(1100);
+        QColor col = m_startViewport->pen().color();
+        col.setAlpha(100);
+        m_startViewport->setBrush(col);
+        m_startViewport->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+        m_startViewport->setSelected(true);
+        selectionChanged();
+        slotSelectTool();
+    } else {
+        m_startViewport->setZValue(-1000);
+        m_startViewport->setBrush(QBrush());
+        m_startViewport->setFlags(0);
+    }
+
+}
+
+void TitleWidget::slotAnimEnd(bool anim)
+{
+    if (anim && anim_start->isChecked()) {
+        anim_start->setChecked(false);
+        m_startViewport->setZValue(-1000);
+        m_startViewport->setBrush(QBrush());
+    }
+    slotSelectTool();
+    QList<QGraphicsItem *> list = m_scene->items();
+    for (int i = 0; i < list.count(); i++) {
+        if (list.at(i)->zValue() > -1000) {
+            list.at(i)->setFlag(QGraphicsItem::ItemIsMovable, !anim);
+            list.at(i)->setFlag(QGraphicsItem::ItemIsSelectable, !anim);
+        }
+    }
+    align_box->setEnabled(anim);
+    itemzoom->setEnabled(!anim);
+    itemrotate->setEnabled(!anim);
+    frame_toolbar->setEnabled(!anim);
+    rect_properties->setEnabled(!anim);
+    if (anim) {
+        keep_aspect->setChecked(!m_endViewport->data(0).isNull());
+        m_endViewport->setZValue(1100);
+        QColor col = m_endViewport->pen().color();
+        col.setAlpha(100);
+        m_endViewport->setBrush(col);
+        m_endViewport->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+        m_endViewport->setSelected(true);
+        selectionChanged();
+        slotSelectTool();
+    } else {
+        m_endViewport->setZValue(-1000);
+        m_endViewport->setBrush(QBrush());
+        m_endViewport->setFlags(0);
+    }
+}
+
+void TitleWidget::slotKeepAspect(bool keep)
+{
+    if (m_endViewport->zValue() == 1100) {
+        m_endViewport->setData(0, keep == true ? m_frameWidth : QVariant());
+        m_endViewport->setData(1, keep == true ? m_frameHeight : QVariant());
+    } else {
+        m_startViewport->setData(0, keep == true ? m_frameWidth : QVariant());
+        m_startViewport->setData(1, keep == true ? m_frameHeight : QVariant());
+    }
+}
+
+void TitleWidget::slotResize50()
+{
+    if (m_endViewport->zValue() == 1100) {
+        m_endViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
+    } else m_startViewport->setRect(0, 0, m_frameWidth / 2, m_frameHeight / 2);
+}
+
+void TitleWidget::slotResize100()
+{
+    if (m_endViewport->zValue() == 1100) {
+        m_endViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
+    } else m_startViewport->setRect(0, 0, m_frameWidth, m_frameHeight);
+}
+
+void TitleWidget::slotResize200()
+{
+    if (m_endViewport->zValue() == 1100) {
+        m_endViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
+    } else m_startViewport->setRect(0, 0, m_frameWidth * 2, m_frameHeight * 2);
+}
+
+
+