FancyMenu: use XdgIcon

lxqt · Jan 7, 2024 · 82a9a39 · 82a9a39
1 parent 192b005
commit 82a9a39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/plugin-fancymenu/lxqtfancymenuappmap.cpp b/plugin-fancymenu/lxqtfancymenuappmap.cpp
@@ -1,6 +1,7 @@
 #include "lxqtfancymenuappmap.h"
 
 #include <XdgMenu>
+#include <XdgIcon>
 
 LXQtFancyMenuAppMap::LXQtFancyMenuAppMap()
 {
@@ -10,7 +11,7 @@ LXQtFancyMenuAppMap::LXQtFancyMenuAppMap()
     //Add Favorites category
     Category favorites;
     favorites.menuTitle = QLatin1String("Favorites"); //TODO: translate
-    favorites.icon = QIcon::fromTheme(QLatin1String("bookmarks"));
+    favorites.icon = XdgIcon::fromTheme(QLatin1String("bookmarks"));
     mCategories.append(favorites);
 }
 
@@ -49,7 +50,7 @@ bool LXQtFancyMenuAppMap::rebuildModel(const XdgMenu &menu)
     //Add All Apps category
     Category allAppsCategory;
     allAppsCategory.menuTitle = QLatin1String("All Applications");
-    allAppsCategory.icon = QIcon::fromTheme(QLatin1String("folder"));
+    allAppsCategory.icon = XdgIcon::fromTheme(QLatin1String("folder"));
     mCategories.append(allAppsCategory);
 
     //TODO: add separator
@@ -200,7 +201,7 @@ void LXQtFancyMenuAppMap::parseMenu(const QDomElement &menu, const QString& topL
                 item.menuName = e.attribute(QLatin1String("name"));
                 item.menuTitle = e.attribute(QLatin1Literal("title"), item.menuName);
                 QString iconName = e.attribute(QLatin1String("icon"));
-                item.icon = QIcon::fromTheme(iconName);
+                item.icon = XdgIcon::fromTheme(iconName);
                 mCategories.append(item);
 
                 //Merge sub menu to parent

diff --git a/plugin-fancymenu/lxqtfancymenuwindow.cpp b/plugin-fancymenu/lxqtfancymenuwindow.cpp
@@ -41,13 +41,13 @@ LXQtFancyMenuWindow::LXQtFancyMenuWindow(QWidget *parent)
     //connect(mSearchEdit, &QLineEdit::returnPressed, mSearchView, &ActionView::activateCurrent);
 
     mSettingsButton = new QToolButton;
-    mSettingsButton->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop"))); //TODO: preferences-system?
+    mSettingsButton->setIcon(XdgIcon::fromTheme(QStringLiteral("preferences-desktop"))); //TODO: preferences-system?
     mSettingsButton->setText(tr("Settings"));
     mSettingsButton->setToolTip(mSettingsButton->text());
     connect(mSettingsButton, &QToolButton::clicked, this, &LXQtFancyMenuWindow::runSystemConfigDialog);
 
     mPowerButton = new QToolButton;
-    mPowerButton->setIcon(QIcon::fromTheme(QStringLiteral("system-shutdown")));
+    mPowerButton->setIcon(XdgIcon::fromTheme(QStringLiteral("system-shutdown")));
     mPowerButton->setText(tr("Shutdown"));
     mPowerButton->setToolTip(mPowerButton->text());
     connect(mPowerButton, &QToolButton::clicked, this, &LXQtFancyMenuWindow::runPowerDialog);