From 5061f86e006f9e8c28fc0fb5556ecd994add95fb Mon Sep 17 00:00:00 2001
From: Laura Sebesta <laurici@188-25-140-76.rdsnet.ro>
Date: Fri, 25 May 2012 11:45:28 +0300
Subject: [PATCH] Fixed scrolling issues in plugin by adding all elements to a
 parent QFrame widget, and then activating scrolling in
 configpipxtremewidget.cpp constructor.

---
 .../plugins/config/configpipxtremewidget.cpp  |   5 +
 .../src/plugins/config/pipxtreme.ui           | 203 +++++++++---------
 2 files changed, 112 insertions(+), 96 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
index f4d20fc5d..b810ebde9 100644
--- a/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
@@ -89,6 +89,11 @@ ConfigPipXtremeWidget::ConfigPipXtremeWidget(QWidget *parent) : ConfigTaskWidget
 	timeOut = new QTimer(this);
 	connect(timeOut, SIGNAL(timeout()),this,SLOT(disconnected()));
 
+    //Add scroll bar when necessary
+    QScrollArea *scroll = new QScrollArea;
+    scroll->setWidget(m_pipx->frame_3);
+    m_pipx->verticalLayout_3->addWidget(scroll);
+
 	// Request and update of the setting object.
 	settingsUpdated = false;
 	pipxSettingsObj->requestUpdate();
diff --git a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui b/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
index 06662e450..1326f2b35 100644
--- a/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
+++ b/ground/openpilotgcs/src/plugins/config/pipxtreme.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>840</width>
-    <height>724</height>
+    <height>834</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -165,6 +165,12 @@
          </item>
          <item>
           <widget class="QGroupBox" name="groupBox_3">
+           <property name="minimumSize">
+            <size>
+             <width>400</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="font">
             <font>
              <weight>75</weight>
@@ -374,7 +380,7 @@
             <item row="6" column="0">
              <widget class="QLabel" name="label_12">
               <property name="text">
-               <string>Frequency Step Size</string>
+               <string>Freq. Step Size</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -779,7 +785,7 @@
          <item row="0" column="0">
           <widget class="QLabel" name="TelemPortConfigLabel">
            <property name="text">
-            <string>Telemetry Port Configuration</string>
+            <string>Telemetry Port Config.</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -1105,13 +1111,13 @@
             <bool>true</bool>
            </property>
            <property name="minimum">
-            <double>0</double>
+            <number>0</number>
            </property>
            <property name="maximum">
-            <double>1000000000</double>
+            <number>1000000000</number>
            </property>
            <property name="singleStep">
-            <double>100000</double>
+            <number>100000</number>
            </property>
           </widget>
          </item>
@@ -1210,99 +1216,104 @@
         </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>
-   <item>
-    <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>
-    <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>
  </widget>
  <resources/>