Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
402b380b
Commit
402b380b
authored
Nov 29, 2015
by
dogmaphobic
Browse files
Adding thumbstick bezel
parent
285ac2ba
Changes
4
Show whitespace changes
Inline
Side-by-side
qgcresources.qrc
View file @
402b380b
...
...
@@ -101,16 +101,18 @@
</qresource>
<qresource prefix="/res">
<file alias="Play">resources/Play.svg</file>
<file alias="Pause">resources/Pause.svg</file>
<file alias="Stop">resources/Stop.svg</file>
<file alias="AntennaT">resources/Antenna_T.svg</file>
<file alias="AntennaRC">resources/Antenna_RC.svg</file>
<file alias="SplashScreen">resources/SplashScreen.png</file>
<file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
<file alias="PowerButton">resources/PowerButton.svg</file>
<file alias="AntennaT">resources/Antenna_T.svg</file>
<file alias="buttonLeft.svg">resources/buttonLeft.svg</file>
<file alias="buttonRight.svg">resources/buttonRight.svg</file>
<file alias="JoystickBezel.png">resources/JoystickBezel.png</file>
<file alias="JoystickBezelLight.png">resources/JoystickBezelLight.png</file>
<file alias="Pause">resources/Pause.svg</file>
<file alias="Play">resources/Play.svg</file>
<file alias="PowerButton">resources/PowerButton.svg</file>
<file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
<file alias="SplashScreen">resources/SplashScreen.png</file>
<file alias="Stop">resources/Stop.svg</file>
<file alias="XDelete.svg">resources/XDelete.svg</file>
<file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
</qresource>
...
...
resources/JoystickBezel.png
0 → 100644
View file @
402b380b
22.4 KB
resources/JoystickBezelLight.png
0 → 100644
View file @
402b380b
21.7 KB
src/QmlControls/JoystickThumbPad.qml
View file @
402b380b
...
...
@@ -4,12 +4,8 @@ import QtQuick.Controls 1.2
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
ScreenTools
1.0
Rectangle
{
Item
{
id
:
_joyRoot
radius
:
width
/
2
border.color
:
mapPal
.
thumbJoystick
border.width
:
ScreenTools
.
defaultFontPixelWidth
*
0.25
color
:
"
transparent
"
property
alias
lightColors
:
mapPal
.
lightColors
/// true: use light colors from QGCMapPalette for drawing
property
var
stickPosition
:
Qt
.
point
(
0
,
0
)
...
...
@@ -47,9 +43,11 @@ Rectangle {
stickPosition
=
Qt
.
point
(
width
/
2
,
width
/
2
)
}
Column
{
QGCLabel
{
text
:
xAxis
}
QGCLabel
{
text
:
yAxis
}
Image
{
anchors.fill
:
parent
source
:
lightColors
?
"
/res/JoystickBezel.png
"
:
"
/res/JoystickBezelLight.png
"
mipmap
:
true
smooth
:
true
}
Rectangle
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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