diff --git a/custom-example/src/CustomPlugin.cc b/custom-example/src/CustomPlugin.cc index 7058ef3847fc..5fb681ac66f2 100644 --- a/custom-example/src/CustomPlugin.cc +++ b/custom-example/src/CustomPlugin.cc @@ -232,12 +232,12 @@ void CustomPlugin::paletteOverride(const QString &colorName, QGCPalette::Palette colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#000000"); colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#212529"); colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#000000"); - } else if (colorName == QStringLiteral("brandingPurple")) { + } else if (colorName == QStringLiteral("brandPrimary")) { colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#4a2c6d"); colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#4a2c6d"); colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#4a2c6d"); colorInfo[QGCPalette::Light][QGCPalette::ColorGroupDisabled] = QColor("#4a2c6d"); - } else if (colorName == QStringLiteral("brandingBlue")) { + } else if (colorName == QStringLiteral("brandAccent")) { colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupEnabled] = QColor("#6045c5"); colorInfo[QGCPalette::Dark][QGCPalette::ColorGroupDisabled] = QColor("#48d6ff"); colorInfo[QGCPalette::Light][QGCPalette::ColorGroupEnabled] = QColor("#6045c5"); diff --git a/src/FactSystem/FactControls/FactValueSlider.qml b/src/FactSystem/FactControls/FactValueSlider.qml index 9591ab7422b9..a3505c40be3d 100644 --- a/src/FactSystem/FactControls/FactValueSlider.qml +++ b/src/FactSystem/FactControls/FactValueSlider.qml @@ -142,7 +142,7 @@ Rectangle { width: _itemWidth + (_borderWidth * 2) height: _itemHeight + (_borderWidth * 2) border.width: _borderWidth - border.color: qgcPal.brandingBlue + border.color: qgcPal.brandAccent color: "transparent" readonly property int _borderWidth: 3 diff --git a/src/QmlControls/QGCPalette.cc b/src/QmlControls/QGCPalette.cc index d667e33dbd70..d1219306b059 100644 --- a/src/QmlControls/QGCPalette.cc +++ b/src/QmlControls/QGCPalette.cc @@ -76,8 +76,8 @@ void QGCPalette::_buildMap() // Colors not affecting by theming // Disabled Enabled - DECLARE_QGC_NONTHEMED_COLOR(brandingPurple, "#4A2C6D", "#4A2C6D") - DECLARE_QGC_NONTHEMED_COLOR(brandingBlue, "#48D6FF", "#6045c5") + DECLARE_QGC_NONTHEMED_COLOR(brandPrimary, "#4A2C6D", "#4A2C6D") + DECLARE_QGC_NONTHEMED_COLOR(brandAccent, "#48D6FF", "#6045c5") DECLARE_QGC_NONTHEMED_COLOR(toolStripFGColor, "#707070", "#ffffff") DECLARE_QGC_NONTHEMED_COLOR(photoCaptureButtonColor, "#707070", "#ffffff") DECLARE_QGC_NONTHEMED_COLOR(videoCaptureButtonColor, "#f89a9e", "#f32836") diff --git a/src/QmlControls/QGCPalette.h b/src/QmlControls/QGCPalette.h index 6588c1c3b948..e7a8555ac90a 100644 --- a/src/QmlControls/QGCPalette.h +++ b/src/QmlControls/QGCPalette.h @@ -127,8 +127,8 @@ class QGCPalette : public QObject DEFINE_QGC_COLOR(mapWidgetBorderLight, setMapWidgetBorderLight) DEFINE_QGC_COLOR(mapWidgetBorderDark, setMapWidgetBorderDark) DEFINE_QGC_COLOR(mapMissionTrajectory, setMapMissionTrajectory) - DEFINE_QGC_COLOR(brandingPurple, setBrandingPurple) - DEFINE_QGC_COLOR(brandingBlue, setBrandingBlue) + DEFINE_QGC_COLOR(brandPrimary, setBrandPrimary) + DEFINE_QGC_COLOR(brandAccent, setBrandAccent) DEFINE_QGC_COLOR(colorGreen, setColorGreen) DEFINE_QGC_COLOR(colorYellow, setColorYellow) DEFINE_QGC_COLOR(colorYellowGreen, setColorYellowGreen) diff --git a/src/Toolbar/FlyViewToolBar.qml b/src/Toolbar/FlyViewToolBar.qml index 6312af3b3c70..b94cf2c8dcaa 100644 --- a/src/Toolbar/FlyViewToolBar.qml +++ b/src/Toolbar/FlyViewToolBar.qml @@ -16,7 +16,7 @@ Item { property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle property bool _communicationLost: _activeVehicle ? _activeVehicle.vehicleLinkManager.communicationLost : false - property color _mainStatusBGColor: qgcPal.brandingPurple + property color _mainStatusBGColor: qgcPal.brandPrimary property real _leftRightMargin: ScreenTools.defaultFontPixelWidth * 0.75 property var _guidedController: globals.guidedControllerFlyView diff --git a/src/Toolbar/MainStatusIndicator.qml b/src/Toolbar/MainStatusIndicator.qml index 86aa1ac661fe..697440b2e642 100644 --- a/src/Toolbar/MainStatusIndicator.qml +++ b/src/Toolbar/MainStatusIndicator.qml @@ -102,7 +102,7 @@ RowLayout { } } } else { - _mainStatusBGColor = qgcPal.brandingPurple + _mainStatusBGColor = qgcPal.brandPrimary return mainStatusLabel._disconnectedText } }