Merge pull request #7186 from DonLakeFlyer/WaypointsOnlyMode

Waypoints only mode tweaks

Merge pull request #7186 from DonLakeFlyer/WaypointsOnlyMode
Waypoints only mode tweaks
9165fa15 · Don Gagne · GitHub · 730ab8fb · e3684f8b · 9165fa15
Unverified Commit 9165fa15 authored Jan 23, 2019 by Don Gagne Committed by GitHub Jan 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

MissionSettingsEditor.qml src/PlanView/MissionSettingsEditor.qml +1 -1

PlanView.qml src/PlanView/PlanView.qml +1 -1

No files found.
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -93,7 +93,7 @@ Rectangle {

            CameraSection {
                id:         cameraSection
-                checked:    missionItem.cameraSection.settingsSpecified
+                checked:    !_waypointsOnlyMode && missionItem.cameraSection.settingsSpecified
                visible:    _showCameraSection
            }


--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -588,7 +588,7 @@ QGCView {
                rotateImage:        [ masterController.syncInProgress, false, false, false, false, false, false ]
                animateImage:       [ masterController.dirty, false, false, false, false, false, false ]
                buttonEnabled:      [ !masterController.syncInProgress, true, true, true, true, true, true ]
-                buttonVisible:      [ true, true, false/*_waypointsOnlyMode*/, true, true, _showZoom, _showZoom ]
+                buttonVisible:      [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ]
                maxHeight:          mapScale.y - toolStrip.y

                property bool _showZoom: !ScreenTools.isMobile