diff --git a/src/services/status_notifier/item.cpp b/src/services/status_notifier/item.cpp index 42847399..7b3bb3cf 100644 --- a/src/services/status_notifier/item.cpp +++ b/src/services/status_notifier/item.cpp @@ -352,6 +352,7 @@ DBusResult DBusDataTransform::fromWire(const QString DBusResult DBusDataTransform::fromWire(const QString& wire) { if (wire == "ApplicationStatus") return DBusResult(Category::ApplicationStatus); + if (wire == "Communications") return DBusResult(Category::Communications); if (wire == "SystemServices") return DBusResult(Category::SystemServices); if (wire == "Hardware") return DBusResult(Category::Hardware); diff --git a/src/services/status_notifier/item.hpp b/src/services/status_notifier/item.hpp index cd3bfaba..1c28364a 100644 --- a/src/services/status_notifier/item.hpp +++ b/src/services/status_notifier/item.hpp @@ -44,13 +44,15 @@ Q_NAMESPACE; QML_ELEMENT; enum Enum : quint8 { - /// The fallback category for general applications or anything that does - /// not fit into a different category. - ApplicationStatus = 0, + /// Hardware controls like battery indicators or volume control. + Hardware = 0, /// System services such as IMEs or disk indexing. SystemServices = 1, - /// Hardware controls like battery indicators or volume control. - Hardware = 2, + /// The fallback category for general applications or anything that does + /// not fit into a different category. + ApplicationStatus = 2, + /// Communication related applications such as instant messengers or email clients. + Communications = 3, }; Q_ENUM_NS(Enum); } // namespace Category diff --git a/src/services/status_notifier/qml.cpp b/src/services/status_notifier/qml.cpp index 15231ff6..5f865c44 100644 --- a/src/services/status_notifier/qml.cpp +++ b/src/services/status_notifier/qml.cpp @@ -1,5 +1,6 @@ #include "qml.hpp" +#include #include #include "../../core/model.hpp" @@ -28,9 +29,6 @@ void SystemTray::onItemRegistered(StatusNotifierItem* item) { void SystemTray::onItemUnregistered(StatusNotifierItem* item) { this->mItems.removeObject(item); } ObjectModel* SystemTray::items() { return &this->mItems; } -bool SystemTray::compareItems( - qs::service::sni::StatusNotifierItem* a, - qs::service::sni::StatusNotifierItem* b -) { - return a->category() > b->category() || a->id().compare(b->id(), Qt::CaseInsensitive) >= 0; +bool SystemTray::compareItems(StatusNotifierItem* a, StatusNotifierItem* b) { + return a->category() < b->category() || a->id().compare(b->id(), Qt::CaseInsensitive) >= 0; }