diff options
| -rw-r--r-- | src-qt5/core/core.pro | 3 | ||||
| -rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.cpp | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro index 27aff3a2..4878b1f3 100644 --- a/src-qt5/core/core.pro +++ b/src-qt5/core/core.pro @@ -7,7 +7,8 @@ CONFIG += recursive SUBDIRS+= lumina-desktop \ lumina-session \ lumina-open \ - lumina-info + lumina-info \ + $${PWD}/../../icon-theme # lumina-wm-INCOMPLETE \ # lumina-checkpass diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index d17cc330..3694916b 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -764,12 +764,12 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ //Get the currently-set theme QString cTheme = QIcon::themeName(); if(cTheme.isEmpty()){ - QIcon::setThemeName("oxygen"); - cTheme = "oxygen"; + QIcon::setThemeName("material-design-light"); + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ - //Need to reset search paths: setup the "icontheme" "oxygen" and "fallback" sets + //Need to reset search paths: setup the "icontheme" "material-design-light" and "fallback" sets // - Get all the base icon directories QStringList paths; paths << QDir::homePath()+"/.icons/"; //ordered by priority - local user dirs first @@ -782,18 +782,18 @@ QIcon LXDG::findIcon(QString iconName, QString fallback){ QStringList theme, oxy, fall; for(int i=0; i<paths.length(); i++){ theme << getChildIconDirs( paths[i]+cTheme); - oxy << getChildIconDirs(paths[i]+"oxygen"); //Lumina base icon set + oxy << getChildIconDirs(paths[i]+"material-design-light"); //Lumina base icon set fall << getChildIconDirs(paths[i]+"hicolor"); //XDG fallback (apps add to this) } //fall << LOS::AppPrefix()+"share/pixmaps"; //always use this as well as a final fallback QDir::setSearchPaths("icontheme", theme); - QDir::setSearchPaths("oxygen", oxy); + QDir::setSearchPaths("material-design-light", oxy); QDir::setSearchPaths("fallback", fall); - //qDebug() << "Setting Icon Search Paths:" << "\nicontheme:" << theme << "\noxygen:" << oxy << "\nfallback:" << fall; + //qDebug() << "Setting Icon Search Paths:" << "\nicontheme:" << theme << "\nmaterial-design-light:" << oxy << "\nfallback:" << fall; } //Find the icon in the search paths QIcon ico; - QStringList srch; srch << "icontheme" << "oxygen" << "fallback"; + QStringList srch; srch << "icontheme" << "material-design-light" << "fallback"; for(int i=0; i<srch.length() && ico.isNull(); i++){ //Look for a svg first if(QFile::exists(srch[i]+":"+iconName+".svg") ){ |