Use XdgIconLoader library (#10)

luis-pereira · agaida · commit 78735d5c38d2 · 2016-05-19T22:25:18.000+02:00
We now use our XdgIconLoader all the time and not only when using XdgIcon
as before.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -31,6 +31,7 @@ target_link_libraries(qtlxqt
     Qt5::DBus
     dbusmenu-qt5
     lxqt
+    Qt5XdgIconLoader
 )
 
 # there is no standard way to get the plugin dir of Qt5 with cmake
diff --git a/src/lxqtplatformtheme.cpp b/src/lxqtplatformtheme.cpp
@@ -44,7 +44,7 @@
 #include <QFileInfo>
 #include <QFileSystemWatcher>
 #include <QStyle>
-#include "qiconloader_p.h"
+#include <private/xdgiconloader/xdgiconloader_p.h>
 
 LXQtPlatformTheme::LXQtPlatformTheme():
     settingsWatcher_(NULL)
@@ -162,7 +162,7 @@ void LXQtPlatformTheme::onSettingsChanged() {
     }
 
     if(iconTheme_ != oldIconTheme) { // the icon theme is changed
-        QIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.
+        XdgIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.
     }
 
     // if font is changed
@@ -294,6 +294,11 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {
     return QPlatformTheme::themeHint(hint);
 }
 
+QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const
+{
+    return new XdgIconLoaderEngine(iconName);
+}
+ 
 // Helper to return the icon theme paths from XDG.
 QStringList LXQtPlatformTheme::xdgIconThemePaths() const
 {
diff --git a/src/lxqtplatformtheme.h b/src/lxqtplatformtheme.h
@@ -72,7 +72,7 @@ class Q_GUI_EXPORT LXQtPlatformTheme : public QObject, public QPlatformTheme {
     // virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
     //                               QPlatformTheme::IconOptions iconOptions = 0) const;
 
-    // virtual QIconEngine *createIconEngine(const QString &iconName) const;
+    virtual QIconEngine *createIconEngine(const QString &iconName) const;
 
     // virtual QList<QKeySequence> keyBindings(QKeySequence::StandardKey key) const;
 
diff --git a/src/qiconloader_p.h b/src/qiconloader_p.h

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ target_link_libraries(qtlxqt`
`31`	`31`	`Qt5::DBus`
`32`	`32`	`dbusmenu-qt5`
`33`	`33`	`lxqt`
	`34`	`+ Qt5XdgIconLoader`
`34`	`35`	`)`
`35`	`36`
`36`	`37`	`# there is no standard way to get the plugin dir of Qt5 with cmake`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`#include <QFileInfo>`
`45`	`45`	`#include <QFileSystemWatcher>`
`46`	`46`	`#include <QStyle>`
`47`		`-#include "qiconloader_p.h"`
	`47`	`+#include <private/xdgiconloader/xdgiconloader_p.h>`
`48`	`48`
`49`	`49`	`LXQtPlatformTheme::LXQtPlatformTheme():`
`50`	`50`	`settingsWatcher_(NULL)`
`@@ -162,7 +162,7 @@ void LXQtPlatformTheme::onSettingsChanged() {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`if(iconTheme_ != oldIconTheme) { // the icon theme is changed`
`165`		`- QIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.`
	`165`	`+ XdgIconLoader::instance()->updateSystemTheme(); // this is a private internal API of Qt5.`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// if font is changed`
`@@ -294,6 +294,11 @@ QVariant LXQtPlatformTheme::themeHint(ThemeHint hint) const {`
`294`	`294`	`return QPlatformTheme::themeHint(hint);`
`295`	`295`	`}`
`296`	`296`
	`297`	`+QIconEngine *LXQtPlatformTheme::createIconEngine(const QString &iconName) const`
	`298`	`+{`
	`299`	`+ return new XdgIconLoaderEngine(iconName);`
	`300`	`+}`
	`301`	`+`
`297`	`302`	`// Helper to return the icon theme paths from XDG.`
`298`	`303`	`QStringList LXQtPlatformTheme::xdgIconThemePaths() const`
`299`	`304`	`{`