Separate Settings Panel

qgcresources.qrc

@@ -41,9 +41,7 @@
         <file alias="attitudeInstrument.svg">src/FlightMap/Images/attitudeInstrument.svg</file>
         <file alias="attitudePointer.svg">src//FlightMap/Images/attitudePointer.svg</file>
         <file alias="buttonHome.svg">src/FlightMap/Images/buttonHome.svg</file>
-        <file alias="buttonLeft.svg">src/FlightMap/Images/buttonLeft.svg</file>
         <file alias="buttonMore.svg">src/FlightMap/Images/buttonMore.svg</file>
-        <file alias="buttonRight.svg">src/FlightMap/Images/buttonRight.svg</file>
         <file alias="compassInstrumentAirplane.svg">src/FlightMap/Images/compassInstrumentAirplane.svg</file>
         <file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
         <file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
@@ -74,18 +72,19 @@
         <file alias="MapTypeBlack.svg">src/FlightMap/Images/MapTypeBlack.svg</file>
         <file alias="TrashDelete.svg">src/FlightMap/Images/TrashDelete.svg</file>
         <file alias="TrashDeleteBlack.svg">src/FlightMap/Images/TrashDeleteBlack.svg</file>
-        <file alias="XDelete.svg">src/FlightMap/Images/XDelete.svg</file>
-        <file alias="XDeleteBlack.svg">src/FlightMap/Images/XDeleteBlack.svg</file>
-
 
         <!-- Toolbar -->
         <file alias="Armed.svg">src/ui/toolbar/Images/Armed.svg</file>
         <file alias="Battery.svg">src/ui/toolbar/Images/Battery.svg</file>
         <file alias="Connect.svg">src/ui/toolbar/Images/Connect.svg</file>
         <file alias="Disarmed.svg">src/ui/toolbar/Images/Disarmed.svg</file>
         <file alias="Disconnect.svg">src/ui/toolbar/Images/Disconnect.svg</file>
+        <file alias="Gears.svg">src/ui/toolbar/Images/Gears.svg</file>
         <file alias="Gps.svg">src/ui/toolbar/Images/Gps.svg</file>
+        <file alias="Hamburger.svg">src/ui/toolbar/Images/Hamburger.svg</file>
         <file alias="Megaphone.svg">src/ui/toolbar/Images/Megaphone.svg</file>
+        <file alias="PaperPlane.svg">src/ui/toolbar/Images/PaperPlane.svg</file>
+        <file alias="Plan.svg">src/ui/toolbar/Images/Plan.svg</file>
         <file alias="Quad.svg">src/ui/toolbar/Images/Quad.svg</file>
         <file alias="RC.svg">src/ui/toolbar/Images/RC.svg</file>
         <file alias="Signal0.svg">src/ui/toolbar/Images/Signal0.svg</file>
@@ -116,19 +115,14 @@
         <file alias="Shutdown">resources/Shutdown.svg</file>
         <file alias="AntennaT">resources/Antenna_T.svg</file>
         <file alias="AntennaRC">resources/Antenna_RC.svg</file>
-        <file alias="Battery_0">resources/Battery_0.svg</file>
-        <file alias="Battery_20">resources/Battery_20.svg</file>
-        <file alias="Battery_40">resources/Battery_40.svg</file>
-        <file alias="Battery_60">resources/Battery_60.svg</file>
-        <file alias="Battery_80">resources/Battery_80.svg</file>
-        <file alias="Battery_100">resources/Battery_100.svg</file>
         <file alias="SystemLockScreen">resources/SystemLockScreen.svg</file>
         <file alias="SplashScreen">resources/SplashScreen.png</file>
         <file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
-        <file alias="Gears">resources/Gears.svg</file>
-        <file alias="Plan">resources/Plan.svg</file>
-        <file alias="PaperPlane">resources/PaperPlane.svg</file>
         <file alias="PowerButton">resources/PowerButton.svg</file>
+        <file alias="buttonLeft.svg">resources/buttonLeft.svg</file>
+        <file alias="buttonRight.svg">resources/buttonRight.svg</file>
+        <file alias="XDelete.svg">resources/XDelete.svg</file>
+        <file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
     </qresource>
 
     <qresource prefix="/res/firmware">

qgroundcontrol.qrc

@@ -15,8 +15,6 @@
         <file alias="QGroundControl/FactControls/FactCheckBox.qml">src/FactSystem/FactControls/FactCheckBox.qml</file>
         <file alias="QGroundControl/FactControls/FactComboBox.qml">src/FactSystem/FactControls/FactComboBox.qml</file>
         <file alias="QGroundControl/Controls/qmldir">src/QmlControls/QGroundControl.Controls.qmldir</file>
-
-        <!-- Controls module -->
         <file alias="QGroundControl/Controls/QGCButton.qml">src/QmlControls/QGCButton.qml</file>
         <file alias="QGroundControl/Controls/QGCRadioButton.qml">src/QmlControls/QGCRadioButton.qml</file>
         <file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
@@ -48,24 +46,16 @@
         <file alias="QGroundControl/Controls/QGCCanvas.qml">src/QmlControls/QGCCanvas.qml</file>
         <file alias="QGroundControl/Controls/ExclusiveGroupItem.qml">src/QmlControls/ExclusiveGroupItem.qml</file>
         <file alias="QGroundControl/Controls/ClickableColor.qml">src/QmlControls/ClickableColor.qml</file>
-
-        <!-- Main Window -->
         <file alias="MainWindow.qml">src/ui/MainWindow.qml</file>
-
-        <!-- Main ToolBar -->
+        <file alias="MainWindowLeftPanel.qml">src/ui/MainWindowLeftPanel.qml</file>
         <file alias="QGroundControl/Controls/MainToolBar.qml">src/ui/toolbar/MainToolBar.qml</file>
         <file alias="QGroundControl/Controls/MainToolBarIndicators.qml">src/ui/toolbar/MainToolBarIndicators.qml</file>
         <file alias="QGroundControl/Controls/SignalStrength.qml">src/ui/toolbar/SignalStrength.qml</file>
-
-        <!-- Vehicle Setup -->
         <file alias="SetupView.qml">src/VehicleSetup/SetupView.qml</file>
         <file alias="VehicleSummary.qml">src/VehicleSetup/VehicleSummary.qml</file>
         <file alias="FirmwareUpgrade.qml">src/VehicleSetup/FirmwareUpgrade.qml</file>
         <file alias="JoystickConfig.qml">src/VehicleSetup/JoystickConfig.qml</file>
         <file alias="SetupParameterEditor.qml">src/VehicleSetup/SetupParameterEditor.qml</file>
-        <file alias="DebugWindow.qml">src/VehicleSetup/DebugWindow.qml</file>
-        <file alias="GeneralSettings.qml">src/VehicleSetup/GeneralSettings.qml</file>
-
         <file alias="CustomCommandWidget.qml">src/ViewWidgets/CustomCommandWidget.qml</file>
         <file alias="SafetyComponent.qml">src/AutoPilotPlugins/PX4/SafetyComponent.qml</file>
         <file alias="RadioComponent.qml">src/AutoPilotPlugins/PX4/RadioComponent.qml</file>
@@ -84,19 +74,13 @@
         <file alias="FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
         <file alias="MissionEditor.qml">src/MissionEditor/MissionEditor.qml</file>
         <file alias="MissionEditorHelp.qml">src/MissionEditor/MissionEditorHelp.qml</file>
-
         <file alias="APMAirframeComponent.qml">src/AutoPilotPlugins/APM/APMAirframeComponent.qml</file>
         <file alias="APMAirframeComponentSummary.qml">src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml</file>
-
-
-        <!-- FlightDisplay module -->
         <file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayView.qml">src/FlightDisplay/FlightDisplayView.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayViewMap.qml">src/FlightDisplay/FlightDisplayViewMap.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayViewVideo.qml">src/FlightDisplay/FlightDisplayViewVideo.qml</file>
         <file alias="QGroundControl/FlightDisplay/FlightDisplayViewWidgets.qml">src/FlightDisplay/FlightDisplayViewWidgets.qml</file>
-
-        <!-- FlightMap module -->
         <file alias="QGroundControl/FlightMap/qmldir">src/FlightMap/qmldir</file>
         <file alias="QGroundControl/FlightMap/FlightMap.qml">src/FlightMap/FlightMap.qml</file>
         <file alias="QGroundControl/FlightMap/QGCVideoBackground.qml">src/FlightMap/QGCVideoBackground.qml</file>
@@ -112,5 +96,9 @@
         <file alias="QGroundControl/FlightMap/MissionItemView.qml">src/FlightMap/MapItems/MissionItemView.qml</file>
         <file alias="QGroundControl/FlightMap/MissionLineView.qml">src/FlightMap/MapItems/MissionLineView.qml</file>
 
+        <file alias="DebugWindow.qml">src/ui/preferences/DebugWindow.qml</file>
+        <file alias="MavlinkSettings.qml">src/ui/preferences/MavlinkSettings.qml</file>
+        <file alias="GeneralSettings.qml">src/ui/preferences/GeneralSettings.qml</file>
+
     </qresource>
 </RCC>