Skip to content

Q
qgroundcontrol
Commit 5084a7aa authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Merge pull request #2191 from dogmaphobic/preferences 

Separate Settings Panel
parents 0a48bfe9 a8ffba6e
Hide whitespace changes
Inline Side-by-side
Showing with 547 additions and 309 deletions
qgcresources.qrc
View file @ 5084a7aa
......@@ -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,9 +72,6 @@
<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>
......@@ -84,8 +79,12 @@
<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
View file @ 5084a7aa
......@@ -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>
resources/Battery_0.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
resources/Battery_100.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<path id="path4679" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#0F763C" d="M30.9,265.899V42.117H131.1
v223.782H30.9z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
resources/Battery_20.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<path id="path4679" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#5B140E" d="M30.9,265.899v-39.866H131.1
v39.866H30.9z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
resources/Battery_40.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<path id="path4679" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#5B4219" d="M30.9,265.899v-86.02H131.1
v86.02H30.9z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
resources/Battery_60.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<path id="path4679" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#5C5B27" d="M30.9,265.899V133.958H131.1
v131.941H30.9z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
resources/Battery_80.svg deleted 100644 → 0
View file @ 0a48bfe9
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 162 288" enable-background="new 0 0 162 288" xml:space="preserve">
<path id="rect4970" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" d="M14.742,264.074V40.618
c0-6.588,5.831-11.93,13.042-11.93H134.26c7.211,0,13.042,5.342,13.042,11.93v223.456c0,6.588-5.831,11.93-13.042,11.93H27.785
C20.573,276.003,14.742,270.662,14.742,264.074z"/>
<path id="rect4360" inkscape:connector-curvature="0" fill="none" d="M9,268.391V36.255c0-6.855,6.321-12.419,14.155-12.419h115.69
c7.834,0,14.155,5.609,14.155,12.419v232.136c0,6.855-6.321,12.419-14.155,12.419H23.2C15.365,280.811,9,275.246,9,268.391z"/>
<path id="path4679" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" fill="#0F763C" d="M30.9,265.899V88.27H131.1
v177.628H30.9z"/>
<g id="g4222" transform="translate(-127.22081,216.20249)">
<path id="path4224" inkscape:connector-curvature="0" fill="#E7E7E7" stroke="#E7E7E7" stroke-width="6" stroke-miterlimit="10" d="
M244.512-189.383c0,0.979-0.757,1.736-1.736,1.736h-68.995c-0.979,0-1.736-0.757-1.736-1.736v-17.894
c0-0.979,0.757-1.736,1.736-1.736h68.995c0.979,0,1.736,0.757,1.736,1.736V-189.383L244.512-189.383L244.512-189.383z"/>
</g>
</svg>
src/FlightMap/Images/XDelete.svg → resources/XDelete.svg
View file @ 5084a7aa
......@@ -2,9 +2,6 @@
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
<g>
<path fill="none" stroke="#FFFFFF" stroke-miterlimit="10" d="M-68.877,70.722"/>
</g>
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-76.409" y1="105.398" x2="-29.609" y2="58.602"/>
<line fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" x1="-29.725" y1="105.4" x2="-76.521" y2="58.6"/>
<line fill="none" stroke="#FFFFFF" stroke-width="8.6625" stroke-linecap="round" stroke-miterlimit="10" x1="-29.734" y1="58.668" x2="-76.4" y2="105.332"/>
<line fill="none" stroke="#FFFFFF" stroke-width="8.6625" stroke-linecap="round" stroke-miterlimit="10" x1="-76.266" y1="58.668" x2="-29.6" y2="105.332"/>
</svg>
src/FlightMap/Images/XDeleteBlack.svg → resources/XDeleteBlack.svg
View file @ 5084a7aa
......@@ -2,9 +2,6 @@
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-89 46 72 72" enable-background="new -89 46 72 72" xml:space="preserve">
<g>
<path fill="none" stroke="#231F20" stroke-miterlimit="10" d="M-68.877,70.722"/>
</g>
<line fill="none" stroke="#231F20" stroke-width="3" stroke-miterlimit="10" x1="-76.409" y1="105.398" x2="-29.609" y2="58.602"/>
<line fill="none" stroke="#231F20" stroke-width="3" stroke-miterlimit="10" x1="-29.725" y1="105.4" x2="-76.521" y2="58.6"/>
<line fill="none" stroke="#231F20" stroke-width="8.6625" stroke-linecap="round" stroke-miterlimit="10" x1="-29.734" y1="58.668" x2="-76.4" y2="105.332"/>
<line fill="none" stroke="#231F20" stroke-width="8.6625" stroke-linecap="round" stroke-miterlimit="10" x1="-76.266" y1="58.668" x2="-29.6" y2="105.332"/>
</svg>
src/FlightMap/Images/buttonLeft.svg → resources/buttonLeft.svg
View file @ 5084a7aa
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-161 253 288 288" style="enable-background:new -161 253 288 288;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#231F20;stroke-width:24;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
</style>
<g id="Layer_2">
<polyline class="st0" points="-59.8,282 -126.1,397 -59.8,512 "/>
<polyline class="st0" points="16.2,282 -50.2,397 16.2,512 "/>
<polyline class="st0" points="92.1,282 25.8,397 92.1,512 "/>
</g>
viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
26.424,7.552 10,36 26.424,64.448 "/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
45.212,7.552 28.788,36 45.212,64.448 "/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
64,7.552 47.576,36 64,64.448 "/>
</svg>
src/FlightMap/Images/buttonRight.svg → resources/buttonRight.svg
View file @ 5084a7aa
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-161 253 288 288" style="enable-background:new -161 253 288 288;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#231F20;stroke-width:24;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
</style>
<g id="Layer_2">
<polyline class="st0" points="15.8,512 82.1,397 15.8,282 "/>
<polyline class="st0" points="-60.2,512 6.2,397 -60.2,282 "/>
<polyline class="st0" points="-136.1,512 -69.8,397 -136.1,282 "/>
</g>
viewBox="0 0 72 72" enable-background="new 0 0 72 72" xml:space="preserve">
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
46.576,7.552 63,36 46.576,64.448 "/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
27.788,7.552 44.212,36 27.788,64.448 "/>
<polyline fill="none" stroke="#FFFFFF" stroke-width="7" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" points="
9,7.552 25.424,36 9,64.448 "/>
</svg>
src/FlightDisplay/FlightDisplayView.qml
View file @ 5084a7aa
......@@ -182,11 +182,11 @@ Item {
width: ScreenTools.defaultFontPixelSize * 2
radius: ScreenTools.defaultFontPixelSize / 3
visible: _controller.hasVideo && !_isPipVisible
color: isBackgroundDark ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
Image {
width: parent.width * 0.75
height: parent.height * 0.75
source: "/qmlimages/buttonRight.svg"
source: "/res/buttonRight.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
......
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ 5084a7aa
......@@ -108,11 +108,11 @@ Item {
width: ScreenTools.defaultFontPixelSize * 2
radius: ScreenTools.defaultFontPixelSize / 3
visible: !_isInstrumentVisible
color: isBackgroundDark ? Qt.rgba(1,1,1,0.5) : Qt.rgba(0,0,0,0.5)
color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
Image {
width: parent.width * 0.75
height: parent.height * 0.75
source: "/qmlimages/buttonLeft.svg"
source: "/res/buttonLeft.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
......
src/MissionEditor/MissionEditorHelp.qml
View file @ 5084a7aa
......@@ -45,7 +45,7 @@ Rectangle {
anchors.right: parent.right
width: ScreenTools.defaultFontPixelHeight * 1.5
height: ScreenTools.defaultFontPixelHeight * 1.5
source: (qgcPal.globalTheme === QGCPalette.Light) ? "/qmlimages/XDeleteBlack.svg" : "/qmlimages/XDelete.svg"
source: (qgcPal.globalTheme === QGCPalette.Light) ? "/res/XDeleteBlack.svg" : "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
......
src/QmlControls/QGCToolBarButton.qml
View file @ 5084a7aa
......@@ -33,7 +33,7 @@ Item {
id: iconOverlay
anchors.fill: icon
source: icon
color: (checked ? "#ffff20" : "#ffffff")
color: (checked ? "#e4e428" : "#ffffff")
}
MouseArea {
......
src/VehicleSetup/SetupView.qml
View file @ 5084a7aa
......@@ -36,7 +36,6 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.MultiVehicleManager 1.0
Rectangle {
//color: qgcPal.windowShadeDark
color: qgcPal.window
z: QGroundControl.zOrderTopMost
......@@ -110,16 +109,6 @@ Rectangle {
}
}
function showDebugPanel()
{
panelLoader.source = "DebugWindow.qml";
}
function showGeneralPanel()
{
panelLoader.source = "GeneralSettings.qml";
}
Component.onCompleted: showSummaryPanel()
Connections {
......@@ -219,7 +208,7 @@ Rectangle {
Flickable {
id: buttonScroll
width: _buttonWidth
width: mainWindow.menuButtonWidth
anchors.topMargin: _defaultTextHeight / 2
anchors.top: parent.top
anchors.bottom: parent.bottom
......@@ -231,12 +220,12 @@ Rectangle {
Column {
id: buttonColumn
width: _buttonWidth
width: mainWindow.menuButtonWidth
spacing: _defaultTextHeight / 2
SubMenuButton {
id: summaryButton
width: _buttonWidth
width: mainWindow.menuButtonWidth
imageResource: "/qmlimages/VehicleSummaryIcon.png"
setupIndicator: false
checked: true
......@@ -246,18 +235,9 @@ Rectangle {
onClicked: showSummaryPanel()
}
SubMenuButton {
width: _buttonWidth
setupIndicator: false
exclusiveGroup: setupButtonGroup
visible: true
text: "GENERAL"
onClicked: showGeneralPanel()
}
SubMenuButton {
id: firmwareButton
width: _buttonWidth
width: mainWindow.menuButtonWidth
imageResource: "/qmlimages/FirmwareUpgradeIcon.png"
setupIndicator: false
exclusiveGroup: setupButtonGroup
......@@ -269,7 +249,7 @@ Rectangle {
SubMenuButton {
id: joystickButton
width: _buttonWidth
width: mainWindow.menuButtonWidth
setupIndicator: true
setupComplete: joystickManager.activeJoystick ? joystickManager.activeJoystick.calibrated : false
exclusiveGroup: setupButtonGroup
......@@ -283,7 +263,7 @@ Rectangle {
model: _fullParameterVehicleAvailable ? multiVehicleManager.activeVehicle.autopilot.vehicleComponents : 0
SubMenuButton {
width: _buttonWidth
width: mainWindow.menuButtonWidth
imageResource: modelData.iconResource
setupIndicator: modelData.requiresSetup
setupComplete: modelData.setupComplete
......@@ -295,7 +275,7 @@ Rectangle {
}
SubMenuButton {
width: _buttonWidth
width: mainWindow.menuButtonWidth
setupIndicator: false
exclusiveGroup: setupButtonGroup
visible: multiVehicleManager.parameterReadyVehicleAvailable
......@@ -304,16 +284,6 @@ Rectangle {
onClicked: showParametersPanel()
}
SubMenuButton {
width: _buttonWidth
setupIndicator: false
exclusiveGroup: setupButtonGroup
visible: ScreenTools.isDebug
text: "DEBUG"
onClicked: showDebugPanel()
}
}
}
......
src/ui/MainWindow.qml
View file @ 5084a7aa
......@@ -21,11 +21,12 @@ along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
import QtQuick 2.3
import QtQuick 2.5
import QtQuick.Controls 1.2
import QtPositioning 5.2
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FlightDisplay 1.0
import QGroundControl.ScreenTools 1.0
......@@ -37,7 +38,14 @@ Item {
readonly property string _planViewSource: "MissionEditor.qml"
readonly property string _setupViewSource: "SetupView.qml"
property real avaiableHeight: height - toolBar.height
QGCPalette { id: __qgcPal; colorGroupEnabled: true }
property real tbHeight: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.0444)) : ScreenTools.defaultFontPixelSize * 4
property int tbCellHeight: tbHeight * 0.75
property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54
property real tbButtonWidth: tbCellHeight * 1.3
property real avaiableHeight: height - tbHeight
property real menuButtonWidth: (tbButtonWidth * 2) + (tbSpacing * 4) + 1
Connections {
......@@ -77,37 +85,67 @@ Item {
onShowSetupVehicleComponent: setupViewLoader.item.showVehicleComponentPanel(vehicleComponent)
}
// Detect tablet position
//-- Detect tablet position
property var tabletPosition: QtPositioning.coordinate(37.803784, -122.462276)
PositionSource {
id: positionSource
updateInterval: 1000
active: ScreenTools.isMobile
active: true // ScreenTools.isMobile
onPositionChanged: {
tabletPosition = positionSource.position.coordinate
flightView.latitude = tabletPosition.latitude
flightView.longitude = tabletPosition.longitude
positionSource.active = false
tabletPosition = positionSource.position.coordinate
flightView.latitude = tabletPosition.latitude
flightView.longitude = tabletPosition.longitude
positionSource.active = false
}
}
function showLeftMenu() {
if(!leftPanel.visible && !leftPanel.item.animateShowDialog.running) {
leftPanel.visible = true
leftPanel.item.animateShowDialog.start()
} else if(leftPanel.visible && !leftPanel.item.animateShowDialog.running) {
//-- If open, toggle it closed
hideLeftMenu()
}
}
function hideLeftMenu() {
if(leftPanel.visible && !leftPanel.item.animateHideDialog.running) {
leftPanel.item.animateHideDialog.start()
}
}
//-- Left Settings Menu
Loader {
id: leftPanel
anchors.fill: mainWindow
visible: false
z: QGroundControl.zOrderTopMost + 100
}
//-- Main UI
MainToolBar {
id: toolBar
height: ScreenTools.isMobile ? (ScreenTools.isTinyScreen ? (mainWindow.width * 0.0666) : (mainWindow.width * 0.0444)) : ScreenTools.defaultFontPixelSize * 4
height: tbHeight
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
mainWindow: mainWindow
opaqueBackground: leftPanel.visible
isBackgroundDark: flightView.isBackgroundDark
z: QGroundControl.zOrderTopMost
Component.onCompleted: {
leftPanel.source = "MainWindowLeftPanel.qml"
}
}
FlightDisplayView {
id: flightView
anchors.fill: parent
avaiableHeight: mainWindow.avaiableHeight
visible: true
id: flightView
anchors.fill: parent
avaiableHeight: mainWindow.avaiableHeight
visible: true
}
Loader {
......
src/ui/MainWindowLeftPanel.qml 0 → 100644
View file @ 5084a7aa
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
import QtQuick 2.5
import QtQuick.Controls 1.2
import QtPositioning 5.2
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FlightDisplay 1.0
import QGroundControl.ScreenTools 1.0
//-- Left Menu
Item {
id: __leftPanel
anchors.fill: parent
property alias animateShowDialog: __animateShowDialog
property alias animateHideDialog: __animateHideDialog
readonly property int __animationDuration: 100
readonly property real __closeButtonSize: ScreenTools.defaultFontPixelHeight * 2
onVisibleChanged: {
//-- Unselect any selected button
panelActionGroup.current = null
//-- Destroy panel contents if not visible
if(!visible) {
__rightPanel.source = ""
}
}
ParallelAnimation {
id: __animateShowDialog
NumberAnimation {
target: __transparentSection
properties: "opacity"
from: 0.0
to: 0.8
duration: __leftPanel.__animationDuration
}
NumberAnimation {
target: __transparentSection
properties: "width"
from: 1
to: mainWindow.width
duration: __leftPanel.__animationDuration
}
}
ParallelAnimation {
id: __animateHideDialog
NumberAnimation {
target: __transparentSection
properties: "opacity"
from: 0.8
to: 0.0
duration: __leftPanel.__animationDuration
}
NumberAnimation {
target: __transparentSection
properties: "width"
from: mainWindow.width
to: 1
duration: __leftPanel.__animationDuration
}
onRunningChanged: {
if (!running) {
parent.visible = false
}
}
}
// This covers the screen with a transparent section
Rectangle {
id: __transparentSection
height: parent.height - toolBar.height
anchors.bottom: parent.bottom
anchors.left: parent.left
opacity: 0.0
color: __qgcPal.window
visible: __rightPanel.source == ""
// Dismiss if clicked outside menu area
MouseArea {
anchors.fill: parent
onClicked: {
mainWindow.hideLeftMenu()
}
}
}
//-- Top Separator
Rectangle {
id: __topSeparator
width: parent.width
height: 1
y: toolBar.height
anchors.left: parent.left
color: QGroundControl.isDarkStyle ? "#909090" : "#7f7f7f"
}
// This is the menu dialog panel which is anchored to the left edge
Rectangle {
id: __leftMenu
width: (tbButtonWidth * 2) + (tbSpacing * 4) + 1
anchors.left: parent.left
anchors.top: __topSeparator.bottom
anchors.bottom: parent.bottom
color: __qgcPal.windowShadeDark
ExclusiveGroup { id: panelActionGroup }
Column {
width: parent.width
spacing: ScreenTools.defaultFontPixelHeight
Item {
width: 1
height: ScreenTools.defaultFontPixelHeight * 0.5
}
QGCLabel {
text: "Preferences"
anchors.horizontalCenter: parent.horizontalCenter
}
QGCButton {
width: parent.width * 0.8
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "General"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "GeneralSettings.qml") {
__rightPanel.source = "GeneralSettings.qml"
}
checked = true
}
}
QGCButton {
width: parent.width * 0.8
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "MavLink"
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "MavlinkSettings.qml") {
__rightPanel.source = "MavlinkSettings.qml"
}
checked = true
}
}
QGCButton {
width: parent.width * 0.8
height: ScreenTools.defaultFontPixelHeight * 2.5
text: "Debug"
visible: ScreenTools.isDebug
exclusiveGroup: panelActionGroup
anchors.horizontalCenter: parent.horizontalCenter
onClicked: {
if(__rightPanel.source != "DebugWindow.qml") {
__rightPanel.source = "DebugWindow.qml"
}
checked = true
}
}
}
}
//-- Clicking in tool bar area dismiss it all
MouseArea {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
height: toolBar.height
onClicked: {
mainWindow.hideLeftMenu()
}
}
//-- Vertical Separator
Rectangle {
id: __verticalSeparator
width: 1
height: parent.height - toolBar.height
anchors.left: __leftMenu.right
anchors.bottom: parent.bottom
color: QGroundControl.isDarkStyle ? "#909090" : "#7f7f7f"
}
//-- Main Setting Display Area
Rectangle {
anchors.left: __verticalSeparator.right
width: mainWindow.width - __leftMenu.width - __verticalSeparator.width
height: parent.height - toolBar.height - __topSeparator.height
anchors.bottom: parent.bottom
visible: __rightPanel.source != ""
color: __qgcPal.window
//-- Panel Contents
Loader {
id: __rightPanel
anchors.fill: parent
}
//-- Dismiss it all
Item {
id: closeButton
width: __closeButtonSize
height: __closeButtonSize
anchors.right: parent.right
anchors.top: parent.top
anchors.margins: ScreenTools.defaultFontPixelSize * 0.5
QGCColoredImage {
source: "/res/XDelete.svg"
mipmap: true
fillMode: Image.PreserveAspectFit
color: __qgcPal.text
width: parent.width * 0.75
height: parent.height * 0.75
anchors.centerIn: parent
}
MouseArea {
anchors.fill: parent
onClicked: {
__rightPanel.source = ""
mainWindow.hideLeftMenu()
}
}
}
}
}
src/VehicleSetup/GeneralSettings.qml → src/ui/preferences/GeneralSettings.qml
View file @ 5084a7aa
......@@ -35,7 +35,7 @@ import QGroundControl.Palette 1.0
Rectangle {
id: _generalRoot
color: qgcPal.windowShade
color: __qgcPal.window
QGCPalette {
id: qgcPal
......@@ -169,60 +169,6 @@ Rectangle {
}
}
}
//-----------------------------------------------------------------
//-- Mavlink Settings
//-----------------------------------------------------------------
Rectangle {
height: 1
width: parent.width
color: qgcPal.button
}
QGCCheckBox {
id: showMavlinkSettings
text: "Show Advanced Mavlink Settings"
checked: false
}
QGCLabel {
text: "Mavlink Settings"
visible: showMavlinkSettings.checked
font.pixelSize: ScreenTools.mediumFontPixelSize
}
Rectangle {
height: 1
width: parent.width
color: qgcPal.button
visible: showMavlinkSettings.checked
}
//-----------------------------------------------------------------
//-- Mavlink Heartbeats
QGCCheckBox {
text: "Emit heartbeat"
checked: QGroundControl.isHeartBeatEnabled
visible: showMavlinkSettings.checked
onClicked: {
QGroundControl.isHeartBeatEnabled = checked
}
}
//-----------------------------------------------------------------
//-- Mavlink Multiplexing
QGCCheckBox {
text: "Enable multiplexing (forward packets to all other links)"
checked: QGroundControl.isMultiplexingEnabled
visible: showMavlinkSettings.checked
onClicked: {
QGroundControl.isMultiplexingEnabled = checked
}
}
//-----------------------------------------------------------------
//-- Mavlink Version Check
QGCCheckBox {
text: "Only accept MAVs with same protocol version"
checked: QGroundControl.isVersionCheckEnabled
visible: showMavlinkSettings.checked
onClicked: {
QGroundControl.isVersionCheckEnabled = checked
}
}
}
}
}
src/ui/preferences/MavlinkSettings.qml 0 → 100644
View file @ 5084a7aa
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
import QtQuick.Dialogs 1.1
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.MultiVehicleManager 1.0
import QGroundControl.Palette 1.0
Rectangle {
id: __mavlinkRoot
color: __qgcPal.window
QGCPalette {
id: qgcPal
colorGroupEnabled: enabled
}
Flickable {
clip: true
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelWidth
contentHeight: settingsColumn.height
contentWidth: __mavlinkRoot.width
flickableDirection: Flickable.VerticalFlick
boundsBehavior: Flickable.StopAtBounds
Column {
id: settingsColumn
width: __mavlinkRoot.width
spacing: ScreenTools.defaultFontPixelHeight
anchors.margins: ScreenTools.defaultFontPixelWidth
QGCLabel {
text: "MavLink Settings"
font.pixelSize: ScreenTools.mediumFontPixelSize
}
Rectangle {
height: 1
width: parent.width
color: qgcPal.button
}
//-----------------------------------------------------------------
//-- Mavlink Heartbeats
QGCCheckBox {
text: "Emit heartbeat"
checked: QGroundControl.isHeartBeatEnabled
onClicked: {
QGroundControl.isHeartBeatEnabled = checked
}
}
//-----------------------------------------------------------------
//-- Mavlink Multiplexing
QGCCheckBox {
text: "Enable multiplexing (forward packets to all other links)"
checked: QGroundControl.isMultiplexingEnabled
onClicked: {
QGroundControl.isMultiplexingEnabled = checked
}
}
//-----------------------------------------------------------------
//-- Mavlink Version Check
QGCCheckBox {
text: "Only accept MAVs with same protocol version"
checked: QGroundControl.isVersionCheckEnabled
onClicked: {
QGroundControl.isVersionCheckEnabled = checked
}
}
}
}
}
src/ui/toolbar/Images/Hamburger.svg 0 → 100644
View file @ 5084a7aa
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="160 862 72 72" style="enable-background:new 160 862 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:6.962;stroke-linecap:round;stroke-miterlimit:10;}
</style>
<line class="st0" x1="169" y1="880.4" x2="223" y2="879.9"/>
<line class="st0" x1="169" y1="898.2" x2="223" y2="897.8"/>
<line class="st0" x1="169" y1="916.1" x2="223" y2="915.6"/>
</svg>
src/ui/toolbar/MainToolBar.qml
View file @ 5084a7aa
......@@ -40,7 +40,7 @@ import QGroundControl.Controllers 1.0
Rectangle {
id: toolBar
color: isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5)
color: opaqueBackground ? "#404040" : (isBackgroundDark ? Qt.rgba(0,0,0,0.75) : Qt.rgba(0,0,0,0.5))
QGCPalette { id: qgcPal; colorGroupEnabled: true }
......@@ -48,6 +48,7 @@ Rectangle {
property var mainWindow: null
property bool isMessageImportant: activeVehicle ? !activeVehicle.messageTypeNormal && !activeVehicle.messageTypeNone : false
property bool isBackgroundDark: true
property bool opaqueBackground: false
/*
Dev System (Mac OS)
......@@ -132,14 +133,10 @@ Rectangle {
*/
readonly property int cellHeight: height * 0.75
readonly property real tbFontSmall: 10 * ScreenTools.fontHRatio
readonly property real tbFontNormal: 12 * ScreenTools.fontHRatio
readonly property real tbFontLarge: 18 * ScreenTools.fontHRatio
readonly property real tbSpacing: ScreenTools.isMobile ? toolBar.width * 0.00824 : 9.54
readonly property var colorGreen: "#05f068"
readonly property var colorOrange: "#f0ab06"
readonly property var colorRed: "#fc4638"
......@@ -172,61 +169,78 @@ Rectangle {
Row {
id: viewRow
height: cellHeight
spacing: tbSpacing
height: mainWindow.tbCellHeight
spacing: mainWindow.tbSpacing
anchors.left: parent.left
anchors.leftMargin: tbSpacing
anchors.leftMargin: mainWindow.tbSpacing
anchors.verticalCenter: parent.verticalCenter
ExclusiveGroup { id: mainActionGroup }
QGCToolBarButton {
id: preferencesButton
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
source: "/qmlimages/Hamburger.svg"
onClicked: {
mainWindow.showLeftMenu();
preferencesButton.checked = false;
}
}
Rectangle {
height: mainWindow.tbCellHeight
width: 1
color: Qt.rgba(1,1,1,0.45)
}
QGCToolBarButton {
id: setupButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
exclusiveGroup: mainActionGroup
source: "qrc:/res/Gears"
source: "/qmlimages/Gears.svg"
onClicked: {
_controller.onSetupView();
}
}
Rectangle {
height: cellHeight
height: mainWindow.tbCellHeight
width: 1
color: Qt.rgba(1,1,1,0.45)
}
QGCToolBarButton {
id: planButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
exclusiveGroup: mainActionGroup
source: "qrc:/res/Plan"
source: "/qmlimages/Plan.svg"
onClicked: {
_controller.onPlanView();
}
}
Rectangle {
height: cellHeight
height: mainWindow.tbCellHeight
width: 1
color: Qt.rgba(1,1,1,0.45)
}
QGCToolBarButton {
id: flyButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
exclusiveGroup: mainActionGroup
source: "qrc:/res/PaperPlane"
source: "/qmlimages/PaperPlane.svg"
onClicked: {
_controller.onFlyView();
}
}
Rectangle {
height: cellHeight
height: mainWindow.tbCellHeight
width: 1
color: Qt.rgba(1,1,1,0.45)
}
......@@ -235,10 +249,10 @@ Rectangle {
Item {
visible: showMavStatus() && !connectionStatus.visible
height: cellHeight
height: mainWindow.tbCellHeight
width: (toolBar.width - viewRow.width - connectRow.width)
anchors.left: viewRow.right
anchors.leftMargin: tbSpacing * 2
anchors.leftMargin: mainWindow.tbSpacing * 2
anchors.verticalCenter: parent.verticalCenter
Loader {
source: multiVehicleManager.activeVehicleAvailable ? "MainToolBarIndicators.qml" : ""
......@@ -255,15 +269,15 @@ Rectangle {
font.weight: Font.DemiBold
color: colorRed
anchors.left: viewRow.right
anchors.leftMargin: tbSpacing * 2
anchors.leftMargin: mainWindow.tbSpacing * 2
anchors.verticalCenter: parent.verticalCenter
}
Row {
id: connectRow
height: cellHeight
spacing: tbSpacing
anchors.rightMargin: tbSpacing
height: mainWindow.tbCellHeight
spacing: mainWindow.tbSpacing
anchors.rightMargin: mainWindow.tbSpacing
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
......@@ -295,15 +309,15 @@ Rectangle {
}
Rectangle {
height: cellHeight
height: mainWindow.tbCellHeight
width: 1
color: Qt.rgba(1,1,1,0.45)
}
QGCToolBarButton {
id: connectButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
visible: _controller.connectionCount === 0
source: "/qmlimages/Connect.svg"
checked: false
......@@ -327,15 +341,15 @@ Rectangle {
console.log("tbFontSmall: " + tbFontSmall);
console.log("tbFontNormal: " + tbFontNormal);
console.log("tbFontLarge: " + tbFontLarge);
console.log("tbSpacing: " + tbSpacing);
console.log("mainWindow.tbSpacing: " + tbSpacing);
*/
}
}
QGCToolBarButton {
id: disconnectButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
visible: _controller.connectionCount === 1
source: "/qmlimages/Disconnect.svg"
checked: false
......@@ -365,8 +379,8 @@ Rectangle {
QGCToolBarButton {
id: multidisconnectButton
width: cellHeight * 1.3
height: cellHeight
width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight
visible: _controller.connectionCount > 1
source: "/qmlimages/Disconnect.svg"
checked: false
......@@ -410,7 +424,7 @@ Rectangle {
color: qgcPal.warningText
lineHeightMode: Text.ProportionalHeight
lineHeight: 1.15
anchors.margins: tbSpacing
anchors.margins: mainWindow.tbSpacing
}
}
QGCButton {
......@@ -419,7 +433,7 @@ Rectangle {
text: "Close"
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.margins: tbSpacing
anchors.margins: mainWindow.tbSpacing
onClicked: {
toolBarMessageArea.visible = false
_controller.onToolBarMessageClosed()
......
src/ui/toolbar/MainToolBarIndicators.qml
View file @ 5084a7aa
......@@ -101,8 +101,8 @@ Row {
//-- Message Indicator
Item {
id: messages
width: cellHeight
height: cellHeight
width: mainWindow.tbCellHeight
height: mainWindow.tbCellHeight
visible: activeVehicle.messageCount
anchors.verticalCenter: parent.verticalCenter
......@@ -112,7 +112,7 @@ Row {
visible: activeVehicle.messageCount > 0 && isMessageImportant
Image {
source: "/qmlimages/Yield.svg"
height: cellHeight * 0.75
height: mainWindow.tbButtonWidth
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
......@@ -142,7 +142,7 @@ Row {
Image {
id: messageIcon
source: "/qmlimages/Megaphone.svg"
height: cellHeight * 0.5
height: mainWindow.tbCellHeight * 0.5
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
......@@ -171,7 +171,7 @@ Row {
Item {
id: satelitte
width: gpsRow.width * 1.1
height: cellHeight
height: mainWindow.tbCellHeight
Row {
id: gpsRow
height: parent.height
......@@ -181,13 +181,13 @@ Row {
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
width: cellHeight * 0.65
height: cellHeight * 0.5
width: mainWindow.tbCellHeight * 0.65
height: mainWindow.tbCellHeight * 0.5
opacity: activeVehicle.satelliteCount < 1 ? 0.5 : 1
anchors.verticalCenter: parent.verticalCenter
}
SignalStrength {
size: cellHeight * 0.5
size: mainWindow.tbCellHeight * 0.5
percent: getSatStrength(activeVehicle.satelliteCount)
anchors.verticalCenter: parent.verticalCenter
}
......@@ -208,7 +208,7 @@ Row {
Item {
id: rcRssi
width: rssiRow.width * 1.1
height: cellHeight
height: mainWindow.tbCellHeight
Row {
id: rssiRow
height: parent.height
......@@ -217,13 +217,13 @@ Row {
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
width: cellHeight * 0.65
height: cellHeight * 0.5
width: mainWindow.tbCellHeight * 0.65
height: mainWindow.tbCellHeight * 0.5
opacity: _controller.remoteRSSI < 1 ? 0.5 : 1
anchors.verticalCenter: parent.verticalCenter
}
SignalStrength {
size: cellHeight * 0.5
size: mainWindow.tbCellHeight * 0.5
percent: _controller.remoteRSSI
anchors.verticalCenter: parent.verticalCenter
}
......@@ -235,11 +235,11 @@ Row {
Item {
id: batteryStatus
width: battRow.width * 1.1
height: cellHeight
height: mainWindow.tbCellHeight
opacity: (activeVehicle.batteryVoltage > 0) ? 1 : 0.5
Row {
id: battRow
height: cellHeight
height: mainWindow.tbCellHeight
spacing: tbSpacing
anchors.horizontalCenter: parent.horizontalCenter
Column {
......@@ -285,7 +285,7 @@ Row {
//-- Vehicle Selector
QGCButton {
width: ScreenTools.defaultFontPixelSize * 12
height: cellHeight * 0.75
height: mainWindow.tbButtonWidth
text: "Vehicle " + activeVehicle.id
visible: vehicleMenuItems.length > 0
anchors.verticalCenter: parent.verticalCenter
......@@ -340,7 +340,7 @@ Row {
Item {
width: selectorRow.width * 1.1
height: cellHeight
height: mainWindow.tbCellHeight
anchors.verticalCenter: parent.verticalCenter
Row {
id: selectorRow
......@@ -348,8 +348,8 @@ Row {
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
Image {
width: cellHeight * 0.65
height: cellHeight * 0.65
width: mainWindow.tbCellHeight * 0.65
height: mainWindow.tbCellHeight * 0.65
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
......@@ -417,15 +417,15 @@ Row {
Item {
width: armCol.width * 1.1
height: cellHeight
height: mainWindow.tbCellHeight
anchors.verticalCenter: parent.verticalCenter
Row {
id: armCol
spacing: tbSpacing * 0.5
anchors.verticalCenter: parent.verticalCenter
Image {
width: cellHeight * 0.5
height: cellHeight * 0.5
width: mainWindow.tbCellHeight * 0.5
height: mainWindow.tbCellHeight * 0.5
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
......@@ -476,7 +476,7 @@ Row {
Rectangle {
id: rssiRC
width: getProportionalDimmension(55)
height: cellHeight
height: mainWindow.tbCellHeight
visible: _controller.remoteRSSI <= 100
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(_controller.remoteRSSI);
......@@ -484,7 +484,7 @@ Row {
border.width: 0
Image {
source: "qrc:/res/AntennaRC";
width: cellHeight * 0.7
width: mainWindow.tbCellHeight * 0.7
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
......@@ -507,7 +507,7 @@ Row {
Rectangle {
id: rssiTelemetry
width: getProportionalDimmension(80)
height: cellHeight
height: mainWindow.tbCellHeight
visible: (_controller.telemetryRRSSI > 0) && (_controller.telemetryLRSSI > 0)
anchors.verticalCenter: parent.verticalCenter
color: getRSSIColor(Math.min(_controller.telemetryRRSSI,_controller.telemetryLRSSI));
......@@ -515,7 +515,7 @@ Row {
border.width: 0
Image {
source: "qrc:/res/AntennaT";
width: cellHeight * 0.7
width: mainWindow.tbCellHeight * 0.7
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
......
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