From 2e98bbb9c8b11f024c3dbd86e8fcfa86fb5f7632 Mon Sep 17 00:00:00 2001
From: Bryant <bwmairs@ucsc.edu>
Date: Wed, 29 May 2013 22:39:38 -0700
Subject: [PATCH] Extended most of the new toolbar theming to the dark theme.
 It looks pretty good, though both themes still need some more refinement.

---
 files/styles/style-dark.css  | 75 +++++++++++++++++++++---------------
 files/styles/style-light.css | 70 +++++++++++----------------------
 2 files changed, 67 insertions(+), 78 deletions(-)

diff --git a/files/styles/style-dark.css b/files/styles/style-dark.css
index b175eec6a..43007a85c 100644
--- a/files/styles/style-dark.css
+++ b/files/styles/style-dark.css
@@ -79,11 +79,15 @@ QGCToolBar QLabel#symbolLabel {
     background-clip: content;
 }
 
-QGCToolBar QToolButton#firstAction {
-    margin-left: 8px;
-    border-bottom-left-radius: 6px;
-    border-top-left-radius: 6px;
-    border-right: none;
+QGCToolBar QLabel#toolBarBatteryBar {
+    color: #008000;
+}
+
+QGCToolBar QLabel#toolBarTimeoutLabel {
+    border-radius: 4px;
+    padding: 0;
+    color: #000;
+    background-color: #FF0037;
 }
 
 QGCToolBar QToolButton {
@@ -106,6 +110,13 @@ QGCToolBar QToolButton#advancedButton {
     border-left: none;
 }
 
+QGCToolBar QToolButton#firstAction {
+    margin-left: 8px;
+    border-bottom-left-radius: 6px;
+    border-top-left-radius: 6px;
+    border-right: none;
+}
+
 QGCToolBar .QWidget {
     margin: 0;
     background-color: transparent;
@@ -146,26 +157,6 @@ QLabel#noUas {
     font-size: 30pt;
 }
 
-QLabel#toolBarNameLabel {
-    font: bold 16px;
-    color: #3C7B9E;
-}
-
-QLabel#toolBarModeLabel {
-    font: 12px;
-}
-
-QLabel#toolBarStateLabel {
-    font: 12px;
-    color: #3C7B9E;
-}
-
-QLabel#toolBarMessageLabel {
-    font: 12px;
-    font-style: italic;
-    color: #3C7B9E;
-}
-
 QLineEdit {
     border: 1px solid #777;
     border-radius: 2px;
@@ -189,6 +180,10 @@ QMenu::item:selected {
     background-color: #666;
 }
 
+QMenu::item:checked {
+    background-color: #B8D3E6;
+}
+
 QMenu::separator {
     height: 1px;
     background: #379AC3;
@@ -217,7 +212,7 @@ QProgressBar {
     text-align: center;
     padding: 2px;
     color: #DDD;
-    background-color: #111;
+    background: #111;
     height: 10px;
 }
 
@@ -256,9 +251,8 @@ QPushButton, QToolButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333);
 }
 
-QToolButton {
-    padding-left: 3px;
-    padding-right: 3px;
+QPushButton#connectButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
 }
 
 QPushButton#controlButton {
@@ -266,6 +260,10 @@ QPushButton#controlButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
 }
 
+QPushButton#deleteButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
+}
+
 QPushButton#killButton {
     font-weight: bold;
     min-height: 30px;
@@ -280,6 +278,11 @@ QPushButton:checked, QToolButton:checked {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
 }
 
+QPushButton:checked#connectButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #B37300);
+    color: #000;
+}
+
 QPushButton:checked#controlButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718);
 }
@@ -306,6 +309,10 @@ QPushButton:pressed#killButton {
     border-radius: 5px;
 }
 
+QScrollBar {
+    border: 1px solid #333;
+}
+
 QSeparator {
     color: #EEE;
 }
@@ -323,6 +330,7 @@ QSlider::groove:horizontal {
 
 QSlider::groove:horizontal:disabled {
     border: 1px solid #454545;
+    background-color: #CCC;
     height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
     margin: 2px 0;
 }
@@ -388,7 +396,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button {
 }
 
 QStatusBar {
-    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop:0.34 #383838, stop:1 #181818);
 }
 
 QTabBar::tab {
@@ -426,7 +434,12 @@ QTextEdit {
 QToolBar {
     border-top-color: #969696;
     border-bottom-color: #484848;
-    background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818);
+}
+
+QToolButton {
+    padding-left: 3px;
+    padding-right: 3px;
 }
 
 QToolTip {
diff --git a/files/styles/style-light.css b/files/styles/style-light.css
index c08ff63bb..56f95d2f5 100644
--- a/files/styles/style-light.css
+++ b/files/styles/style-light.css
@@ -58,8 +58,8 @@ QDockWidget::close-button:hover, QDockWidget::float-button:hover {
 }
 
 QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
-    background: #555;
     padding: 1px -1px -1px 1px;
+    background: #555;
 }
 
 QDockWidget::title {
@@ -90,13 +90,6 @@ QGCToolBar QLabel#toolBarTimeoutLabel {
     background-color: #FF0037;
 }
 
-QGCToolBar QToolButton#firstAction {
-    margin-left: 8px;
-    border-bottom-left-radius: 6px;
-    border-top-left-radius: 6px;
-    border-right: none;
-}
-
 QGCToolBar QToolButton {
     margin: 0;
     padding-left: 0;
@@ -116,6 +109,13 @@ QGCToolBar QToolButton#advancedButton {
     border-left: none;
 }
 
+QGCToolBar QToolButton#firstAction {
+    margin-left: 8px;
+    border-bottom-left-radius: 6px;
+    border-top-left-radius: 6px;
+    border-right: none;
+}
+
 QGCToolBar .QWidget {
     margin: 0;
     background-color: transparent;
@@ -156,26 +156,6 @@ QLabel#noUas {
     font-size: 30pt;
 }
 
-QLabel#toolBarNameLabel {
-    font: bold 16px;
-    color: #3C7B9E;
-}
-
-QLabel#toolBarModeLabel {
-    font: 12px;
-}
-
-QLabel#toolBarStateLabel {
-    font: 12px;
-    color: #3C7B9E;
-}
-
-QLabel#toolBarMessageLabel {
-    font: 12px;
-    font-style: italic;
-    color: #3C7B9E;
-}
-
 QLineEdit {
     border: 1px solid #111;
     border-radius: 2px;
@@ -209,11 +189,6 @@ QMenu::separator {
     margin: 8px 5px 4px 5px;
 }
 
-QMenu::icon, QMenu::icon:selected, QMenu::icon:disabled, QMenu::icon:checked {
-    background: #F00;
-    border: none;
-}
-
 QMenuBar::item:selected {
     background-color: #CCC;
 }
@@ -275,9 +250,8 @@ QPushButton, QToolButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777);
 }
 
-QToolButton {
-    padding-left: 3px;
-    padding-right: 3px;
+QPushButton#connectButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
 }
 
 QPushButton#controlButton {
@@ -285,24 +259,20 @@ QPushButton#controlButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
 }
 
+QPushButton#deleteButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
+}
+
 QPushButton#killButton {
     font-weight: bold;
     min-height: 30px;
     color: #000;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop:1 #B37300);
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop: 1 #B37300);
     background-clip: border;
     border: 1px solid #555;
     border-radius: 5px;
 }
 
-QPushButton#connectButton {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
-}
-
-QPushButton#deleteButton {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
-}
-
 QPushButton:checked, QToolButton:checked {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888);
     color: #FFF;
@@ -360,6 +330,7 @@ QSlider::groove:horizontal {
 }
 
 QSlider::groove:horizontal:disabled {
+    border: 1px solid #454545;
     background-color: #CCC;
     height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
     margin: 2px 0;
@@ -464,9 +435,14 @@ QTextEdit {
 QToolBar {
     border-top-color: #969696;
     border-bottom-color: #484848;
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
 }
-            
+
+QToolButton {
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
 QToolTip {
     background-color: #F6F6F6;
     border:0 solid #379AC3;
-- 
2.22.0