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
896f0783
Commit
896f0783
authored
Oct 19, 2019
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
1b970693
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
249 additions
and
239 deletions
+249
-239
ArmedIndicator.qml
src/ui/toolbar/ArmedIndicator.qml
+6
-7
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+209
-76
MainToolBarIndicators.qml
src/ui/toolbar/MainToolBarIndicators.qml
+17
-136
ModeIndicator.qml
src/ui/toolbar/ModeIndicator.qml
+6
-7
MultiVehicleSelector.qml
src/ui/toolbar/MultiVehicleSelector.qml
+5
-6
VTOLModeIndicator.qml
src/ui/toolbar/VTOLModeIndicator.qml
+6
-7
No files found.
src/ui/toolbar/ArmedIndicator.qml
View file @
896f0783
...
...
@@ -20,8 +20,7 @@ import QGroundControl.Palette 1.0
//-------------------------------------------------------------------------
//-- Armed Indicator
QGCComboBox
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.verticalCenter
:
parent
.
verticalCenter
alternateText
:
_armed
?
qsTr
(
"
Armed
"
)
:
qsTr
(
"
Disarmed
"
)
model
:
[
qsTr
(
"
Arm
"
),
qsTr
(
"
Disarm
"
)
]
font.pointSize
:
ScreenTools
.
mediumFontPointSize
...
...
src/ui/toolbar/MainToolBar.qml
View file @
896f0783
This diff is collapsed.
Click to expand it.
src/ui/toolbar/MainToolBarIndicators.qml
View file @
896f0783
...
...
@@ -9,7 +9,6 @@
import
QtQuick
2.11
import
QtQuick
.
Controls
2.4
import
QtQuick
.
Dialogs
1.3
import
QtQuick
.
Layouts
1.11
import
QGroundControl
1.0
...
...
@@ -18,69 +17,14 @@ import QGroundControl.MultiVehicleManager 1.0
import
QGroundControl
.
ScreenTools
1.0
import
QGroundControl
.
Palette
1.0
Item
{
//-------------------------------------------------------------------------
// Easter egg mechanism
MouseArea
{
anchors.fill
:
parent
onClicked
:
{
_clickCount
++
eggTimer
.
restart
()
if
(
_clickCount
==
5
)
{
if
(
!
QGroundControl
.
corePlugin
.
showAdvancedUI
)
{
advancedModeConfirmation
.
open
()
}
else
{
QGroundControl
.
corePlugin
.
showAdvancedUI
=
false
}
}
else
if
(
_clickCount
==
7
)
{
QGroundControl
.
corePlugin
.
showTouchAreas
=
!
QGroundControl
.
corePlugin
.
showTouchAreas
}
}
property
int
_clickCount
:
0
Timer
{
id
:
eggTimer
interval
:
1000
repeat
:
false
onTriggered
:
parent
.
_clickCount
=
0
}
MessageDialog
{
id
:
advancedModeConfirmation
title
:
qsTr
(
"
Advanced Mode
"
)
text
:
QGroundControl
.
corePlugin
.
showAdvancedUIMessage
standardButtons
:
StandardButton
.
Yes
|
StandardButton
.
No
onYes
:
{
QGroundControl
.
corePlugin
.
showAdvancedUI
=
true
advancedModeConfirmation
.
close
()
}
}
}
//-------------------------------------------------------------------------
//-- Waiting for a vehicle
QGCLabel
{
id
:
waitForVehicle
anchors.centerIn
:
parent
text
:
qsTr
(
"
Waiting For Vehicle Connection
"
)
font.pointSize
:
ScreenTools
.
mediumFontPointSize
font.family
:
ScreenTools
.
demiboldFontFamily
color
:
qgcPal
.
colorRed
visible
:
!
activeVehicle
}
//-------------------------------------------------------------------------
//-- Toolbar Indicators
Row
{
//-------------------------------------------------------------------------
//-- Toolbar Indicators
Row
{
id
:
indicatorRow
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
*
2
spacing
:
ScreenTools
.
defaultFontPixelWidth
*
1.5
visible
:
activeVehicle
&&
!
communicationLost
Repeater
{
model
:
activeVehicle
?
activeVehicle
.
toolBarIndicators
:
[]
Loader
{
...
...
@@ -92,67 +36,4 @@ Item {
visible
:
item
.
showIndicator
}
}
}
//-------------------------------------------------------------------------
//-- Branding Logo
Image
{
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.margins
:
ScreenTools
.
defaultFontPixelHeight
*
0.66
visible
:
activeVehicle
&&
!
communicationLost
&&
x
>
(
indicatorRow
.
x
+
indicatorRow
.
width
+
ScreenTools
.
defaultFontPixelWidth
)
fillMode
:
Image
.
PreserveAspectFit
source
:
_outdoorPalette
?
_brandImageOutdoor
:
_brandImageIndoor
mipmap
:
true
property
bool
_outdoorPalette
:
qgcPal
.
globalTheme
===
QGCPalette
.
Light
property
bool
_corePluginBranding
:
QGroundControl
.
corePlugin
.
brandImageIndoor
.
length
!=
0
property
string
_userBrandImageIndoor
:
QGroundControl
.
settingsManager
.
brandImageSettings
.
userBrandImageIndoor
.
value
property
string
_userBrandImageOutdoor
:
QGroundControl
.
settingsManager
.
brandImageSettings
.
userBrandImageOutdoor
.
value
property
bool
_userBrandingIndoor
:
_userBrandImageIndoor
.
length
!=
0
property
bool
_userBrandingOutdoor
:
_userBrandImageOutdoor
.
length
!=
0
property
string
_brandImageIndoor
:
_userBrandingIndoor
?
_userBrandImageIndoor
:
(
_userBrandingOutdoor
?
_userBrandImageOutdoor
:
(
_corePluginBranding
?
QGroundControl
.
corePlugin
.
brandImageIndoor
:
(
activeVehicle
?
activeVehicle
.
brandImageIndoor
:
""
)
)
)
property
string
_brandImageOutdoor
:
_userBrandingOutdoor
?
_userBrandImageOutdoor
:
(
_userBrandingIndoor
?
_userBrandImageIndoor
:
(
_corePluginBranding
?
QGroundControl
.
corePlugin
.
brandImageOutdoor
:
(
activeVehicle
?
activeVehicle
.
brandImageOutdoor
:
""
)
)
)
}
//-------------------------------------------------------------------------
//-- Connection Status
Row
{
anchors.fill
:
parent
layoutDirection
:
Qt
.
RightToLeft
spacing
:
ScreenTools
.
defaultFontPixelWidth
visible
:
activeVehicle
&&
communicationLost
QGCButton
{
id
:
disconnectButton
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
qsTr
(
"
Disconnect
"
)
primary
:
true
onClicked
:
activeVehicle
.
disconnectInactiveVehicle
()
}
QGCLabel
{
id
:
connectionLost
anchors.verticalCenter
:
parent
.
verticalCenter
text
:
qsTr
(
"
COMMUNICATION LOST
"
)
font.pointSize
:
ScreenTools
.
largeFontPointSize
font.family
:
ScreenTools
.
demiboldFontFamily
color
:
qgcPal
.
colorRed
}
}
}
src/ui/toolbar/ModeIndicator.qml
View file @
896f0783
...
...
@@ -20,8 +20,7 @@ import QGroundControl.Palette 1.0
//-------------------------------------------------------------------------
//-- Mode Indicator
QGCComboBox
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.verticalCenter
:
parent
.
verticalCenter
alternateText
:
_activeVehicle
?
_activeVehicle
.
flightMode
:
""
model
:
_flightModes
font.pointSize
:
ScreenTools
.
mediumFontPointSize
...
...
src/ui/toolbar/MultiVehicleSelector.qml
View file @
896f0783
...
...
@@ -20,8 +20,7 @@ import QGroundControl.Palette 1.0
//-------------------------------------------------------------------------
//-- Multiple Vehicle Selector
QGCComboBox
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.verticalCenter
:
parent
.
verticalCenter
font.pointSize
:
ScreenTools
.
mediumFontPointSize
currentIndex
:
-
1
sizeToContents
:
true
...
...
src/ui/toolbar/VTOLModeIndicator.qml
View file @
896f0783
...
...
@@ -20,8 +20,7 @@ import QGroundControl.Palette 1.0
//-------------------------------------------------------------------------
//-- VTOL Mode Indicator
QGCLabel
{
anchors.top
:
parent
.
top
anchors.bottom
:
parent
.
bottom
anchors.verticalCenter
:
parent
.
verticalCenter
verticalAlignment
:
Text
.
AlignVCenter
text
:
_fwdFlight
?
qsTr
(
"
VTOL: Fixed Wing
"
)
:
qsTr
(
"
VTOL: Multi-Rotor
"
)
font.pointSize
:
ScreenTools
.
mediumFontPointSize
...
...
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