Z index handling in titler:

Icons known from inkscape added (lower/rise object, top/bottom)
Shortcuts (PageUp/Down, Home/End)
link: http://www.kdenlive.org/mantis/view.php?id=1211
svn path=/trunk/kdenlive/; revision=4165

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 5ea7c434f17946fe617d8879e2482331d10ac06d..931b5d8f55055736dd2cdd78380f8cbda0265abf 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -187,6 +187,37 @@ TitleWidget::TitleWidget(KUrl url, Timecode tc, QString projectTitlePath, Render
     m_unicodeAction->setToolTip(i18n("Insert Unicode character") + ' ' + m_unicodeAction->shortcut().toString());
     connect(m_unicodeAction, SIGNAL(triggered()), this, SLOT(slotInsertUnicode()));
     buttonInsertUnicode->setDefaultAction(m_unicodeAction);
+    
+    m_zUp = new QAction(KIcon("kdenlive-zindex-up"), QString(), this);
+    m_zUp->setShortcut(Qt::Key_PageUp);
+    m_zUp->setToolTip(i18n("Raise object"));
+    connect(m_zUp, SIGNAL(triggered()), this, SLOT(slotZIndexUp()));
+    zUp->setDefaultAction(m_zUp);
+    
+    m_zDown = new QAction(KIcon("kdenlive-zindex-down"), QString(), this);
+    m_zDown->setShortcut(Qt::Key_PageDown);
+    m_zDown->setToolTip(i18n("Lower object"));
+    connect(m_zDown, SIGNAL(triggered()), this, SLOT(slotZIndexDown()));
+    zDown->setDefaultAction(m_zDown);
+    
+    m_zTop = new QAction(KIcon("kdenlive-zindex-top"), QString(), this);
+    m_zTop->setShortcut(Qt::Key_Home);
+    m_zTop->setToolTip(i18n("Raise object to top"));
+    connect(m_zTop, SIGNAL(triggered()), this, SLOT(slotZIndexTop()));
+    zTop->setDefaultAction(m_zTop);
+    
+    m_zBottom = new QAction(KIcon("kdenlive-zindex-bottom"), QString(), this);
+    m_zBottom->setShortcut(Qt::Key_End);
+    m_zBottom->setToolTip(i18n("Lower object to bottom"));
+    connect(m_zBottom, SIGNAL(triggered()), this, SLOT(slotZIndexBottom()));
+    zBottom->setDefaultAction(m_zBottom);
+    
+    zDown->setIcon(KIcon("kdenlive-zindex-down"));
+    zTop->setIcon(KIcon("kdenlive-zindex-top"));
+    zBottom->setIcon(KIcon("kdenlive-zindex-bottom"));
+    connect(zDown, SIGNAL(clicked()), this, SLOT(slotZIndexDown()));
+    connect(zTop, SIGNAL(clicked()), this, SLOT(slotZIndexTop()));
+    connect(zBottom, SIGNAL(clicked()), this, SLOT(slotZIndexBottom()));
 
     origin_x_left->setToolTip(i18n("Invert x axis and change 0 point"));
     origin_y_top->setToolTip(i18n("Invert y axis and change 0 point"));
@@ -335,6 +366,10 @@ TitleWidget::~TitleWidget()
     delete m_buttonSave;
     delete m_buttonLoad;
     delete m_unicodeAction;
+    delete m_zUp;
+    delete m_zDown;
+    delete m_zTop;
+    delete m_zBottom;
 
     delete m_unicodeDialog;
     delete m_frameBorder;
@@ -929,8 +964,9 @@ void TitleWidget::updateDimension(QGraphicsItem *i)
 {
     value_w->blockSignals(true);
     value_h->blockSignals(true);
+    zValue->blockSignals(true);
 
-
+       zValue->setValue((int) i->zValue());
     if (i->type() == IMAGEITEM) {
         // Get multipliers for rotation/scaling
 
@@ -953,6 +989,7 @@ void TitleWidget::updateDimension(QGraphicsItem *i)
         value_h->setValue((int) t->boundingRect().height());
     }
 
+       zValue->blockSignals(false);
     value_w->blockSignals(false);
     value_h->blockSignals(false);
 }
@@ -1844,8 +1881,8 @@ void TitleWidget::slotFontText(const QString& s)
         // starts typing «dejavu» for example).
         font_family->setCurrentFont(f);
     }
-    // TODO: typing dejavu serif does not recognize the font (takes sans).
-    // upper/lowercase problem?
+    // Note: Typing dejavu serif does not recognize the font (takes sans)
+    // in older Qt versions.
 }
 
 void TitleWidget::slotEditTypewriter(int ix)
@@ -1887,3 +1924,86 @@ void TitleWidget::slotEditShadow()
     }
 #endif
 }
+
+qreal TitleWidget::zIndexBounds(bool maxBound)
+{
+       qreal bound = maxBound? -99 : 99;
+       QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+       if (l.size() > 0) {
+               QList<QGraphicsItem*> lItems = graphicsView->scene()->items(l[0]->sceneBoundingRect(), Qt::IntersectsItemShape);
+               if (lItems.size() > 0) {
+                       int n = lItems.size();
+                       qreal z;
+                       if (maxBound) {
+                               for (int i = 0; i < n; i++) {
+                                       z = lItems[i]->zValue();
+                                       if (z > bound && !lItems[i]->isSelected()) {
+                                               bound = z;
+                                       }
+                               }
+                       } else {
+                               // Get minimum z index.
+                               for (int i = 0; i < n; i++) {
+                                       z = lItems[i]->zValue();
+                                       if (z < bound && !lItems[i]->isSelected() && z > -999) {
+                                               // There are items at the very bottom (background e.g.) with z-index < -1000.
+                                               bound = z;
+                                       }
+                               }
+                       }
+               }
+       }
+       return bound;
+}
+
+void TitleWidget::slotZIndexUp() 
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+               qreal currentZ = l[0]->zValue();
+           qreal max = zIndexBounds(true);
+               if (currentZ <= max) {
+                       l[0]->setZValue(currentZ+1);
+                   updateDimension(l[0]);
+               }
+    }
+}
+
+void TitleWidget::slotZIndexTop() 
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+               qreal currentZ = l[0]->zValue();
+           qreal max = zIndexBounds(true);
+               if (currentZ <= max) {
+                       l[0]->setZValue(max+1);
+                   updateDimension(l[0]);
+               }
+    }
+}
+
+void TitleWidget::slotZIndexDown() 
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+               qreal currentZ = l[0]->zValue();
+           qreal min = zIndexBounds(false);
+               if (currentZ >= min) {
+                       l[0]->setZValue(currentZ-1);
+                   updateDimension(l[0]);
+               }
+    }
+}
+
+void TitleWidget::slotZIndexBottom() 
+{
+    QList<QGraphicsItem*> l = graphicsView->scene()->selectedItems();
+    if (l.size() >= 1) {
+               qreal currentZ = l[0]->zValue();
+           qreal min = zIndexBounds(false);
+               if (currentZ >= min) {
+                       l[0]->setZValue(min-1);
+                   updateDimension(l[0]);
+               }
+    }
+}

diff --git a/src/titlewidget.h b/src/titlewidget.h
index 460e4412a8de2af8a373babebac8e932205ed847..cfafd89707061f406c37e81671b39e6c5825b2cf 100644 (file)
--- a/src/titlewidget.h
+++ b/src/titlewidget.h
@@ -107,6 +107,10 @@ private:
     QAction *m_buttonLoad;
 
     QAction *m_unicodeAction;
+    QAction *m_zUp;
+    QAction *m_zDown;
+    QAction *m_zTop;
+    QAction *m_zBottom;
 
     /** \brief Dialog for entering unicode in text fields */
     UnicodeDialog *m_unicodeDialog;
@@ -156,6 +160,9 @@ private:
     void updateInfoText();
     /** \brief Remove the "start" and "end" info text from animation viewports */
     void deleteAnimInfoText();
+    
+    qreal maxZIndex();
+    qreal zIndexBounds(bool maxBound);
 
 public slots:
     void slotNewText(QGraphicsTextItem *tt);
@@ -260,6 +267,12 @@ private slots:
     void slotEditBlur(int ix);
     void slotEditShadow();
     void slotEditTypewriter(int ix);
+    
+    /** \brief Changes the z index of objects. */
+    void slotZIndexUp();
+    void slotZIndexDown();
+    void slotZIndexTop();
+    void slotZIndexBottom();
 };
 
 

diff --git a/src/widgets/titlewidget_ui.ui b/src/widgets/titlewidget_ui.ui
index 5a6b59d88bf0d00255b9b2385637dfcab9ec912e..440d3feeff9bfaa6f562694eab3bc2708d6a47d4 100644 (file)
--- a/src/widgets/titlewidget_ui.ui
+++ b/src/widgets/titlewidget_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>812</width>
-    <height>570</height>
+    <width>1414</width>
+    <height>720</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -155,6 +155,34 @@
         </item>
        </layout>
       </item>
+      <item row="0" column="1">
+       <widget class="QToolButton" name="zUp">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QToolButton" name="zDown">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QToolButton" name="zTop">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QToolButton" name="zBottom">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -715,7 +743,7 @@
       <enum>QFrame::Raised</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="page_6">
       <layout class="QGridLayout" name="gridLayout_2">
@@ -1057,16 +1085,6 @@
     </widget>
    </item>
   </layout>
-  <zorder>frame_toolbar</zorder>
-  <zorder>frame_properties</zorder>
-  <zorder>splitter</zorder>
-  <zorder>buttonFitZoom</zorder>
-  <zorder>buttonRealSize</zorder>
-  <zorder>zoom_slider</zorder>
-  <zorder>zoom_label</zorder>
-  <zorder>displayBg</zorder>
-  <zorder>toolbar_stack</zorder>
-  <zorder>buttonBox</zorder>
  </widget>
  <customwidgets>
   <customwidget>