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
c6c138b5
Commit
c6c138b5
authored
Mar 20, 2017
by
Donald Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Flashing sync button when dirty
parent
1f464e45
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+1
-0
ToolStrip.qml
src/QmlControls/ToolStrip.qml
+19
-0
No files found.
src/MissionEditor/MissionEditor.qml
View file @
c6c138b5
...
@@ -718,6 +718,7 @@ QGCView {
...
@@ -718,6 +718,7 @@ QGCView {
z
:
QGroundControl
.
zOrderWidgets
z
:
QGroundControl
.
zOrderWidgets
showAlternateIcon
:
[
false
,
false
,
_syncDropDownController
.
dirty
,
false
,
false
,
false
,
false
]
showAlternateIcon
:
[
false
,
false
,
_syncDropDownController
.
dirty
,
false
,
false
,
false
,
false
]
rotateImage
:
[
false
,
false
,
_syncDropDownController
.
syncInProgress
,
false
,
false
,
false
,
false
]
rotateImage
:
[
false
,
false
,
_syncDropDownController
.
syncInProgress
,
false
,
false
,
false
,
false
]
animateImage
:
[
false
,
false
,
_syncDropDownController
.
dirty
,
false
,
false
,
false
,
false
]
buttonEnabled
:
[
true
,
true
,
!
_syncDropDownController
.
syncInProgress
,
true
,
true
,
true
,
true
]
buttonEnabled
:
[
true
,
true
,
!
_syncDropDownController
.
syncInProgress
,
true
,
true
,
true
,
true
]
buttonVisible
:
[
true
,
true
,
true
,
true
,
true
,
_showZoom
,
_showZoom
]
buttonVisible
:
[
true
,
true
,
true
,
true
,
true
,
_showZoom
,
_showZoom
]
maxHeight
:
mapScale
.
y
-
toolStrip
.
y
maxHeight
:
mapScale
.
y
-
toolStrip
.
y
...
...
src/QmlControls/ToolStrip.qml
View file @
c6c138b5
...
@@ -24,6 +24,7 @@ Rectangle {
...
@@ -24,6 +24,7 @@ Rectangle {
property
alias
model
:
repeater
.
model
property
alias
model
:
repeater
.
model
property
var
showAlternateIcon
///< List of bool values, one for each button in strip - true: show alternate icon, false: show normal icon
property
var
showAlternateIcon
///< List of bool values, one for each button in strip - true: show alternate icon, false: show normal icon
property
var
rotateImage
///< List of bool values, one for each button in strip - true: animation rotation, false: static image
property
var
rotateImage
///< List of bool values, one for each button in strip - true: animation rotation, false: static image
property
var
animateImage
///< List of bool values, one for each button in strip - true: animate image, false: static image
property
var
buttonEnabled
///< List of bool values, one for each button in strip - true: button enabled, false: button disabled
property
var
buttonEnabled
///< List of bool values, one for each button in strip - true: button enabled, false: button disabled
property
var
buttonVisible
///< List of bool values, one for each button in strip - true: button visible, false: button invisible
property
var
buttonVisible
///< List of bool values, one for each button in strip - true: button visible, false: button invisible
property
real
maxHeight
///< Maximum height for control, determines whether text is hidden to make control shorter
property
real
maxHeight
///< Maximum height for control, determines whether text is hidden to make control shorter
...
@@ -123,6 +124,7 @@ Rectangle {
...
@@ -123,6 +124,7 @@ Rectangle {
property
var
_alternateIconSource
:
modelData
.
alternateIconSource
property
var
_alternateIconSource
:
modelData
.
alternateIconSource
property
var
_source
:
(
_root
.
showAlternateIcon
&&
_root
.
showAlternateIcon
[
index
])
?
_alternateIconSource
:
_iconSource
property
var
_source
:
(
_root
.
showAlternateIcon
&&
_root
.
showAlternateIcon
[
index
])
?
_alternateIconSource
:
_iconSource
property
bool
rotateImage
:
_root
.
rotateImage
?
_root
.
rotateImage
[
index
]
:
false
property
bool
rotateImage
:
_root
.
rotateImage
?
_root
.
rotateImage
[
index
]
:
false
property
bool
animateImage
:
_root
.
animateImage
?
_root
.
animateImage
[
index
]
:
false
onExclusiveGroupChanged
:
{
onExclusiveGroupChanged
:
{
if
(
exclusiveGroup
)
{
if
(
exclusiveGroup
)
{
...
@@ -139,6 +141,15 @@ Rectangle {
...
@@ -139,6 +141,15 @@ Rectangle {
}
}
}
}
onAnimateImageChanged
:
{
if
(
animateImage
)
{
opacityAnimation
.
running
=
true
}
else
{
opacityAnimation
.
running
=
false
button
.
opacity
=
1
}
}
Item
{
Item
{
width
:
1
width
:
1
height
:
_buttonSpacing
height
:
_buttonSpacing
...
@@ -170,6 +181,14 @@ Rectangle {
...
@@ -170,6 +181,14 @@ Rectangle {
running
:
false
running
:
false
}
}
NumberAnimation
on
opacity
{
id
:
opacityAnimation
running
:
false
from
:
0
to
:
1.0
loops
:
Animation
.
Infinite
duration
:
2000
}
}
}
QGCMouseArea
{
QGCMouseArea
{
...
...
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