From 9fb46a100df61f13a6308e227d65b4acf674cd20 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Mon, 29 Apr 2013 23:20:45 +0200
Subject: [PATCH] More usability improvements

---
 files/styles/style-indoor.css          |  8 +++-----
 src/ui/MainWindow.cc                   |  2 +-
 src/ui/QGCStatusBar.cc                 |  4 +++-
 src/ui/QGCToolBar.cc                   |  2 +-
 src/ui/uas/QGCUnconnectedInfoWidget.cc |  2 +-
 src/ui/uas/QGCUnconnectedInfoWidget.ui | 26 ++++++++++++++++----------
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/files/styles/style-indoor.css b/files/styles/style-indoor.css
index 43a75afca..5989e6c88 100644
--- a/files/styles/style-indoor.css
+++ b/files/styles/style-indoor.css
@@ -1,13 +1,11 @@
-* { font-family: "Bitstream Vera Sans"; font: "Roman"; font-size: 12px; border: 0px solid; }
+/** { font-family: "Bitstream Vera Sans"; font: "Roman"; font-size: 12px; }*/
 QWidget#colorIcon {}
 
 QWidget {
-background-color: #151518;
+background-color: #191919;
 color: #DDDDDF;
-background-clip: border;
+/*background-clip: border;*/
 font-size: 11px;
-border: 0px;
-padding: 1px;
 }
 
 QGroupBox {
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 94d2e7525..c32b2d596 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -1672,7 +1672,7 @@ void MainWindow::loadViewState()
             headUpDockWidget->show();
             video1DockWidget->hide();
             video2DockWidget->hide();
-            mavlinkInspectorWidget->show();
+            mavlinkInspectorWidget->hide();
             break;
         }
     }
diff --git a/src/ui/QGCStatusBar.cc b/src/ui/QGCStatusBar.cc
index 52467e151..88362a3aa 100644
--- a/src/ui/QGCStatusBar.cc
+++ b/src/ui/QGCStatusBar.cc
@@ -44,7 +44,9 @@ QGCStatusBar::QGCStatusBar(QWidget *parent) :
 
     loadSettings();
 
-    setStyleSheet("QStatusBar {margin: 1px; border-bottom: 1px solid #252525; border-top: 1px solid #969696; padding: 1px");
+    //setStyleSheet("QStatusBar {margin: 1px; border-bottom: 1px solid #252525; border-top: 1px solid #969696; padding: 1px");
+    setStyleSheet("* { border-color: transparent; margin: 0px; } QWidget { border-color: transparent; } QStatusBar {border-bottom: 1px solid #101010; border-top: 1px solid #4F4F4F; 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);}");
+
 }
 
 void QGCStatusBar::setLogPlayer(QGCMAVLinkLogPlayer* player)
diff --git a/src/ui/QGCToolBar.cc b/src/ui/QGCToolBar.cc
index 333c2e742..eb8b351cd 100644
--- a/src/ui/QGCToolBar.cc
+++ b/src/ui/QGCToolBar.cc
@@ -75,7 +75,7 @@ void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms)
 
 void QGCToolBar::createUI()
 {
-    setStyleSheet("QToolBar {margin: 1px; border-bottom: 1px solid #484848; border-top: 1px solid #969696; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #8B8B8B, stop:0.3 #808080, stop:0.34 #747474, stop:1 #484848);}");
+    setStyleSheet("QToolBar {margin: 0px; border-bottom: 1px solid #484848; border-top: 1px solid #969696; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #8B8B8B, stop:0.3 #808080, stop:0.34 #747474, stop:1 #484848);}");
 
     // CREATE TOOLBAR ITEMS
     // Add internal actions
diff --git a/src/ui/uas/QGCUnconnectedInfoWidget.cc b/src/ui/uas/QGCUnconnectedInfoWidget.cc
index 296f95c2b..f0bec6267 100644
--- a/src/ui/uas/QGCUnconnectedInfoWidget.cc
+++ b/src/ui/uas/QGCUnconnectedInfoWidget.cc
@@ -11,7 +11,7 @@ QGCUnconnectedInfoWidget::QGCUnconnectedInfoWidget(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    connect(ui->simulationButton, SIGNAL(clicked()), this, SLOT(simulate()));
+    //connect(ui->simulationButton, SIGNAL(clicked()), this, SLOT(simulate()));
     connect(ui->connectButton, SIGNAL(clicked()), this, SLOT(addLink()));
 
     // Overwrite global style sheet
diff --git a/src/ui/uas/QGCUnconnectedInfoWidget.ui b/src/ui/uas/QGCUnconnectedInfoWidget.ui
index 8b49cd27e..5999885e3 100644
--- a/src/ui/uas/QGCUnconnectedInfoWidget.ui
+++ b/src/ui/uas/QGCUnconnectedInfoWidget.ui
@@ -7,20 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>372</width>
-    <height>288</height>
+    <height>299</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowstretch="100,1">
-   <item row="1" column="0">
-    <widget class="QPushButton" name="simulationButton">
-     <property name="text">
-      <string>Demo Mode</string>
-     </property>
-    </widget>
-   </item>
+  <layout class="QGridLayout" name="gridLayout" rowstretch="90,100">
    <item row="0" column="0">
     <widget class="QToolButton" name="connectButton">
      <property name="minimumSize">
@@ -33,7 +26,7 @@
       <string notr="true"/>
      </property>
      <property name="text">
-      <string>Connect to Autopilot</string>
+      <string>Click Icon to Connect</string>
      </property>
      <property name="icon">
       <iconset resource="../../../qgroundcontrol.qrc">
@@ -50,6 +43,19 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources>
-- 
2.22.0