[kde-doc-english] playground/utils/synaptiks/kcmodule

[Sebastian Wiesner]

SVN commit 1102061 by swiesner:

GUI: Reworked scrolling page to consume less space
Split scrolling options into horizontal and vertical scrolling group

 M  +2 -1      synaptikswidgets.cpp  
 M  +76 -72    ui/scrollingpage.ui  


--- trunk/playground/utils/synaptiks/kcmodule/synaptikswidgets.cpp #1102060:1102061
@@ -159,7 +159,8 @@
     QDBusReply<int> fingers = touchpad.call("fingerDetection");
     if (fingers.isValid()) {
         if (fingers.value() < 2) {
-            ui.twoFingerScrollingGroup->setEnabled(false);
+            ui.kcfg_HorizontalTwoFingerScrolling->setEnabled(false);
+            ui.kcfg_VerticalTwoFingerScrolling->setEnabled(false);
         }
     }
 }
--- trunk/playground/utils/synaptiks/kcmodule/ui/scrollingpage.ui #1102060:1102061
@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>478</width>
-    <height>445</height>
+    <width>533</width>
+    <height>360</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,93 +16,97 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="twoFingerScrollingGroup">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QGroupBox" name="horizontalScrollingGroup">
+       <property name="title">
+        <string comment="@title:group">Horizontal scrolling</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="QCheckBox" name="kcfg_HorizontalTwoFingerScrolling">
+          <property name="text">
+           <string comment="@option:check">Horizontal scrolling with two fingers</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="kcfg_HorizontalEdgeScrolling">
+          <property name="text">
+           <string comment="@option:check">Horizontal scrolling at bottom edge</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="verticalScrollingGroup">
+       <property name="title">
+        <string comment="@title:group">Vertical scrolling</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_4">
+        <item>
+         <widget class="QCheckBox" name="kcfg_VerticalTwoFingerScrolling">
+          <property name="text">
+           <string comment="@option:check">Vertical scrolling with two fingers</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="kcfg_VerticalEdgeScrolling">
+          <property name="text">
+           <string comment="@option:check">Vertical scrolling at right edge</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="kcfg_Coasting">
      <property name="title">
-      <string comment="@title:group">Scrolling with two fingers</string>
+      <string comment="@option:check">Continue edge scrolling automatically</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
-       <widget class="QCheckBox" name="kcfg_HorizontalTwoFingerScrolling">
+       <widget class="QRadioButton" name="conventionalCoasting">
         <property name="text">
-         <string comment="@option:check">Horizontal scrolling with two fingers</string>
+         <string comment="@option:radio">Continue edge scrolling, if the finger is lifted while scrolling</string>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="kcfg_VerticalTwoFingerScrolling">
-        <property name="text">
-         <string comment="@option:check">Vertical scrolling with two fingers</string>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string comment="@title:group">Edge scrolling</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
-       <widget class="QCheckBox" name="kcfg_HorizontalEdgeScrolling">
-        <property name="text">
-         <string comment="@option:check">Horizontal scrolling at bottom edge</string>
+       <widget class="KDoubleNumInput" name="kcfg_CoastingSpeed">
+        <property name="label">
+         <string comment="@label:spinbox">Scrolling speed threshold to continue scrolling</string>
         </property>
+        <property name="minimum">
+         <double>0.010000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>15.000000000000000</double>
+        </property>
+        <property name="sliderEnabled">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="kcfg_VerticalEdgeScrolling">
+       <widget class="QRadioButton" name="kcfg_CornerCoasting">
         <property name="text">
-         <string comment="@option:check">Vertical scrolling at right edge</string>
+         <string comment="@option:radio">Continue edge scrolling, while the finger stays in an edge corner</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QGroupBox" name="kcfg_Coasting">
-        <property name="title">
-         <string comment="@option:check">Continue edge scrolling automatically</string>
-        </property>
-        <property name="checkable">
-         <bool>true</bool>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="QRadioButton" name="conventionalCoasting">
-           <property name="text">
-            <string comment="@option:radio">Continue edge scrolling, if the finger is lifted while scrolling</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KDoubleNumInput" name="kcfg_CoastingSpeed">
-           <property name="label">
-            <string comment="@label:spinbox">Scrolling speed threshold to continue scrolling</string>
-           </property>
-           <property name="minimum">
-            <double>0.010000000000000</double>
-           </property>
-           <property name="maximum">
-            <double>15.000000000000000</double>
-           </property>
-           <property name="sliderEnabled">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="kcfg_CornerCoasting">
-           <property name="text">
-            <string comment="@option:radio">Continue edge scrolling, while the finger stays in an edge corner</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>