Skip to content
GitLab
Commit 93ad9a29 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Merged MainWindow reorg

parents a4af4d4d d96e83d5
Hide whitespace changes
Inline Side-by-side
src/ui/MainWindow.cc
View file @ 93ad9a29
......@@ -1314,11 +1314,6 @@ void MainWindow::loadSimulationView()
}
}
QList<QAction*> MainWindow::listLinkMenuActions()
{
return _ui.menuNetwork->actions();
}
/// @brief Hides the spash screen if it is currently being shown
void MainWindow::hideSplashScreen(void)
{
......
src/ui/MainWindow.h
View file @ 93ad9a29
......@@ -118,8 +118,6 @@ public:
return _lowPowerMode;
}
QList<QAction*> listLinkMenuActions();
void hideSplashScreen(void);
/// @brief Saves the last used connection
......@@ -240,8 +238,6 @@ protected:
void storeSettings();
LinkInterface* udpLink;
QSettings settings;
// Center widgets
......
src/ui/MainWindow.ui
View file @ 93ad9a29
......@@ -58,28 +58,13 @@
<property name="title">
<string>File</string>
</property>
<addaction name="actionSimulate"/>
<addaction name="separator"/>
<addaction name="actionMuteAudioOutput"/>
<addaction name="actionAdd_Link"/>
<addaction name="actionSettings"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuNetwork">
<property name="title">
<string>Communication</string>
</property>
<addaction name="actionAdd_Link"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menuTools">
<property name="title">
<string>Tool Widgets</string>
</property>
<addaction name="actionNewCustomWidget"/>
<addaction name="actionLoadCustomWidgetFile"/>
<addaction name="separator"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
......@@ -96,26 +81,38 @@
<addaction name="actionMissionView"/>
<addaction name="actionFlightView"/>
<addaction name="actionEngineersView"/>
<addaction name="separator"/>
<addaction name="actionFullscreen"/>
<addaction name="actionNormal"/>
</widget>
<widget class="QMenu" name="menuAdvanced">
<property name="title">
<string>Advanced</string>
</property>
<widget class="QMenu" name="menuTools">
<property name="title">
<string>Tool Widgets</string>
</property>
<addaction name="actionNewCustomWidget"/>
<addaction name="actionLoadCustomWidgetFile"/>
<addaction name="separator"/>
</widget>
<addaction name="actionGoogleEarthView"/>
<addaction name="actionLocal3DView"/>
<addaction name="actionTerminalView"/>
<addaction name="actionSimulationView"/>
<addaction name="separator"/>
<addaction name="actionFullscreen"/>
<addaction name="actionNormal"/>
<addaction name="actionSimulate"/>
<addaction name="separator"/>
<addaction name="menuTools"/>
</widget>
<addaction name="menuMGround"/>
<addaction name="menuNetwork"/>
<addaction name="menuPerspectives"/>
<addaction name="menuTools"/>
<addaction name="menuAdvanced"/>
<addaction name="menuHelp"/>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="actionExit">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/actions/system-log-out.svg</normaloff>:/files/images/actions/system-log-out.svg</iconset>
</property>
<property name="text">
<string>Exit</string>
</property>
......@@ -171,17 +168,13 @@
</action>
<action name="actionAdd_Link">
<property name="text">
<string>Manage Links</string>
<string>Manage Communication Links</string>
</property>
</action>
<action name="actionSimulate">
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/control/launch.svg</normaloff>:/files/images/control/launch.svg</iconset>
</property>
<property name="text">
<string>Simulate</string>
</property>
......@@ -190,28 +183,16 @@
</property>
</action>
<action name="actionOnline_Documentation">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>Online Documentation</string>
</property>
</action>
<action name="actionProject_Roadmap">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/software-update-available.svg</normaloff>:/files/images/status/software-update-available.svg</iconset>
</property>
<property name="text">
<string>Project Roadmap</string>
</property>
</action>
<action name="actionDeveloper_Credits">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/categories/preferences-system.svg</normaloff>:/files/images/categories/preferences-system.svg</iconset>
</property>
<property name="text">
<string>Developer Credits</string>
</property>
......@@ -220,10 +201,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/categories/applications-internet.svg</normaloff>:/files/images/categories/applications-internet.svg</iconset>
</property>
<property name="text">
<string>Plan</string>
</property>
......@@ -232,10 +209,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>Analyze</string>
</property>
......@@ -244,19 +217,11 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/network-wireless-encrypted.svg</normaloff>:/files/images/status/network-wireless-encrypted.svg</iconset>
</property>
<property name="text">
<string>Fly</string>
</property>
</action>
<action name="actionNewCustomWidget">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/apps/utilities-system-monitor.svg</normaloff>:/files/images/apps/utilities-system-monitor.svg</iconset>
</property>
<property name="text">
<string>New Custom Widget</string>
</property>
......@@ -265,14 +230,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/audio-volume-high.svg</normaloff>
<normalon>:/files/images/status/audio-volume-muted.svg</normalon>
<activeon>:/files/images/status/audio-volume-muted.svg</activeon>
<selectedoff>:/files/images/status/audio-volume-high.svg</selectedoff>
<selectedon>:/files/images/status/audio-volume-muted.svg</selectedon>:/files/images/status/audio-volume-high.svg</iconset>
</property>
<property name="text">
<string>Mute Audio Output</string>
</property>
......@@ -329,10 +286,6 @@
</property>
</action>
<action name="actionLoadCustomWidgetFile">
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/status/folder-drag-accept.svg</normaloff>:/files/images/status/folder-drag-accept.svg</iconset>
</property>
<property name="text">
<string>Load Custom Widget File</string>
</property>
......@@ -341,10 +294,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/categories/preferences-system.svg</normaloff>:/files/images/categories/preferences-system.svg</iconset>
</property>
<property name="text">
<string>Setup</string>
</property>
......@@ -367,10 +316,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/apps/accessories-calculator.svg</normaloff>:/files/images/apps/accessories-calculator.svg</iconset>
</property>
<property name="text">
<string>HIL Simulation</string>
</property>
......@@ -379,10 +324,6 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="icon">
<iconset resource="../../qgroundcontrol.qrc">
<normaloff>:/files/images/apps/utilities-terminal.svg</normaloff>:/files/images/apps/utilities-terminal.svg</iconset>
</property>
<property name="text">
<string>Terminal</string>
</property>
......
Supports Markdown
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