diff --git a/deepin_reader.pro b/deepin_reader.pro index 21915e99..12eca85b 100644 --- a/deepin_reader.pro +++ b/deepin_reader.pro @@ -21,7 +21,7 @@ versionAtLeast(QT_VERSION, 6.0.0) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus + PKGCONFIG += dtkwidget dtkgui dtkcore QMAKE_LRELEASE = lrelease diff --git a/reader/app/DBusObject.cpp b/reader/app/DBusObject.cpp index a7988d5a..a62a6d3b 100644 --- a/reader/app/DBusObject.cpp +++ b/reader/app/DBusObject.cpp @@ -11,26 +11,19 @@ #include #include +#include + // gesture 触控板手势 #define DBUS_SERVER "com.deepin.Reader" #define DBUS_SERVER_PATH "/com/deepin/Reader" -#ifdef OS_BUILD_V23 -#define DBUS_GESTURE "org.deepin.dde.Gesture1" -#define DBUS_GESTURE_PATH "/org/deepin/dde/Gesture1" -#define DBUS_GESTURE_INTERFACE "org.deepin.dde.Gesture1" -#else -#define DBUS_GESTURE "com.deepin.daemon.Gesture" -#define DBUS_GESTURE_PATH "/com/deepin/daemon/Gesture" -#define DBUS_GESTURE_INTERFACE "com.deepin.daemon.Gesture" -#endif -#define DBUS_GESTURE_SIGNAL "Event" - #define DBUS_IM "com.deepin.im" #define DBUS_IM_PATH "/com/deepin/im" #define DBUS_IM_INTERFACE "com.deepin.im" #define DBUS_IM_SIGNAL "imActiveChanged" +DCORE_USE_NAMESPACE + DBusObject *DBusObject::s_instance = nullptr; DBusObject *DBusObject::instance() @@ -65,7 +58,17 @@ bool DBusObject::registerOrNotify(QStringList arguments) dbus.registerObject(DBUS_SERVER_PATH, this, QDBusConnection::ExportScriptableSlots); - QDBusConnection::systemBus().connect(DBUS_GESTURE, DBUS_GESTURE_PATH, DBUS_GESTURE_INTERFACE, DBUS_GESTURE_SIGNAL, this, SIGNAL(sigTouchPadEventSignal(QString, QString, int))); + const QString gestureSignal = "Event"; + QString gestureName = "com.deepin.daemon.Gesture"; + QString gesturePath = "/com/deepin/daemon/Gesture"; + // check if os edition on v23 or later + const int osMajor = DSysInfo::majorVersion().toInt(); + if (osMajor >= 23) { + gestureName = "org.deepin.dde.Gesture1"; + gesturePath = "/org/deepin/dde/Gesture1"; + } + + QDBusConnection::systemBus().connect(gestureName, gesturePath, gestureName, gestureSignal, this, SIGNAL(sigTouchPadEventSignal(QString, QString, int))); return true; } diff --git a/reader/app/Utils.h b/reader/app/Utils.h index 89b2a96b..012db37c 100644 --- a/reader/app/Utils.h +++ b/reader/app/Utils.h @@ -12,17 +12,6 @@ #include #include -// gesture 触控板手势 -#ifdef OS_BUILD_V23 -#define GESTURE_SERVICE "org.deepin.dde.Gesture" -#define GESTURE_PATH "/org/deepin/dde/Gesture" -#define GESTURE_INTERFACE "org.deepin.dde.Gesture" -#else -#define GESTURE_SERVICE "com.deepin.daemon.Gesture" -#define GESTURE_PATH "/com/deepin/daemon/Gesture" -#define GESTURE_INTERFACE "com.deepin.daemon.Gesture" -#endif -#define GESTURE_SIGNAL "Event" class Utils : public QObject { diff --git a/reader/reader.pro b/reader/reader.pro index 253e1d3a..88aed507 100755 --- a/reader/reader.pro +++ b/reader/reader.pro @@ -15,7 +15,7 @@ equals(QT_MAJOR_VERSION, 6) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus + PKGCONFIG += dtkwidget dtkgui dtkcore QMAKE_LRELEASE = lrelease } @@ -72,14 +72,6 @@ TEMPLATE = app #DEFINES += PERF_ON -# 判断系统环境 -MAJOR_VERSION=$$system("cat /etc/os-version | grep MajorVersion | grep -o '[0-9]\+'") -message("MAJOR_VERSION: " $$MAJOR_VERSION) -equals(MAJOR_VERSION, 25) { - message("----------------- OS_BUILD_V25 on") - DEFINES += OS_BUILD_V23 -} - #Install target.path = $$PREFIX/bin diff --git a/reader/src.pri b/reader/src.pri index bed258ea..db31ee4f 100644 --- a/reader/src.pri +++ b/reader/src.pri @@ -43,7 +43,7 @@ equals(QT_MAJOR_VERSION, 6) { QT += core gui widgets network sql dbus svg webchannel webenginewidgets concurrent xml # Qt5 specific configurations - PKGCONFIG += dtkwidget dframeworkdbus + PKGCONFIG += dtkwidget dtkgui dtkcore QMAKE_LRELEASE = lrelease }