diff --git a/main.cpp b/main.cpp --- a/main.cpp +++ b/main.cpp @@ -59,6 +59,7 @@ migrate.setUiFiles(QStringList() << QStringLiteral("kmenueditui.rc")); migrate.migrate(); + QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); KLocalizedString::setApplicationDomain("kmenuedit"); KAboutData aboutData(QStringLiteral("kmenuedit"), i18n("KDE Menu Editor"), diff --git a/treeview.cpp b/treeview.cpp --- a/treeview.cpp +++ b/treeview.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -225,13 +225,6 @@ return false; } -static QPixmap appIcon(const QString &iconName) -{ - QPixmap normal = KIconLoader::global()->loadIcon(iconName, KIconLoader::Small, 0, KIconLoader::DefaultState, QStringList(), 0L, true); - return normal; -} - - TreeView::TreeView( KActionCollection *ac, QWidget *parent, const char *name ) : QTreeWidget(parent), m_ac(ac), m_popupMenu(0), m_clipboard(0), m_clipboardFolderInfo(0), m_clipboardEntryInfo(0), @@ -432,7 +425,7 @@ item->setMenuFolderInfo(folderInfo); item->setName(folderInfo->caption); - item->setIcon(0, appIcon(folderInfo->icon)); + item->setIcon(0, QIcon::fromTheme(folderInfo->icon)); item->setDirectoryPath(folderInfo->fullId); item->setHiddenInMenu(folderInfo->hidden); item->load(); @@ -465,7 +458,7 @@ ////qDebug() << parent << after << name; item->setMenuEntryInfo(entryInfo); item->setName(name); - item->setIcon(0, appIcon(entryInfo->icon)); + item->setIcon(0, QIcon::fromTheme(entryInfo->icon)); item->setHiddenInMenu(hidden); item->load(); @@ -687,7 +680,7 @@ } item->setName(folderInfo->caption); - item->setIcon(0, appIcon(folderInfo->icon)); + item->setIcon(0, QIcon::fromTheme(folderInfo->icon)); } void TreeView::currentDataChanged(MenuEntryInfo *entryInfo) @@ -710,7 +703,7 @@ } item->setName(name); - item->setIcon(0, appIcon(entryInfo->icon)); + item->setIcon(0, QIcon::fromTheme(entryInfo->icon)); } QStringList TreeView::fileList(const QString& rPath)