From 26b682122b62672362961d3a2927bd5fd5023730 Mon Sep 17 00:00:00 2001
From: chris pember <chris.pember@gmail.com>
Date: Sat, 1 Sep 2012 11:11:44 -0700
Subject: [PATCH] fixed the text on the mixer, need mike or someone to hook up
 the reverse button for the yaw mixer, as well as change the range on the
 slider

---
 .../stylesheets/default_linux.qss             |  72 ++++++++++++-
 .../stylesheets/default_windows.qss           | 100 ++++++++++++++++++
 .../openpilotgcs/stylesheets/wide_linux.qss   |  72 ++++++++++++-
 .../openpilotgcs/stylesheets/wide_macos.qss   |  27 +++--
 .../openpilotgcs/stylesheets/wide_windows.qss | 100 ++++++++++++++++++
 .../src/plugins/config/airframe.ui            |  12 +--
 .../src/plugins/config/stabilization.ui       |  28 +++--
 7 files changed, 385 insertions(+), 26 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss
index 1c27c3d69..035fa5633 100644
--- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss
+++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss
@@ -1,6 +1,5 @@
 MyListWidget {font-size: 11px;}
 Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
-
  
 
 
@@ -29,4 +28,75 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
 		padding: 0px;
 		} 
 
+	QSlider::groove:horizontal {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		height: 6px;
+		border-radius: 2px;
+		margin 10px 10px;
+		}
+	QSlider::add-page:horizontal {
+		background: #fff;
+		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
 
+ 	QSlider::sub-page:horizontal {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:horizontal {
+     		background: rgb(196,196,196);
+     		width: 18px;
+		height: 28px;
+     		margin: -2px 0;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::groove:vertical {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		width: 6px;
+		border-radius: 2px;
+		margin 0px -10px;
+		}
+	QSlider::sub-page:vertical {
+		background: #fff;
+		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::add-page:vertical {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:vertical {
+     		background: rgb(196,196,196);
+     		width: 18px;
+     		margin: -6 -6;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::handle:vertical:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
+
+	QSlider::handle:horizontal:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_windows.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_windows.qss
index 3d57edaeb..035fa5633 100644
--- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_windows.qss
+++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default_windows.qss
@@ -1,2 +1,102 @@
 MyListWidget {font-size: 11px;}
 Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
+ 
+
+
+
+
+
+	QGroupBox 	{
+		border: 1px solid gray;
+		border-radius: 5px;
+		margin-top: 1ex; /* leave space at the top for the title */
+		font-size: 11px;
+		font-weight: bold;
+		}
+
+	QGroupBox::title {
+		subcontrol-origin: margin;
+		subcontrol-position: top left; /* position at the top center */
+		padding: 0 3px;
+		
+		}
+
+	QTabWidget::pane { /* The tab widget frame */	
+		margin: 1px,1px,1px,1px;
+		border: 2px solid rgb(196,196,196);
+		border-radius: 5px;
+		padding: 0px;
+		} 
+
+	QSlider::groove:horizontal {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		height: 6px;
+		border-radius: 2px;
+		margin 10px 10px;
+		}
+	QSlider::add-page:horizontal {
+		background: #fff;
+		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::sub-page:horizontal {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:horizontal {
+     		background: rgb(196,196,196);
+     		width: 18px;
+		height: 28px;
+     		margin: -2px 0;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::groove:vertical {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		width: 6px;
+		border-radius: 2px;
+		margin 0px -10px;
+		}
+	QSlider::sub-page:vertical {
+		background: #fff;
+		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::add-page:vertical {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:vertical {
+     		background: rgb(196,196,196);
+     		width: 18px;
+     		margin: -6 -6;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::handle:vertical:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
+
+	QSlider::handle:horizontal:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss
index 1c27c3d69..035fa5633 100644
--- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss
+++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss
@@ -1,6 +1,5 @@
 MyListWidget {font-size: 11px;}
 Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
-
  
 
 
@@ -29,4 +28,75 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
 		padding: 0px;
 		} 
 
+	QSlider::groove:horizontal {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		height: 6px;
+		border-radius: 2px;
+		margin 10px 10px;
+		}
+	QSlider::add-page:horizontal {
+		background: #fff;
+		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
 
+ 	QSlider::sub-page:horizontal {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:horizontal {
+     		background: rgb(196,196,196);
+     		width: 18px;
+		height: 28px;
+     		margin: -2px 0;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::groove:vertical {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		width: 6px;
+		border-radius: 2px;
+		margin 0px -10px;
+		}
+	QSlider::sub-page:vertical {
+		background: #fff;
+		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::add-page:vertical {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:vertical {
+     		background: rgb(196,196,196);
+     		width: 18px;
+     		margin: -6 -6;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::handle:vertical:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
+
+	QSlider::handle:horizontal:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss
index 22958dbdd..035fa5633 100644
--- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss
+++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss
@@ -33,7 +33,7 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
 		background: white;
 		height: 6px;
 		border-radius: 2px;
-		margin 2px 2px;
+		margin 10px 10px;
 		}
 	QSlider::add-page:horizontal {
 		background: #fff;
@@ -59,24 +59,21 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
 		border: 1px solid #777;
  		}
 
-
-
-
 	QSlider::groove:vertical {
 		border: 1px solid rgb(196,196,196);
 		background: white;
 		width: 6px;
 		border-radius: 2px;
-		margin 0px 2px;
+		margin 0px -10px;
 		}
-	QSlider::add-page:vertical {
+	QSlider::sub-page:vertical {
 		background: #fff;
 		border: 1px solid #777;
 		width: 1px;
 		border-radius: 4px;
 		}
 
- 	QSlider::sub-page:vertical {
+ 	QSlider::add-page:vertical {
  		background: rgb(249,117,76);
  		border: 1px solid #777;
 		width: 1px;
@@ -87,7 +84,19 @@ Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:
  	QSlider::handle:vertical {
      		background: rgb(196,196,196);
      		width: 18px;
-     		margin: -6 0;
+     		margin: -6 -6;
      		border-radius: 3px;
 		border: 1px solid #777;
- 		}
\ No newline at end of file
+ 		}
+
+	QSlider::handle:vertical:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
+
+	QSlider::handle:horizontal:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_windows.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_windows.qss
index 3d57edaeb..035fa5633 100644
--- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_windows.qss
+++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_windows.qss
@@ -1,2 +1,102 @@
 MyListWidget {font-size: 11px;}
 Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
+ 
+
+
+
+
+
+	QGroupBox 	{
+		border: 1px solid gray;
+		border-radius: 5px;
+		margin-top: 1ex; /* leave space at the top for the title */
+		font-size: 11px;
+		font-weight: bold;
+		}
+
+	QGroupBox::title {
+		subcontrol-origin: margin;
+		subcontrol-position: top left; /* position at the top center */
+		padding: 0 3px;
+		
+		}
+
+	QTabWidget::pane { /* The tab widget frame */	
+		margin: 1px,1px,1px,1px;
+		border: 2px solid rgb(196,196,196);
+		border-radius: 5px;
+		padding: 0px;
+		} 
+
+	QSlider::groove:horizontal {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		height: 6px;
+		border-radius: 2px;
+		margin 10px 10px;
+		}
+	QSlider::add-page:horizontal {
+		background: #fff;
+		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::sub-page:horizontal {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		height: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:horizontal {
+     		background: rgb(196,196,196);
+     		width: 18px;
+		height: 28px;
+     		margin: -2px 0;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::groove:vertical {
+		border: 1px solid rgb(196,196,196);
+		background: white;
+		width: 6px;
+		border-radius: 2px;
+		margin 0px -10px;
+		}
+	QSlider::sub-page:vertical {
+		background: #fff;
+		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+ 	QSlider::add-page:vertical {
+ 		background: rgb(249,117,76);
+ 		border: 1px solid #777;
+		width: 1px;
+		border-radius: 4px;
+		}
+
+
+ 	QSlider::handle:vertical {
+     		background: rgb(196,196,196);
+     		width: 18px;
+     		margin: -6 -6;
+     		border-radius: 3px;
+		border: 1px solid #777;
+ 		}
+
+	QSlider::handle:vertical:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
+
+	QSlider::handle:horizontal:hover {
+		background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
+		border: 1px solid #444;
+		border-radius: 4px;
+		}
diff --git a/ground/openpilotgcs/src/plugins/config/airframe.ui b/ground/openpilotgcs/src/plugins/config/airframe.ui
index 23a6ba351..93c7dc96e 100644
--- a/ground/openpilotgcs/src/plugins/config/airframe.ui
+++ b/ground/openpilotgcs/src/plugins/config/airframe.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>810</width>
+    <width>856</width>
     <height>633</height>
    </rect>
   </property>
@@ -122,7 +122,7 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>756</width>
+            <width>802</width>
             <height>509</height>
            </rect>
           </property>
@@ -888,7 +888,6 @@ margin:1px;</string>
                     <property name="styleSheet">
                      <string notr="true">background:transparent</string>
                     </property>
-                    <zorder>groupBox</zorder>
                    </widget>
                   </item>
                  </layout>
@@ -1436,7 +1435,7 @@ font: bold 12px;
 margin:1px;</string>
                     </property>
                     <property name="text">
-                     <string>Tricopter Yaw Motor Direction</string>
+                     <string>Multirotor Yaw Direction</string>
                     </property>
                     <property name="alignment">
                      <set>Qt::AlignCenter</set>
@@ -1484,7 +1483,7 @@ font: bold 12px;
 margin:1px;</string>
                     </property>
                     <property name="text">
-                     <string>Tricopter Yaw Motor channel:</string>
+                     <string>Tricopter Yaw Motor channel</string>
                     </property>
                     <property name="alignment">
                      <set>Qt::AlignCenter</set>
@@ -2796,7 +2795,7 @@ margin:1px;</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>756</width>
+            <width>802</width>
             <height>509</height>
            </rect>
           </property>
@@ -3063,7 +3062,6 @@ In 'units per second', a sound default is 1000.</string>
              <zorder>maxAccelSlider</zorder>
              <zorder>label_37</zorder>
              <zorder>feedForwardSliderValue</zorder>
-             <zorder></zorder>
              <zorder>label_20</zorder>
             </widget>
            </item>
diff --git a/ground/openpilotgcs/src/plugins/config/stabilization.ui b/ground/openpilotgcs/src/plugins/config/stabilization.ui
index 399d85372..d8c709894 100755
--- a/ground/openpilotgcs/src/plugins/config/stabilization.ui
+++ b/ground/openpilotgcs/src/plugins/config/stabilization.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>978</width>
-    <height>837</height>
+    <width>967</width>
+    <height>639</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -612,8 +612,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>948</width>
-            <height>720</height>
+            <width>937</width>
+            <height>522</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0,0,0,0">
@@ -6971,7 +6971,7 @@ border-radius: 5;</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>567</width>
+            <width>922</width>
             <height>650</height>
            </rect>
           </property>
@@ -6982,6 +6982,12 @@ border-radius: 5;</string>
            <property name="spacing">
             <number>24</number>
            </property>
+           <property name="leftMargin">
+            <number>12</number>
+           </property>
+           <property name="rightMargin">
+            <number>12</number>
+           </property>
            <item>
             <widget class="QGroupBox" name="RateStabilizationGroup_8">
              <property name="sizePolicy">
@@ -16849,7 +16855,7 @@ border-radius: 5;</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>818</width>
+            <width>922</width>
             <height>599</height>
            </rect>
           </property>
@@ -16857,6 +16863,12 @@ border-radius: 5;</string>
            <property name="spacing">
             <number>24</number>
            </property>
+           <property name="leftMargin">
+            <number>12</number>
+           </property>
+           <property name="rightMargin">
+            <number>12</number>
+           </property>
            <item>
             <widget class="QGroupBox" name="groupBox_4">
              <property name="sizePolicy">
@@ -19779,7 +19791,7 @@ border-radius: 5;</string>
                 </property>
                 <layout class="QGridLayout" name="gridLayout_8" columnstretch="0,0,1,0,1,0,1,0">
                  <property name="leftMargin">
-                  <number>0</number>
+                  <number>12</number>
                  </property>
                  <item row="1" column="4">
                   <widget class="QDoubleSpinBox" name="RatePitchILimit">
@@ -22939,7 +22951,7 @@ border-radius: 5;</string>
                    </property>
                    <property name="sizeHint" stdset="0">
                     <size>
-                     <width>91</width>
+                     <width>102</width>
                      <height>20</height>
                     </size>
                    </property>