|
7 | 7 | #define DBUSMANAGER_H |
8 | 8 | #include "service.h" |
9 | 9 |
|
| 10 | +#include <DSysInfo> |
| 11 | + |
10 | 12 | #include <QObject> |
11 | 13 | #include <QList> |
12 | 14 | #include <QVariant> |
|
20 | 22 | #define KWINDBUSPATH "/KWin" |
21 | 23 |
|
22 | 24 | // deepin Appearance |
23 | | -#define APPEARANCESERVICE "com.deepin.daemon.Appearance" |
24 | | -#define APPEARANCEPATH "/com/deepin/daemon/Appearance" |
| 25 | +inline const char *getAppearanceService() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "org.deepin.dde.Appearance1" : "com.deepin.daemon.Appearance"; } |
| 26 | +inline const char *getAppearancePath() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "/org/deepin/dde/Appearance1" : "/com/deepin/daemon/Appearance"; } |
| 27 | +#define APPEARANCESERVICE getAppearanceService() |
| 28 | +#define APPEARANCEPATH getAppearancePath() |
25 | 29 |
|
26 | 30 | // sound effect 音效服务 |
27 | | -#define SOUND_EFFECT_SERVICE "com.deepin.daemon.SoundEffect" |
28 | | -#define SOUND_EFFECT_PATH "/com/deepin/daemon/SoundEffect" |
29 | | -#define SOUND_EFFECT_INTERFACE "com.deepin.daemon.SoundEffect" |
30 | | -#define SOUND_EFFECT_METHOD(method) QDBusMessage::createMethodCall(SOUND_EFFECT_SERVICE, SOUND_EFFECT_PATH, SOUND_EFFECT_INTERFACE, (method)) |
| 31 | +inline const char *getSoundEffectService() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "org.deepin.dde.SoundEffect1" : "com.deepin.daemon.SoundEffect"; } |
| 32 | +inline const char *getSoundEffectPath() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "/org/deepin/dde/SoundEffect1" : "/com/deepin/daemon/SoundEffect"; } |
| 33 | +inline const char *getSoundEffectInterface() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "org.deepin.dde.SoundEffect1" : "com.deepin.daemon.SoundEffect"; } |
| 34 | +#define SOUND_EFFECT_METHOD(method) QDBusMessage::createMethodCall(getSoundEffectService(), getSoundEffectPath(), getSoundEffectInterface(), (method)) |
31 | 35 |
|
32 | 36 | // gesture 触控板手势 |
33 | | -#define GESTURE_SERVICE "com.deepin.daemon.Gesture" |
34 | | -#define GESTURE_PATH "/com/deepin/daemon/Gesture" |
35 | | -#define GESTURE_INTERFACE "com.deepin.daemon.Gesture" |
| 37 | +inline const char *getGestureService() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "org.deepin.dde.Gesture1" : "com.deepin.daemon.Gesture"; } |
| 38 | +inline const char *getGesturePath() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "/org/deepin/dde/Gesture1" : "/com/deepin/daemon/Gesture"; } |
| 39 | +inline const char *getGestureInterface() { return Dtk::Core::DSysInfo::majorVersion().toInt() >= 23 ? "org.deepin.dde.Gesture1" : "com.deepin.daemon.Gesture"; } |
| 40 | +#define GESTURE_SERVICE getGestureService() |
| 41 | +#define GESTURE_PATH getGesturePath() |
| 42 | +#define GESTURE_INTERFACE getGestureInterface() |
36 | 43 | #define GESTURE_SIGNAL "Event" |
37 | 44 |
|
38 | 45 | // deepin wm 窗管 |
|
0 commit comments