Find/fix a couple other issues with the themes files.

2 files changed, 9 insertions, 29 deletions

diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index dacc9f98..6d55633b 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -9,7 +9,7 @@ QWidget{
 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: 1px solid transparent;*/
 }
 /* Set the default canvas appearance for Lumina desktop plugins*/
 LDPlugin#LuminaDesktopPlugin{
@@ -38,7 +38,7 @@ QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTi
 }
 
 /* PAGES OF CONTAINER WIDGETS */
-QStackedWidget .QWidget, QTabWidget .QWidget{
+QStackedWidget .QWidget, QTabWidget .QWidget, QToolBox  > QScrollArea{
   background: %%ALTBASECOLOR%%;
   color: %%TEXTCOLOR%%;
   border: none;
@@ -81,6 +81,7 @@ QTabBar::tab {
   background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
   border: 1px solid %%ACCENTCOLOR%%;
   padding: 2px;
+  color: %%TEXTCOLOR%%;
 }
 QTabBar::tab:top{
   border-top-left-radius: 4px;
@@ -162,13 +163,6 @@ QGroupBox::title{
   border: none;
   color: %%TEXTCOLOR%%;
 }
-/*QGroupBox::indicator{ width: 13px; height 13px; }
-QGroupBox::indicator:checked{
-  image: url(:/trolltech/styles/commonstyle/images/standardbutton-apply-16.png);
-}
-QGroupBox::indicator:unchecked{
-  image: url(:/trolltech/styles/commonstyle/images/standardbutton-cancel-16.png);
-}*/
 
 /* COMBO BOX */
 QComboBox{
@@ -176,24 +170,10 @@ QComboBox{
   border-radius: 3px;
   padding: 1px 18px 1px 3px;*/
   color: %%TEXTCOLOR%%;
-  /*background: %%ALTBASECOLOR%%;
-  selection-background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);*/
+  background: %%ALTBASECOLOR%%;
+  selection-background-color: %%HIGHLIGHTCOLOR%%;
  }
 
-/* menu for the combo box */
-/* BUG IN QT 5: Cannot seem to change the highlight colors in the menu */
-/*QComboBox QAbstractItemView{
-  border: none;
-  border-radius: 0px;
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  selection-background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
-  background-color: %%ALTBASECOLOR%%;
-  color: %%TEXTCOLOR%%;
-  selection-color: %%TEXTHIGHLIGHTCOLOR%%;
-  padding: 1px;
-}*/
-
 
 /* VIEW WIDGETS */
 QTreeView, QListView{
@@ -202,7 +182,6 @@ QTreeView, QListView{
   border-radius: 3px;
   show-decoration-selected: 1;
   color: %%TEXTCOLOR%%;
-  /*margin: 1px;*/
 }
 
 /*
@@ -402,6 +381,7 @@ QPushButton:flat, QToolButton:flat{
    padding: 2px;
    border: 1px solid transparent;
    border-radius: 3px;
+   color: %%TEXTCOLOR%%;
  }
  QRadioButton::hover, QCheckBox:hover{
    background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
@@ -471,7 +451,7 @@ QAbstractSpinBox::up-arrow{
  /* CALENDER WIDGET */
  /* (This is a special hack since there is no official support for stylesheets for this widget) */
  QCalendarWidget QWidget#qt_calendar_navigationbar{
-   background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);
+   background-color: %%ALTBASECOLOR%%;
  }
 QCalendarWidget QWidget{ 
    background-color: %%BASECOLOR%%; 
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index 1633f2a3..c48ec645 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -7,7 +7,7 @@ QWidget{
 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: 1px solid transparent;*/
 }
 /* Set the default canvas appearance for Lumina desktop plugins*/
 LDPlugin#LuminaDesktopPlugin{
@@ -25,7 +25,7 @@ LDPlugin#LuminaDesktopPluginVisible{
 /* CALENDER WIDGET */
  /* (This is a special hack since there is no official support for stylesheets for this widget) */
  QCalendarWidget QWidget#qt_calendar_navigationbar{
-   background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);
+   background-color: %%ALTBASECOLOR%%;
  }
 QCalendarWidget QWidget{ 
    background-color: %%BASECOLOR%%;