Merge branch 'integration_merge_connstatus' of...

Merge branch 'integration_merge_connstatus' of github.com:Susurrus/qgroundcontrol into integration_merge_connstatus

files/styles/style-dark.css

@@ -90,8 +90,14 @@ QGCMAVLinkLogPlayer QLabel:disabled {
 	color: #AAA;
 }
 
+QGCToolBar {
+    border-top-color: #969696;
+    border-bottom-color: #484848;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818);
+}
+
 QGCToolBar QLabel {
-    font-size: 10pt;
+    font-size: 12pt;
     font-weight: bold;
     margin: 3px 2px;
 }
@@ -111,14 +117,32 @@ QGCToolBar QLabel#toolBarTimeoutLabel {
     background-color: #FF0037;
 }
 
+QGCToolBar QProgressBar {
+    height: 26px;
+    max-height: 16px;
+}
+
 QGCToolBar QToolButton {
     margin: 0;
     padding-left: 0;
     padding-right: 0;
+    border: none;
+    border-top: 1px solid #333;
+    border-bottom: 1px solid #333;
     border-radius: 0;
     text-align: left;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #BBB);
+    color: #000;
+}
+
+QGCToolBar QToolButton:checked, QGCToolBar QToolButton:pressed, QGCToolBar QToolButton:checked:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555, stop: 1 #777);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:hover {
+    color: #FFF;
 }
-/*    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop:1 #B37300);*/
 
 QGCToolBar QToolButton#advancedButton {
     margin-left: 0;
@@ -150,6 +174,10 @@ QGCToolWidgetItem {
     margin-top: 1ex; /* leave space at the top for the title */
 }
 
+QGCUnconnectedInfoWidget QPushButton {
+    border-radius: 18px;
+}
+
 QGroupBox {
     border: 1px solid #666;
     border-radius: 3px;
@@ -309,7 +337,7 @@ QPushButton:disabled, QToolButton:disabled {
 }
 
 QPushButton:hover, QToolButton:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666F, stop: 1 #414B52);
 }
 
 QPushButton:hover#connectButton, QPushButton:hover#controlButton {
@@ -454,12 +482,6 @@ QTextEdit {
     border-radius: 2px;
 }
 
-QToolBar {
-    border-top-color: #969696;
-    border-bottom-color: #484848;
-    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;

files/styles/style-light.css

@@ -90,8 +90,14 @@ QGCMAVLinkLogPlayer QLabel:disabled {
 	color: #666;
 }
 
+QGCToolBar {
+    border-top-color: #969696;
+    border-bottom-color: #484848;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999);
+}
+
 QGCToolBar QLabel {
-    font-size: 10pt;
+    font-size: 12pt;
     font-weight: bold;
     margin: 3px 2px;
 }
@@ -111,12 +117,31 @@ QGCToolBar QLabel#toolBarTimeoutLabel {
     background-color: #FF0037;
 }
 
+QGCToolBar QProgressBar {
+    height: 26px;
+    max-height: 16px;
+}
+
 QGCToolBar QToolButton {
     margin: 0;
     padding-left: 0;
     padding-right: 0;
+    border: none;
+    border-top: 1px solid #DDD;
+    border-bottom: 1px solid #DDD;
     border-radius: 0;
     text-align: left;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #333, stop: 1 #444);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:checked, QGCToolBar QToolButton:pressed, QGCToolBar QToolButton:checked:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #999);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:hover {
+    color: #000;
 }
 
 QGCToolBar QToolButton#advancedButton {
@@ -149,6 +174,10 @@ QGCToolWidgetItem {
     margin-top: 1ex; /* leave space at the top for the title */
 }
 
+QGCUnconnectedInfoWidget QPushButton {
+    border-radius: 18px;
+}
+
 QGroupBox {
     border: 1px solid #666;
     border-radius: 3px;
@@ -420,7 +449,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button {
 }
 
 QStatusBar {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999);
 }
 
 QTabBar::tab {
@@ -455,12 +484,6 @@ QTextEdit {
     border-radius: 2px;
 }
 
-QToolBar {
-    border-top-color: #969696;
-    border-bottom-color: #484848;
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
-}
-
 QToolButton {
     padding-left: 3px;
     padding-right: 3px;

src/ui/uas/QGCUnconnectedInfoWidget.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -29,7 +29,7 @@
    <item row="0" column="0">
     <widget class="QPushButton" name="connectButton">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>