diff --git a/qgcresources.qrc b/qgcresources.qrc
index 033fcd8cf01c6c83e6385c47d91a124c8d6a5458..d74da17b4d82abe46ff89e18880278f360fefee8 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -175,19 +175,22 @@
resources/gear-white.svg
resources/JoystickBezel.png
resources/JoystickBezelLight.png
+ resources/land.svg
resources/notile.png
- resources/Pause.svg
+ resources/Pause.svg
resources/Play.svg
resources/PowerButton.svg
- resources/QGCLogoWhite.svg
resources/QGCLogoBlack.svg
+ resources/QGCLogoWhite.svg
resources/QGroundControlConnect.svg
+ resources/rtl.svg
resources/SplashScreen.png
resources/Stop.svg
+ resources/takeoff.svg
resources/TrashDelete.svg
+ resources/waves.svg
resources/XDelete.svg
resources/XDeleteBlack.svg
- resources/waves.svg
resources/icons/qgroundcontrol.ico
diff --git a/resources/land.svg b/resources/land.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c6a1401d0581802ec4ffa15872e01d996136056f
--- /dev/null
+++ b/resources/land.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/resources/rtl.svg b/resources/rtl.svg
new file mode 100644
index 0000000000000000000000000000000000000000..83c67f9b55c058e30f11afc8bb24d561ece1ce05
--- /dev/null
+++ b/resources/rtl.svg
@@ -0,0 +1,17 @@
+
+
+
diff --git a/resources/takeoff.svg b/resources/takeoff.svg
new file mode 100644
index 0000000000000000000000000000000000000000..53f4abc0b61f07610335ed6565e5d4cd17dae2dc
--- /dev/null
+++ b/resources/takeoff.svg
@@ -0,0 +1,19 @@
+
+
+
diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 1dc71f75ccf32deecb5b6c0964a18fd417e1eef6..347edf22353c1b5494c9815fd184fd1c1dc39174 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -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 {
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 {
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 {
QGCLabel {
id: messageText
+ color: qgcPal.alertText
anchors.left: slider.left
anchors.right: slider.right
horizontalAlignment: Text.AlignHCenter
@@ -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 {
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 {
ColumnLayout {
id: actionColumn
anchors.margins: guidedActionList._margins
- anchors.top: parent.top
- anchors.left: parent.left
+ anchors.centerIn: parent
spacing: _margins
QGCLabel {
diff --git a/src/QGCPalette.cc b/src/QGCPalette.cc
index 32e1fe3737b783471c9a8b6a7663f67927cc246c..c0c2d76b5b9ba017eeb92ad9d5de258642d05bbd 100644
--- a/src/QGCPalette.cc
+++ b/src/QGCPalette.cc
@@ -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")
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 3e912e4d05652b7b9e1a3e9c707718dbd9def4a7..c851cdb7b510fc786219178c35ea60db696272b6 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -54,6 +54,7 @@ Rectangle {
onDefaultFontPixelHeightChanged: recalcShowOptionalElements()
}
+ /*
onHeightChanged: {
if (_needRecalc) {
_needRecalc = false
@@ -62,6 +63,7 @@ Rectangle {
}
}
}
+ */
function recalcShowOptionalElements() {
if (_showOptionalElements) {
@@ -232,6 +234,12 @@ Rectangle {
}
}
+ Item {
+ width: 1
+ height: ScreenTools.defaultFontPixelHeight * 0.25
+ visible: _showOptionalElements
+ }
+
QGCLabel {
id: buttonLabel
anchors.horizontalCenter: parent.horizontalCenter