diff --git a/custom-example/res/QGCLogoFull.svg b/custom-example/res/QGCLogoFull.svg
index 853fbc5b64f..822ab6891ab 100644
--- a/custom-example/res/QGCLogoFull.svg
+++ b/custom-example/res/QGCLogoFull.svg
@@ -1,5 +1,86 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/deploy/installer/config/logos/QGCLogoFull.svg b/deploy/installer/config/logos/QGCLogoFull.svg
index ebfb890a6b4..c0da7982190 100644
--- a/deploy/installer/config/logos/QGCLogoFull.svg
+++ b/deploy/installer/config/logos/QGCLogoFull.svg
@@ -1,27 +1,75 @@
-
+
-
diff --git a/resources/QGCLogoFull.svg b/resources/QGCLogoFull.svg
index ebfb890a6b4..c0da7982190 100644
--- a/resources/QGCLogoFull.svg
+++ b/resources/QGCLogoFull.svg
@@ -1,27 +1,75 @@
-
+
-
diff --git a/src/FlightDisplay/GuidedActionConfirm.qml b/src/FlightDisplay/GuidedActionConfirm.qml
index d6d92dc0ccc..02d80a742d4 100644
--- a/src/FlightDisplay/GuidedActionConfirm.qml
+++ b/src/FlightDisplay/GuidedActionConfirm.qml
@@ -88,9 +88,8 @@ Rectangle {
ColumnLayout {
id: mainLayout
- anchors.margins: _margins
- anchors.left: parent.left
- anchors.right: parent.right
+ anchors.centerIn: parent
+ width: parent.width - (_margins * 2)
spacing: _margins
QGCLabel {
@@ -147,7 +146,7 @@ Rectangle {
anchors.fill: parent
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
- color: qgcPal.text
+ color: qgcPal.primaryButtonText
}
QGCMouseArea {
diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml
index ca371e9b911..042a5aea36e 100644
--- a/src/QmlControls/QGCButton.qml
+++ b/src/QmlControls/QGCButton.qml
@@ -30,7 +30,7 @@ Button {
property alias wrapMode: text.wrapMode
property alias horizontalAlignment: text.horizontalAlignment
- property bool _showHighlight: enabled && (pressed | hovered | checked)
+ property bool _showHighlight: enabled && (pressed | checked)
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight * heightFactor)
@@ -44,7 +44,13 @@ Button {
implicitHeight: ScreenTools.implicitButtonHeight
border.width: showBorder ? 1 : 0
border.color: qgcPal.buttonBorder
- color: _showHighlight ? qgcPal.buttonHighlight : (primary ? qgcPal.primaryButton : qgcPal.button)
+ color: primary ? qgcPal.primaryButton : qgcPal.button
+
+ Rectangle {
+ anchors.fill: parent
+ color: qgcPal.buttonHighlight
+ opacity: _showHighlight ? 1 : control.enabled && control.hovered ? .2 : 0
+ }
}
contentItem: RowLayout {
diff --git a/src/QmlControls/SliderSwitch.qml b/src/QmlControls/SliderSwitch.qml
index c2f8c3766d2..05cd106634a 100644
--- a/src/QmlControls/SliderSwitch.qml
+++ b/src/QmlControls/SliderSwitch.qml
@@ -70,7 +70,7 @@ Rectangle {
fillMode: Image.PreserveAspectFit
smooth: false
mipmap: false
- color: qgcPal.buttonText
+ color: qgcPal.primaryButtonText
cache: false
source: "/res/ArrowRight.svg"
}
diff --git a/src/QmlControls/SubMenuButton.qml b/src/QmlControls/SubMenuButton.qml
index 378ed8c835c..1fcadc9027a 100644
--- a/src/QmlControls/SubMenuButton.qml
+++ b/src/QmlControls/SubMenuButton.qml
@@ -17,6 +17,7 @@ Button {
text: "Button" ///< Pass in your own button text
focusPolicy: Qt.ClickFocus
+ hoverEnabled: !ScreenTools.isMobile
implicitHeight: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 3.5 : ScreenTools.defaultFontPixelHeight * 2.5
//implicitWidth: __panel.implicitWidth
@@ -39,10 +40,16 @@ Button {
background: Rectangle {
id: innerRect
- color: showHighlight ? qgcPal.buttonHighlight : qgcPal.windowShade
+ color: qgcPal.windowShade
implicitWidth: titleBar.x + titleBar.contentWidth + ScreenTools.defaultFontPixelWidth
+ Rectangle {
+ anchors.fill: parent
+ color: qgcPal.buttonHighlight
+ opacity: showHighlight ? 1 : control.enabled && control.hovered ? .2 : 0
+ }
+
QGCColoredImage {
id: image
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index daf07f7d637..09eb9827ab2 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -78,7 +78,6 @@ Rectangle {
anchors.left: toolStripColumn.left
anchors.right: toolStripColumn.right
height: width
- radius: ScreenTools.defaultFontPixelWidth / 2
fontPointSize: _root.fontSize
toolStripAction: modelData
dropPanel: _dropPanel
diff --git a/src/QmlControls/ToolStripHoverButton.qml b/src/QmlControls/ToolStripHoverButton.qml
index a7fc4cc019e..99c637ac803 100644
--- a/src/QmlControls/ToolStripHoverButton.qml
+++ b/src/QmlControls/ToolStripHoverButton.qml
@@ -20,10 +20,10 @@ Button {
hoverEnabled: !ScreenTools.isMobile
enabled: toolStripAction.enabled
visible: toolStripAction.visible
- imageSource: toolStripAction.showAlternateIcon ? modelData.alternateIconSource : modelData.iconSource
+ imageSource: toolStripAction.showAlternateIcon ? toolStripAction.alternateIconSource : toolStripAction.iconSource
text: toolStripAction.text
checked: toolStripAction.checked
- checkable: toolStripAction.dropPanelComponent || modelData.checkable
+ checkable: toolStripAction.dropPanelComponent || toolStripAction.checkable
property var toolStripAction: undefined
property var dropPanel: undefined
@@ -78,7 +78,7 @@ Button {
sourceSize.width: width
anchors.horizontalCenter: parent.horizontalCenter
source: control.imageSource
- visible: source != "" && modelData.fullColorIcon
+ visible: source != "" && toolStripAction.fullColorIcon
}
QGCColoredImage {
@@ -93,11 +93,11 @@ Button {
sourceSize.height: height
sourceSize.width: width
anchors.horizontalCenter: parent.horizontalCenter
- visible: source != "" && !modelData.fullColorIcon
+ visible: source != "" && !toolStripAction.fullColorIcon
QGCColoredImage {
id: innerImageSecondColor
- source: modelData.alternateIconSource
+ source: toolStripAction.alternateIconSource
height: contentLayoutItem.height * imageScale
width: contentLayoutItem.width * imageScale
smooth: true
@@ -108,7 +108,7 @@ Button {
sourceSize.height: height
sourceSize.width: width
anchors.horizontalCenter: parent.horizontalCenter
- visible: source != "" && modelData.biColorIcon
+ visible: source != "" && toolStripAction.biColorIcon
}
}
@@ -127,7 +127,8 @@ Button {
id: buttonBkRect
color: (control.checked || control.pressed) ?
qgcPal.buttonHighlight :
- (control.hovered ? qgcPal.toolStripHoverColor : qgcPal.toolbarBackground)
+ (control.enabled && control.hovered ? qgcPal.toolStripHoverColor : qgcPal.toolbarBackground)
+ radius: ScreenTools.defaultFontPixelWidth / 2
anchors.fill: parent
}
}
diff --git a/src/UI/AppSettings.qml b/src/UI/AppSettings.qml
index c7151095d98..491c584b3bf 100644
--- a/src/UI/AppSettings.qml
+++ b/src/UI/AppSettings.qml
@@ -83,13 +83,15 @@ Rectangle {
Layout.fillWidth: true
text: name
padding: ScreenTools.defaultFontPixelWidth / 2
+ hoverEnabled: !ScreenTools.isMobile
autoExclusive: true
icon.source: iconUrl
visible: pageVisible()
background: Rectangle {
- color: checked ? qgcPal.buttonHighlight : "transparent"
- radius: ScreenTools.defaultFontPixelWidth / 2
+ color: qgcPal.buttonHighlight
+ opacity: checked ? 1 : enabled && hovered ? .2 : 0
+ radius: ScreenTools.defaultFontPixelWidth / 2
}
contentItem: RowLayout {
diff --git a/test/QmlControls/QmlTest.qml b/test/QmlControls/QmlTest.qml
index cce783afa07..df4f856a245 100644
--- a/test/QmlControls/QmlTest.qml
+++ b/test/QmlControls/QmlTest.qml
@@ -12,6 +12,8 @@ Rectangle {
anchors.margins: ScreenTools.defaultFontPixelWidth
color: "white"
+ QGCPalette { id: qgcPal }
+
property var palette: QGCPalette { colorGroupEnabled: true }
property var enabledPalette: QGCPalette { colorGroupEnabled: true }
property var disabledPalette: QGCPalette { colorGroupEnabled: false }
@@ -237,16 +239,16 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
QGCRadioButton {
text: qsTr("Light")
- checked: _root.qgcPal.globalTheme === QGCPalette.Light
+ checked: qgcPal.globalTheme === QGCPalette.Light
onClicked: {
- _root.qgcPal.globalTheme = QGCPalette.Light
+ qgcPal.globalTheme = QGCPalette.Light
}
}
QGCRadioButton {
text: qsTr("Dark")
- checked: _root.qgcPal.globalTheme === QGCPalette.Dark
+ checked: qgcPal.globalTheme === QGCPalette.Dark
onClicked: {
- _root.qgcPal.globalTheme = QGCPalette.Dark
+ qgcPal.globalTheme = QGCPalette.Dark
}
}
}
@@ -433,12 +435,10 @@ Rectangle {
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
text: qsTr("Button")
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
text: qsTr("Button")
enabled: false
}
@@ -450,13 +450,11 @@ Rectangle {
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
primary: true
text: qsTr("Button")
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
text: qsTr("Button")
primary: true
enabled: false
@@ -468,19 +466,19 @@ Rectangle {
property string text: "ToolStripHoverButton"
}
ToolStripHoverButton {
- width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height * 2
- text: qsTr("Hover Button")
- radius: ScreenTools.defaultFontPointSize
- imageSource: "/qmlimages/Gears.svg"
+ width: ScreenTools.defaultFontPixelWidth * 10
+ toolStripAction: ToolStripAction {
+ text: qsTr("Button")
+ iconSource: "/qmlimages/Gears.svg"
+ }
}
ToolStripHoverButton {
- width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height * 2
- text: qsTr("Hover Button")
- radius: ScreenTools.defaultFontPointSize
- imageSource: "/qmlimages/Gears.svg"
- enabled: false
+ width: ScreenTools.defaultFontPixelWidth * 10
+ toolStripAction: ToolStripAction {
+ text: qsTr("Button")
+ iconSource: "/qmlimages/Gears.svg"
+ enabled: false
+ }
}
// QGCButton - menu
@@ -502,13 +500,11 @@ Rectangle {
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
text: qsTr("Button")
onClicked: buttonMenu.popup()
}
QGCButton {
width: ctlPrevColumn._colWidth
- height: ctlPrevColumn._height
text: qsTr("Button")
enabled: false
onClicked: buttonMenu.popup()