Commit e656040b authored by John Tapsell's avatar John Tapsell

Make the menu "Perspectives" menu options order and naming match the main tab

parent f2165ddb
...@@ -216,8 +216,6 @@ void MainWindow::init() ...@@ -216,8 +216,6 @@ void MainWindow::init()
toolBar = new QGCToolBar(this); toolBar = new QGCToolBar(this);
this->addToolBar(toolBar); this->addToolBar(toolBar);
ui.actionHardwareConfig->setText(tr("Config"));
// Add actions for average users (displayed next to each other) // Add actions for average users (displayed next to each other)
QList<QAction*> actions; QList<QAction*> actions;
actions << ui.actionFlightView; actions << ui.actionFlightView;
...@@ -232,6 +230,8 @@ void MainWindow::init() ...@@ -232,6 +230,8 @@ void MainWindow::init()
advancedActions << ui.actionEngineersView; advancedActions << ui.actionEngineersView;
toolBar->setPerspectiveChangeAdvancedActions(advancedActions); toolBar->setPerspectiveChangeAdvancedActions(advancedActions);
} else {
ui.actionHardwareConfig->setText(tr("Hardware"));
} }
customStatusBar = new QGCStatusBar(this); customStatusBar = new QGCStatusBar(this);
......
...@@ -95,13 +95,13 @@ ...@@ -95,13 +95,13 @@
<property name="title"> <property name="title">
<string>Perspectives</string> <string>Perspectives</string>
</property> </property>
<addaction name="actionMissionView"/>
<addaction name="actionFlightView"/> <addaction name="actionFlightView"/>
<addaction name="actionMissionView"/>
<addaction name="actionHardwareConfig"/> <addaction name="actionHardwareConfig"/>
<addaction name="actionSoftwareConfig"/> <addaction name="actionSoftwareConfig"/>
<addaction name="actionTerminalView"/> <addaction name="actionTerminalView"/>
<addaction name="actionEngineersView"/>
<addaction name="actionSimulationView"/> <addaction name="actionSimulationView"/>
<addaction name="actionEngineersView"/>
<addaction name="actionGoogleEarthView"/> <addaction name="actionGoogleEarthView"/>
<addaction name="actionLocal3DView"/> <addaction name="actionLocal3DView"/>
<addaction name="separator"/> <addaction name="separator"/>
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
<normaloff>:/files/images/categories/preferences-system.svg</normaloff>:/files/images/categories/preferences-system.svg</iconset> <normaloff>:/files/images/categories/preferences-system.svg</normaloff>:/files/images/categories/preferences-system.svg</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Hardware</string> <string>Config</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Configuration options of the vehicle.</string> <string>Configuration options of the vehicle.</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment