Whoops. Look like you can't inherit from QToolBar using Qt Designer. Restored last set of code. Also, changed one of the QToolButtons to a QLabel in QGCToolbar.

files/styles/style-light.css

@@ -70,6 +70,10 @@ QDockWidget::title {
     height: 14px;
 }
 
+QGCToolBar {
+    min-height: 60px;
+}
+
 QGCToolWidgetItem {
     border: 1px solid #666;
     border-radius: 3px;
@@ -408,6 +412,43 @@ QToolBar {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
 }
 
+QToolButton#symbolButton {
+    margin-left: 10px;
+    background-color: #050508;
+    color: #DDD;
+    background-clip: border;
+}
+QLabel#toolBarTimeoutLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px;
+ border-radius: 4px;
+}
+QLabel#toolBarBatteryVoltageLabel {
+    margin: 0 0 0 4px; font: 14px; 
+}
+QLabel#toolBarWpLabel { margin: 3px 2px; font: 18px; color: #ACEBFE; }
+QLabel#toolBarMessageLabel { margin: 3px 2px; font: 14px; color: #ACEBFE; }
+QPushButton#connectButton {min-height: 20px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5AAA49, stop: 1 #106B38);  margin-left: 4px; margin-right: 4px; border-radius: 4px; border: 1px solid #085B35; }
+QPushButton:checked#connectButton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #FFD450); color: #222; border-color: #D1892A}
+QLabel#toolBarSafetyLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px; color: #14C814; }
+QLabel#toolBarModeLabel { margin: 3px 2px; font: 14px; color: #ACEBFE; }
+QLabel#toolBarStateLabel { margin: 3px 2px; font: 14px; color: #FEC654; }
+QToolButton#firstAction { min-width: 60px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 8px; margin-right: 0px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-left-radius: 6px; border-top-left-radius: 6px; border-left: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
+QToolButton:checked#firstAction { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
+QGCToolBar QToolButton { min-width: 60px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8);  margin-left: -2px; margin-right: -2px; padding-left: 0px; padding-right: 0px; border-radius: 0px; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
+QGCToolBar QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
+QPushButton#advancedButton { min-width: 60px; font-weight: bold; text-align: left; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8);  margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; }
+QPushButton:checked#advancedButton { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
+
+QGCToolBar QMenu { font-weight: bold; min-width: 70px; color: #222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); border: 1px solid #484848; }
+QGCToolBar QMenu::item:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDD; }
+
+QGCToolBar .QWidget {
+    margin: 0px;
+background-color: transparent;
+min-height: 24px;
+    background-color: #F00;
+}
+
+            
 QToolTip {
     background-color: #F6F6F6;
     border:0 solid #379AC3;

qgroundcontrol.pro

@@ -226,8 +226,7 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/QGCHilXPlaneConfiguration.ui \
     src/ui/designer/QGCComboBox.ui \
     src/ui/designer/QGCTextLabel.ui \
-    src/ui/uas/UASQuickView.ui \
-    src/ui/QGCToolBar.ui
+    src/ui/uas/UASQuickView.ui
 INCLUDEPATH += src \
     src/ui \
     src/ui/linechart \

src/ui/QGCToolBar.cc

@@ -25,7 +25,6 @@ This file is part of the QGROUNDCONTROL project
 #include <QLabel>
 #include <QSpacerItem>
 #include "QGCToolBar.h"
-#include "ui_QGCToolBar.h"
 #include "UASManager.h"
 #include "MainWindow.h"
 
@@ -40,9 +39,9 @@ QGCToolBar::QGCToolBar(QWidget *parent) :
     wpDistance(0),
     systemArmed(false),
     currentLink(NULL),
-    firstAction(NULL),
-    m_ui(new Ui::QGCToolBar)
+    firstAction(NULL)
 {
+    setObjectName("QGCToolBar");
 
     // Do not load UI, wait for actions
 }
@@ -65,11 +64,11 @@ void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms)
         // Alternate colors to increase visibility
         if ((ms / 1000) % 2 == 0)
         {
-            toolBarTimeoutLabel->setStyleSheet(QString("QLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px; color: %1; background-color: %2; border-radius: 4px;}").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.name()));
+            toolBarTimeoutLabel->setStyleSheet(QString("QLabel {color: %1; background-color: %2;}").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.name()));
         }
         else
         {
-            toolBarTimeoutLabel->setStyleSheet(QString("QLabel { margin: 3px 2px; padding: 2px; padding-left: 4px; padding-right: 4px; font: 14px; color: %1; background-color: %2; border-radius: 4px;}").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.dark(250).name()));
+            toolBarTimeoutLabel->setStyleSheet(QString("QLabel {color: %1; background-color: %2;}").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.dark(250).name()));
         }
         toolBarTimeoutLabel->setText(tr("CONNECTION LOST: %1 s").arg((ms / 1000.0f), 2, 'f', 1, ' '));
     }
@@ -86,7 +85,76 @@ void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms)
 
 void QGCToolBar::createUI()
 {
-    m_ui->setupUi(this);
+    // CREATE TOOLBAR ITEMS
+    // Add internal actions
+    // Add MAV widget
+    symbolLabel = new QLabel(this);
+    addWidget(symbolLabel);
+
+    toolBarNameLabel = new QLabel("------", this);
+    toolBarNameLabel->setToolTip(tr("Currently controlled vehicle"));
+    toolBarNameLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarNameLabel);
+
+    toolBarTimeoutLabel = new QLabel("UNCONNECTED", this);
+    toolBarTimeoutLabel->setToolTip(tr("System timed out, interval since last message"));
+    toolBarTimeoutLabel->setStyleSheet(QString("QLabel {color: %1; background-color: %2;}").arg(QGC::colorDarkWhite.name()).arg(QGC::colorMagenta.name()));
+    toolBarTimeoutLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarTimeoutLabel);
+
+    toolBarSafetyLabel = new QLabel("SAFE", this);
+    toolBarSafetyLabel->setToolTip(tr("Vehicle safety state"));
+    toolBarSafetyLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarSafetyLabel);
+
+    toolBarModeLabel = new QLabel("------", this);
+    toolBarModeLabel->setToolTip(tr("Vehicle mode"));
+    toolBarModeLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarModeLabel);
+
+    toolBarStateLabel = new QLabel("------", this);
+    toolBarStateLabel->setToolTip(tr("Vehicle state"));
+    toolBarStateLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarStateLabel);
+
+    toolBarBatteryBar = new QProgressBar(this);
+    toolBarBatteryBar->setMinimum(0);
+    toolBarBatteryBar->setMaximum(100);
+    toolBarBatteryBar->setMinimumWidth(20);
+    toolBarBatteryBar->setMaximumWidth(100);
+    toolBarBatteryBar->setValue(0);
+    toolBarBatteryBar->setToolTip(tr("Battery charge level"));
+    toolBarBatteryBar->setObjectName("toolBarBatteryBar");
+    addWidget(toolBarBatteryBar);
+
+    toolBarBatteryVoltageLabel = new QLabel("xx.x V");
+    toolBarBatteryVoltageLabel->setStyleSheet(QString("QLabel {color: %1; }").arg(QColor(Qt::green).name()));
+    toolBarBatteryVoltageLabel->setToolTip(tr("Battery voltage"));
+    toolBarBatteryVoltageLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarBatteryVoltageLabel);
+
+    toolBarWpLabel = new QLabel("WP--", this);
+    toolBarWpLabel->setToolTip(tr("Current waypoint"));
+    toolBarWpLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarWpLabel);
+
+    toolBarDistLabel = new QLabel("--- ---- m", this);
+    toolBarDistLabel->setToolTip(tr("Distance to current waypoint"));
+    toolBarDistLabel->setAlignment(Qt::AlignCenter);
+    addWidget(toolBarDistLabel);
+
+    toolBarMessageLabel = new QLabel("", this);
+    toolBarMessageLabel->setToolTip(tr("Most recent system message"));
+    addWidget(toolBarMessageLabel);
+
+    QWidget* spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    addWidget(spacer);
+
+    connectButton = new QPushButton(tr("Connect"), this);
+    connectButton->setToolTip(tr("Connect wireless link to MAV"));
+    connectButton->setCheckable(true);
+    addWidget(connectButton);
     connect(connectButton, SIGNAL(clicked(bool)), this, SLOT(connectLink(bool)));
 
     // DONE INITIALIZING BUTTONS
@@ -130,7 +198,7 @@ void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions)
         first->setCheckable(true);
         connect(first, SIGNAL(clicked(bool)), actions.first(), SIGNAL(triggered(bool)));
         connect(actions.first(),SIGNAL(triggered(bool)),first,SLOT(setChecked(bool)));
-        first->setStyleSheet("QToolButton { min-width: 60px; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 8px; margin-right: 0px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-left-radius: 6px; border-top-left-radius: 6px; border-left: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
+        first->setObjectName("firstAction");
         addWidget(first);
         group->addButton(first);
 
@@ -146,7 +214,6 @@ void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions)
             btn->setCheckable(true);
             connect(btn, SIGNAL(clicked(bool)), actions.at(i), SIGNAL(triggered(bool)));
             connect(actions.at(i),SIGNAL(triggered(bool)),btn,SLOT(setChecked(bool)));
-            btn->setStyleSheet("QToolButton { min-width: 60px; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8);  margin-left: -2px; margin-right: -2px; padding-left: 0px; padding-right: 0px; border-radius: 0px; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
             addWidget(btn);
             group->addButton(btn);
         }
@@ -158,14 +225,14 @@ void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions)
         advancedButton->setText(tr("Pro"));
         advancedButton->setToolTip(tr("Options for advanced users"));
         advancedButton->setCheckable(true);
-        advancedButton->setStyleSheet("QPushButton { min-width: 60px; font-weight: bold; text-align: left; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8);  margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QPushButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
+        advancedButton->setObjectName("advancedButton");
         addWidget(advancedButton);
         group->addButton(advancedButton);
     } else {
         qDebug() << __FILE__ << __LINE__ << "Not enough perspective change actions provided";
     }
 
-    // Add the rest
+    // Add the "rest"
     createUI();
 }
 
@@ -181,8 +248,6 @@ void QGCToolBar::setPerspectiveChangeAdvancedActions(const QList<QAction*> &acti
             menu->addAction(actions.at(i));
         }
 
-        menu->setStyleSheet("QMenu { font-weight: bold; min-width: 70px; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); border: 1px solid #484848; } QMenu::item:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
-
         advancedButton->setMenu(menu);
         connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(advancedActivityTriggered(QAction*)));
 
@@ -243,7 +308,7 @@ void QGCToolBar::setActiveUAS(UASInterface* active)
     systemArmed = mav->isArmed();
     toolBarNameLabel->setText(mav->getUASName());
     toolBarNameLabel->setStyleSheet(QString("QLabel { font: bold 16px; color: %1; }").arg(mav->getColor().name()));
-    symbolButton->setStyleSheet(QString("QWidget { background-color: %1; color: #DDDDDF; background-clip: border; } QToolButton { font-weight: bold; font-size: 14px; border: 0px solid #484848; border-radius: 5px; min-width:22px; max-width: 22px; min-height: 22px; max-height: 22px; padding: 0px; margin: 0px 4px 0px 20px; background-color: none; }").arg(mav->getColor().name()));
+    symbolLabel->setStyleSheet(QString("QWidget { background-color: %1; color: #DDDDDF; background-clip: border; } QToolButton { font-weight: bold; font-size: 14px; border: 0px solid #484848; border-radius: 5px; min-width:22px; max-width: 22px; min-height: 22px; max-height: 22px; padding: 0px; margin: 0px 4px 0px 20px; background-color: none; }").arg(mav->getColor().name()));
     toolBarModeLabel->setText(mav->getShortMode());
     toolBarStateLabel->setText(mav->getShortState());
     toolBarTimeoutLabel->setStyleSheet(QString(""));
@@ -367,61 +432,61 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
         // Set matching icon
         switch (systemType) {
         case MAV_TYPE_GENERIC:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/generic.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/generic.svg"));
             break;
         case MAV_TYPE_FIXED_WING:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/fixed-wing.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/fixed-wing.svg"));
             break;
         case MAV_TYPE_QUADROTOR:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/quadrotor.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/quadrotor.svg"));
             break;
         case MAV_TYPE_COAXIAL:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/coaxial.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/coaxial.svg"));
             break;
         case MAV_TYPE_HELICOPTER:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/helicopter.svg"));
             break;
         case MAV_TYPE_ANTENNA_TRACKER:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/antenna-tracker.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/antenna-tracker.svg"));
             break;
         case MAV_TYPE_GCS:
-            symbolButton->setIcon(QIcon(":files/images/mavs/groundstation.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/groundstation.svg"));
             break;
         case MAV_TYPE_AIRSHIP:
-            symbolButton->setIcon(QIcon(":files/images/mavs/airship.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/airship.svg"));
             break;
         case MAV_TYPE_FREE_BALLOON:
-            symbolButton->setIcon(QIcon(":files/images/mavs/free-balloon.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/free-balloon.svg"));
             break;
         case MAV_TYPE_ROCKET:
-            symbolButton->setIcon(QIcon(":files/images/mavs/rocket.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/rocket.svg"));
             break;
         case MAV_TYPE_GROUND_ROVER:
-            symbolButton->setIcon(QIcon(":files/images/mavs/ground-rover.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/ground-rover.svg"));
             break;
         case MAV_TYPE_SURFACE_BOAT:
-            symbolButton->setIcon(QIcon(":files/images/mavs/surface-boat.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/surface-boat.svg"));
             break;
         case MAV_TYPE_SUBMARINE:
-            symbolButton->setIcon(QIcon(":files/images/mavs/submarine.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/submarine.svg"));
             break;
         case MAV_TYPE_HEXAROTOR:
-            symbolButton->setIcon(QIcon(":files/images/mavs/hexarotor.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/hexarotor.svg"));
             break;
         case MAV_TYPE_OCTOROTOR:
-            symbolButton->setIcon(QIcon(":files/images/mavs/octorotor.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/octorotor.svg"));
             break;
         case MAV_TYPE_TRICOPTER:
-            symbolButton->setIcon(QIcon(":files/images/mavs/tricopter.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/tricopter.svg"));
             break;
         case MAV_TYPE_FLAPPING_WING:
-            symbolButton->setIcon(QIcon(":files/images/mavs/flapping-wing.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/flapping-wing.svg"));
             break;
         case MAV_TYPE_KITE:
-            symbolButton->setIcon(QIcon(":files/images/mavs/kite.svg"));
+            symbolLabel->setPixmap(QPixmap(":files/images/mavs/kite.svg"));
             break;
         default:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/unknown.svg"));
+            symbolLabel->setPixmap(QPixmap(":/files/images/mavs/unknown.svg"));
             break;
         }
 }

src/ui/QGCToolBar.h

@@ -32,7 +32,6 @@ This file is part of the QGROUNDCONTROL project
 #include <QProgressBar>
 #include "UASInterface.h"
 #include "QGCMAVLinkLogPlayer.h"
-#include "ui_QGCToolBar.h"
 
 class QGCToolBar : public QToolBar
 {
@@ -91,7 +90,7 @@ protected:
     void createUI();
 
     UASInterface* mav;
-    QToolButton* symbolButton;
+    QLabel* symbolLabel;
     QLabel* toolBarNameLabel;
     QLabel* toolBarTimeoutLabel;
     QLabel* toolBarSafetyLabel;
@@ -122,8 +121,6 @@ protected:
     QAction* firstAction;
     QPushButton *advancedButton;
     QButtonGroup *group;
-private:
-    Ui::QGCToolBar *m_ui;
 };
 
 #endif // QGCTOOLBAR_H

src/ui/QGCToolBar.ui

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QGCToolBar</class>
- <widget class="QWidget" name="QGCToolBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>640</width>
-    <height>66</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QLabel" name="symbolLabel">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="pixmap">
-      <pixmap resource="../../qgroundcontrol.qrc">:/files/images/mavs/unknown.svg</pixmap>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarNameLabel">
-     <property name="toolTip">
-      <string>Currently controlled vehicle</string>
-     </property>
-     <property name="text">
-      <string>------</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarSafetyLabel">
-     <property name="toolTip">
-      <string>Vehicle safety state</string>
-     </property>
-     <property name="text">
-      <string>SAFE</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarTimeoutLabel">
-     <property name="toolTip">
-      <string>System timed out, interval since last message</string>
-     </property>
-     <property name="text">
-      <string>UNCONNECTED</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarModeLabel">
-     <property name="toolTip">
-      <string>Vehicle mode</string>
-     </property>
-     <property name="text">
-      <string>------</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarStateLabel">
-     <property name="toolTip">
-      <string>Vehicle state</string>
-     </property>
-     <property name="text">
-      <string>------</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="toolBarBatteryBar">
-     <property name="toolTip">
-      <string>Battery charge level</string>
-     </property>
-     <property name="value">
-      <number>24</number>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarBatteryVoltageLabel">
-     <property name="toolTip">
-      <string>Battery voltage</string>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>xx.x V</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarStateLabel_2">
-     <property name="toolTip">
-      <string>Most recent system message</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarWpLabel">
-     <property name="toolTip">
-      <string>Current waypoint</string>
-     </property>
-     <property name="text">
-      <string>WP--</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarDistLabel">
-     <property name="toolTip">
-      <string>Distance to current waypoint</string>
-     </property>
-     <property name="text">
-      <string>-- ---- m</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="toolBarMessageLabel">
-     <property name="toolTip">
-      <string>Most recent system message</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>24</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QPushButton" name="connectButton">
-     <property name="toolTip">
-      <string>Connect wireless link to MAV</string>
-     </property>
-     <property name="text">
-      <string>Connect</string>
-     </property>
-     <property name="checkable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="../../qgroundcontrol.qrc"/>
- </resources>
- <connections/>
-</ui>