Fix small issues with titler widget

svn path=/trunk/kdenlive/; revision=3991

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 1dbb0569a298e50ed27951a52411b5a401dab09e..4906d82cbecdaa0a4f9caf6c17864a5000d3bf84 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -385,7 +385,6 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             return;
         } else if (m_operationMode == SPACER && move && m_selectionGroup) {
             // spacer tool
-            int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
             if (snappedPos < 0) snappedPos = 0;
             // Make sure there is no collision
             QList<QGraphicsItem *> children = m_selectionGroup->childItems();
@@ -3578,7 +3577,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
         for (int i = 0; i < max; i++) {
             if (children.at(i)->type() == GROUPWIDGET) {
                 children += children.at(i)->childItems();
-                AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(children.at(i));
+                //AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(children.at(i));
                 //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
                 /*m_document->clipManager()->removeGroup(grp);
                 m_scene->destroyItemGroup(grp);*/

diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp
index 14eabe0d4e11b091b2fd85ae7f4580f916dffe7e..dd233457f0e2b03767cf4235749415956628763a 100644 (file)
--- a/src/graphicsscenerectmove.cpp
+++ b/src/graphicsscenerectmove.cpp
@@ -504,12 +504,15 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e)
 
 void GraphicsSceneRectMove::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent)
 {
-    QList<QGraphicsView*> viewlist = views();
-    //kDebug() << wheelEvent->delta() << " " << zoom;
-    if (viewlist.size() > 0) {
-        if (wheelEvent->delta() < 0) emit sceneZoom(true);
-        else emit sceneZoom(false);
+    if (wheelEvent->modifiers() == Qt::ControlModifier) {
+        QList<QGraphicsView*> viewlist = views();
+        //kDebug() << wheelEvent->delta() << " " << zoom;
+        if (viewlist.size() > 0) {
+            if (wheelEvent->delta() > 0) emit sceneZoom(true);
+            else emit sceneZoom(false);
+        }
     }
+    else wheelEvent->setAccepted(false);
 }
 
 void GraphicsSceneRectMove::setScale(double s)

diff --git a/src/widgets/titlewidget_ui.ui b/src/widgets/titlewidget_ui.ui
index 8737c056b90597973ba1ed4ea1ee1cc286e6f9f2..63c456d3f53a359a3d889bcbad177f516408b38e 100644 (file)
--- a/src/widgets/titlewidget_ui.ui
+++ b/src/widgets/titlewidget_ui.ui
@@ -146,10 +146,10 @@
         <item>
          <widget class="QSpinBox" name="zValue">
           <property name="minimum">
-           <number>-1000</number>
+           <number>-5000</number>
           </property>
           <property name="maximum">
-           <number>1000</number>
+           <number>5000</number>
           </property>
          </widget>
         </item>
@@ -592,9 +592,6 @@
        </item>
        <item row="2" column="1">
         <widget class="KIntSpinBox" name="itemzoom">
-         <property name="suffix">
-          <string>%</string>
-         </property>
          <property name="maximum">
           <number>100000</number>
          </property>
@@ -612,9 +609,6 @@
        </item>
        <item row="3" column="1">
         <widget class="KIntSpinBox" name="itemrotate">
-         <property name="suffix">
-          <string>°</string>
-         </property>
          <property name="minimum">
           <number>-360</number>
          </property>