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
76619fd9
Unverified
Commit
76619fd9
authored
Jul 30, 2019
by
Gus Grubba
Committed by
GitHub
Jul 30, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7643 from yasendimov/pr_custom-theme-fixes
Custom theme - Multi vehicle and Camera Shutter fixes
parents
4b15d5bc
60a4faa5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
CustomVehicleButton.qml
custom-example/res/Custom/Widgets/CustomVehicleButton.qml
+11
-11
CustomCameraControl.qml
custom-example/res/CustomCameraControl.qml
+2
-2
CustomFlyView.qml
custom-example/res/CustomFlyView.qml
+2
-2
No files found.
custom-example/res/Custom/Widgets/CustomVehicleButton.qml
View file @
76619fd9
...
...
@@ -47,7 +47,7 @@ Button {
background
:
Rectangle
{
anchors.fill
:
parent
color
:
button
.
checked
?
qgcPal
.
buttonHighlight
:
qgcPal
.
button
color
:
button
.
checked
?
qgcPal
.
window
:
qgcPal
.
button
radius
:
ScreenTools
.
defaultFontPixelWidth
*
0.5
}
...
...
@@ -55,16 +55,16 @@ Button {
spacing
:
ScreenTools
.
defaultFontPixelWidth
anchors.margins
:
ScreenTools
.
defaultFontPixelWidth
anchors.verticalCenter
:
button
.
verticalCenter
QGCColoredImage
{
id
:
_icon
height
:
ScreenTools
.
defaultFontPixelHeight
*
1.5
width
:
height
sourceSize.height
:
parent
.
height
fillMode
:
Image
.
PreserveAspectFit
color
:
button
.
checked
?
qgcPal
.
buttonHighlightText
:
qgcPal
.
buttonText
source
:
"
/qmlimages/PaperPlane.svg
"
anchors.verticalCenter
:
parent
.
verticalCenter
}
//
QGCColoredImage {
//
id: _icon
//
height: ScreenTools.defaultFontPixelHeight * 1.5
//
width: height
//
sourceSize.height: parent.height
//
fillMode: Image.PreserveAspectFit
//
color: button.checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
//
source: "/qmlimages/PaperPlane.svg"
//
anchors.verticalCenter: parent.verticalCenter
//
}
Column
{
id
:
_infoCol
spacing
:
ScreenTools
.
defaultFontPixelHeight
*
0.25
...
...
custom-example/res/CustomCameraControl.qml
View file @
76619fd9
...
...
@@ -232,10 +232,10 @@ Item {
height
:
ScreenTools
.
defaultFontPixelHeight
*
4
radius
:
width
*
0.5
border.color
:
qgcPal
.
buttonText
border.width
:
2
border.width
:
1
anchors.horizontalCenter
:
parent
.
horizontalCenter
Rectangle
{
width
:
parent
.
width
*
0.
9
5
width
:
parent
.
width
*
0.
8
5
height
:
width
radius
:
width
*
0.5
color
:
_cameraModeUndefined
?
qgcPal
.
colorGrey
:
(
_cameraVideoMode
?
qgcPal
.
colorRed
:
qgcPal
.
text
)
...
...
custom-example/res/CustomFlyView.qml
View file @
76619fd9
...
...
@@ -256,7 +256,7 @@ Item {
width
:
vehicleStatusGrid
.
width
+
(
ScreenTools
.
defaultFontPixelWidth
*
3
)
height
:
vehicleStatusGrid
.
height
+
(
ScreenTools
.
defaultFontPixelHeight
*
1.5
)
radius
:
2
anchors.bottom
:
multiVehicleSelector
.
visible
?
multiVehicleSelector
.
top
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
anchors.bottomMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.right
:
attitudeIndicator
.
visible
?
attitudeIndicator
.
left
:
parent
.
right
anchors.rightMargin
:
attitudeIndicator
.
visible
?
-
ScreenTools
.
defaultFontPixelWidth
:
ScreenTools
.
defaultFontPixelWidth
...
...
@@ -493,7 +493,7 @@ Item {
spacing
:
ScreenTools
.
defaultFontPixelWidth
anchors.bottom
:
parent
.
bottom
anchors.bottomMargin
:
ScreenTools
.
defaultFontPixelWidth
*
1.5
anchors.right
:
parent
.
righ
t
anchors.right
:
vehicleIndicator
.
lef
t
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
visible
:
QGroundControl
.
multiVehicleManager
.
vehicles
.
count
>
1
Repeater
{
...
...
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