From 77bdd46330aeab37d53d60c4d2eb5c148adaf922 Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Mon, 12 Oct 2015 14:54:46 -0400 Subject: [PATCH] Plan View Tweaks Replacing some icons, cleaning up help text, etc. --- qgroundcontrol.qrc | 9 +- resources/Sync.png | Bin 4035 -> 0 bytes ...{MapHomeTearDrop.svg => MapAddMission.svg} | 5 +- src/FlightMap/Images/MapHome.svg | 11 ++ src/FlightMap/Images/MapSync.svg | 29 ++++ src/FlightMap/qmldir | 2 +- src/MissionEditor/MissionEditor.qml | 159 ++++++------------ 7 files changed, 97 insertions(+), 118 deletions(-) delete mode 100644 resources/Sync.png rename src/FlightMap/Images/{MapHomeTearDrop.svg => MapAddMission.svg} (54%) create mode 100644 src/FlightMap/Images/MapHome.svg create mode 100644 src/FlightMap/Images/MapSync.svg diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index b5e879ef6..f6d196c44 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -63,13 +63,16 @@ src/FlightMap/Images/scale_end.png src/FlightMap/Images/airplaneOutline.svg src/FlightMap/Images/airplaneOpaque.svg - src/FlightMap/Images/MapType.svg - src/FlightMap/Images/MapCenter.svg src/FlightMap/Images/ZoomPlus.svg src/FlightMap/Images/ZoomMinus.svg - resources/Sync.png + src/FlightMap/Images/MapCenter.svg + src/FlightMap/Images/MapSync.svg + src/FlightMap/Images/MapType.svg + src/FlightMap/Images/MapHome.svg + src/FlightMap/Images/MapAddMission.svg + src/test.qml diff --git a/resources/Sync.png b/resources/Sync.png deleted file mode 100644 index ea9bcccf7df54515ad6c399c2a26fb5ac7f1ac06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4035 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 - + - + + diff --git a/src/FlightMap/Images/MapHome.svg b/src/FlightMap/Images/MapHome.svg new file mode 100644 index 000000000..3344ab9c4 --- /dev/null +++ b/src/FlightMap/Images/MapHome.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/FlightMap/Images/MapSync.svg b/src/FlightMap/Images/MapSync.svg new file mode 100644 index 000000000..ddf5dc4c0 --- /dev/null +++ b/src/FlightMap/Images/MapSync.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/FlightMap/qmldir b/src/FlightMap/qmldir index 692c7d79e..18f0c2102 100644 --- a/src/FlightMap/qmldir +++ b/src/FlightMap/qmldir @@ -19,4 +19,4 @@ QGCSpeedWidget 1.0 QGCSpeedWidget.qml # MapQuickItems VehicleMapItem 1.0 VehicleMapItem.qml -MissionItemIndicator 1.0 MissionItemIndicator.qml +MissionItemIndicator 1.0 MissionItemIndicator.qml diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index 28b0e3a98..b8ab36743 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -130,88 +130,44 @@ QGCView { } } - Rectangle { + Image { id: addMissionItemsButton anchors.rightMargin: ScreenTools.defaultFontPixelHeight anchors.right: homePositionManagerButton.left anchors.top: homePositionManagerButton.top - radius: (ScreenTools.defaultFontPixelHeight * 3) / 2 - width: radius * 2 - height: radius * 2 - border.width: 2 - border.color: "white" - color: _addMissionItems ? _qgcPal.buttonHighlight : "black" - opacity: _addMissionItems ? 0.75 : 1.0 - + width: ScreenTools.defaultFontPixelHeight * 3 + fillMode: Image.PreserveAspectFit + mipmap: true + smooth: true + source: "/qmlimages/MapAddMission.svg" + opacity: _addMissionItems ? 1.0 : 0.75 MouseArea { anchors.fill: parent - onClicked: { _addMissionItems = !_addMissionItems _showHomePositionManager = false } } - - Rectangle { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: width - radius: width / 2 - border.width: 2 - border.color: "white" - color: "transparent" - - QGCLabel { - anchors.fill: parent - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: "white" - text: "1" - } - } } - Rectangle { + Image { id: homePositionManagerButton anchors.rightMargin: ScreenTools.defaultFontPixelHeight anchors.right: centerMapButton.left anchors.top: centerMapButton.top - radius: (ScreenTools.defaultFontPixelHeight * 3) / 2 - width: radius * 2 - height: radius * 2 - border.width: 2 - border.color: "white" - color: _showHomePositionManager ? _qgcPal.buttonHighlight : "black" - opacity: _showHomePositionManager ? 0.75 : 1.0 - + width: ScreenTools.defaultFontPixelHeight * 3 + fillMode: Image.PreserveAspectFit + mipmap: true + smooth: true + source: "/qmlimages/MapHome.svg" + opacity: _showHomePositionManager ? 1.0 : 0.75 MouseArea { anchors.fill: parent - onClicked: { _showHomePositionManager = !_showHomePositionManager _addMissionItems = false } } - - Rectangle { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: width - radius: width / 2 - border.width: 2 - border.color: "white" - color: "transparent" - - QGCLabel { - anchors.fill: parent - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: "white" - text: "H" - } - } } DropButton { @@ -296,7 +252,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: mapTypeButton.left anchors.top: mapTypeButton.top dropDirection: dropDown - buttonImage: "/qmlimages/Sync.png" + buttonImage: "/qmlimages/MapSync.svg" viewportMargins: ScreenTools.defaultFontPixelWidth / 2 exclusiveGroup: _dropButtonsExclusiveGroup @@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only QGCLabel { width: parent.width wrapMode: Text.WordWrap - text: "To add a new home position, click in the Map to set the position. " + + text: "To add a new home position, click on the Map to set the position. " + "Then give it a new name and click Add/Update. " + - "To change the current home position, click in the Map to set the new position. " + + "To change the current home position, click on the Map to set the new position. " + "Then click Add/Update without changing the name." } @@ -716,28 +672,18 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.top: helpTitle.bottom width: parent.width wrapMode: Text.WordWrap - text: "In the upper right corner of the map you will see the Mission Planner tools:" + text: "Mission Planner tool buttons:" } - Rectangle { - id: addMissionItemsHelpIcon - anchors.topMargin: ScreenTools.defaultFontPixelHeight - anchors.top: helpIconLabel.bottom - anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: width - radius: width / 2 - border.width: 2 - border.color: "white" - color: _qgcPal.window - - QGCLabel { - anchors.fill: parent - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: "white" - text: "1" - } + Image { + id: addMissionItemsHelpIcon + anchors.topMargin: ScreenTools.defaultFontPixelHeight + anchors.top: helpIconLabel.bottom + width: ScreenTools.defaultFontPixelHeight * 3 + fillMode: Image.PreserveAspectFit + mipmap: true + smooth: true + source: "/qmlimages/MapAddMission.svg" } QGCLabel { @@ -747,30 +693,19 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: parent.right anchors.top: addMissionItemsHelpIcon.top wrapMode: Text.WordWrap - text: "This is the Add Mission Items tool. " + - "Click it to turn on the ability to add mission items by clicking in the map. " + - "Click it again to turn it off." + text: "Add Mission Items
" + + "When enabled, add mission items by clicking on the map." } - Rectangle { - id: homePositionManagerHelpIcon - anchors.topMargin: ScreenTools.defaultFontPixelHeight - anchors.top: addMissionItemsHelpText.bottom - anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter - width: ScreenTools.defaultFontPixelHeight * 1.5 - height: width - radius: width / 2 - border.width: 2 - border.color: "white" - color: _qgcPal.window - - QGCLabel { - anchors.fill: parent - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: "white" - text: "H" - } + Image { + id: homePositionManagerHelpIcon + anchors.topMargin: ScreenTools.defaultFontPixelHeight + anchors.top: addMissionItemsHelpText.bottom + width: ScreenTools.defaultFontPixelHeight * 3 + fillMode: Image.PreserveAspectFit + mipmap: true + smooth: true + source: "/qmlimages/MapHome.svg" } QGCLabel { @@ -780,8 +715,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: parent.right anchors.top: homePositionManagerHelpIcon.top wrapMode: Text.WordWrap - text: "This is the Home Position Manager tool. " + - "This tool allows you to select/add/update home positions. " + + text: "Home Position Manager
" + + "When enabled, allows you to select/add/update home positions. " + "You can save multiple home position to represent multiple flying areas." } @@ -803,8 +738,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: parent.right anchors.top: mapCenterHelpIcon.top wrapMode: Text.WordWrap - text: "This is the Map Center tool. " + - "It will show a set of options which will center the map." + text: "Map Center
" + + "Options for centering the map." } Image { @@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only fillMode: Image.PreserveAspectFit mipmap: true smooth: true - source: "/qmlimages/Sync.png" + source: "/qmlimages/MapSync.svg" } QGCLabel { @@ -825,8 +760,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: parent.right anchors.top: syncHelpIcon.top wrapMode: Text.WordWrap - text: "This is the Sync tool. " + - "It will show a set of options for saving/loading mission items." + text: "Sync
" + + "Options for saving/loading mission items." } Image { @@ -847,8 +782,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only anchors.right: parent.right anchors.top: mapTypeHelpIcon.top wrapMode: Text.WordWrap - text: "This is the Map Type tool. " + - "It will show a set of options for selecting map types." + text: "Map Type
" + + "Map type options." } } // Item - Help Panel } // Item -- 2.22.0