Get the new LuminaThemes class working with a sample color theme for Insight (for testing). The theme loading/usage appears to be working, now I just need to generalize the theme template so that it applies to all the QAbstract* widgets

1 files changed, 72 insertions, 12 deletions

diff --git a/libLumina/LuminaThemes.cpp b/libLumina/LuminaThemes.cpp
index 0ec46c67..5100a084 100644
--- a/libLumina/LuminaThemes.cpp
+++ b/libLumina/LuminaThemes.cpp
@@ -8,11 +8,14 @@
 
 #include "LuminaUtils.h"
 #include "LuminaOS.h"
+#include <QIcon>
+#include <QDebug>
+
 
 QStringList LTHEME::availableSystemThemes(){ 
   //returns: [name::::path] for each item
   QDir dir(LOS::LuminaShare()+"themes");
-  QStringList list = dir.entryList(QStringList() <<"*.qss.template", QDir::Files, QDir::Name());
+  QStringList list = dir.entryList(QStringList() <<"*.qss.template", QDir::Files, QDir::Name);
   for(int i=0; i<list.length(); i++){
     //Format the output entry [<name>::::<fullpath>]
     list[i] = list[i].section(".qss.",0,0)+"::::"+dir.absoluteFilePath(list[i]);
@@ -22,7 +25,7 @@ QStringList LTHEME::availableSystemThemes(){
 
 QStringList LTHEME::availableLocalThemes(){	//returns: [name::::path] for each item
   QDir dir(QDir::homePath()+"/.lumina/themes");
-  QStringList list = dir.entryList(QStringList() <<"*.qss.template", QDir::Files, QDir::Name());
+  QStringList list = dir.entryList(QStringList() <<"*.qss.template", QDir::Files, QDir::Name);
   for(int i=0; i<list.length(); i++){
     //Format the output entry [<name>::::<fullpath>]
     list[i] = list[i].section(".qss.",0,0)+"::::"+dir.absoluteFilePath(list[i]);
@@ -33,7 +36,7 @@ QStringList LTHEME::availableLocalThemes(){	//returns: [name::::path] for each i
 QStringList LTHEME::availableSystemColors(){ 	//returns: [name::::path] for each item
   //returns: [name::::path] for each item
   QDir dir(LOS::LuminaShare()+"colors");
-  QStringList list = dir.entryList(QStringList() <<"*.qss.colortemplate", QDir::Files, QDir::Name());
+  QStringList list = dir.entryList(QStringList() <<"*.qss.colors", QDir::Files, QDir::Name);
   for(int i=0; i<list.length(); i++){
     //Format the output entry [<name>::::<fullpath>]
     list[i] = list[i].section(".qss.",0,0)+"::::"+dir.absoluteFilePath(list[i]);
@@ -43,7 +46,7 @@ QStringList LTHEME::availableSystemColors(){ 	//returns: [name::::path] for each
 
 QStringList LTHEME::availableLocalColors(){ 	//returns: [name::::path] for each item
   QDir dir(QDir::homePath()+"/.lumina/colors");
-  QStringList list = dir.entryList(QStringList() <<"*.qss.template", QDir::Files, QDir::Name());
+  QStringList list = dir.entryList(QStringList() <<"*.qss.colors", QDir::Files, QDir::Name);
   for(int i=0; i<list.length(); i++){
     //Format the output entry [<name>::::<fullpath>]
     list[i] = list[i].section(".qss.",0,0)+"::::"+dir.absoluteFilePath(list[i]);
@@ -52,22 +55,79 @@ QStringList LTHEME::availableLocalColors(){ 	//returns: [name::::path] for each
 }
 
 QStringList LTHEME::availableSystemIcons(){ 	//returns: [name] for each item
-  return QStringList(); //not implemented yet
+  QStringList paths;
+  paths << QDir::homePath()+"/.icons";
+  QStringList xdd = QString(getenv("XDG_DATA_HOME")).split(":");
+  xdd << QString(getenv("XDG_DATA_DIRS")).split(":");
+  for(int i=0; i<xdd.length(); i++){
+    if(QFile::exists(xdd[i]+"/icons")){
+      paths << xdd[i]+"/icons";	    
+    }
+  }
+  //Now get all the icon themes in these directories
+  QStringList themes;
+  QDir dir;
+  for(int i=0; i<paths.length(); i++){
+    if(dir.cd(paths[i])){
+       themes << dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+    }
+  }
+  themes.removeDuplicates();
+  themes.sort();
+  return themes;
 }
 	
   //Return the currently selected Theme/Colors/Icons
 QStringList LTHEME::currentSettings(){ //returns [theme path, colorspath, iconsname]
-	
+  QStringList out; out << "" << "" << "";
+  QStringList settings = LUtils::readFile(QDir::homePath()+"/.lumina/themesettings.cfg");
+  for(int i=0; i<settings.length(); i++){
+    if(settings[i].startsWith("THEMEFILE=")){ out[0] = settings[i].section("=",1,1).simplified(); }
+    else if(settings[i].startsWith("COLORFILE=")){ out[1] = settings[i].section("=",1,1).simplified(); }
+  }
+  out[2] = QIcon::themeName();
+  bool nofile = settings.isEmpty();
+  if(out[0].isEmpty()){ out[0] = LOS::LuminaShare()+"themes/SampleTheme.qss.template"; }
+  if(out[1].isEmpty()){ out[1] = LOS::LuminaShare()+"colors/SampleColors.qss.colors"; }
+  if(nofile){ setCurrentSettings(out[0], out[1], out[2]); }
+  
+  return out;
 }
 	
   //Change the current Theme/Colors/Icons
 bool LTHEME::setCurrentSettings(QString themepath, QString colorpath, QString iconname){
-	
+  QStringList contents;
+	contents << "THEMEFILE="+themepath;
+	contents << "COLORFILE="+colorpath;
+	contents << "ICONTHEME="+iconname;
+  bool ok = LUtils::writeFile(QDir::homePath()+"/.lumina/themesettings.cfg", contents, true);
+  QIcon::setThemeName(iconname);
+  return ok;
 }
 	
   //Return the complete stylesheet for a given theme/colors
 QString LTHEME::assembleStyleSheet(QString themepath, QString colorpath){
-	
+  QString stylesheet = LUtils::readFile(themepath).join("\n");
+  QStringList colors = LUtils::readFile(colorpath);
+  //qDebug() << "Found Theme:" << themepath << stylesheet;
+  //qDebug() << "Found Colors:" << colorpath << colors;
+  for(int i=0; i<colors.length(); i++){
+    if(colors[i].isEmpty() || colors[i].startsWith("#")){ continue; }
+    else if(colors[i].startsWith("PRIMARYCOLOR=")){ stylesheet = stylesheet.replace("%%PRIMARYCOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("SECONDARYCOLOR=")){ stylesheet = stylesheet.replace("%%SECONDARYCOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("HIGHLIGHTCOLOR=")){ stylesheet = stylesheet.replace("%%HIGHLIGHTCOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("ACCENTCOLOR=")){ stylesheet = stylesheet.replace("%%ACCENTCOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("PRIMARYDISABLECOLOR=")){ stylesheet = stylesheet.replace("%%PRIMARYDISABLECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("SECONDARYDISABLECOLOR=")){ stylesheet = stylesheet.replace("%%SECONDARYDISABLECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("HIGHLIGHTDISABLECOLOR=")){ stylesheet = stylesheet.replace("%%HIGHLIGHTDISABLECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("ACCENTDISABLECOLOR=")){ stylesheet = stylesheet.replace("%%ACCENTDISABLECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("BASECOLOR=")){ stylesheet = stylesheet.replace("%%BASECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("ALTBASECOLOR=")){ stylesheet = stylesheet.replace("%%ALTBASECOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("TEXTCOLOR=")){ stylesheet = stylesheet.replace("%%TEXTCOLOR%%", colors[i].section("=",1,1).simplified()); }
+    else if(colors[i].startsWith("TEXTHIGHLIGHTCOLOR=")){ stylesheet = stylesheet.replace("%%TEXTHIGHLIGHTCOLOR%%", colors[i].section("=",1,1).simplified()); }
+  }
+  //qDebug() << "Assembled Style Sheet:\n" << stylesheet;
+  return stylesheet;
 }
 
 //==================
@@ -77,10 +137,10 @@ LuminaThemeEngine::LuminaThemeEngine(QApplication *app){
   application=app; //save this pointer for later
   QStringList current = LTHEME::currentSettings();
   theme = current[0]; colors=current[1]; icons=current[2];
-  application->setCurrentStyleSheet( LTHEME::assembleStyleSheet(theme, colors) );
+  application->setStyleSheet( LTHEME::assembleStyleSheet(theme, colors) );
   watcher = new QFileSystemWatcher(this);
-	watcher->addPath( QDir::homePath()+"/.lumina/currenttheme.conf" );
-  connect(watcher, SIGNAL(fileChanged(const &QString)), this, SLOT(watcherChange()) );
+	watcher->addPath( QDir::homePath()+"/.lumina/themesettings.cfg" );
+  connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(watcherChange()) );
 }
 
 LuminaThemeEngine::~LuminaThemeEngine(){
@@ -90,7 +150,7 @@ LuminaThemeEngine::~LuminaThemeEngine(){
 void LuminaThemeEngine::watcherChange(){
   QStringList current = LTHEME::currentSettings();
   if(theme!=current[0] || colors!=current[1]){
-    application->setCurrentStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1]) );
+    application->setStyleSheet( LTHEME::assembleStyleSheet(current[0], current[1]) );
   }
   if(icons!=current[3]){
     emit updateIcons();