Skip to content

Q
qgroundcontrol
Commit 91c556cf authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #3104 from DonLakeFlyer/OutdoorPalette 

Much better Outdoor palette visuals
parents b9e0a303 bc69d121
Show whitespace changes
Inline Side-by-side
Showing with 194 additions and 206 deletions
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
View file @ 91c556cf
...@@ -403,7 +403,6 @@ QGCView { ...@@ -403,7 +403,6 @@ QGCView {
QGCButton { QGCButton {
id: nextButton id: nextButton
showBorder: true
text: "Next" text: "Next"
enabled: false enabled: false
onClicked: controller.nextClicked() onClicked: controller.nextClicked()
...@@ -411,7 +410,6 @@ QGCView { ...@@ -411,7 +410,6 @@ QGCView {
QGCButton { QGCButton {
id: cancelButton id: cancelButton
showBorder: true
text: "Cancel" text: "Cancel"
enabled: false enabled: false
onClicked: controller.cancelCalibration() onClicked: controller.cancelCalibration()
......
src/AutoPilotPlugins/Common/RadioComponent.qml
View file @ 91c556cf
...@@ -396,7 +396,6 @@ QGCView { ...@@ -396,7 +396,6 @@ QGCView {
QGCButton { QGCButton {
id: skipButton id: skipButton
showBorder: true
text: "Skip" text: "Skip"
onClicked: controller.skipButtonClicked() onClicked: controller.skipButtonClicked()
...@@ -404,7 +403,6 @@ QGCView { ...@@ -404,7 +403,6 @@ QGCView {
QGCButton { QGCButton {
id: cancelButton id: cancelButton
showBorder: true
text: "Cancel" text: "Cancel"
onClicked: controller.cancelButtonClicked() onClicked: controller.cancelButtonClicked()
...@@ -413,7 +411,6 @@ QGCView { ...@@ -413,7 +411,6 @@ QGCView {
QGCButton { QGCButton {
id: nextButton id: nextButton
primary: true primary: true
showBorder: true
text: "Calibrate" text: "Calibrate"
onClicked: { onClicked: {
...@@ -457,7 +454,6 @@ QGCView { ...@@ -457,7 +454,6 @@ QGCView {
QGCButton { QGCButton {
id: bindButton id: bindButton
showBorder: true
text: "Spektrum Bind" text: "Spektrum Bind"
onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) onClicked: showDialog(spektrumBindDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
...@@ -465,7 +461,6 @@ QGCView { ...@@ -465,7 +461,6 @@ QGCView {
} }
QGCButton { QGCButton {
showBorder: true
text: "Copy Trims" text: "Copy Trims"
visible: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware visible: QGroundControl.multiVehicleManager.activeVehicle.px4Firmware
onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel) onClicked: showDialog(copyTrimsDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, StandardButton.Ok | StandardButton.Cancel)
......
src/AutoPilotPlugins/PX4/PowerComponent.qml
View file @ 91c556cf
...@@ -202,7 +202,7 @@ QGCView { ...@@ -202,7 +202,7 @@ QGCView {
height: voltageCol.height height: voltageCol.height
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
smooth: true smooth: true
color: palette.button color: palette.text
cache: false cache: false
source: getBatteryImage(); source: getBatteryImage();
} }
......
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @ 91c556cf
...@@ -355,7 +355,6 @@ QGCView { ...@@ -355,7 +355,6 @@ QGCView {
QGCButton { QGCButton {
id: cancelButton id: cancelButton
showBorder: true
text: "Cancel" text: "Cancel"
enabled: false enabled: false
onClicked: controller.cancelCalibration() onClicked: controller.cancelCalibration()
......
src/FlightDisplay/FlightDisplayView.qml
View file @ 91c556cf
...@@ -42,11 +42,9 @@ import QGroundControl.FactSystem 1.0 ...@@ -42,11 +42,9 @@ import QGroundControl.FactSystem 1.0
QGCView { QGCView {
id: root id: root
viewPanel: _panel viewPanel: _panel
topDialogMargin: height - availableHeight
QGCPalette { id: qgcPal; colorGroupEnabled: enabled } QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
property real availableHeight: parent.height
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
...@@ -227,10 +225,7 @@ QGCView { ...@@ -227,10 +225,7 @@ QGCView {
Loader { Loader {
id: widgetsLoader id: widgetsLoader
z: _panel.z + 4 z: _panel.z + 4
anchors.right: parent.right anchors.fill: parent
anchors.left: parent.left
anchors.bottom: parent.bottom
height: availableHeight
asynchronous: true asynchronous: true
visible: status == Loader.Ready visible: status == Loader.Ready
......
src/MissionEditor/MissionEditor.qml
View file @ 91c556cf
...@@ -43,7 +43,6 @@ QGCView { ...@@ -43,7 +43,6 @@ QGCView {
property bool syncNeeded: controller.visualItems.dirty // Unsaved changes, visible to parent container property bool syncNeeded: controller.visualItems.dirty // Unsaved changes, visible to parent container
viewPanel: panel viewPanel: panel
topDialogMargin: height - mainWindow.availableHeight
// zOrder comes from the Loader in MainWindow.qml // zOrder comes from the Loader in MainWindow.qml
z: QGroundControl.zOrderTopMost z: QGroundControl.zOrderTopMost
...@@ -458,7 +457,7 @@ QGCView { ...@@ -458,7 +457,7 @@ QGCView {
// Mission Item Editor // Mission Item Editor
Item { Item {
id: missionItemEditor id: missionItemEditor
height: mainWindow.availableHeight anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
width: _rightPanelWidth width: _rightPanelWidth
...@@ -510,18 +509,12 @@ QGCView { ...@@ -510,18 +509,12 @@ QGCView {
} }
} }
Item {
id: toolbarSpacer
height: mainWindow.tbHeight
width: 1
}
//-- Vertical Tool Buttons //-- Vertical Tool Buttons
Column { Column {
id: toolColumn id: toolColumn
anchors.margins: ScreenTools.defaultFontPixelHeight anchors.margins: ScreenTools.defaultFontPixelHeight
anchors.left: parent.left anchors.left: parent.left
anchors.top: toolbarSpacer.bottom anchors.top: parent.top
spacing: ScreenTools.defaultFontPixelHeight spacing: ScreenTools.defaultFontPixelHeight
RoundButton { RoundButton {
......
src/MissionEditor/SimpleItemEditor.qml
View file @ 91c556cf
...@@ -40,6 +40,7 @@ Rectangle { ...@@ -40,6 +40,7 @@ Rectangle {
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pixelSize: ScreenTools.smallFontPixelHeight
text: missionItem.sequenceNumber == 0 ? text: missionItem.sequenceNumber == 0 ?
"Planned home position." : "Planned home position." :
(missionItem.rawEdit ? (missionItem.rawEdit ?
......
src/QGCPalette.cc
View file @ 91c556cf
...@@ -34,7 +34,7 @@ QList<QGCPalette*> QGCPalette::_paletteObjects; ...@@ -34,7 +34,7 @@ QList<QGCPalette*> QGCPalette::_paletteObjects;
QGCPalette::Theme QGCPalette::_theme = QGCPalette::Dark; QGCPalette::Theme QGCPalette::_theme = QGCPalette::Dark;
QColor QGCPalette::_window[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = { QColor QGCPalette::_window[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor("#f9f8f4"), QColor("#f9f8f4") }, { QColor("#ffffff"), QColor("#ffffff") },
{ QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22) } { QColor(0x22, 0x22, 0x22), QColor(0x22, 0x22, 0x22) }
}; };
...@@ -59,7 +59,7 @@ QColor QGCPalette::_warningText[QGCPalette::_cThemes][QGCPalette::_cColorGroups] ...@@ -59,7 +59,7 @@ QColor QGCPalette::_warningText[QGCPalette::_cThemes][QGCPalette::_cColorGroups]
}; };
QColor QGCPalette::_button[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = { QColor QGCPalette::_button[QGCPalette::_cThemes][QGCPalette::_cColorGroups] = {
{ QColor("#ffffff"), QColor("#91d1e4") }, { QColor("#ffffff"), QColor("#ffffff") },
{ QColor(0x58, 0x58, 0x58), QColor(98, 98, 100) }, { QColor(0x58, 0x58, 0x58), QColor(98, 98, 100) },
}; };
......
src/QmlControls/IndicatorButton.qml
View file @ 91c556cf
...@@ -9,8 +9,6 @@ import QGroundControl.ScreenTools 1.0 ...@@ -9,8 +9,6 @@ import QGroundControl.ScreenTools 1.0
// indicator on the right edge. // indicator on the right edge.
QGCButton { QGCButton {
showBorder: true
property bool indicatorGreen: false property bool indicatorGreen: false
Rectangle { Rectangle {
......
src/QmlControls/QGCButton.qml
View file @ 91c556cf
...@@ -8,12 +8,11 @@ import QGroundControl.ScreenTools 1.0 ...@@ -8,12 +8,11 @@ import QGroundControl.ScreenTools 1.0
Button { Button {
property bool primary: false // primary: true - primary button for a group of buttons property bool primary: false ///< primary button for a group of buttons
property bool showBorder: false ///< true: draw border around button
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool _showHighlight: (pressed | hovered | checked) && !__forceHoverOff
property bool __showHighlight: (pressed | hovered | checked) && !__forceHoverOff property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light
// This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can // This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can
// move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn // move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn
...@@ -69,11 +68,11 @@ Button { ...@@ -69,11 +68,11 @@ Button {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
border.width: showBorder ? 1: 0 border.width: _showBorder ? 1: 0
border.color: __qgcPal.buttonText border.color: _qgcPal.buttonText
color: __showHighlight ? color: _showHighlight ?
control.__qgcPal.buttonHighlight : control._qgcPal.buttonHighlight :
(primary ? control.__qgcPal.primaryButton : control.__qgcPal.button) (primary ? control._qgcPal.primaryButton : control._qgcPal.button)
} }
Image { Image {
...@@ -111,9 +110,9 @@ Button { ...@@ -111,9 +110,9 @@ Button {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: __showHighlight ? color: _showHighlight ?
control.__qgcPal.buttonHighlightText : control._qgcPal.buttonHighlightText :
(primary ? control.__qgcPal.primaryButtonText : control.__qgcPal.buttonText) (primary ? control._qgcPal.primaryButtonText : control._qgcPal.buttonText)
} }
} }
} }
......
src/QmlControls/QGCComboBox.qml
View file @ 91c556cf
...@@ -7,14 +7,15 @@ import QGroundControl.Palette 1.0 ...@@ -7,14 +7,15 @@ import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0 import QGroundControl.ScreenTools 1.0
ComboBox { ComboBox {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } property var _qgcPal: QGCPalette { colorGroupEnabled: enabled }
property bool __showHighlight: pressed | hovered property bool _showHighlight: pressed | hovered
property bool _showBorder: _qgcPal.globalTheme == QGCPalette.Light
style: ComboBoxStyle { style: ComboBoxStyle {
font.pixelSize: ScreenTools.defaultFontPixelSize font.pixelSize: ScreenTools.defaultFontPixelSize
textColor: __showHighlight ? textColor: _showHighlight ?
control.__qgcPal.buttonHighlightText : control._qgcPal.buttonHighlightText :
control.__qgcPal.buttonText control._qgcPal.buttonText
background: Item { background: Item {
implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5) implicitWidth: Math.round(TextSingleton.implicitHeight * 4.5)
...@@ -22,14 +23,13 @@ ComboBox { ...@@ -22,14 +23,13 @@ ComboBox {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: __showHighlight ? color: _showHighlight ? control._qgcPal.buttonHighlight : control._qgcPal.button
control.__qgcPal.buttonHighlight : border.width: _showBorder ? 1: 0
control.__qgcPal.button border.color: control._qgcPal.buttonText
} }
Image { Image {
id: imageItem id: imageItem
visible: control.menu !== null
source: "/qmlimages/arrow-down.png" source: "/qmlimages/arrow-down.png"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
......
src/QmlControls/QGCToolBarButton.qml
View file @ 91c556cf
...@@ -26,6 +26,7 @@ import QtQuick.Controls 1.2 ...@@ -26,6 +26,7 @@ import QtQuick.Controls 1.2
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
Item { Item {
id: _root id: _root
...@@ -34,6 +35,8 @@ Item { ...@@ -34,6 +35,8 @@ Item {
property bool checked: false property bool checked: false
property ExclusiveGroup exclusiveGroup: null property ExclusiveGroup exclusiveGroup: null
readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight / 2
signal clicked() signal clicked()
QGCPalette { id: qgcPal } QGCPalette { id: qgcPal }
...@@ -44,20 +47,25 @@ Item { ...@@ -44,20 +47,25 @@ Item {
} }
} }
Rectangle {
anchors.fill: parent
color: qgcPal.buttonHighlight
visible: checked
}
QGCColoredImage { QGCColoredImage {
id: icon id: icon
width: parent.height * 0.9 anchors.left: parent.left
height: parent.height * 0.9 anchors.right: parent.right
anchors.topMargin: _topBottomMargins
anchors.bottomMargin: _topBottomMargins
anchors.top: parent.top
anchors.bottom: parent.bottom
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText color: checked ? qgcPal.buttonHighlight : qgcPal.buttonText
anchors.verticalCenter: parent.verticalCenter }
anchors.horizontalCenter: parent.horizontalCenter
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: _topBottomMargins / 3
color: qgcPal.buttonHighlight
visible: checked
} }
MouseArea { MouseArea {
......
src/VehicleSetup/SetupView.qml
View file @ 91c556cf
...@@ -209,15 +209,6 @@ Rectangle { ...@@ -209,15 +209,6 @@ Rectangle {
} }
} }
Rectangle {
//-- Limit height to available height (below tool bar)
anchors.topMargin: _margin
height: mainWindow.availableHeight
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
color: qgcPal.window
QGCFlickable { QGCFlickable {
id: buttonScroll id: buttonScroll
width: buttonColumn.width width: buttonColumn.width
...@@ -333,5 +324,4 @@ Rectangle { ...@@ -333,5 +324,4 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
}
} }
src/ui/MainWindowInner.qml
View file @ 91c556cf
...@@ -48,7 +48,6 @@ Item { ...@@ -48,7 +48,6 @@ Item {
property int tbCellHeight: tbHeight * 0.75 property int tbCellHeight: tbHeight * 0.75
property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54 property real tbSpacing: ScreenTools.isMobile ? width * 0.00824 : 9.54
property real tbButtonWidth: tbCellHeight * 1.35 property real tbButtonWidth: tbCellHeight * 1.35
property real availableHeight: height - tbHeight
property real menuButtonWidth: (tbButtonWidth * 2) + (tbSpacing * 4) + 1 property real menuButtonWidth: (tbButtonWidth * 2) + (tbSpacing * 4) + 1
property var gcsPosition: QtPositioning.coordinate() // Starts as invalid coordinate property var gcsPosition: QtPositioning.coordinate() // Starts as invalid coordinate
property var currentPopUp: null property var currentPopUp: null
...@@ -285,20 +284,28 @@ Item { ...@@ -285,20 +284,28 @@ Item {
FlightDisplayView { FlightDisplayView {
id: flightView id: flightView
anchors.fill: parent anchors.left: parent.left
availableHeight: mainWindow.availableHeight anchors.right: parent.right
anchors.top: toolBar.bottom
anchors.bottom: parent.bottom
visible: true visible: true
} }
Loader { Loader {
id: planViewLoader id: planViewLoader
anchors.fill: parent anchors.left: parent.left
anchors.right: parent.right
anchors.top: toolBar.bottom
anchors.bottom: parent.bottom
visible: false visible: false
} }
Loader { Loader {
id: setupViewLoader id: setupViewLoader
anchors.fill: parent anchors.left: parent.left
anchors.right: parent.right
anchors.top: toolBar.bottom
anchors.bottom: parent.bottom
visible: false visible: false
} }
......
src/ui/toolbar/MainToolBar.qml
View file @ 91c556cf
...@@ -397,6 +397,14 @@ Rectangle { ...@@ -397,6 +397,14 @@ Rectangle {
} }
} }
Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
height: 1
color: "black"
}
//--------------------------------------------- //---------------------------------------------
// Toolbar Row // Toolbar Row
Row { Row {
...@@ -405,14 +413,17 @@ Rectangle { ...@@ -405,14 +413,17 @@ Rectangle {
spacing: mainWindow.tbSpacing spacing: mainWindow.tbSpacing
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: mainWindow.tbSpacing anchors.leftMargin: mainWindow.tbSpacing
anchors.verticalCenter: parent.verticalCenter anchors.bottomMargin: 1
anchors.top: parent.top
anchors.bottom: parent.bottom
ExclusiveGroup { id: mainActionGroup } ExclusiveGroup { id: mainActionGroup }
QGCToolBarButton { QGCToolBarButton {
id: preferencesButton id: preferencesButton
width: mainWindow.tbButtonWidth width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight anchors.top: parent.top
anchors.bottom: parent.bottom
source: "/qmlimages/Hamburger.svg" source: "/qmlimages/Hamburger.svg"
onClicked: { onClicked: {
mainWindow.showLeftMenu(); mainWindow.showLeftMenu();
...@@ -423,7 +434,8 @@ Rectangle { ...@@ -423,7 +434,8 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: setupButton id: setupButton
width: mainWindow.tbButtonWidth width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight anchors.top: parent.top
anchors.bottom: parent.bottom
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
source: "/qmlimages/Gears.svg" source: "/qmlimages/Gears.svg"
onClicked: toolBar.showSetupView() onClicked: toolBar.showSetupView()
...@@ -432,7 +444,8 @@ Rectangle { ...@@ -432,7 +444,8 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: planButton id: planButton
width: mainWindow.tbButtonWidth width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight anchors.top: parent.top
anchors.bottom: parent.bottom
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
source: "/qmlimages/Plan.svg" source: "/qmlimages/Plan.svg"
onClicked: toolBar.showPlanView() onClicked: toolBar.showPlanView()
...@@ -441,7 +454,8 @@ Rectangle { ...@@ -441,7 +454,8 @@ Rectangle {
QGCToolBarButton { QGCToolBarButton {
id: flyButton id: flyButton
width: mainWindow.tbButtonWidth width: mainWindow.tbButtonWidth
height: mainWindow.tbCellHeight anchors.top: parent.top
anchors.bottom: parent.bottom
exclusiveGroup: mainActionGroup exclusiveGroup: mainActionGroup
source: "/qmlimages/PaperPlane.svg" source: "/qmlimages/PaperPlane.svg"
onClicked: toolBar.showFlyView() onClicked: toolBar.showFlyView()
......
src/ui/toolbar/MainToolBarIndicators.qml
View file @ 91c556cf
...@@ -371,15 +371,6 @@ Row { ...@@ -371,15 +371,6 @@ Row {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCColoredImage {
width: mainWindow.tbCellHeight * 0.65
height: mainWindow.tbCellHeight * 0.65
fillMode: Image.PreserveAspectFit
source: "/qmlimages/Quad.svg"
color: qgcPal.buttonText
anchors.verticalCenter: parent.verticalCenter
}
QGCLabel { QGCLabel {
text: activeVehicle ? activeVehicle.flightMode : "N/A" text: activeVehicle ? activeVehicle.flightMode : "N/A"
font.pixelSize: tbFontLarge font.pixelSize: tbFontLarge
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment