From 7e012fc49a8f473471aee089d1618df96545be7e Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Tue, 26 Sep 2023 21:21:06 -0700 Subject: [PATCH] porting: Port away from PlasmaCore colors --- .../qml/actiondrawer/LandscapeContentContainer.qml | 2 +- .../actiondrawer/quicksettings/QuickSettingsDelegate.qml | 6 +++--- components/mobileshell/qml/statusbar/StatusBar.qml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml index ba966a0a..1823ddb2 100644 --- a/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml +++ b/components/mobileshell/qml/actiondrawer/LandscapeContentContainer.qml @@ -131,7 +131,7 @@ Item { id: date text: Qt.formatDate(timeSource.data.Local.DateTime, "ddd MMMM d") verticalAlignment: Qt.AlignTop - color: PlasmaCore.ColorScope.disabledTextColor + color: Kirigami.Theme.disabledTextColor opacity: columnLayout.opacity anchors { diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml index 099cb4e9..7a9ce940 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDelegate.qml @@ -36,10 +36,10 @@ Components.BaseItem { // set by children property var iconItem - readonly property color enabledButtonBorderColor: Qt.darker(PlasmaCore.ColorScope.highlightColor, 1.25) + readonly property color enabledButtonBorderColor: Qt.darker(Kirigami.Theme.highlightColor, 1.25) readonly property color disabledButtonBorderColor: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.textColor, Kirigami.Theme.backgroundColor, 0.75) - readonly property color enabledButtonColor: Kirigami.ColorUtils.tintWithAlpha(PlasmaCore.ColorScope.highlightColor, Kirigami.Theme.backgroundColor, 0.6) - readonly property color enabledButtonPressedColor: Kirigami.ColorUtils.tintWithAlpha(PlasmaCore.ColorScope.highlightColor, Kirigami.Theme.backgroundColor, 0.4); + readonly property color enabledButtonColor: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.highlightColor, Kirigami.Theme.backgroundColor, 0.6) + readonly property color enabledButtonPressedColor: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.highlightColor, Kirigami.Theme.backgroundColor, 0.4); readonly property color disabledButtonColor: Kirigami.Theme.backgroundColor readonly property color disabledButtonPressedColor: Qt.darker(disabledButtonColor, 1.1) diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index f3a9072b..84494e04 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -202,7 +202,7 @@ Item { PlasmaComponents.Label { text: Qt.formatDate(timeSource.data.Local.DateTime, "ddd. MMMM d") - color: PlasmaCore.ColorScope.disabledTextColor + color: Kirigami.Theme.disabledTextColor font.pixelSize: root.smallerTextPixelSize } @@ -213,7 +213,7 @@ Item { visible: root.showTime text: signalStrengthInfo.label - color: PlasmaCore.ColorScope.disabledTextColor + color: Kirigami.Theme.disabledTextColor font.pixelSize: root.smallerTextPixelSize horizontalAlignment: Qt.AlignRight }