From 888b8fb0c98b167ea5bb6e47575205dcda5bea42 Mon Sep 17 00:00:00 2001
From: Laura Sebesta <laurici@Lauras-MacBook-Pro.local>
Date: Sat, 26 May 2012 12:00:16 +0300
Subject: [PATCH] Disabled wheel scrolling, improved tab order.

---
 .../plugins/config/configpipxtremewidget.cpp  |   3 +
 .../src/plugins/config/pipxtreme.ui           | 228 ++++++++++--------
 2 files changed, 136 insertions(+), 95 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
index b810ebde9..6b169a74f 100644
--- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
@@ -97,6 +97,9 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget
 	// Request and update of the setting object.
 	settingsUpdated = false;
 	pipxSettingsObj->requestUpdate();
+
+    disableMouseWheelEvents();
+
 }
 
 ConfigPipXtremeWidget::~ConfigPipXtremeWidget()
diff --git a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui b/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
index 1326f2b35..0b4c8b10f 100644
--- a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
+++ b/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
@@ -23,6 +23,96 @@
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="1" column="0" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_12">
+        <item>
+         <widget class="QGraphicsView" name="graphicsView_Spectrum">
+          <property name="backgroundBrush">
+           <brush brushstyle="NoBrush">
+            <color alpha="255">
+             <red>0</red>
+             <green>0</green>
+             <blue>0</blue>
+            </color>
+           </brush>
+          </property>
+          <property name="foregroundBrush">
+           <brush brushstyle="NoBrush">
+            <color alpha="255">
+             <red>0</red>
+             <green>0</green>
+             <blue>0</blue>
+            </color>
+           </brush>
+          </property>
+          <property name="interactive">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QLabel" name="message">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="submitButtons">
+          <item>
+           <widget class="QFrame" name="frame">
+            <property name="frameShape">
+             <enum>QFrame::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Raised</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QPushButton" name="Apply">
+            <property name="toolTip">
+             <string>Send settings to the board but do not save to the non-volatile memory</string>
+            </property>
+            <property name="text">
+             <string>Apply</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="Save">
+            <property name="toolTip">
+             <string>Send settings to the board and save to the non-volatile memory</string>
+            </property>
+            <property name="text">
+             <string>Save</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
       <item row="0" column="0">
        <widget class="QFrame" name="frame_2">
         <property name="frameShape">
@@ -1216,106 +1306,54 @@
         </layout>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout_12">
-        <item>
-         <widget class="QGraphicsView" name="graphicsView_Spectrum">
-          <property name="backgroundBrush">
-           <brush brushstyle="NoBrush">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </property>
-          <property name="foregroundBrush">
-           <brush brushstyle="NoBrush">
-            <color alpha="255">
-             <red>0</red>
-             <green>0</green>
-             <blue>0</blue>
-            </color>
-           </brush>
-          </property>
-          <property name="interactive">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="message">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="submitButtons">
-          <item>
-           <widget class="QFrame" name="frame">
-            <property name="frameShape">
-             <enum>QFrame::StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="QPushButton" name="Apply">
-            <property name="toolTip">
-             <string>Send settings to the board but do not save to the non-volatile memory</string>
-            </property>
-            <property name="text">
-             <string>Apply</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="Save">
-            <property name="toolTip">
-             <string>Send settings to the board and save to the non-volatile memory</string>
-            </property>
-            <property name="text">
-             <string>Save</string>
-            </property>
-            <property name="checked">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
      </layout>
-     <zorder>frame_2</zorder>
-     <zorder>groupBox</zorder>
-     <zorder>layoutWidget</zorder>
-     <zorder>layoutWidget_2</zorder>
-     <zorder>graphicsView_Spectrum</zorder>
     </widget>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>PairSelect1</tabstop>
+  <tabstop>PairID1</tabstop>
+  <tabstop>PairSelect2</tabstop>
+  <tabstop>PairID2</tabstop>
+  <tabstop>PairSelect3</tabstop>
+  <tabstop>PairID3</tabstop>
+  <tabstop>PairSelect4</tabstop>
+  <tabstop>PairID4</tabstop>
+  <tabstop>FirmwareVersion</tabstop>
+  <tabstop>SerialNumber</tabstop>
+  <tabstop>DeviceID</tabstop>
+  <tabstop>MinFrequency</tabstop>
+  <tabstop>MaxFrequency</tabstop>
+  <tabstop>FrequencyStepSize</tabstop>
+  <tabstop>LinkState</tabstop>
+  <tabstop>RxAFC</tabstop>
+  <tabstop>Retries</tabstop>
+  <tabstop>Errors</tabstop>
+  <tabstop>UAVTalkErrors</tabstop>
+  <tabstop>Resets</tabstop>
+  <tabstop>TXRate</tabstop>
+  <tabstop>RXRate</tabstop>
+  <tabstop>TelemPortConfig</tabstop>
+  <tabstop>TelemPortSpeed</tabstop>
+  <tabstop>FlexiPortConfig</tabstop>
+  <tabstop>FlexiPortSpeed</tabstop>
+  <tabstop>VCPConfig</tabstop>
+  <tabstop>VCPSpeed</tabstop>
+  <tabstop>MaxRFDatarate</tabstop>
+  <tabstop>MaxRFTxPower</tabstop>
+  <tabstop>SendTimeout</tabstop>
+  <tabstop>MinPacketSize</tabstop>
+  <tabstop>FrequencyCalibration</tabstop>
+  <tabstop>Frequency</tabstop>
+  <tabstop>ScanSpectrum</tabstop>
+  <tabstop>AESKey</tabstop>
+  <tabstop>AESKeyRandom</tabstop>
+  <tabstop>AESEnable</tabstop>
+  <tabstop>graphicsView_Spectrum</tabstop>
+  <tabstop>Apply</tabstop>
+  <tabstop>Save</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>