From f724ddbeec6fd29838b7ef5792d6746a9e201ed3 Mon Sep 17 00:00:00 2001
From: pixhawk <pixhawk@pixhawk02.(none)>
Date: Mon, 9 Jan 2012 19:19:21 +0100
Subject: [PATCH] Improved the visuals of the "Onboard Waypoints"-tab contents.
 Not yet complete.

---
 src/ui/WaypointList.ui         |  18 ++++-
 src/ui/WaypointViewOnlyView.ui | 120 +++++++++++++++++++++------------
 2 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/src/ui/WaypointList.ui b/src/ui/WaypointList.ui
index 04b69dfb22..2773693df8 100644
--- a/src/ui/WaypointList.ui
+++ b/src/ui/WaypointList.ui
@@ -260,6 +260,18 @@
        <string>Onboard Waypoints</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>6</number>
+       </property>
        <item row="0" column="0" colspan="3">
         <widget class="QScrollArea" name="readOnlyScrollArea">
          <property name="widgetResizable">
@@ -270,8 +282,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>830</width>
-            <height>304</height>
+            <width>836</width>
+            <height>316</height>
            </rect>
           </property>
           <property name="autoFillBackground">
@@ -285,7 +297,7 @@
              </property>
              <property name="maximumSize">
               <size>
-               <width>828</width>
+               <width>16777215</width>
                <height>16777215</height>
               </size>
              </property>
diff --git a/src/ui/WaypointViewOnlyView.ui b/src/ui/WaypointViewOnlyView.ui
index eb35191b1e..aefdf75c36 100644
--- a/src/ui/WaypointViewOnlyView.ui
+++ b/src/ui/WaypointViewOnlyView.ui
@@ -6,43 +6,63 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>381</width>
-    <height>40</height>
+    <width>704</width>
+    <height>31</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>31</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <property name="styleSheet">
-   <string notr="true"/>
+   <string notr="true">QGroupBox {
+	border: 1px solid #EEEEEE;
+	border-radius: 5px;
+	padding: 0px 0px 0px 0px;
+margin-top: 1ex; /* leave space at the top for the title */
+	margin: 0px;
+}
+
+ QGroupBox::title {
+     subcontrol-origin: margin;
+     subcontrol-position: top center; /* position at the top center */
+     margin: 0 3px 0px 3px;
+     padding: 0 3px 0px 0px;
+     font: bold 8px;
+ }</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_2">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>2</number>
-   </property>
-   <property name="topMargin">
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="spacing">
     <number>0</number>
    </property>
-   <item>
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="enabled">
       <bool>true</bool>
      </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
      <property name="title">
       <string/>
      </property>
@@ -55,24 +75,21 @@
      <property name="checkable">
       <bool>false</bool>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1,100,1">
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="3,2,100,10,5,1">
       <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="leftMargin">
        <number>2</number>
       </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
+      <property name="margin">
+       <number>4</number>
       </property>
       <item>
        <widget class="QCheckBox" name="current">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="toolTip">
          <string>Currently executed waypoint</string>
         </property>
@@ -92,34 +109,49 @@
        </widget>
       </item>
       <item>
-       <widget class="QTextBrowser" name="displayBar">
+       <widget class="QLabel" name="displayBar">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>31</height>
-         </size>
+        <property name="text">
+         <string>test 1</string>
         </property>
-        <property name="font">
-         <font>
-          <pointsize>8</pointsize>
-         </font>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="frameShadow">
-         <enum>QFrame::Sunken</enum>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>79</width>
+          <height>17</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="frameLabel">
+        <property name="text">
+         <string>v10</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="autoContinue">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="toolTip">
          <string>Automatically continue after this waypoint</string>
         </property>
-- 
GitLab