Merge pull request #1391 from dogmaphobic/cleanupToolbar

Removing old Tool Bar code.

qgroundcontrol.pro

@@ -425,7 +425,6 @@ HEADERS += \
     src/ui/map/QGCMapTool.h \
     src/ui/map/QGCMapToolBar.h \
     src/QGCGeo.h \
-    src/ui/QGCToolBar.h \
     src/ui/QGCMAVLinkInspector.h \
     src/ui/MAVLinkDecoder.h \
     src/ui/WaypointViewOnlyView.h \
@@ -571,7 +570,6 @@ SOURCES += \
     src/ui/map/Waypoint2DIcon.cc \
     src/ui/map/QGCMapTool.cc \
     src/ui/map/QGCMapToolBar.cc \
-    src/ui/QGCToolBar.cc \
     src/ui/QGCMAVLinkInspector.cc \
     src/ui/MAVLinkDecoder.cc \
     src/ui/WaypointViewOnlyView.cc \

src/qgcunittest/MainWindowTest.cc

@@ -27,7 +27,6 @@
 ///     @author Don Gagne <don@thegagnes.com>
 
 #include "MainWindowTest.h"
-#include "QGCToolBar.h"
 #include "MockLink.h"
 #include "QGCMessageBox.h"
 

src/ui/MainWindow.h

@@ -61,7 +61,6 @@ This file is part of the QGROUNDCONTROL project
 #include "QGCGoogleEarthView.h"
 #endif
 #include "MainToolBar.h"
-#include "QGCToolBar.h"
 #include "LogCompressor.h"
 
 #include "QGCMAVLinkInspector.h"
@@ -255,8 +254,6 @@ protected:
     QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
 
     QPointer<MainToolBar> _mainToolBar;
-    QPointer<QGCToolBar> toolBar;
-
     QPointer<QDockWidget> mavlinkInspectorWidget;
     QPointer<MAVLinkDecoder> mavlinkDecoder;
     QPointer<QDockWidget> mavlinkSenderWidget;

src/ui/QGCToolBar.h

-/*=====================================================================
-
-QGroundControl Open Source Ground Control Station
-
-(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
-
-This file is part of the QGROUNDCONTROL project
-
-    QGROUNDCONTROL is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    QGROUNDCONTROL is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
-
-======================================================================*/
-
-#ifndef QGCTOOLBAR_H
-#define QGCTOOLBAR_H
-
-#include <QToolBar>
-#include <QAction>
-#include <QToolButton>
-#include <QPushButton>
-#include <QLabel>
-#include <QProgressBar>
-#include <QComboBox>
-#include <QTimer>
-
-#include "UASInterface.h"
-#include "SerialLink.h"
-#include "LinkManager.h"
-
-class UASMessageViewRollDown;
-
-class QGCToolBar : public QToolBar
-{
-    Q_OBJECT
-
-public:
-    explicit QGCToolBar(QWidget* parent = 0);
-    void setPerspectiveChangeActions(const QList<QAction*> &action);
-    void setPerspectiveChangeAdvancedActions(const QList<QAction*> &action);
-    /**
-     * @brief Mouse entered Message label area
-     */
-    void enterMessageLabel();
-    /**
-     * @brief Mouse left message drop down list area (and closed it)
-     */
-    void leaveMessageView();
-
-public slots:
-    /** @brief Set the system that is currently displayed by this widget */
-    void setActiveUAS(UASInterface* active);
-    /** @brief Set the system state */
-    void updateState(UASInterface* system, QString name, QString description);
-    /** @brief Set the system mode */
-    void updateMode(int system, QString name, QString description);
-    /** @brief Update the system name */
-    void updateName(const QString& name);
-    /** @brief Set the MAV system type */
-    void setSystemType(UASInterface* uas, unsigned int systemType);
-    /** @brief Received system text message */
-    void receiveTextMessage(int uasid, int componentid, int severity, QString text);
-    /** @brief Update battery charge state */
-    void updateBatteryRemaining(UASInterface* uas, double voltage, double current, double percent, int seconds);
-    /** @brief Update current waypoint */
-    void updateCurrentWaypoint(quint16 id);
-    /** @brief Update distance to current waypoint */
-    void updateWaypointDistance(double distance);
-    /** @brief Update arming state */
-    void updateArmingState(bool armed);
-    /** @brief Repaint widgets */
-    void updateView();
-    /** @brief Update connection timeout time */
-    void heartbeatTimeout(bool timeout, unsigned int ms);
-    /** @brief Set an activity action as checked in menu */
-    void advancedActivityTriggered(QAction* action);
-
-protected:
-    void createUI();
-    void resetToolbarUI();
-    UASInterface* mav;
-    QLabel* symbolLabel;
-    QLabel* toolBarNameLabel;
-    QLabel* toolBarTimeoutLabel;
-    QAction* toolBarTimeoutAction; ///< Needed to set label (in)visible.
-    QAction* toolBarMessageAction;
-    QAction* toolBarWpAction;
-    QAction* toolBarBatteryBarAction;
-    QAction* toolBarBatteryVoltageAction;
-    QLabel* toolBarSafetyLabel;
-    QLabel* toolBarModeLabel;
-    QLabel* toolBarStateLabel;
-    QLabel* toolBarWpLabel;
-    QLabel* toolBarMessageLabel;
-    QProgressBar* toolBarBatteryBar;
-    QLabel* toolBarBatteryVoltageLabel;
-
-    bool changed;
-    float batteryPercent;
-    float batteryVoltage;
-    int wpId;
-    double wpDistance;
-    float altitudeRel;
-    QString state;
-    QString mode;
-    QString systemName;
-    QString lastSystemMessage;
-    quint64 lastSystemMessageTimeMs;
-    QTimer updateViewTimer;
-    bool systemArmed;
-    LinkInterface* currentLink;
-    QAction* firstAction;
-    QToolButton *advancedButton;
-    QButtonGroup *group;
-
-private slots:
-    void _linkConnected(LinkInterface* link);
-    void _linkDisconnected(LinkInterface* link);
-    void _disconnectFromMenu(bool checked);
-    void _connectButtonClicked(bool checked);
-    void _linkComboActivated(int index);
-    void _updateConfigurations();
-
-private:
-    void _updateConnectButton(LinkInterface* disconnectedLink = NULL);
-
-    LinkManager*    _linkMgr;
-
-    QComboBox*  _linkCombo;
-    QAction*    _linkComboAction;
-
-    UASMessageViewRollDown* _rollDownMessages;
-
-    QPushButton*    _connectButton;
-    bool            _linksConnected;
-    bool            _linkSelected;      // User selected a link. Stop autoselecting it.
-};
-
-#endif // QGCTOOLBAR_H