Add a bunch of new color schemes for Lumina (Red/Green/Purple/Gold/Glass), and adjust the auto-loading of a theme so that it will automatically pick up when the current theme/color file changes (such as when it was manually edited).

8 files changed, 77 insertions, 19 deletions

diff --git a/libLumina/LuminaThemes.cpp b/libLumina/LuminaThemes.cpp
index 0b328502..feacc81d 100644
--- a/libLumina/LuminaThemes.cpp
+++ b/libLumina/LuminaThemes.cpp
@@ -107,8 +107,8 @@ QStringList LTHEME::currentSettings(){ //returns [theme path, colorspath, iconsn
     else if(settings[i].startsWith("FONTSIZE=")){ out[4] = settings[i].section("=",1,1).simplified(); }
   }
   bool nofile = settings.isEmpty();
-  if(out[0].isEmpty()){ out[0] = LOS::LuminaShare()+"themes/Lumina-default.qss.template"; }
-  if(out[1].isEmpty()){ out[1] = LOS::LuminaShare()+"colors/SampleColors.qss.colors"; }
+  if(out[0].isEmpty() || !QFile::exists(out[0]) ){ out[0] = LOS::LuminaShare()+"themes/Lumina-default.qss.template"; }
+  if(out[1].isEmpty() || !QFile::exists(out[1]) ){ out[1] = LOS::LuminaShare()+"colors/Lumina-Glass.qss.colors"; }
   if(out[3].isEmpty()){ out[3] = QFont().defaultFamily(); }
   if(out[4].isEmpty()){ 
     int num = QFont().pointSize(); out[4] = QString::number(num)+"pt"; //Check point size first
@@ -179,6 +179,7 @@ LuminaThemeEngine::LuminaThemeEngine(QApplication *app){
   QIcon::setThemeName(icons); //make sure this sets set within this environment
   watcher = new QFileSystemWatcher(this);
 	watcher->addPath( QDir::homePath()+"/.lumina/themesettings.cfg" );
+	watcher->addPaths( QStringList() << theme << colors ); //also watch these files for changes
   connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange()) );
 }
 
@@ -188,13 +189,14 @@ LuminaThemeEngine::~LuminaThemeEngine(){
 
 void LuminaThemeEngine::watcherChange(){
   QStringList current = LTHEME::currentSettings();
-  if(theme!=current[0] || colors!=current[1] || font!=current[3] || fontsize!=current[4]){
-    application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1], current[3], current[4]) );
-  }
+  application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1], current[3], current[4]) );
+	
   if(icons!=current[2]){
     QIcon::setThemeName(current[2]); //make sure this sets set within this environment
     emit updateIcons();
   }
   //Now save this for later checking
+  watcher->removePaths( QStringList() << theme << colors );
   theme = current[0]; colors=current[1]; icons=current[2]; font=current[3]; fontsize=current[4];
+  watcher->addPaths( QStringList() << theme << colors );
 }
diff --git a/libLumina/colors/Lumina-Glass.qss.colors b/libLumina/colors/Lumina-Glass.qss.colors
new file mode 100644
index 00000000..7b74e036
--- /dev/null
+++ b/libLumina/colors/Lumina-Glass.qss.colors
@@ -0,0 +1,13 @@
+ACCENTCOLOR=rgba(255,252,234,100)
+ACCENTDISABLECOLOR=rgba(0,0,0,100)
+ALTBASECOLOR=rgb(252,252,255)
+BASECOLOR=rgb(247,246,244)
+HIGHLIGHTCOLOR=rgba(212,212,212,170)
+HIGHLIGHTDISABLECOLOR=rgba(184,184,184,100)
+PRIMARYCOLOR=rgba(235,242,242,200)
+PRIMARYDISABLECOLOR=rgba(214,220,220,200)
+SECONDARYCOLOR=rgba(208,220,244,200)
+SECONDARYDISABLECOLOR=rgba(168,179,200,100)
+TEXTCOLOR=black
+TEXTDISABLECOLOR=grey
+TEXTHIGHLIGHTCOLOR=black
\ No newline at end of file
diff --git a/libLumina/colors/Lumina-Gold.qss.colors b/libLumina/colors/Lumina-Gold.qss.colors
new file mode 100644
index 00000000..24dcdd5c
--- /dev/null
+++ b/libLumina/colors/Lumina-Gold.qss.colors
@@ -0,0 +1,13 @@
+ACCENTCOLOR=rgb(246,243,225)
+ACCENTDISABLECOLOR=black
+ALTBASECOLOR=white
+BASECOLOR=rgb(247,246,244)
+HIGHLIGHTCOLOR=rgba(234,128,7,200)
+HIGHLIGHTDISABLECOLOR=rgba(242,165,41,200)
+PRIMARYCOLOR=rgb(242,228,157)
+PRIMARYDISABLECOLOR=rgb(215,203,140)
+SECONDARYCOLOR=rgb(246,240,181)
+SECONDARYDISABLECOLOR=rgb(228,220,172)
+TEXTCOLOR=black
+TEXTDISABLECOLOR=grey
+TEXTHIGHLIGHTCOLOR=white
\ No newline at end of file
diff --git a/libLumina/colors/Lumina-Green.qss.colors b/libLumina/colors/Lumina-Green.qss.colors
new file mode 100644
index 00000000..404b132c
--- /dev/null
+++ b/libLumina/colors/Lumina-Green.qss.colors
@@ -0,0 +1,13 @@
+ACCENTCOLOR=rgb(233,246,233)
+ACCENTDISABLECOLOR=black
+ALTBASECOLOR=white
+BASECOLOR=rgb(245,247,245)
+HIGHLIGHTCOLOR=rgb(142,192,150)
+HIGHLIGHTDISABLECOLOR=rgb(109,168,119)
+PRIMARYCOLOR=rgb(29,145,77)
+PRIMARYDISABLECOLOR=rgb(80,159,101)
+SECONDARYCOLOR=rgb(255,249,183)
+SECONDARYDISABLECOLOR=rgb(255,253,220)
+TEXTCOLOR=black
+TEXTDISABLECOLOR=grey
+TEXTHIGHLIGHTCOLOR=white
\ No newline at end of file
diff --git a/libLumina/colors/Lumina-Purple.qss.colors b/libLumina/colors/Lumina-Purple.qss.colors
new file mode 100644
index 00000000..63864735
--- /dev/null
+++ b/libLumina/colors/Lumina-Purple.qss.colors
@@ -0,0 +1,13 @@
+ACCENTCOLOR=rgb(243,233,246)
+ACCENTDISABLECOLOR=black
+ALTBASECOLOR=white
+BASECOLOR=rgb(246,245,247)
+HIGHLIGHTCOLOR=rgb(159,142,192)
+HIGHLIGHTDISABLECOLOR=rgb(126,109,168)
+PRIMARYCOLOR=rgb(117,48,178)
+PRIMARYDISABLECOLOR=rgb(90,54,145)
+SECONDARYCOLOR=rgb(212,183,255)
+SECONDARYDISABLECOLOR=rgb(189,145,255)
+TEXTCOLOR=black
+TEXTDISABLECOLOR=grey
+TEXTHIGHLIGHTCOLOR=white
\ No newline at end of file
diff --git a/libLumina/colors/Lumina-Red.qss.colors b/libLumina/colors/Lumina-Red.qss.colors
new file mode 100644
index 00000000..32826748
--- /dev/null
+++ b/libLumina/colors/Lumina-Red.qss.colors
@@ -0,0 +1,13 @@
+ACCENTCOLOR=rgb(246,233,233)
+ACCENTDISABLECOLOR=black
+ALTBASECOLOR=white
+BASECOLOR=rgb(247,245,245)
+HIGHLIGHTCOLOR=rgb(126,30,30)
+HIGHLIGHTDISABLECOLOR=rgb(101,25,25)
+PRIMARYCOLOR=rgb(148,22,22)
+PRIMARYDISABLECOLOR=rgb(101,16,16)
+SECONDARYCOLOR=rgb(255,222,189)
+SECONDARYDISABLECOLOR=#e0c3a6
+TEXTCOLOR=black
+TEXTDISABLECOLOR=grey
+TEXTHIGHLIGHTCOLOR=white
\ No newline at end of file
diff --git a/libLumina/colors/SampleColors.qss.colors b/libLumina/colors/SampleColors.qss.colors
deleted file mode 100644
index 19f27ff5..00000000
--- a/libLumina/colors/SampleColors.qss.colors
+++ /dev/null
@@ -1,13 +0,0 @@
-PRIMARYCOLOR=#7292bf
-SECONDARYCOLOR=#efeeed
-HIGHLIGHTCOLOR=#7292bf
-ACCENTCOLOR=#9abbbe
-PRIMARYDISABLECOLOR=#d0dbea
-SECONDARYDISABLECOLOR=#f5f0e7
-HIGHLIGHTDISABLECOLOR=#d0dbea
-ACCENTDISABLECOLOR=#f5f0e7
-BASECOLOR=#f4f0e8
-ALTBASECOLOR=white
-TEXTCOLOR=black
-TEXTDISABLECOLOR=grey
-TEXTHIGHLIGHTCOLOR=black
\ No newline at end of file
diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro
index 6f7e3ede..d37c2c0d 100644
--- a/libLumina/libLumina.pro
+++ b/libLumina/libLumina.pro
@@ -49,7 +49,11 @@ include.files=LuminaXDG.h \
 	LuminaOS.h
 
 colors.path=$$PREFIX/share/Lumina-DE/colors/
-colors.files=colors/SampleColors.qss.colors
+colors.files=colors/Lumina-Red.qss.colors \
+		colors/Lumina-Green.qss.colors \
+		colors/Lumina-Purple.qss.colors \
+		colors/Lumina-Gold.qss.colors \
+		colors/Lumina-Glass.qss.colors
 
 themes.path=$$PREFIX/share/Lumina-DE/themes/
 themes.files=themes/Lumina-default.qss.template \