From 08418849bf30416d5d7083d2c69a36ab261d8cbb Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 13 Apr 2017 08:13:41 -0400
Subject: Commit some small changes I still had on my main workstation: 1)
 Better support for the "inherited" property in icon themes 2) Some other
 random WM stuff

---
 src-qt5/core/libLumina/LuminaThemes.cpp  |  3 ++-
 src-qt5/core/libLumina/LuminaXDG.cpp     | 21 +++++++++++++++++++++
 src-qt5/core/libLumina/LuminaXDG.h       |  1 +
 src-qt5/core/libLumina/RootSubWindow.cpp |  2 +-
 4 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/libLumina')

diff --git a/src-qt5/core/libLumina/LuminaThemes.cpp b/src-qt5/core/libLumina/LuminaThemes.cpp
index 70cd221d..85d43925 100644
--- a/src-qt5/core/libLumina/LuminaThemes.cpp
+++ b/src-qt5/core/libLumina/LuminaThemes.cpp
@@ -83,7 +83,8 @@ QStringList LTHEME::availableSystemIcons(){ 	//returns: [name] for each item
        tmpthemes = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
        for(int j=0; j<tmpthemes.length(); j++){
 	 if(tmpthemes[j].startsWith("default")){ continue; }
-         if(QFile::exists(dir.absoluteFilePath(tmpthemes[j]+"/index.theme")) ){ themes << tmpthemes[j]; }
+         if(QFile::exists(dir.absoluteFilePath(tmpthemes[j]+"/index.theme")) ||
+		QFile::exists(dir.absoluteFilePath(tmpthemes[j]+"/index.desktop")) ){ themes << tmpthemes[j]; }
        }
     }
   }
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index f34bc0e8..4a095e33 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -780,11 +780,15 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){
         }
     //Now load all the dirs into the search paths
     QStringList theme, oxy, fall;
+    QStringList themedeps = getIconThemeDepChain(cTheme, paths);
     for(int i=0; i<paths.length(); i++){
       theme << getChildIconDirs( paths[i]+cTheme);
+      for(int j=0; j<themedeps.length(); j++){ theme << getChildIconDirs(paths[i]+themedeps[j]); }
       oxy << getChildIconDirs(paths[i]+"oxygen"); //Lumina base icon set
       fall << getChildIconDirs(paths[i]+"hicolor"); //XDG fallback (apps add to this)
     }
+    //Now load all the icon theme dependencies in order (Theme1 -> Theme2 -> Theme3 -> Fallback)
+    
     //fall << LOS::AppPrefix()+"share/pixmaps"; //always use this as well as a final fallback
     QDir::setSearchPaths("icontheme", theme);
     QDir::setSearchPaths("oxygen", oxy);
@@ -880,6 +884,23 @@ QStringList LXDG::getChildIconDirs(QString parent){
   return out;
 }
 
+QStringList LXDG::getIconThemeDepChain(QString theme, QStringList paths){
+  QStringList results;
+  for(int i=0; i<paths.length(); i++){
+    if( QFile::exists(paths[i]+theme+"/index.theme") ){
+      QStringList deps = LUtils::readFile(paths[i]+theme+"/index.theme").filter("Inherits=");
+      if(!deps.isEmpty()){
+        deps = deps.first().section("=",1,-1).split(";",QString::SkipEmptyParts);
+        for(int j=0; j<deps.length(); j++){
+          results << deps[j] << getIconThemeDepChain(deps[j],paths);
+        }
+      }
+      break; //found primary theme index file - stop here
+    }
+  }
+  return results;;
+}
+
 QStringList LXDG::systemMimeDirs(){
   //Returns a list of all the directories where *.xml MIME files can be found
   QStringList appDirs = QString(getenv("XDG_DATA_HOME")).split(":");
diff --git a/src-qt5/core/libLumina/LuminaXDG.h b/src-qt5/core/libLumina/LuminaXDG.h
index fbfd6fd4..d159ef43 100644
--- a/src-qt5/core/libLumina/LuminaXDG.h
+++ b/src-qt5/core/libLumina/LuminaXDG.h
@@ -187,6 +187,7 @@ public:
 	static QIcon findIcon(QString iconName, QString fallback = "");
 	//Recursivly compile a list of child directories with *.png files in them
 	static QStringList getChildIconDirs(QString parent);
+	static QStringList getIconThemeDepChain(QString theme, QStringList paths);
 	//List all the mime-type directories
 	static QStringList systemMimeDirs();
 	//Find the mime-type icon for a particular file extension
diff --git a/src-qt5/core/libLumina/RootSubWindow.cpp b/src-qt5/core/libLumina/RootSubWindow.cpp
index ba682077..688a1d07 100644
--- a/src-qt5/core/libLumina/RootSubWindow.cpp
+++ b/src-qt5/core/libLumina/RootSubWindow.cpp
@@ -23,7 +23,7 @@ RootSubWindow::RootSubWindow(QWidget *root, NativeWindow *win) : QFrame(root){
   initWindowFrame();
   LoadProperties( NativeWindow::allProperties() );
   //Hookup the signals/slots
-  connect(WIN, SIGNAL(PropertiesChanged(QList<NativeWindow::Property>, QList<QVariant>)), this, SLOT(PropertiesChanged(QList<NativeWindow::Property>, QList<QVariant>)));
+  connect(WIN, SIGNAL(PropertiesChanged(QList<NativeWindow::Property>, QList<QVariant>)), this, SLOT(propertiesChanged(QList<NativeWindow::Property>, QList<QVariant>)));
 }
 
 RootSubWindow::~RootSubWindow(){
-- 
cgit