diff options
| author | Weblate <noreply@weblate.org> | 2017-08-17 16:11:36 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-08-17 16:11:36 +0000 |
| commit | 35915a6a5a72ea5c45af7a787dcad69fee31218b (patch) | |
| tree | 250dc618a5f8e12f041a1a2166269e3c8c3c4bfa /src-qt5/core/libLumina/LIconCache.cpp | |
| parent | Translated using Weblate (French) (diff) | |
| parent | Merge remote-tracking branch 'origin/master' (diff) | |
| download | lumina-35915a6a5a72ea5c45af7a787dcad69fee31218b.tar.gz lumina-35915a6a5a72ea5c45af7a787dcad69fee31218b.tar.bz2 lumina-35915a6a5a72ea5c45af7a787dcad69fee31218b.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/libLumina/LIconCache.cpp')
| -rw-r--r-- | src-qt5/core/libLumina/LIconCache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src-qt5/core/libLumina/LIconCache.cpp b/src-qt5/core/libLumina/LIconCache.cpp index bb81bc47..70c360fb 100644 --- a/src-qt5/core/libLumina/LIconCache.cpp +++ b/src-qt5/core/libLumina/LIconCache.cpp @@ -57,7 +57,7 @@ QString LIconCache::findFile(QString icon){ QString cTheme = QIcon::themeName(); if(cTheme.isEmpty()){ QIcon::setThemeName("material-design-light"); - cTheme = "material-design-light"; + cTheme = "material-design-light"; } //Make sure the current search paths correspond to this theme if( QDir::searchPaths("icontheme").filter("/"+cTheme+"/").isEmpty() ){ @@ -231,7 +231,7 @@ QStringList LIconCache::getChildIconDirs(QString path){ QDir D(path); QStringList out; QStringList dirs = D.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ + if(!dirs.isEmpty() && (dirs.contains("32x32") || dirs.contains("scalable")) ){ //Need to sort these directories by image size //qDebug() << " - Parent:" << parent << "Dirs:" << dirs; for(int i=0; i<dirs.length(); i++){ @@ -305,7 +305,7 @@ void LIconCache::ReadFile(LIconCache *obj, QString id, QString path){ } bool LIconCache::isThemeIcon(QString id){ - return (!id.contains("/") && !id.contains(".") ); + return (!id.contains("/") && !id.contains(".") && !id.contains("libreoffice") ); } QIcon LIconCache::iconFromTheme(QString id){ |