Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: port to the new KDBusMenuImporter class

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-05-28 20:57:12 +03:00
parent 19656fc81a
commit 2daece3d26
5 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -76,13 +76,6 @@ if(Q_WS_X11)
endif()
endif(Q_WS_X11)
kde4_optional_find_package(DBusMenuQt 0.6.0)
set_package_properties(DBusMenuQt PROPERTIES
DESCRIPTION "Support for notification area menus via the DBusMenu protocol"
URL "https://launchpad.net/libdbusmenu-qt"
TYPE RECOMMENDED
)
kde4_optional_find_package(OpenGL)
set_package_properties(OpenGL PROPERTIES
DESCRIPTION "The OpenGL libraries"

4
plasma/dataengines/CMakeLists.txt
View file

@ -13,9 +13,7 @@ add_subdirectory(powermanagement)
add_subdirectory(soliddevice)
add_subdirectory(time)
add_subdirectory(weather)
if(DBUSMENUQT_FOUND)
add_subdirectory(statusnotifieritem)
endif()
add_subdirectory(statusnotifieritem)
add_subdirectory(systemmonitor)
add_subdirectory(tasks)

3
plasma/dataengines/statusnotifieritem/CMakeLists.txt
View file

@ -1,7 +1,6 @@
project(plasma-statusnotifieritem_engine)
include_directories(${CMAKE_SOURCE_DIR}/statusnotifierwatcher)
include_directories(${DBUSMENUQT_INCLUDE_DIR})
# We add our source code here
set(statusnotifieritem_engine_SRCS
@ -25,7 +24,7 @@ set_source_files_properties(${statusnotifieritem_xml} PROPERTIES
QT4_ADD_DBUS_INTERFACE(statusnotifieritem_engine_SRCS ${statusnotifieritem_xml} statusnotifieritem_interface)
kde4_add_plugin(plasma_engine_statusnotifieritem ${statusnotifieritem_engine_SRCS})
target_link_libraries(plasma_engine_statusnotifieritem ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${DBUSMENUQT_LIBRARIES})
target_link_libraries(plasma_engine_statusnotifieritem ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS})
install(TARGETS plasma_engine_statusnotifieritem DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
install(FILES plasma_engine_statusnotifieritem.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})

8
plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
View file

@ -30,6 +30,7 @@
#include <KIcon>
#include <KIconLoader>
#include <KStandardDirs>
#include <KDBusMenuImporter>
#include <QPainter>
#include <QDBusMessage>
#include <QDBusPendingCall>
@ -38,17 +39,14 @@
#include <QImage>
#include <QMenu>
#include <QPixmap>
#include <QtCore/qglobal.h>
#include <netinet/in.h>
#include <dbusmenuimporter.h>
class PlasmaDBusMenuImporter : public DBusMenuImporter
class PlasmaDBusMenuImporter : public KDBusMenuImporter
{
public:
PlasmaDBusMenuImporter(const QString &service, const QString &path, KIconLoader *iconLoader, QObject *parent)
: DBusMenuImporter(service, path, parent)
: KDBusMenuImporter(service, path, parent)
, m_iconLoader(iconLoader)
{}

5
plasma/dataengines/statusnotifieritem/statusnotifieritemsource.h
View file

@ -29,8 +29,7 @@
#include "statusnotifieritem_interface.h"
class KIconLoader;
class DBusMenuImporter;
class KDBusMenuImporter;
class StatusNotifierItemSource : public Plasma::DataContainer
{
@ -72,7 +71,7 @@ private:
QString m_name;
QTimer m_refreshTimer;
KIconLoader *m_customIconLoader;
DBusMenuImporter *m_menuImporter;
KDBusMenuImporter *m_menuImporter;
org::kde::StatusNotifierItem *m_statusNotifierItemInterface;
bool m_refreshing : 1;
bool m_needsReRefreshing : 1;