Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
827bab13
Commit
827bab13
authored
Nov 14, 2015
by
Gus Grubba
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2214 from dogmaphobic/buttons
Consistent buttons in Fly and Mission views.
parents
e855eb08
754c0249
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
163 additions
and
135 deletions
+163
-135
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+163
-135
No files found.
src/MissionEditor/MissionEditor.qml
View file @
827bab13
...
...
@@ -695,6 +695,17 @@ QGCView {
} // Item - Home Position Manager
*/
//-- Dismiss Drop Down (if any)
MouseArea
{
anchors.fill
:
parent
enabled
:
_dropButtonsExclusiveGroup
.
current
!=
null
onClicked
:
{
if
(
_dropButtonsExclusiveGroup
.
current
)
_dropButtonsExclusiveGroup
.
current
.
checked
=
false
_dropButtonsExclusiveGroup
.
current
=
null
}
}
//-- Help Panel
Loader
{
id
:
helpPanel
...
...
@@ -705,14 +716,23 @@ QGCView {
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
Item
{
id
:
toolbarSpacer
height
:
mainWindow
.
tbHeight
width
:
1
}
//-- Vertical Tool Buttons
Column
{
id
:
toolColumn
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
anchors.left
:
parent
.
left
anchors.top
:
toolbarSpacer
.
bottom
spacing
:
ScreenTools
.
defaultFontPixelHeight
RoundButton
{
id
:
addMissionItemsButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
y
:
(
parent
.
height
-
(
_toolButtonCount
*
height
)
-
((
_toolButtonCount
-
1
)
*
_margin
))
/
2
buttonImage
:
"
/qmlimages/MapAddMission.svg
"
exclusiveGroup
:
_dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
onCheckedChanged
:
{
...
...
@@ -734,14 +754,10 @@ QGCView {
RoundButton
{
id
:
deleteMissionItemButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.top
:
addMissionItemsButton
.
bottom
buttonImage
:
"
/qmlimages/TrashDelete.svg
"
exclusiveGroup
:
_dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
onClicked
:
{
addMissionItemsButton
.
checked
=
false
itemDragger
.
clearItem
()
controller
.
deleteCurrentMissionItem
()
checked
=
false
...
...
@@ -752,20 +768,14 @@ QGCView {
Home Position manager temporarily disable
RoundButton {
id: homePositionManagerButton
anchors.margins: _margin
anchors.left: parent.left
anchors.top: deleteMissionItemButton.bottom
buttonImage: "/qmlimages/MapHome.svg"
exclusiveGroup: _dropButtonsExclusiveGroup
//
exclusiveGroup: _dropButtonsExclusiveGroup
z: QGroundControl.zOrderWidgets
}
*/
DropButton
{
id
:
centerMapButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.top
:
deleteMissionItemButton
.
bottom
dropDirection
:
dropRight
buttonImage
:
"
/qmlimages/MapCenter.svg
"
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
...
...
@@ -808,9 +818,6 @@ QGCView {
DropButton
{
id
:
syncButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.top
:
centerMapButton
.
bottom
dropDirection
:
dropRight
buttonImage
:
_syncNeeded
?
"
/qmlimages/MapSyncChanged.svg
"
:
"
/qmlimages/MapSync.svg
"
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
...
...
@@ -822,9 +829,6 @@ QGCView {
DropButton
{
id
:
mapTypeButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.top
:
syncButton
.
bottom
dropDirection
:
dropRight
buttonImage
:
"
/qmlimages/MapType.svg
"
viewportMargins
:
ScreenTools
.
defaultFontPixelWidth
/
2
...
...
@@ -859,16 +863,40 @@ QGCView {
}
}
//-- Zoom Map In
RoundButton
{
id
:
mapZoomPlus
visible
:
!
ScreenTools
.
isTinyScreen
buttonImage
:
"
/qmlimages/ZoomPlus.svg
"
z
:
QGroundControl
.
zOrderWidgets
onClicked
:
{
if
(
editorMap
)
editorMap
.
zoomLevel
+=
0.5
checked
=
false
}
}
//-- Zoom Map Out
RoundButton
{
id
:
mapZoomMinus
visible
:
!
ScreenTools
.
isTinyScreen
buttonImage
:
"
/qmlimages/ZoomMinus.svg
"
z
:
QGroundControl
.
zOrderWidgets
onClicked
:
{
if
(
editorMap
)
editorMap
.
zoomLevel
-=
0.5
checked
=
false
}
}
RoundButton
{
id
:
helpButton
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.top
:
mapTypeButton
.
bottom
buttonImage
:
"
/qmlimages/Help.svg
"
exclusiveGroup
:
_dropButtonsExclusiveGroup
z
:
QGroundControl
.
zOrderWidgets
checked
:
_showHelp
}
}
Rectangle
{
id
:
waypointDistanceDisplay
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment