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
ec1271c9
Commit
ec1271c9
authored
Jun 11, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Large font for guided bar
Was too hard to click
parent
28b7de31
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
7 deletions
+13
-7
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+7
-2
QGCButton.qml
src/QmlControls/QGCButton.qml
+3
-3
SliderSwitch.qml
src/QmlControls/SliderSwitch.qml
+3
-2
No files found.
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
ec1271c9
...
...
@@ -442,27 +442,31 @@ Item {
}
Row
{
spacing
:
_margins
spacing
:
_margins
*
2
QGCButton
{
pointSize
:
ScreenTools
.
largeFontPointSize
text
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
?
(
_activeVehicle
.
flying
?
qsTr
(
"
Emergency Stop
"
)
:
qsTr
(
"
Disarm
"
))
:
qsTr
(
"
Arm
"
)
visible
:
_activeVehicle
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
armed
?
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmEmergencyStop
:
_guidedModeBar
.
confirmDisarm
)
:
_guidedModeBar
.
confirmArm
)
}
QGCButton
{
pointSize
:
ScreenTools
.
largeFontPointSize
text
:
qsTr
(
"
RTL
"
)
visible
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
flying
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmHome
)
}
QGCButton
{
pointSize
:
ScreenTools
.
largeFontPointSize
text
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
?
qsTr
(
"
Land
"
):
qsTr
(
"
Takeoff
"
)
visible
:
_activeVehicle
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_activeVehicle
.
flying
?
_guidedModeBar
.
confirmLand
:
_guidedModeBar
.
confirmTakeoff
)
}
QGCButton
{
pointSize
:
ScreenTools
.
largeFontPointSize
text
:
qsTr
(
"
Pause
"
)
visible
:
(
_activeVehicle
&&
_activeVehicle
.
armed
)
&&
_activeVehicle
.
pauseVehicleSupported
&&
_activeVehicle
.
flying
onClicked
:
{
...
...
@@ -472,6 +476,7 @@ Item {
}
QGCButton
{
pointSize
:
ScreenTools
.
largeFontPointSize
text
:
qsTr
(
"
Change Altitude
"
)
visible
:
(
_activeVehicle
&&
_activeVehicle
.
flying
)
&&
_activeVehicle
.
guidedModeSupported
&&
_activeVehicle
.
armed
onClicked
:
_guidedModeBar
.
confirmAction
(
_guidedModeBar
.
confirmChangeAlt
)
...
...
@@ -492,7 +497,7 @@ Item {
anchors.bottomMargin
:
_margins
anchors.bottom
:
parent
.
bottom
anchors.horizontalCenter
:
parent
.
horizontalCenter
height
:
ScreenTools
.
defaultFontPixelHeight
*
3
height
:
_guidedModeBar
.
height
visible
:
false
z
:
QGroundControl
.
zOrderWidgets
...
...
src/QmlControls/QGCButton.qml
View file @
ec1271c9
...
...
@@ -7,8 +7,8 @@ import QGroundControl.Palette 1.0
import
QGroundControl
.
ScreenTools
1.0
Button
{
property
bool
primary
:
false
///< primary button for a group of buttons
property
bool
primary
:
false
///< primary button for a group of buttons
property
real
pointSize
:
ScreenTools
.
defaultFontPointSize
///< Point size for button text
property
var
_qgcPal
:
QGCPalette
{
colorGroupEnabled
:
enabled
}
property
bool
_showHighlight
:
(
pressed
|
hovered
|
checked
)
&&
!
__forceHoverOff
...
...
@@ -102,7 +102,7 @@ Button {
id
:
text
antialiasing
:
true
text
:
control
.
text
font.pointSize
:
ScreenTools
.
defaultFontP
ointSize
font.pointSize
:
p
ointSize
font.family
:
ScreenTools
.
normalFontFamily
anchors.verticalCenter
:
parent
.
verticalCenter
color
:
_showHighlight
?
...
...
src/QmlControls/SliderSwitch.qml
View file @
ec1271c9
...
...
@@ -23,10 +23,11 @@ Rectangle {
QGCPalette
{
id
:
qgcPal
;
colorGroupEnabled
:
true
}
QGCLabel
{
id
:
label
id
:
label
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
qsTr
(
"
Slide to %1
"
).
arg
(
confirmText
)
font.pointSize
:
ScreenTools
.
largeFontPointSize
text
:
qsTr
(
"
Slide to %1
"
).
arg
(
confirmText
)
}
Rectangle
{
...
...
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