hotfix for Contour Shuttlexpress button mapping problem

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

config button count increased to 10. This fix is very static but solves
for now the problem. Will provide in future a more generic and flexible
way.

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 7afa59472bc36cbd4e965c6f0c52974499c4f92f..015149bc00f1c7c692e2ebe4bdc0819cbf1e24a2 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -142,6 +142,11 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
     m_shuttle_buttons.push_back(m_configShuttle.shuttle3);
     m_shuttle_buttons.push_back(m_configShuttle.shuttle4);
     m_shuttle_buttons.push_back(m_configShuttle.shuttle5);
+    m_shuttle_buttons.push_back(m_configShuttle.shuttle6);
+    m_shuttle_buttons.push_back(m_configShuttle.shuttle7);
+    m_shuttle_buttons.push_back(m_configShuttle.shuttle8);
+    m_shuttle_buttons.push_back(m_configShuttle.shuttle9);
+    m_shuttle_buttons.push_back(m_configShuttle.shuttle10);
 
     // populate the buttons with the current configuration. The items are sorted
     // according to the user-selected language, so they do not appear in random order.

diff --git a/src/widgets/configjogshuttle_ui.ui b/src/widgets/configjogshuttle_ui.ui
index 455a3b17b50a3be4fc00bee08563d63900368d75..0fc352496054ecec59f5826e1c0ecc9b12ddb7c8 100644 (file)
--- a/src/widgets/configjogshuttle_ui.ui
+++ b/src/widgets/configjogshuttle_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>287</width>
-    <height>253</height>
+    <width>327</width>
+    <height>393</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
@@ -40,6 +40,34 @@
       <string>Device configuration</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Button  7</string>
+        </property>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="text">
+         <string>Button  8</string>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>Button  9</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Button  6</string>
+        </property>
+       </widget>
+      </item>
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -60,7 +88,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Button 1</string>
+         <string>Button  1</string>
         </property>
        </widget>
       </item>
@@ -70,7 +98,7 @@
       <item row="2" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Button 2</string>
+         <string>Button  2</string>
         </property>
        </widget>
       </item>
@@ -80,7 +108,7 @@
       <item row="3" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Button 3</string>
+         <string>Button  3</string>
         </property>
        </widget>
       </item>
@@ -90,7 +118,7 @@
       <item row="4" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
-         <string>Button 4</string>
+         <string>Button  4</string>
         </property>
        </widget>
       </item>
@@ -100,13 +128,35 @@
       <item row="5" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
-         <string>Button 5</string>
+         <string>Button  5</string>
         </property>
        </widget>
       </item>
       <item row="5" column="1" colspan="2">
        <widget class="KComboBox" name="shuttle5"/>
       </item>
+      <item row="10" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="text">
+         <string>Button 10</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="KComboBox" name="shuttle6"/>
+      </item>
+      <item row="7" column="1" colspan="2">
+       <widget class="KComboBox" name="shuttle7"/>
+      </item>
+      <item row="8" column="1" colspan="2">
+       <widget class="KComboBox" name="shuttle8"/>
+      </item>
+      <item row="9" column="1" colspan="2">
+       <widget class="KComboBox" name="shuttle9"/>
+      </item>
+      <item row="10" column="1" colspan="2">
+       <widget class="KComboBox" name="shuttle10"/>
+      </item>
      </layout>
     </widget>
    </item>
@@ -126,16 +176,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>