From 693e21b5ca7f609a7339fafab0d404efca0ecfee Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Thu, 9 Jul 2015 10:09:34 -0400
Subject: Update the lumina themes and the PC-BSD color scheme a bit, and a
 couple more minor adjustments to case sensitivity in the luminaDesktop.conf
 parsing.

---
 libLumina/LuminaUtils.cpp                    |  4 +-
 libLumina/colors/PCBSD10-Default.qss.colors  | 20 +++++-----
 libLumina/themes/Lumina-default.qss.template | 56 ++++++++++++++++++++--------
 libLumina/themes/None.qss.template           | 14 +++++--
 4 files changed, 63 insertions(+), 31 deletions(-)

(limited to 'libLumina')

diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index 78f7826e..540598cf 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -381,7 +381,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){
       }
       else if(var==(panvar+"_autohide")){ deskset << "hidepanel="+istrue; }
       else if(var==(panvar+"_location")){ deskset << "location="+val.toLower(); }
-      else if(var==(panvar+"_plugins")){ deskset << "pluginlist="+val.toLower(); }
+      else if(var==(panvar+"_plugins")){ deskset << "pluginlist="+val; }
       else if(var==(panvar+"_pinlocation")){ deskset << "pinLocation="+val.toLower(); }
       else if(var==(panvar+"_edgepercent")){ deskset << "lengthPercent="+val; }
     }
@@ -394,7 +394,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){
   if(!tmp.isEmpty()){deskset << "[menu]"; }
   for(int i=0; i<tmp.length(); i++){
     if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; }
-    QString var = tmp[i].section("=",0,0).toLower().simplified();
+    QString var = tmp[i].section("=",0,0).simplified();
     QString val = tmp[i].section("=",1,1).section("#",0,0).toLower().simplified();
     //Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while
     if(var.contains(".")){ var.replace(".","_"); } 
diff --git a/libLumina/colors/PCBSD10-Default.qss.colors b/libLumina/colors/PCBSD10-Default.qss.colors
index b8fd375b..efcea51d 100644
--- a/libLumina/colors/PCBSD10-Default.qss.colors
+++ b/libLumina/colors/PCBSD10-Default.qss.colors
@@ -1,13 +1,13 @@
-ACCENTCOLOR=rgba(149,144,122,200)
-ACCENTDISABLECOLOR=rgba(74,71,60,200)
-ALTBASECOLOR=rgb(230,230,230)
+ACCENTCOLOR=rgba(182,186,191,200)
+ACCENTDISABLECOLOR=rgba(190,190,191,200)
+ALTBASECOLOR=rgb(241,241,241)
 BASECOLOR=rgb(247,246,244)
-HIGHLIGHTCOLOR=rgba(107,161,199,170)
-HIGHLIGHTDISABLECOLOR=rgba(107,161,199,100)
-PRIMARYCOLOR=rgba(229,231,238,200)
-PRIMARYDISABLECOLOR=rgba(229,231,238,100)
-SECONDARYCOLOR=rgba(243,235,199,200)
-SECONDARYDISABLECOLOR=rgba(221,214,181,100)
+HIGHLIGHTCOLOR=rgb(129,184,243)
+HIGHLIGHTDISABLECOLOR=rgba(129,184,243,150)
+PRIMARYCOLOR=rgba(224,236,238,200)
+PRIMARYDISABLECOLOR=rgba(234,237,238,100)
+SECONDARYCOLOR=rgba(200,222,243,200)
+SECONDARYDISABLECOLOR=rgba(200,222,243,100)
 TEXTCOLOR=black
 TEXTDISABLECOLOR=grey
-TEXTHIGHLIGHTCOLOR=black
\ No newline at end of file
+TEXTHIGHLIGHTCOLOR=black
diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index ed02b310..1b47e0af 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -79,18 +79,24 @@ LTBWidget{
 }
 LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/
 LTBWidget#WindowVisible{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%SECONDARYCOLOR%%, stop: 1 transparent);
 }
 LTBWidget#WindowInvisible{
   /* Primary color is used for the panel appearance, so use that to make it disappear*/
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 transparent);
+  background: transparent;
 }
 LTBWidget#WindowActive{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%ACCENTCOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent);
 }
 LTBWidget#WindowAttention{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTCOLOR%%, stop: 1 transparent);
+}
+LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover{
+  background: %%HIGHLIGHTCOLOR%%;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
+  border: 1px solid %%ACCENTCOLOR%%;
 }
+
 /* ALL THE WIDGETS WITH THE BASE COLOR */
 QMainWindow, QMenu, QDialog, QMessageBox{ 
   background: %%BASECOLOR%%; 
@@ -118,13 +124,32 @@ QToolBox::tab{
 }
 
 /* MENU WIDGETS */
-QMenuBar, QMenuBar::item, QToolBar, QStatusBar{ 
-  background: transparent;
-  border-color: none;
+QMenuBar, QMenuBar::item,QToolBar{ 
+  background: %%SECONDARYCOLOR%%;
+  border: none;
+  color: %%TEXTCOLOR%%;
+}
+
+QStatusBar{
+  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 transparent, stop: 0.5 %%SECONDARYCOLOR%%);
+  border: none;
   color: %%TEXTCOLOR%%;
 }
+QToolBar:top{
+  border-bottom: 1px solid %%ACCENTCOLOR%%;
+}
+QToolBar:bottom{
+  border-top: 1px solid %%ACCENTCOLOR%%;
+}
+QToolBar:left{
+  border-right: 1px solid %%ACCENTCOLOR%%;
+}
+QToolBar:right{
+  border-left: 1px solid %%ACCENTCOLOR%%;
+}
 
 QMenuBar::item{
+  background: transparent; /*Use the menu bar color*/
   padding-left: 4px;
   padding-right: 2px;
 }
@@ -233,7 +258,7 @@ QGroupBox::title{
   subcontrol-position: top center;
   padding: 0 3px;
   background: transparent;
-  border: none;
+  /*border: none;*/
   color: %%TEXTCOLOR%%;
 }
 
@@ -270,6 +295,7 @@ Already set though parentage  and causes usage errors if set manually
   border-color: %%ACCENTCOLOR%%;
   color: %%TEXTCOLOR%%;
 }*/
+
 QTreeView::item:hover, QListView::item:hover{
   background: %%HIGHLIGHTDISABLECOLOR%%;
 }
@@ -325,14 +351,14 @@ QScrollBar::add-page:horizontal{
   border-left: none;
 }
 QScrollBar::handle{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
+  background: QLinearGradient(x1: 0, y1: -0.3, x2: 0, y2: 1.3, stop: 0 %%BASECOLOR%%, stop: 0.5 %%SECONDARYCOLOR%%, stop: 1 %%BASECOLOR%%);
   border: 1px solid %%ACCENTCOLOR%%;
 }
 QScrollBar::handle:hover, QScrollBar::add-line:hover, QScrollBar::sub-line:hover{
   background: %%HIGHLIGHTCOLOR%%;
 }
 QScrollBar::add-line{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%BASECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
   border: 1px solid %%ACCENTCOLOR%%;
 subcontrol-position: bottom right;
 subcontrol-origin: margin;
@@ -344,7 +370,7 @@ QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal{
 width: 20px;
 }
 QScrollBar::sub-line{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%BASECOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
   border: 1px solid %%ACCENTCOLOR%%;
 subcontrol-position: top left;
 subcontrol-origin: margin;
@@ -424,7 +450,7 @@ border: 1px solid %%ACCENTCOLOR%%;
 /* BUTTONS */
 QPushButton{
      border: 1px solid %%ACCENTCOLOR%%;
-     border-radius: 6px;
+     border-radius: 3px;
      background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
      padding: 2px;
      padding-right: 4px;
@@ -449,8 +475,8 @@ QPushButton:flat, QToolButton:flat{
    border: 1px solid transparent; /* no border for a flat button */
 }
  
-QPushButton::hover, QToolButton::hover{
-   border: 1px solid %%ACCENTDISABLECOLOR%%;
+QPushButton:hover, QToolButton:hover{
+   border: 1px solid %%ACCENTCOLOR%%;
    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
    color: %%TEXTHIGHLIGHTCOLOR%%;
 }
@@ -466,7 +492,7 @@ QRadioButton::hover, QCheckBox:hover{
    color: %%TEXTHIGHLIGHTCOLOR%%;
 }
 QRadioButton::indicator, QCheckBox::indicator, QGroupBox::indicator{
-  border: 1px solid %%ACCENTCOLOR%%;
+  border: 1px solid %%TEXTCOLOR%%;
 }
 QRadioButton::indicator{
   border-radius: 7px;
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index 430bd44b..4b1d302d 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -68,6 +68,7 @@ UserItemWidget:hover{
   background: %%HIGHLIGHTCOLOR%%;
   color: %%TEXTHIGHLIGHTCOLOR%%;
 }
+
 /*Special taskmanager window buttons: based on window state*/
 LTBWidget{
   border: 1px solid transparent;
@@ -75,17 +76,22 @@ LTBWidget{
 }
 LTBWidget::menu-indicator{ image: none; } /*disable the menu arrow*/
 LTBWidget#WindowVisible{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%SECONDARYCOLOR%%, stop: 1 transparent);
 }
 LTBWidget#WindowInvisible{
   /* Primary color is used for the panel appearance, so use that to make it disappear*/
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 transparent);
+  background: transparent;
 }
 LTBWidget#WindowActive{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%ACCENTCOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent);
 }
 LTBWidget#WindowAttention{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 transparent);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1.1, stop: 0.3 %%HIGHLIGHTCOLOR%%, stop: 1 transparent);
+}
+LTBWidget:hover, LTBWidget#WindowVisible:hover, LTBWidget#WindowInvisible:hover, LTBWidget#WindowActive:hover, LTBWidget#WindowAttention:hover{
+  background: %%HIGHLIGHTCOLOR%%;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
+  border: 1px solid %%ACCENTCOLOR%%;
 }
 
 /* CALENDER WIDGET */
-- 
cgit