Merge branch 'AOSC-Dev-master'

src/branding/default/branding.desc

@@ -1,3 +1,4 @@
+# style.sidebarTextHighlight is optional and defaults to application palette
 ---
 componentName:  default
 
@@ -25,3 +26,4 @@ style:
    sidebarBackground:    "#292F34"
    sidebarText:          "#FFFFFF"
    sidebarTextSelect:    "#292F34"
+   sidebarTextHighlight: "#D35400"

src/calamares/progresstree/ProgressTreeDelegate.cpp

@@ -104,7 +104,12 @@ ProgressTreeDelegate::paintViewStep( QPainter* painter,
     {
         painter->setPen( Calamares::Branding::instance()->
                          styleString( Calamares::Branding::SidebarTextSelect ) );
-        painter->setBrush( APP->mainWindow()->palette().background() );
+        QString textHighlight = Calamares::Branding::instance()->
+                           styleString( Calamares::Branding::SidebarTextHighlight );
+        if ( textHighlight.isEmpty() )
+            painter->setBrush( APP->mainWindow()->palette().background() );
+        else
+            painter->setBrush( QColor( textHighlight ) );
     }
 
     painter->fillRect( option.rect, painter->brush().color() );

src/libcalamaresui/Branding.cpp

@@ -71,7 +71,8 @@ const QStringList Branding::s_styleEntryStrings =
 {
     "sidebarBackground",
     "sidebarText",
-    "sidebarTextSelect"
+    "sidebarTextSelect",
+    "sidebarTextHighlight"
 };
 
 

src/libcalamaresui/Branding.h

@@ -62,7 +62,8 @@ public:
     {
         SidebarBackground,
         SidebarText,
-        SidebarTextSelect
+        SidebarTextSelect,
+        SidebarTextHighlight
     };
 
     static Branding* instance();