Disable zoom using vertical mouse drag in ruler by default:

http://www.kdenlive.org/mantis/view.php?id=1149

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

diff --git a/src/customruler.cpp b/src/customruler.cpp
index ddbac7af2737da4703477fd5ab2fc7d19e219f05..c01a0fe310a57d1c89e53328e79c7b8d705ccd93 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "customruler.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KIcon>
@@ -152,7 +153,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
         if (m_moveCursor == RULER_CURSOR) {
             QPoint diff = event->pos() - m_clickPoint;
             if (m_mouseMove == NO_MOVE) {
-                if (qAbs(diff.x()) >= QApplication::startDragDistance()) {
+                if (!KdenliveSettings::verticalzoom() || qAbs(diff.x()) >= QApplication::startDragDistance()) {
                     m_mouseMove = HORIZONTAL_MOVE;
                 } else if (qAbs(diff.y()) >= QApplication::startDragDistance()) {
                     m_mouseMove = VERTICAL_MOVE;

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index abc9dd9193dd925c68fc3c3ed3d464c3d1a884e3..dbbb28426fb9d806705ac7ea421a46f03b55a068 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -75,6 +75,11 @@
       <default>true</default>
     </entry>
 
+    <entry name="verticalzoom" type="Bool">
+      <label>Vertical drag in timeline ruler zooms.</label>
+      <default>false</default>
+    </entry>
+    
     <entry name="trackheight" type="Int">
       <label>Tracks height in pixel.</label>
       <default>50</default>

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
index d7c49d7015f2c1b23dacdf29b7e4c18e1b20532c..89a367d56e6b720c4dae5844bb10321672b3d493 100644 (file)
--- a/src/widgets/configdisplay_ui.ui
+++ b/src/widgets/configdisplay_ui.ui
@@ -68,17 +68,17 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Track height</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="4" column="1">
     <widget class="QSpinBox" name="kcfg_trackheight"/>
    </item>
-   <item row="3" column="2">
+   <item row="4" column="2">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -91,7 +91,7 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -104,6 +104,13 @@
      </property>
     </spacer>
    </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_verticalzoom">
+     <property name="text">
+      <string>Zoom using vertical drag in ruler</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>