Update the theme files that are included with Lumina (much nicer now).

2 files changed, 115 insertions, 99 deletions

diff --git a/libLumina/themes/Lumina-default.qss.template b/libLumina/themes/Lumina-default.qss.template
index f1d4adc4..dacc9f98 100644
--- a/libLumina/themes/Lumina-default.qss.template
+++ b/libLumina/themes/Lumina-default.qss.template
@@ -7,9 +7,9 @@ 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 %%ACCENTCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
   border-radius: 3px;
-  border: 1px solid %%ACCENTCOLOR%%;
+  border: 1px solid transparent;
 }
 /* Set the default canvas appearance for Lumina desktop plugins*/
 LDPlugin#LuminaDesktopPlugin{
@@ -18,17 +18,11 @@ LDPlugin#LuminaDesktopPlugin{
   border: none;
 }
 /*For special desktop plugins that should never have a transparent background*/
-LDPlugin#LuminaDesktopPlugin QFrame{
-  background: %%ACCENTCOLOR%%;
-  border: none;
-}
-
-/*QAbstractItemView, QAbstractSpinBox, QAbstractScrollArea{
-  border: 1px solid %%ACCENTCOLOR%%;
+LDPlugin#LuminaDesktopPluginVisible{
+  background: %%BASECOLOR%%;
+  border: 1px solid transparent;
   border-radius: 5px;
-  color: %%TEXTCOLOR%%;
-  background-color: %%ALTBASECOLOR%%;
-}*/
+}
 
 /* ALL THE WIDGETS WITH THE BASE COLOR */
 QMainWindow, QMenu, QDialog, QMessageBox{ 
@@ -40,12 +34,12 @@ QMainWindow, QMenu, QDialog, QMessageBox{
 QLineEdit, QTextEdit, QTextBrowser, QPlainTextEdit, QSpinBox, QDateEdit, QDateTimeEdit, QTimeEdit, QDoubleSpinBox{
   background: %%ALTBASECOLOR%%;
   color: %%TEXTCOLOR%%;
-  border-color: %%ACCENTCOLOR%%;
+  border-color: %%ACCENTDISABLECOLOR%%;
 }
 
 /* PAGES OF CONTAINER WIDGETS */
 QStackedWidget .QWidget, QTabWidget .QWidget{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
+  background: %%ALTBASECOLOR%%;
   color: %%TEXTCOLOR%%;
   border: none;
 }
@@ -78,16 +72,6 @@ QMenu::item{
   padding: 2px 30px 2px 20px;
 }
 
-/*QMenu::indicator{ width: 20px; height: 20px; }
-
- QMenu::indicator:non-exclusive:unchecked {
-     image: url(:/trolltech/styles/commonstyle/images/standardbutton-cancel-16.png);
- }
-
- QMenu::indicator:non-exclusive:checked {
-     image: url(:/trolltech/styles/commonstyle/images/standardbutton-apply-16.png);
- }*/
-
 /* TAB WIDGETS */
 /*QTabBar{
   Custom Font settings need to be here and NOT in the ::tab fields, 
@@ -95,7 +79,7 @@ QMenu::item{
 }*/
 QTabBar::tab {
   background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
-  border: 1px solid %%ACCENTDISABLECOLOR%%;
+  border: 1px solid %%ACCENTCOLOR%%;
   padding: 2px;
 }
 QTabBar::tab:top{
@@ -124,23 +108,24 @@ QTabBar::tab:left{
   min-height: 0em;
 }
 QTabBar::tab:selected{
-     background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
+     background: %%HIGHLIGHTDISABLECOLOR%%;
 }
 QTabBar::tab:hover {
-     border-color: %%ACCENTCOLOR%%;
+    background: %%HIGHLIGHTCOLOR%%;
+    border: 1px solid %%ACCENTDISABLECOLOR%%;
  }
 
 QTabBar::tab:!selected:top {
-    margin-top: 2px;
+    margin-top: 4px;
 }
 QTabBar::tab:!selected:bottom{
-  margin-bottom: 2px;
+  margin-bottom: 4px;
 }
 QTabBar::tab:!selected:right{
-  margin-left: 2px;
+  margin-left: 4px;
 }
 QTabBar::tab:!selected:left{
-  margin-right: 2px;
+  margin-right: 4px;
 }
 
 /* FRAME WIDGETS */
@@ -152,12 +137,6 @@ QToolTip{
   color: %%TEXTCOLOR%%;
 }
 
-QFrame{
-  background: transparent;
-  border-radius: 3px;
-  border: 1px solid %%ACCENTCOLOR%%;
-  padding: 1px;
-}
 QLabel{
   background: transparent;
   border: none;
@@ -202,7 +181,7 @@ QComboBox{
  }
 
 /* menu for the combo box */
-/* BUG IN QT 5.2: Cannot seem to change the highlight colors in the menu */
+/* BUG IN QT 5: Cannot seem to change the highlight colors in the menu */
 /*QComboBox QAbstractItemView{
   border: none;
   border-radius: 0px;
@@ -219,11 +198,11 @@ QComboBox{
 /* VIEW WIDGETS */
 QTreeView, QListView{
   background: %%ALTBASECOLOR%%;
-  border-color: %%ACCENTCOLOR%%;
+  border: 1px solid %%ACCENTCOLOR%%;
   border-radius: 3px;
   show-decoration-selected: 1;
   color: %%TEXTCOLOR%%;
-  margin: 1px;
+  /*margin: 1px;*/
 }
 
 /*
@@ -232,115 +211,144 @@ Already set though parentage  and causes usage errors if set manually
 */
 
 QTreeView::item:selected, QListView::item:selected{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
+  background: %%SECONDARYDISABLECOLOR%%;
+  border: %%ACCENTCOLOR%%;
   color: %%TEXTCOLOR%%;
 }
 QTreeView::item:hover, QListView::item:hover{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
-  color: %%TEXTHIGHLIGHTCOLOR%%;
+  background: %%HIGHLIGHTDISABLECOLOR%%;
 }
 QTreeView::item:selected:hover, QListView::item:selected:hover{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
-  color: %%TEXTHIGHLIGHTCOLOR%%;
+  background: %%HIGHLIGHTDISABLECOLOR%%;
 }
 
 QHeaderView{
-  background: transparent;
-  color: %%TEXTCOLOR%%;
-  border: 1px solid transparent;
-  border-radius: 3px;
+  background: %%HIGHLIGHTDISABLECOLOR%%;
+  color: %%TEXTHIGHLIGHTCOLOR%%;
+  border: none;
+  border-top-left-radius: 3px; /*match the list/tree view widgets*/
+  border-top-right-radius: 3px;  /*match the list/tree view widgets*/
 }
 QHeaderView::section{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);
-  color: %%TEXTCOLOR%%;
-  border-radius: 3px;
+  background: %%HIGHLIGHTDISABLECOLOR%%; /*QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYDISABLECOLOR%%, stop: 1 %%PRIMARYCOLOR%%);*/
+  color: %%TEXTHIGHLIGHTCOLOR%%;
   border-color: %%ACCENTCOLOR%%;
   padding: 1px;
   padding-left: 4px;
 }
 QHeaderView::section:hover{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
+  background: %%PRIMARYCOLOR%%;
+  border-color: %%ACCENTDISABLECOLOR%%;
+  color: %%TEXTCOLOR%%;
 }
 
 /* SCROLLBARS (NOTE: Changing 1 subcontrol means you have to change all of them)*/
 QScrollBar{
-  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%ACCENTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 %%SECONDARYCOLOR%%, stop: 1 %%SECONDARYDISABLECOLOR%%);
+  /*border: 1px solid %%ACCENTCOLOR%%;*/
+}
+QScrollBar:horizontal{
+  margin: 0px 20px 0px 20px;
+}
+QScrollBar:vertical{
+  margin: 20px 0px 20px 0px;
 }
 QScrollBar::sub-page, QScrollBar::add-page{
-  background: %%ALTBASECOLOR%%;
-  border: 1px solid black;
+  background: %%BASECOLOR%%;
+  border: 1px solid %%ACCENTCOLOR%%;
 }
-QScrollBar::sub-page:vertical, QScrollBar::add-page:vertical{
-  border-top: none;
+QScrollBar::sub-page:vertical{
   border-bottom: none;
 }
-QScrollBar::sub-page:horizontal, QScrollBar::add-page:horizontal{
-  border-left: none;
+QScrollBar::add-page:vertical{
+  border-top: none;
+}
+QScrollBar::sub-page:horizontal{
   border-right: none;
 }
-
+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%%);
+  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%%);
+  border: 1px solid %%ACCENTCOLOR%%;
+subcontrol-position: bottom right;
+subcontrol-origin: margin;
+}
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical{
+height: 20px;
+}
+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%%);
+  border: 1px solid %%ACCENTCOLOR%%;
+subcontrol-position: top left;
+subcontrol-origin: margin;
+height: 20px;
+}
 /* SLIDERS */
 QSlider::groove:horizontal {
 border: 1px solid %%ACCENTCOLOR%%;
 background: %%ALTBASECOLOR%%;
 height: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::groove:vertical {
 border: 1px solid %%ACCENTCOLOR%%;
 background: %%ALTBASECOLOR%%;
 width: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::sub-page:horizontal {
 background: qlineargradient(x1: 0, y1: 0,  x2: 1, y2: 1,
-    stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
+    stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%);
 border: 1px solid %%ACCENTCOLOR%%;
 height: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::sub-page:vertical {
 background: qlineargradient(x1: 0, y1: 0,  x2: 1, y2: 1,
-    stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
+    stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%);
 border: 1px solid %%ACCENTCOLOR%%;
 width: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::add-page:horizontal{
 background: %%ALTBASECOLOR%%;
 border: 1px solid %%ACCENTCOLOR%%;
 height: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::add-page:vertical{
 background: %%ALTBASECOLOR%%;
 border: 1px solid %%ACCENTCOLOR%%;
 width: 10px;
-border-radius: 4px;
+border-radius: 3px;
 }
 QSlider::handle:horizontal{
-background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
-    stop:0 %%ACCENTDISABLECOLOR%%, stop:1 %%ACCENTCOLOR%%);
-border: 1px solid none;
+background: %%ALTBASECOLOR%%;
+border: 1px solid %%ACCENTCOLOR%%;
 width: 13px;
-margin-top: -2px;
-margin-bottom: -2px;
 border-radius: 4px;
 }
 QSlider::handle:vertical{
-background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
-    stop:0 %%ACCENTDISABLECOLOR%%, stop:1 %%ACCENTCOLOR%%);
-border: 1px solid none;
+background: %%ALTBASECOLOR%%;
+border: 1px solid %%ACCENTCOLOR%%;
 height: 13px;
-margin-top: -2px;
-margin-bottom: -2px;
 border-radius: 4px;
 }
 QSlider::handle:horizontal:hover, QSlider::handle:vertical:hover{
-border: 1px solid %%ACCENTCOLOR%%;
-margin-top: -2px;
-margin-bottom: -2px;
-border-radius: 4px;
+border: 1px solid %%ACCENTDISABLECOLOR%%;
+/*background: %%HIGHLIGHTCOLOR%%;*/
 }
 
 QSlider::sub-page:horizontal:disabled {
@@ -354,14 +362,13 @@ border-color: %%ACCENTCOLOR%%;
 }
 
 QSlider::handle:horizontal:disabled {
-background: %%ACCENTDISABLECOLOR%%;
+background: %%ALTBASECOLOR%%;
 border: 1px solid %%ACCENTCOLOR%%;
-border-radius: 4px;
 }
 
 /* BUTTONS */
 QPushButton{
-     border: 2px solid transparent;
+     border: 1px solid %%ACCENTCOLOR%%;
      border-radius: 6px;
      background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
      padding: 2px;
@@ -374,6 +381,7 @@ QToolButton{ /* Assume a flat button for every toolbutton by default*/
   border: 1px solid transparent;
   border-radius: 3px;
   background-color: transparent;
+  padding: 1px;
 }
 
  QPushButton:pressed, QPushButton:open, QPushButton:selected, QPushButton:checked, QPushButton:on, QToolButton:pressed, QToolButton:open, QToolButton:selected, QToolButton:checked, QToolButton:on{
@@ -382,25 +390,24 @@ QToolButton{ /* Assume a flat button for every toolbutton by default*/
 
 QPushButton:flat, QToolButton:flat{
    background-color: transparent;
-   border: 2px solid transparent; /* no border for a flat button */
+   border: 1px solid transparent; /* no border for a flat button */
 }
  
  QPushButton::hover, QToolButton::hover{
-   border-color: %%ACCENTCOLOR%%;
+   border: 1px solid %%ACCENTDISABLECOLOR%%;
    background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
    color: %%TEXTHIGHLIGHTCOLOR%%;
  }
- /*QRadioButton, QCheckBox{
-   background: transparent;
-   color: %%TEXTCOLOR%%;
+ QRadioButton, QCheckBox{
    padding: 2px;
+   border: 1px solid transparent;
    border-radius: 3px;
  }
  QRadioButton::hover, QCheckBox:hover{
    background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTDISABLECOLOR%%, stop: 1 %%HIGHLIGHTCOLOR%%);
    border: 1px solid %%ACCENTCOLOR%%;
    color: %%TEXTHIGHLIGHTCOLOR%%;
- }*/
+ }
 
 
 /* PROGRESSBAR */
@@ -413,10 +420,18 @@ QProgressBar{
      padding: 1px;
 }
  QProgressBar::chunk {
-     background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%SECONDARYDISABLECOLOR%%, stop: 1 %%SECONDARYCOLOR%%);
-     border: 1px solid %%ACCENTDISABLECOLOR%%;
+     background-color: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%HIGHLIGHTCOLOR%%, stop: 1 %%HIGHLIGHTDISABLECOLOR%%);
+     /*border: 1px solid %%ACCENTDISABLECOLOR%%;*/
      border-radius: 5px;
  }
+QProgressBar::chunk:vertical{
+ margin-left: 2px;
+ margin-right: 2px;
+}
+QProgressBar::chunk:horizontal{
+ margin-top: 2px;
+ margin-bottom: 2px;
+}
  
  /* SPINBOX */
 /*QAbstractSpinBox{
diff --git a/libLumina/themes/None.qss.template b/libLumina/themes/None.qss.template
index 1a8c902d..1633f2a3 100644
--- a/libLumina/themes/None.qss.template
+++ b/libLumina/themes/None.qss.template
@@ -5,9 +5,9 @@ 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 %%ACCENTCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
+  background: QLinearGradient(x1: 0, y1: 0, x2: 1, y2: 1, stop: 0 %%PRIMARYCOLOR%%, stop: 1 %%PRIMARYDISABLECOLOR%%);
   border-radius: 3px;
-  border: 1px solid %%ACCENTCOLOR%%;
+  border: 1px solid transparent;
 }
 /* Set the default canvas appearance for Lumina desktop plugins*/
 LDPlugin#LuminaDesktopPlugin{
@@ -16,12 +16,13 @@ LDPlugin#LuminaDesktopPlugin{
   border: none;
 }
 /*For special desktop plugins that should never have a transparent background*/
-LDPlugin#LuminaDesktopPlugin QFrame{
-  background: %%ACCENTCOLOR%%;
+LDPlugin#LuminaDesktopPluginVisible{
+  background: %%BASECOLOR%%;
   border: 1px solid transparent;
   border-radius: 5px;
 }
- /* CALENDER WIDGET */
+
+/* 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%%);