Clean up the new theme modifications a bit to remove some duplications and unintendeded aftereffects. Also move those new modifications into the "None" theme (since it impacts the desktop and not generic applications).

2 files changed, 59 insertions, 33 deletions

diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index 06cbafb6..a3324513 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -8,47 +8,40 @@ QWidget{
 /* Set the panel appearance for this theme (unless manually customized) */
 QWidget#LuminaPanelColor{
   background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
-  border-radius: 3px;
-  /*border: 1px solid transparent;*/
-}
-/* Set the default canvas appearance for Lumina desktop plugins*/
-QWidget#LuminaPanelColor{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
-  border-radius: 3px;
-  /*border: 1px solid transparent;*/
+  border-radius: 5px;
 }
 
-LDPlugin#audioplayer   {
+/* Set the default canvas appearance for Lumina desktop plugins*/
+LDPlugin#audioplayer{
   background: %%BASECOLOR%%;
+  border-radius: 5px;
 }
 
-LDPlugin#calendar   {
+LDPlugin#calendar{
   background: %%BASECOLOR%%;
+  border-radius: 5px;
 }
 
-LDPlugin#notepad   {
+LDPlugin#notepad{
   background: %%BASECOLOR%%;
+  border-radius: 5px;
 }
 
-LDPlugin#applauncher  QWidget{
+LDPlugin#applauncher  QToolButton{
 background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
   stop: 0 transparent, 
   stop: 0.7 transparent,
   stop: 1.0 %%ACCENTDISABLECOLOR%%);
   border-radius: 5px; 
-  color: %%ALTBASECOLOR%%;
+  color: %%TEXTDISABLECOLOR%%;
 }
-LDPlugin#applauncher  QWidget:hover{
+LDPlugin#applauncher  QToolButton:hover{
   background: %%ACCENTDISABLECOLOR%%;
   border-radius: 5px; 
-  color: %%ALTBASECOLOR%%;
-}
-LDPlugin#applauncher QMenu{
-background: %%BASECOLOR%%;
-color: %%TEXTCOLOR%%;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
 }
 
-LDPlugin#desktopview QWidget{
+LDPlugin#desktopview QListWidget{
   background: transparent;
   border: 1px solid transparent;
 }
@@ -58,17 +51,13 @@ LDPlugin#desktopview QListWidget::item{
   stop: 0.7 transparent,
   stop: 1.0 %%ACCENTDISABLECOLOR%%);
   border-radius: 5px;
-  color: %%ALTBASECOLOR%%;
-}
-LDPlugin#desktopview QMenu{
-background: %%BASECOLOR%%;
-color: %%TEXTCOLOR%%;
+  color: %%TEXTDISABLECOLOR%%;
 }
 
 LDPlugin#desktopview QListWidget::item:hover{
   background: %%ACCENTDISABLECOLOR%%;
   border-radius: 5px;
-  color: %%ALTBASECOLOR%%;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
 }
 
 /*For the special widgets on the user button*/
@@ -80,6 +69,7 @@ UserItemWidget:hover{
   background: %%HIGHLIGHTCOLOR%%;
   color: %%TEXTHIGHLIGHTCOLOR%%;
 }
+
 /*Special taskmanager window buttons: based on window state*/
 LTBWidget{
   border: 1px solid transparent;
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index e141b34a..294aafb9 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -6,20 +6,56 @@ QWidget{
 /* Set the panel appearance for this theme (unless manually customized) */
 QWidget#LuminaPanelColor{
   background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
-  border-radius: 3px;
-  /*border: 1px solid transparent;*/
+  border-radius: 5px;
 }
+
 /* Set the default canvas appearance for Lumina desktop plugins*/
-LDPlugin#LuminaDesktopPlugin{
-  background: transparent;
+LDPlugin#audioplayer{
+  background: %%BASECOLOR%%;
   border-radius: 5px;
-  border: none;
 }
-/*For special desktop plugins that should never have a transparent background*/
-LDPlugin#LuminaDesktopPluginVisible{
+
+LDPlugin#calendar{
+  background: %%BASECOLOR%%;
+  border-radius: 5px;
+}
+
+LDPlugin#notepad{
   background: %%BASECOLOR%%;
+  border-radius: 5px;
+}
+
+LDPlugin#applauncher  QToolButton{
+background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+  stop: 0 transparent, 
+  stop: 0.7 transparent,
+  stop: 1.0 %%ACCENTDISABLECOLOR%%);
+  border-radius: 5px; 
+  color: %%TEXTDISABLECOLOR%%;
+}
+LDPlugin#applauncher  QToolButton:hover{
+  background: %%ACCENTDISABLECOLOR%%;
+  border-radius: 5px; 
+  color: %%TEXTHIGHLIGHTCOLOR%%;
+}
+
+LDPlugin#desktopview QListWidget{
+  background: transparent;
   border: 1px solid transparent;
+}
+LDPlugin#desktopview QListWidget::item{
+  background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+  stop: 0 transparent, 
+  stop: 0.7 transparent,
+  stop: 1.0 %%ACCENTDISABLECOLOR%%);
+  border-radius: 5px;
+  color: %%TEXTDISABLECOLOR%%;
+}
+
+LDPlugin#desktopview QListWidget::item:hover{
+  background: %%ACCENTDISABLECOLOR%%;
   border-radius: 5px;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
 }
 /*For the special widgets on the user button*/
 UserItemWidget{