From 8a122cdbe64ad58b647df9d1cb46bec1e550fe26 Mon Sep 17 00:00:00 2001
From: pip <pip>
Date: Tue, 29 Jun 2010 14:31:50 +0000
Subject: [PATCH] StyleSheet adjustments on the new map plug-in

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@936 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 .../opmap/opmap_edit_waypoint_dialog.ui       | 199 +++++++++++-------
 .../plugins/opmap/opmap_mapoverlaywidget.ui   | 145 ++++++++-----
 ground/src/plugins/opmap/opmap_widget.ui      |  80 ++++---
 3 files changed, 274 insertions(+), 150 deletions(-)

diff --git a/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui b/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
index 2645345fc..7db936a9b 100644
--- a/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
+++ b/ground/src/plugins/opmap/opmap_edit_waypoint_dialog.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>476</width>
+    <width>500</width>
     <height>187</height>
    </rect>
   </property>
@@ -19,6 +19,18 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
+  <property name="minimumSize">
+   <size>
+    <width>500</width>
+    <height>187</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>500</width>
+    <height>187</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>OpenPilot GCS Edit Waypoint</string>
   </property>
@@ -27,26 +39,19 @@
     <normaloff>:/core/images/openpilot_logo_128.png</normaloff>:/core/images/openpilot_logo_128.png</iconset>
   </property>
   <property name="modal">
-   <bool>true</bool>
+   <bool>false</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>Description </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" colspan="5">
-      <widget class="QLineEdit" name="lineEditDescription"/>
-     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label_7">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Number </string>
        </property>
@@ -55,37 +60,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Latitude </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Longitude </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Height </string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
+     <item row="0" column="2">
       <widget class="QLineEdit" name="lineEditNumber">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -107,51 +82,113 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Latitude </string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2" colspan="2">
       <widget class="QLineEdit" name="lineEditLatitude">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
-         <width>130</width>
+         <width>0</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>130</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="1" column="4">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>degrees</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Longitude </string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2" colspan="2">
       <widget class="QLineEdit" name="lineEditLongitude">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
-         <width>130</width>
+         <width>0</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>130</width>
+         <width>16777215</width>
          <height>16777215</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="2" column="4">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>degrees</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Height </string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="2">
       <widget class="QLineEdit" name="lineEditHeight">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -161,43 +198,61 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>130</width>
+         <width>80</width>
          <height>0</height>
         </size>
        </property>
        <property name="maximumSize">
         <size>
-         <width>130</width>
+         <width>80</width>
          <height>16777215</height>
         </size>
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>degrees</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="2">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>degrees</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="2">
+     <item row="3" column="3">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>feet</string>
        </property>
       </widget>
      </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Description </string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2" colspan="4">
+      <widget class="QLineEdit" name="lineEditDescription"/>
+     </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <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="pushButtonOK">
        <property name="text">
diff --git a/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui b/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
index 56f763d37..b5d68b64e 100644
--- a/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
+++ b/ground/src/plugins/opmap/opmap_mapoverlaywidget.ui
@@ -110,6 +110,9 @@ border-radius: 2px;
    <property name="rightMargin">
     <number>0</number>
    </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <property name="rightMargin">
@@ -376,59 +379,99 @@ color: rgb(255, 255, 255);
      <property name="rightMargin">
       <number>20</number>
      </property>
-     <item>
-      <widget class="QLabel" name="labelUAV_2">
-       <property name="styleSheet">
-        <string notr="true">QLabel { /* all label types */
-/* background-color: rgba(0, 0, 0, 0); */
-	background-color: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, stop:0.778409 rgba(0, 0, 0, 176), stop:1 rgba(0, 0, 0, 0));
-color: rgb(255, 255, 255);
-
-}</string>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::NoFrame</enum>
-       </property>
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="margin">
-        <number>8</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <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="QLabel" name="labelMouse">
-       <property name="styleSheet">
-        <string notr="true">QLabel { /* all label types */
-/* background-color: rgba(0, 0, 0, 0); */
-	background-color: qradialgradient(spread:pad, cx:0.5, cy:0.5, radius:0.5, fx:0.5, fy:0.5, stop:0.778409 rgba(0, 0, 0, 176), stop:1 rgba(0, 0, 0, 0));
-color: rgb(255, 255, 255);
-}</string>
-       </property>
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="margin">
-        <number>8</number>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="styleSheet">
+      <string notr="true">background-color: rgba(0, 0, 0, 100);</string>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="labelStatus">
+        <property name="styleSheet">
+         <string notr="true">QLabel { /* all label types */
+color: rgb(255, 255, 255);
+	background-color: rgba(255, 255, 255, 0);
+border: none;
+border-radius: 10px;
+}</string>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="margin">
+         <number>1</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer_3">
+        <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="QProgressBar" name="progressBar">
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>15</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">QProgressBar {
+border: nonei;
+padding: 3px;
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
+color: rgb(255, 255, 255);
+}
+QProgressBar::chunk {
+background-color: rgb(85, 85, 255);
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(160, 160, 255, 255), stop:1 rgba(80, 80, 160, 255));
+border: none;
+border-radius: 3px;
+}</string>
+        </property>
+        <property name="value">
+         <number>24</number>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="format">
+         <string>%v</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>
diff --git a/ground/src/plugins/opmap/opmap_widget.ui b/ground/src/plugins/opmap/opmap_widget.ui
index a40a86a82..f3bec5d70 100644
--- a/ground/src/plugins/opmap/opmap_widget.ui
+++ b/ground/src/plugins/opmap/opmap_widget.ui
@@ -70,6 +70,8 @@ QLabel { /* all label types */
 /* background-color: rgba(255, 255, 255, 0); */
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(64, 64, 64, 255), stop:1 rgba(128, 128, 128, 255));
 color: rgb(255, 255, 255);
+border: 0px; 
+border-radius: 3px;
 }
 
 QToolButton {	/* all types of tool button */ 
@@ -77,19 +79,26 @@ background-color: rgba(255, 255, 255, 0);
 color: rgb(255, 255, 255);
 /*border-style: none;*/
 border: 0px; 
+border-radius: 3px;
 }
 QToolButton:hover {
-background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 160, 0, 255), stop:1 rgba(160, 100, 0, 255));
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(255, 255, 255, 200), stop:1 rgba(180, 180, 180, 200));
 color: rgb(255, 255, 255);
+border: 0px; 
+border-radius: 3px;
 }
 QToolButton:pressed {
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
 color: rgb(255, 255, 255);
+border: 0px; 
+border-radius: 3px;
 }
 
 QToolButton:checked {
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
 color: rgb(255, 255, 255);
+border: 0px; 
+border-radius: 3px;
 }
 
 QSlider::groove:horizontal {
@@ -110,17 +119,18 @@ QComboBox {
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
 color: rgb(255, 255, 255);
 }
-QComboBox:hover {
+QComboBox::down-arrow:on {
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
-	background-color: rgb(197, 138, 0);
+top: 1px; left: 1px;	/* shift the arrow when popup is open */
 }
 QComboBox::down-arrow {
      image: url(:/opmap/images/combobox_down_arrow.png);
 }
 QComboBox:drop-down {
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(110, 110, 110, 255), stop:1 rgba(71, 71, 71, 255));
      subcontrol-origin: padding;
      subcontrol-position: top right;
-     border-left-style: 1px solid black;
+     border-left-style: 1px solid white;
      border-top-right-radius: 1px;
      border-bottom-right-radius: 1px;
 }
@@ -129,6 +139,7 @@ background-color: rgb(255, 255, 255);
 color: rgb(0, 0, 0);
 border: 2px solid darkgray;
 selection-background-color: lightgray;
+border-radius: 3px;
 }
 
 QToolTip {
@@ -136,7 +147,7 @@ background-color: white;
 color: black;
 border: 1px solid black;
 padding: 5px;
-border-radius: 2px;
+border-radius: 3px;
 /* opacity: 170; */ 
 }
 </string>
@@ -195,6 +206,12 @@ border-radius: 2px;
              <iconset resource="../coreplugin/core.qrc">
               <normaloff>:/core/images/prev.png</normaloff>:/core/images/prev.png</iconset>
             </property>
+            <property name="iconSize">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
             <property name="autoRaise">
              <bool>false</bool>
             </property>
@@ -282,8 +299,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRaise">
@@ -327,8 +344,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRepeat">
@@ -356,8 +373,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="checkable">
@@ -404,8 +421,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRepeat">
@@ -433,8 +450,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRepeat">
@@ -475,8 +492,8 @@ border-radius: 2px;
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRaise">
@@ -505,8 +522,8 @@ p, li { white-space: pre-wrap; }
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRaise">
@@ -544,8 +561,7 @@ p, li { white-space: pre-wrap; }
              <bool>false</bool>
             </property>
             <property name="styleSheet">
-             <string notr="true">background-color: rgba(255, 255, 255, 0);
-color: rgb(255, 255, 255);</string>
+             <string notr="true"/>
             </property>
             <property name="minimum">
              <number>2</number>
@@ -605,8 +621,8 @@ color: rgb(255, 255, 255);</string>
             </property>
             <property name="iconSize">
              <size>
-              <width>16</width>
-              <height>16</height>
+              <width>20</width>
+              <height>20</height>
              </size>
             </property>
             <property name="autoRaise">
@@ -638,6 +654,12 @@ color: rgb(255, 255, 255);</string>
              <iconset resource="../coreplugin/core.qrc">
               <normaloff>:/core/images/next.png</normaloff>:/core/images/next.png</iconset>
             </property>
+            <property name="iconSize">
+             <size>
+              <width>20</width>
+              <height>20</height>
+             </size>
+            </property>
             <property name="autoRaise">
              <bool>false</bool>
             </property>
@@ -1161,6 +1183,7 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
 color: rgb(255, 255, 255);
 /*border: 1px solid black;*/
 border: none;
+border-radius: 3px;
 }
 
 QToolTip {
@@ -1369,7 +1392,7 @@ border-radius: 3px;
             <property name="maximumSize">
              <size>
               <width>100</width>
-              <height>12</height>
+              <height>20</height>
              </size>
             </property>
             <property name="autoFillBackground">
@@ -1377,14 +1400,17 @@ border-radius: 3px;
             </property>
             <property name="styleSheet">
              <string notr="true">QProgressBar {
-border: nonei;
-padding: 1px;
+border: none;
+border-radius: 5px;
+padding: 3px;
 background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(48, 48, 48, 255), stop:1 rgba(120, 120, 120, 255));
 color: rgb(255, 255, 255);
 }
 QProgressBar::chunk {
-	background-color: rgb(85, 85, 255);
+background-color: rgb(85, 85, 255);
+background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(160, 160, 255, 255), stop:1 rgba(80, 80, 160, 255));
 border: none;
+border-radius: 3px;
 }</string>
             </property>
             <property name="value">