Commit 434ac621 authored by Michael Carpenter's avatar Michael Carpenter

Disabled movement of dock widges, unless in "Advanced Mode" (File->Advanced Mode)

parent bb90b295
This diff is collapsed.
......@@ -155,6 +155,8 @@ public slots:
void stopVideoCapture();
void saveScreen();
/** @brief Sets advanced mode, allowing for editing of tool widget locations */
void setAdvancedMode();
/** @brief Load configuration view */
void loadConfigurationView();
/** @brief Load default view when no MAV is connected */
......@@ -419,6 +421,8 @@ protected:
QTimer windowNameUpdateTimer;
private:
QMap<QDockWidget*,QWidget*> dockToTitleBarMap;
bool isAdvancedMode;
Ui::MainWindow ui;
QString getWindowStateKey();
......
......@@ -72,6 +72,7 @@
<addaction name="actionJoystickSettings"/>
<addaction name="actionSettings"/>
<addaction name="menuPreferences"/>
<addaction name="actionAdvanced_Mode"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
......@@ -467,9 +468,12 @@
</property>
<property name="toolTip">
<string>Open the simulation view</string>
</property>
</property>
</action>
<action name="actionConfiguration_2">
<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>
......@@ -478,6 +482,14 @@
<string>Configuration</string>
</property>
</action>
<action name="actionAdvanced_Mode">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Advanced Mode</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>
......
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