diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 374ee6ccf4d8ecfffd5c5028f61d66bdf32365d7..ce17b3dfd056d52b9eb90e76a4066b84aecc1df4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,7 +15,7 @@ set(HEADERS
ipc/fcitxvirtualkeyboardserviceproxy.h
ipc/requestmerger.h
ipc/keyboardserviceproxy.h
- ipc/ukuimenuserviceproxy.h
+ ipc/gxdelauncherserviceproxy.h
ipc/fcitxqtdbustypes.h
ipc/fcitxcontrollerserviceproxy.h
localsettings/localsettings.h
@@ -55,7 +55,7 @@ set(SOURCES
ipc/fcitxvirtualkeyboardserviceproxy.cpp
ipc/requestmerger.cpp
ipc/keyboardserviceproxy.cpp
- ipc/ukuimenuserviceproxy.cpp
+ ipc/gxdelauncherserviceproxy.cpp
ipc/fcitxqtdbustypes.cpp
ipc/fcitxcontrollerserviceproxy.cpp
localsettings/viewlocalsettings.cpp
diff --git a/src/ipc/ukuimenuserviceproxy.cpp b/src/ipc/gxdelauncherserviceproxy.cpp
similarity index 59%
rename from src/ipc/ukuimenuserviceproxy.cpp
rename to src/ipc/gxdelauncherserviceproxy.cpp
index fc02df98dcead57874a0eb4562180d60607bc7f6..f97cd85aa1bbefbd4e28123be181bc96be2a702f 100644
--- a/src/ipc/ukuimenuserviceproxy.cpp
+++ b/src/ipc/gxdelauncherserviceproxy.cpp
@@ -15,19 +15,17 @@
* this program. If not, see .
*/
-#include "ukuimenuserviceproxy.h"
+#include "gxdelauncherserviceproxy.h"
-const QString g_ukuiMenuServiceName = "org.ukui.menu";
-const QString g_ukuiMenuServicePath = "/org/ukui/menu";
-const char *g_ukuiMenuServiceInterface = "org.ukui.menu";
+const QString g_gxdeLauncherServiceName = "com.deepin.dde.Launcher";
+const QString g_gxdeLauncherServicePath = "/com/deepin/dde/Launcher";
+const char *g_gxdeLauncherServiceInterface = "com.deepin.dde.Launcher";
-UkuiMenuServiceProxy::UkuiMenuServiceProxy(QObject *parent)
- : QDBusAbstractInterface(g_ukuiMenuServiceName, g_ukuiMenuServicePath,
- g_ukuiMenuServiceInterface,
+GxdeLauncherServiceProxy::GxdeLauncherServiceProxy(QObject *parent)
+ : QDBusAbstractInterface(g_gxdeLauncherServiceName, g_gxdeLauncherServicePath,
+ g_gxdeLauncherServiceInterface,
QDBusConnection::sessionBus(), parent) {}
-void UkuiMenuServiceProxy::toggle() {
- QList argumentList;
- argumentList << "";
- asyncCallWithArgumentList("active", argumentList);
+void GxdeLauncherServiceProxy::toggle() {
+ asyncCall("Toggle"); //这里少改了
}
\ No newline at end of file
diff --git a/src/ipc/ukuimenuserviceproxy.h b/src/ipc/gxdelauncherserviceproxy.h
similarity index 75%
rename from src/ipc/ukuimenuserviceproxy.h
rename to src/ipc/gxdelauncherserviceproxy.h
index 3e89e2476fe0957075d3bb443a9338ab5ca6849f..687acfae1ff987d84602f3a5d851b5ceb1209165 100644
--- a/src/ipc/ukuimenuserviceproxy.h
+++ b/src/ipc/gxdelauncherserviceproxy.h
@@ -15,15 +15,15 @@
* this program. If not, see .
*/
-#ifndef UKUIMENUSERVICEPROXY_H
-#define UKUIMENUSERVICEPROXY_H
+#ifndef GXDELAUNCHERSERVICEPROXY_H
+#define GXDELAUNCHERSERVICEPROXY_H
#include
-class UkuiMenuServiceProxy : public QDBusAbstractInterface {
+class GxdeLauncherServiceProxy : public QDBusAbstractInterface {
public:
- explicit UkuiMenuServiceProxy(QObject *parent = nullptr);
- ~UkuiMenuServiceProxy() override = default;
+ explicit GxdeLauncherServiceProxy(QObject *parent = nullptr);
+ ~GxdeLauncherServiceProxy() override = default;
void toggle();
};
diff --git a/src/virtualkeyboard/virtualkeyboardmodel.cpp b/src/virtualkeyboard/virtualkeyboardmodel.cpp
index 626667e0f2022ddfbeb9cc9a214c90212000092e..6d9d553a9312ac46409260e1f4770fc604599cf7 100644
--- a/src/virtualkeyboard/virtualkeyboardmodel.cpp
+++ b/src/virtualkeyboard/virtualkeyboardmodel.cpp
@@ -24,7 +24,7 @@
VirtualKeyboardModel::VirtualKeyboardModel(QObject *parent) : QObject(parent) {
initFcitx5Controller();
- initUkuiMenuServiceProxy();
+ initGxdeLauncherServiceProxy();
initDBusServiceWatcher();
}
@@ -46,8 +46,8 @@ void VirtualKeyboardModel::processKeyEvent(int keysym, int keycode, int state,
bool isRelease, int time) {
// TODO:未来支持全局快捷键之后需要把这里的逻辑全部去掉 hantengc
if (keycode == 133 && isRelease && state == 64) {
- KVKBD_INFO("will change ukui menu visiblity.");
- changeUkuiMenuVisiblity();
+ KVKBD_INFO("will change gxde launcher visiblity.");
+ changeGxdeLauncherVisiblity();
return;
}
@@ -61,8 +61,8 @@ void VirtualKeyboardModel::initFcitx5Controller() {
fcitx5Controller_.reset(new FcitxControllerServiceProxy(this));
}
-void VirtualKeyboardModel::initUkuiMenuServiceProxy() {
- ukuiMenuServiceProxy_.reset(new UkuiMenuServiceProxy(this));
+void VirtualKeyboardModel::initGxdeLauncherServiceProxy() {
+ gxdeLauncherServiceProxy_.reset(new GxdeLauncherServiceProxy(this));
}
void VirtualKeyboardModel::initDBusServiceWatcher() {
@@ -178,12 +178,12 @@ void VirtualKeyboardModel::syncCurrentIMList() {
setCurrentIMList(QVariant(stringList));
}
-void VirtualKeyboardModel::changeUkuiMenuVisiblity() {
- if (ukuiMenuServiceProxy_ == nullptr) {
- KVKBD_INFO("ukui menu service proxy is nullptr,will return and not to "
- "show ukui menu.");
+void VirtualKeyboardModel::changeGxdeLauncherVisiblity() {
+ if (gxdeLauncherServiceProxy_ == nullptr) {
+ KVKBD_INFO("gxde launcher service proxy is nullptr,will return and not to "
+ "show gxde launcher.");
return;
}
- ukuiMenuServiceProxy_->toggle();
+ gxdeLauncherServiceProxy_->toggle();
}
diff --git a/src/virtualkeyboard/virtualkeyboardmodel.h b/src/virtualkeyboard/virtualkeyboardmodel.h
index b89c8577f9463eb83c082732142756f01689d741..a6a0558712bb1d38f16e341afc52baf9c2cf386c 100644
--- a/src/virtualkeyboard/virtualkeyboardmodel.h
+++ b/src/virtualkeyboard/virtualkeyboardmodel.h
@@ -23,7 +23,7 @@
#include
#include
#include "ipc/fcitxcontrollerserviceproxy.h"
-#include "ipc/ukuimenuserviceproxy.h"
+#include "ipc/gxdelauncherserviceproxy.h"
class VirtualKeyboardModel : public QObject {
Q_OBJECT
@@ -79,7 +79,7 @@ private slots:
private:
void initFcitx5Controller();
- void initUkuiMenuServiceProxy();
+ void initGxdeLauncherServiceProxy();
void initDBusServiceWatcher();
void initVirtualKeyboardBackendInterface();
@@ -92,13 +92,13 @@ private:
int getPreeditCaret() const;
QString getPreeditText() const;
- void changeUkuiMenuVisiblity();
+ void changeGxdeLauncherVisiblity();
private:
std::unique_ptr serviceWatcher_ = nullptr;
std::unique_ptr virtualKeyboardBackendInterface_ = nullptr;
std::unique_ptr fcitx5Controller_ = nullptr;
- std::unique_ptr ukuiMenuServiceProxy_ = nullptr;
+ std::unique_ptr gxdeLauncherServiceProxy_ = nullptr;
QString uniqueName_;