Added Status Notifier Plugin, from equim/lxqt-panel-plugin-snw

Thanks @equim for the initial work!
https://github.com/equeim/lxqt-panel-plugin-snw

CMakeLists.txt

@@ -38,11 +38,13 @@ find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5Xml REQUIRED)
 find_package(Qt5X11Extras REQUIRED)
 find_package(KF5WindowSystem REQUIRED)
+find_package(PkgConfig REQUIRED)
 
 find_package(lxqt REQUIRED)
 find_package(Qt5Xdg REQUIRED QUIET)
 find_package(lxqt-globalkeys REQUIRED)
 find_package(lxqt-globalkeys-ui REQUIRED)
+pkg_check_modules(dbusmenu-qt5 REQUIRED dbusmenu-qt5)
 
 include(${LXQT_USE_FILE})
 include(${QTXDG_USE_FILE})
@@ -55,6 +57,7 @@ include_directories(
     ${LXQT_INCLUDE_DIRS}
     ${QTXDG_INCLUDE_DIRS}
     ${Qt5X11Extras_INCLUDE_DIRS}
+    ${dbusmenu-qt5_INCLUDE_DIRS}
 )
 
 # Warning: This must be before add_subdirectory(panel). Move with caution.
@@ -194,6 +197,13 @@ if(TASKBAR_PLUGIN)
   add_subdirectory(plugin-taskbar)
 endif()
 
+setByDefault(STATUSNOTIFIER_PLUGIN Yes)
+if(STATUSNOTIFIER_PLUGIN)
+    list(APPEND STATIC_PLUGINS "statusnotifier")
+    set(ENABLED_PLUGINS ${ENABLED_PLUGINS} "Status Notifier")
+    add_subdirectory(plugin-statusnotifier)
+endif()
+
 setByDefault(TRAY_PLUGIN Yes)
 if(TRAY_PLUGIN)
     list(APPEND STATIC_PLUGINS "tray")

panel/plugin.cpp

@@ -46,7 +46,6 @@
 #include <LXQt/Settings>
 #include <LXQt/Translator>
 #include <XdgIcon>
-#include <algorithm> // for std::lower_bound()
 
 // statically linked built-in plugins
 #include "../plugin-clock/lxqtclock.h" // clock
@@ -55,6 +54,7 @@
 #include "../plugin-quicklaunch/lxqtquicklaunchplugin.h" // quicklaunch
 #include "../plugin-showdesktop/showdesktop.h" // showdesktop
 #include "../plugin-taskbar/lxqttaskbarplugin.h" // taskbar
+#include "../plugin-statusnotifier/statusnotifier.h" // statusnotifier
 #include "../plugin-tray/lxqttrayplugin.h" // tray
 #include "../plugin-worldclock/lxqtworldclock.h" // worldclock
 
@@ -187,6 +187,7 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName)
     static LxQtQuickLaunchPluginLibrary quicklaunch_lib; // quicklaunch
     static ShowDesktopLibrary showdesktop_lib; //showdesktop
     static LxQtTaskBarPluginLibrary taskbar_lib; //taskbar
+    static StatusNotifierLibrary statusnotifier_lib; // statusnotifier
     static LxQtTrayPluginLibrary tray_lib; //tray
     static LxQtWorldClockLibrary worldclock_lib; // worldclock
 
@@ -198,6 +199,7 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName)
         QStringLiteral("quicklaunch"),
         QStringLiteral("showdesktop"),
         QStringLiteral("taskbar"),
+        QStringLiteral("statusnotifier"),
         QStringLiteral("tray"),
         QStringLiteral("worldclock")
     };
@@ -209,16 +211,15 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName)
         &quicklaunch_lib,
         &showdesktop_lib,
         &taskbar_lib,
+        &statusnotifier_lib,
         &tray_lib,
         &worldclock_lib
     };
 
-    // for small tables, binary search is often faster than hash tables
-    const QString* end = names + sizeof(names)/sizeof(QString);
-    const QString* it = std::lower_bound(names, end, libraryName);
-    if(it != end && *it == libraryName) {
-        return staticPlugins[(it - names)];
-    }
+    for (int i = 0; i < sizeof(names) / sizeof(QString); i++)
+        if (names[i] == libraryName)
+            return staticPlugins[i];
+
     return NULL;
 }
 

plugin-statusnotifier/CMakeLists.txt

@@ -0,0 +1,47 @@
+set(PLUGIN "statusnotifier")
+
+include(CheckLibraryExists)
+
+set(QT_USE_QTDBUS 1)
+set(QT_USE_QTXML 1)
+
+set(HEADERS
+    statusnotifier.h
+    dbustypes.h
+    statusnotifierbutton.h
+    statusnotifieriteminterface.h
+    statusnotifierwatcher.h
+    statusnotifierwidget.h
+)
+
+set(SOURCES
+    statusnotifier.cpp
+    dbustypes.cpp
+    statusnotifierbutton.cpp
+    statusnotifieriteminterface.cpp
+    statusnotifierwatcher.cpp
+    statusnotifierwidget.cpp
+)
+
+set(MOCS
+    statusnotifier.h
+    dbustypes.h
+    statusnotifierbutton.h
+    statusnotifieriteminterface.h
+    statusnotifierwatcher.h
+    statusnotifierwidget.h
+)
+
+qt5_add_dbus_adaptor(SOURCES
+    org.kde.StatusNotifierItem.xml
+    statusnotifieriteminterface.h
+    StatusNotifierItemInterface
+)
+
+set(LIBRARIES
+    ${LXQT_LIBRARIES}
+    ${QTXDG_LIBRARIES}
+    ${dbusmenu-qt5_LIBRARIES}
+)
+
+BUILD_LXQT_PLUGIN(${PLUGIN})