From e6d72cb23b630d22543d85fc89b1500d5400a46f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 3 Jun 2022 11:27:39 +0200
Subject: [PATCH] [calamares] Correct enum-names in QML Sidebar

- previous commits did not fix up all the enum names; this means
  you get errors -- because Branding.SidebarTextSelect is not a known
  name in the enum Branding::StyleEntry -- and the colors are messed up.
---
 src/calamares/calamares-sidebar.qml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/calamares/calamares-sidebar.qml b/src/calamares/calamares-sidebar.qml
index 46d2bd561..4780823cd 100644
--- a/src/calamares/calamares-sidebar.qml
+++ b/src/calamares/calamares-sidebar.qml
@@ -66,7 +66,7 @@ Rectangle {
             Layout.fillWidth: true;
             height: 35
             Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
-            color: Branding.styleString( Branding.SidebarTextHighlight );
+            color: Branding.styleString( Branding.SidebarBackground );
             visible: true;
 
             Rectangle {
@@ -74,7 +74,7 @@ Rectangle {
                 height: 35
                 width: parent.width / 2;
                 anchors.left: parent.left
-                color: Branding.styleString( Branding.SidebarTextHighlight );
+                color: Branding.styleString( Branding.SidebarBackgroundCurrent );
                 visible: true;
 
                 MouseArea {
@@ -87,7 +87,7 @@ Rectangle {
                         anchors.horizontalCenter: parent.horizontalCenter;
                         x: parent.x + 4;
                         text: qsTr("About")
-                        color: Branding.styleString( Branding.SidebarTextSelect );
+                        color: Branding.styleString( Branding.SidebarTextCurrent );
                         font.pointSize : 9
                     }
 
@@ -100,7 +100,7 @@ Rectangle {
                 height: 35
                 width: parent.width / 2;
                 anchors.right: parent.right
-                color: Branding.styleString( Branding.SidebarTextHighlight );
+                color: Branding.styleString( Branding.SidebarBackgroundCurrent );
                 visible: debug.enabled
 
                 MouseArea {
@@ -113,7 +113,7 @@ Rectangle {
                         anchors.horizontalCenter: parent.horizontalCenter;
                         x: parent.x + 4;
                         text: qsTr("Debug")
-                        color: Branding.styleString( Branding.SidebarTextSelect );
+                        color: Branding.styleString( Branding.SidebarTextCurrent );
                         font.pointSize : 9
                     }