Browse Source

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

QGC4.4
John Tapsell 11 years ago
parent
commit
e656040bb9
  1. 4
      src/ui/MainWindow.cc
  2. 6
      src/ui/MainWindow.ui

4
src/ui/MainWindow.cc

@ -216,8 +216,6 @@ void MainWindow::init() @@ -216,8 +216,6 @@ void MainWindow::init()
toolBar = new QGCToolBar(this);
this->addToolBar(toolBar);
ui.actionHardwareConfig->setText(tr("Config"));
// Add actions for average users (displayed next to each other)
QList<QAction*> actions;
actions << ui.actionFlightView;
@ -232,6 +230,8 @@ void MainWindow::init() @@ -232,6 +230,8 @@ void MainWindow::init()
advancedActions << ui.actionEngineersView;
toolBar->setPerspectiveChangeAdvancedActions(advancedActions);
} else {
ui.actionHardwareConfig->setText(tr("Hardware"));
}
customStatusBar = new QGCStatusBar(this);

6
src/ui/MainWindow.ui

@ -95,13 +95,13 @@ @@ -95,13 +95,13 @@
<property name="title">
<string>Perspectives</string>
</property>
<addaction name="actionMissionView"/>
<addaction name="actionFlightView"/>
<addaction name="actionMissionView"/>
<addaction name="actionHardwareConfig"/>
<addaction name="actionSoftwareConfig"/>
<addaction name="actionTerminalView"/>
<addaction name="actionEngineersView"/>
<addaction name="actionSimulationView"/>
<addaction name="actionEngineersView"/>
<addaction name="actionGoogleEarthView"/>
<addaction name="actionLocal3DView"/>
<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>
</property>
<property name="text">
<string>Hardware</string>
<string>Config</string>
</property>
<property name="toolTip">
<string>Configuration options of the vehicle.</string>

Loading…
Cancel
Save