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
075175f2
Commit
075175f2
authored
Jul 07, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove fading help text
parent
409f3040
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
58 deletions
+3
-58
QGCToolBarButton.qml
src/QmlControls/QGCToolBarButton.qml
+3
-54
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+0
-4
No files found.
src/QmlControls/QGCToolBarButton.qml
View file @
075175f2
...
...
@@ -20,18 +20,14 @@ Item {
state
:
"
HelpShown
"
clip
:
true
property
alias
text
:
helpText
.
text
property
alias
source
:
icon
.
source
property
bool
checked
:
false
property
bool
logo
:
false
property
ExclusiveGroup
exclusiveGroup
:
null
signal
clicked
()
readonly
property
real
_topBottomMargins
:
ScreenTools
.
defaultFontPixelHeight
/
2
property
real
_helpTextBottomMargin
:
0
property
real
_imageBottomMargin
:
0
signal
clicked
()
onExclusiveGroupChanged
:
{
if
(
exclusiveGroup
)
{
...
...
@@ -41,43 +37,6 @@ Item {
QGCPalette
{
id
:
qgcPal
}
states
:
[
State
{
name
:
"
HelpShown
"
},
State
{
name
:
"
HelpHidden
"
PropertyChanges
{
target
:
imageAnimation
;
running
:
true
}
PropertyChanges
{
target
:
helpTextAnimation
;
running
:
true
}
}
]
PropertyAnimation
{
id
:
imageAnimation
target
:
_root
property
:
"
_imageBottomMargin
"
duration
:
1000
easing.type
:
Easing
.
InOutQuad
to
:
_topBottomMargins
from
:
0
}
PropertyAnimation
{
id
:
helpTextAnimation
target
:
_root
property
:
"
_helpTextBottomMargin
"
duration
:
1000
easing.type
:
Easing
.
InOutQuad
to
:
-
helpText
.
height
from
:
0
}
Timer
{
interval
:
10000
running
:
true
onTriggered
:
_root
.
state
=
"
HelpHidden
"
}
Rectangle
{
anchors.fill
:
parent
visible
:
logo
...
...
@@ -90,8 +49,8 @@ Item {
anchors.right
:
parent
.
right
anchors.topMargin
:
_topBottomMargins
anchors.top
:
parent
.
top
anchors.bottomMargin
:
_
imageBottomMargin
anchors.bottom
:
helpText
.
top
anchors.bottomMargin
:
_
topBottomMargins
anchors.bottom
:
parent
.
bottom
sourceSize.height
:
parent
.
height
fillMode
:
Image
.
PreserveAspectFit
color
:
logo
?
"
white
"
:
(
checked
?
qgcPal
.
buttonHighlight
:
qgcPal
.
buttonText
)
...
...
@@ -106,16 +65,6 @@ Item {
visible
:
checked
}
QGCLabel
{
id
:
helpText
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottomMargin
:
_helpTextBottomMargin
anchors.bottom
:
parent
.
bottom
horizontalAlignment
:
Text
.
AlignHCenter
color
:
logo
?
"
white
"
:
qgcPal
.
buttonText
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
...
...
src/ui/toolbar/MainToolBar.qml
View file @
075175f2
...
...
@@ -332,7 +332,6 @@ Rectangle {
exclusiveGroup
:
mainActionGroup
source
:
"
/res/QGCLogoWhite
"
logo
:
true
text
:
"
Settings
"
onClicked
:
toolBar
.
showPreferences
()
}
...
...
@@ -343,7 +342,6 @@ Rectangle {
anchors.bottom
:
parent
.
bottom
exclusiveGroup
:
mainActionGroup
source
:
"
/qmlimages/Gears.svg
"
text
:
"
Setup
"
onClicked
:
toolBar
.
showSetupView
()
}
...
...
@@ -354,7 +352,6 @@ Rectangle {
anchors.bottom
:
parent
.
bottom
exclusiveGroup
:
mainActionGroup
source
:
"
/qmlimages/Plan.svg
"
text
:
"
Plan
"
onClicked
:
toolBar
.
showPlanView
()
}
...
...
@@ -365,7 +362,6 @@ Rectangle {
anchors.bottom
:
parent
.
bottom
exclusiveGroup
:
mainActionGroup
source
:
"
/qmlimages/PaperPlane.svg
"
text
:
"
Fly
"
onClicked
:
toolBar
.
showFlyView
()
}
}
...
...
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