zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Adding some WIP icons to the Fly View ToolStrip 

Increasing a bit the bottom margin for the confirmation dialogs
Changed the color for the guidedActionConfirm dialog to the palette’s alertColor
Disabled onHeightChanged on ToolStrip for the time being as it was not working. I need to come back to this and see why it hides “optional elements” even though I have plenty of space for them.
Adjusted the color for disabled text so you can read it within the ToolStrip
QGC4.4
Gus Grubba 8 years ago
parent
4e9b1de50f
commit
83f3ec5c81
7 changed files with 90 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      qgcresources.qrc
  2. 19
      resources/land.svg
  3. 17
      resources/rtl.svg
  4. 19
      resources/takeoff.svg
  5. 33
      src/FlightDisplay/FlightDisplayView.qml
  6. 6
      src/QGCPalette.cc
  7. 8
      src/QmlControls/ToolStrip.qml

9
qgcresources.qrc
Unescape View File

@ -175,19 +175,22 @@ @@ -175,19 +175,22 @@
<file alias="gear-white.svg">resources/gear-white.svg</file>
<file alias="JoystickBezel.png">resources/JoystickBezel.png</file>
<file alias="JoystickBezelLight.png">resources/JoystickBezelLight.png</file>
<file alias="land.svg">resources/land.svg</file>
<file alias="notile.png">resources/notile.png</file>
<file alias="Pause">resources/Pause.svg</file>
<file alias="Pause.svg">resources/Pause.svg</file>
<file alias="Play">resources/Play.svg</file>
<file alias="PowerButton">resources/PowerButton.svg</file>
<file alias="QGCLogoWhite">resources/QGCLogoWhite.svg</file>
<file alias="QGCLogoBlack">resources/QGCLogoBlack.svg</file>
<file alias="QGCLogoWhite">resources/QGCLogoWhite.svg</file>
<file alias="QGroundControlConnect">resources/QGroundControlConnect.svg</file>
<file alias="rtl.svg">resources/rtl.svg</file>
<file alias="SplashScreen">resources/SplashScreen.png</file>
<file alias="Stop">resources/Stop.svg</file>
<file alias="takeoff.svg">resources/takeoff.svg</file>
<file alias="TrashDelete.svg">resources/TrashDelete.svg</file>
<file alias="waves.svg">resources/waves.svg</file>
<file alias="XDelete.svg">resources/XDelete.svg</file>
<file alias="XDeleteBlack.svg">resources/XDeleteBlack.svg</file>
<file alias="waves.svg">resources/waves.svg</file>
<file>resources/icons/qgroundcontrol.ico</file>
</qresource>
<qresource prefix="/res/firmware">

19
resources/land.svg
Unescape View File

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
</style>
<g>
<path class="st0" d="M11.301,25.324c-0.002,0-0.003-0.001-0.005-0.002c-0.661-0.209-1.373,0.125-1.635,0.767
c-0.263,0.645,0.015,1.383,0.637,1.694l17.549,8.787l-6.483,1.559c-0.471,0.113-0.809,0.527-0.826,1.011
c-0.017,0.484,0.291,0.92,0.753,1.066l3.924,1.24c0.113,0.036,0.23,0.053,0.349,0.05l15.64-0.341l14.367,4.514
c5.503,1.648,6.57-0.248,6.766-0.868c0.152-0.481,0.209-1.273-0.383-2.314c-0.601-1.056-1.738-2.157-3.476-3.365
c-0.58-0.403-0.844-0.682-1.124-0.978c-0.983-1.038-1.736-1.656-6.908-3.291l-28.289-8.941l-3.472-10.965
c-0.131-0.413-0.455-0.737-0.869-0.868l-1.849-0.584c-0.381-0.12-0.795-0.064-1.129,0.154c-0.334,0.218-0.553,0.575-0.597,0.971
l-1.231,11.251L11.301,25.324z"/>
<line class="st1" x1="7.607" y1="58.566" x2="64.393" y2="58.566"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

17
resources/rtl.svg
Unescape View File

@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
.st1{fill:#FFFFFF;}
</style>
<g>
<g>
<path class="st0" d="M55.141,11.618H33.159c-12.14,0-21.982,9.842-21.982,21.982v0c0,12.14,9.842,21.982,21.982,21.982h7.629"/>
<g>
<polygon class="st1" points="37.871,65.554 55.141,55.581 37.871,45.609 "/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 737 B

19
resources/takeoff.svg
Unescape View File

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 72 72" style="enable-background:new 0 0 72 72;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
.st1{fill:none;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
</style>
<g>
<path class="st0" d="M13.866,40.628c-0.002,0.001-0.003,0.002-0.005,0.003c-0.615,0.32-0.883,1.059-0.614,1.699
c0.27,0.642,0.988,0.967,1.649,0.748l18.622-6.196l-3.482,5.686c-0.253,0.413-0.199,0.944,0.131,1.299
c0.33,0.354,0.856,0.445,1.286,0.221l3.652-1.898c0.105-0.054,0.2-0.126,0.282-0.211l10.818-11.301l13.351-6.966
c5.056-2.726,4.471-4.821,4.171-5.398c-0.232-0.447-0.752-1.048-1.907-1.365c-1.171-0.322-2.754-0.296-4.837,0.079
c-0.696,0.125-1.079,0.114-1.486,0.103c-1.429-0.039-2.398,0.057-7.212,2.558L21.959,33.369L11.751,28.07
c-0.385-0.2-0.843-0.2-1.228,0.001l-1.72,0.894c-0.354,0.184-0.607,0.517-0.689,0.908c-0.082,0.391,0.015,0.797,0.265,1.109
l7.086,8.826L13.866,40.628z"/>
<line class="st1" x1="7.607" y1="55.275" x2="64.393" y2="55.275"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

33
src/FlightDisplay/FlightDisplayView.qml
Unescape View File

@ -391,22 +391,22 @@ QGCView { @@ -391,22 +391,22 @@ QGCView {
model: [
{
name: guidedController.takeoffTitle,
iconSource: "/qmlimages/MapCenter.svg",
iconSource: "/res/takeoff.svg",
action: guidedController.actionTakeoff
},
{
name: guidedController.landTitle,
iconSource: "/qmlimages/MapCenter.svg",
iconSource: "/res/land.svg",
action: guidedController.actionLand
},
{
name: guidedController.rtlTitle,
iconSource: "/qmlimages/MapCenter.svg",
iconSource: "/res/rtl.svg",
action: guidedController.actionRTL
},
{
name: guidedController.pauseTitle,
iconSource: "/qmlimages/MapCenter.svg",
iconSource: "/res/Pause.svg",
action: guidedController.actionPause
},
{
@ -461,11 +461,14 @@ QGCView { @@ -461,11 +461,14 @@ QGCView {
id: guidedActionConfirm
anchors.margins: _margins
anchors.bottom: parent.bottom
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 4
anchors.horizontalCenter: parent.horizontalCenter
width: confirmColumn.width + (_margins * 2)
height: confirmColumn.height + (_margins * 2)
border.color: qgcPal.alertBorder
border.width: 1
width: confirmColumn.width + (_margins * 4)
height: confirmColumn.height + (_margins * 4)
radius: ScreenTools.defaultFontPixelHeight / 2
color: qgcPal.window
color: qgcPal.alertBackground
opacity: 0.9
z: guidedController.z
visible: false
@ -480,12 +483,12 @@ QGCView { @@ -480,12 +483,12 @@ QGCView {
Column {
id: confirmColumn
anchors.margins: _margins
anchors.top: parent.top
anchors.left: parent.left
anchors.centerIn: parent
spacing: _margins
QGCLabel {
id: titleText
color: qgcPal.alertText
anchors.left: slider.left
anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter
@ -493,6 +496,7 @@ QGCView { @@ -493,6 +496,7 @@ QGCView {
QGCLabel {
id: messageText
color: qgcPal.alertText
anchors.left: slider.left
anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter
@ -530,8 +534,7 @@ QGCView { @@ -530,8 +534,7 @@ QGCView {
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
color: qgcPal.text
color: qgcPal.alertText
QGCMouseArea {
fillItem: parent
onClicked: {
@ -546,9 +549,10 @@ QGCView { @@ -546,9 +549,10 @@ QGCView {
id: guidedActionList
anchors.margins: _margins
anchors.bottom: parent.bottom
anchors.bottomMargin: ScreenTools.defaultFontPixelHeight * 4
anchors.horizontalCenter: parent.horizontalCenter
width: actionColumn.width + (_margins * 2)
height: actionColumn.height + (_margins * 2)
width: actionColumn.width + (_margins * 4)
height: actionColumn.height + (_margins * 4)
radius: _margins / 2
color: qgcPal.window
opacity: 0.9
@ -562,8 +566,7 @@ QGCView { @@ -562,8 +566,7 @@ QGCView {
ColumnLayout {
id: actionColumn
anchors.margins: guidedActionList._margins
anchors.top: parent.top
anchors.left: parent.left
anchors.centerIn: parent
spacing: _margins
QGCLabel {

6
src/QGCPalette.cc
Unescape View File

@ -25,10 +25,10 @@ QGCPalette::Theme QGCPalette::_theme = QGCPalette::Dark; @@ -25,10 +25,10 @@ QGCPalette::Theme QGCPalette::_theme = QGCPalette::Dark;
DECLARE_QGC_COLOR(window, "#ffffff", "#ffffff", "#222222", "#222222")
DECLARE_QGC_COLOR(windowShade, "#d9d9d9", "#d9d9d9", "#333333", "#333333")
DECLARE_QGC_COLOR(windowShadeDark, "#bdbdbd", "#bdbdbd", "#282828", "#282828")
DECLARE_QGC_COLOR(text, "#9d9d9d", "#000000", "#3a3a3a", "#ffffff")
DECLARE_QGC_COLOR(text, "#9d9d9d", "#000000", "#a0a0a0", "#ffffff")
DECLARE_QGC_COLOR(warningText, "#cc0808", "#cc0808", "#f85761", "#f85761")
DECLARE_QGC_COLOR(button, "#ffffff", "#ffffff", "#606060", "#626270")
DECLARE_QGC_COLOR(buttonText, "#9d9d9d", "#000000", "#2c2c2c", "#ffffff")
DECLARE_QGC_COLOR(button, "#ffffff", "#ffffff", "#707070", "#626270")
DECLARE_QGC_COLOR(buttonText, "#9d9d9d", "#000000", "#202020", "#ffffff")
DECLARE_QGC_COLOR(buttonHighlight, "#e4e4e4", "#946120", "#3a3a3a", "#fff291")
DECLARE_QGC_COLOR(buttonHighlightText, "#2c2c2c", "#ffffff", "#2c2c2c", "#000000")
DECLARE_QGC_COLOR(primaryButton, "#585858", "#8cb3be", "#585858", "#8cb3be")

8
src/QmlControls/ToolStrip.qml
Unescape View File

@ -54,6 +54,7 @@ Rectangle { @@ -54,6 +54,7 @@ Rectangle {
onDefaultFontPixelHeightChanged: recalcShowOptionalElements()
}
/*
onHeightChanged: {
if (_needRecalc) {
_needRecalc = false
@ -62,6 +63,7 @@ Rectangle { @@ -62,6 +63,7 @@ Rectangle {
}
}
}
*/
function recalcShowOptionalElements() {
if (_showOptionalElements) {
@ -232,6 +234,12 @@ Rectangle { @@ -232,6 +234,12 @@ Rectangle {
}
}
Item {
width: 1
height: ScreenTools.defaultFontPixelHeight * 0.25
visible: _showOptionalElements
}
QGCLabel {
id: buttonLabel
anchors.horizontalCenter: parent.horizontalCenter

Write Preview
Loading…
Cancel
Save