diff --git a/CMakeLists.txt b/CMakeLists.txt index 0201b6216..ac175de10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,10 +122,7 @@ endif() install(FILES org.kde.neochat.desktop DESTINATION ${KDE_INSTALL_APPDIR}) install(FILES org.kde.neochat.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) install(FILES org.kde.neochat.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) -install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16/apps RENAME org.kde.neochat.svg) -install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@2/apps RENAME org.kde.neochat.svg) -install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/16x16@3/apps RENAME org.kde.neochat.svg) -install(FILES org.kde.neochat-symbolic.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/symbolic/apps) +install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps) add_definitions(-DQT_NO_FOREACH) diff --git a/org.kde.neochat-symbolic.svg b/org.kde.neochat-symbolic.svg deleted file mode 100644 index 098ac5f08..000000000 --- a/org.kde.neochat-symbolic.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/org.kde.neochat.tray.svg b/org.kde.neochat.tray.svg new file mode 100644 index 000000000..c55d96674 --- /dev/null +++ b/org.kde.neochat.tray.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res.qrc b/res.qrc index c9052658f..b0ff13313 100644 --- a/res.qrc +++ b/res.qrc @@ -1,6 +1,7 @@ org.kde.neochat.svg + org.kde.neochat.tray.svg qml/main.qml imports/NeoChat/Page/qmldir imports/NeoChat/Page/LoadingPage.qml diff --git a/src/trayicon.cpp b/src/trayicon.cpp index 7c6d4d32e..5b93e003d 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -12,7 +12,7 @@ TrayIcon::TrayIcon(QObject *parent) : QSystemTrayIcon(parent) { - setIcon(QIcon(":/icons/org.kde.neochat.svg")); + setIcon(QIcon(":/icons/org.kde.neochat.tray.svg")); QMenu *menu = new QMenu(); auto viewAction_ = new QAction(i18n("Show"), parent); diff --git a/src/trayicon_sni.cpp b/src/trayicon_sni.cpp index 651884a70..734a85924 100644 --- a/src/trayicon_sni.cpp +++ b/src/trayicon_sni.cpp @@ -7,7 +7,8 @@ TrayIcon::TrayIcon(QObject *parent) : KStatusNotifierItem(parent) { - setIconByName("org.kde.neochat"); + setCategory(KStatusNotifierItem::ItemCategory::Communications); + setIconByName("org.kde.neochat.tray"); connect(this, &KStatusNotifierItem::activateRequested, this, [this] { KWindowSystem::setCurrentXdgActivationToken(providedToken()); Q_EMIT showWindow();