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
6919af35
Commit
6919af35
authored
Aug 22, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new warningText QGCPalette entry
parent
8867b541
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
PowerComponent.qml
src/AutoPilotPlugins/PX4/PowerComponent.qml
+2
-2
VehicleSummary.qml
src/VehicleSetup/VehicleSummary.qml
+1
-1
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+2
-0
No files found.
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @
6919af35
...
@@ -248,7 +248,7 @@ QGCView {
...
@@ -248,7 +248,7 @@ QGCView {
spacing
:
10
spacing
:
10
QGCLabel
{
QGCLabel
{
color
:
"
yellow
"
color
:
palette
.
warningText
text
:
"
<font color=
\"
yellow
\"
>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</font>
"
text
:
"
<font color=
\"
yellow
\"
>WARNING: Propellers must be removed from vehicle prior to performing ESC calibration.</font>
"
}
}
...
@@ -279,7 +279,7 @@ QGCView {
...
@@ -279,7 +279,7 @@ QGCView {
spacing
:
10
spacing
:
10
QGCLabel
{
QGCLabel
{
color
:
"
yellow
"
color
:
palette
.
warningText
text
:
"
<font color=
\"
yellow
\"
>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</font>
"
text
:
"
<font color=
\"
yellow
\"
>WARNING: Propellers must be removed from vehicle prior to performing UAVCAN ESC configuration.</font>
"
}
}
...
...
src/VehicleSetup/VehicleSummary.qml
View file @
6919af35
...
@@ -58,7 +58,7 @@ Rectangle {
...
@@ -58,7 +58,7 @@ Rectangle {
QGCLabel
{
QGCLabel
{
width
:
parent
.
width
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
color
:
setupComplete
?
qgcPal
.
text
:
"
red
"
color
:
setupComplete
?
qgcPal
.
text
:
qgcPal
.
warningText
font.pixelSize
:
setupComplete
?
ScreenTools
.
defaultFontPixelSize
:
ScreenTools
.
mediumFontPixelSize
font.pixelSize
:
setupComplete
?
ScreenTools
.
defaultFontPixelSize
:
ScreenTools
.
mediumFontPixelSize
text
:
setupComplete
?
text
:
setupComplete
?
"
Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.
"
:
"
Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component.
"
:
...
...
src/ui/toolbar/MainToolBar.qml
View file @
6919af35
...
@@ -784,6 +784,7 @@ Rectangle {
...
@@ -784,6 +784,7 @@ Rectangle {
id
:
toolBarMessage
id
:
toolBarMessage
anchors.fill
:
parent
anchors.fill
:
parent
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
color
:
qgcPal
.
warningText
}
}
QGCButton
{
QGCButton
{
...
@@ -792,6 +793,7 @@ Rectangle {
...
@@ -792,6 +793,7 @@ Rectangle {
anchors.topMargin
:
verticalMargins
anchors.topMargin
:
verticalMargins
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
primary
:
true
text
:
"
Close Message
"
text
:
"
Close Message
"
onClicked
:
{
onClicked
:
{
...
...
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