openkylin
/
kylin-virtual-keyboard
mirror of https://gitee.com/openkylin/kylin-virtual-keyboard.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

优化成员变量的类型和名字 

1. 将成员变量的类型从QDBusInterface改为fcitx::FcitxQtControllerProxy

2. 将成员变量的名字从fcitx5ControllerInterface_改为fcitx5Controller_
This commit is contained in:
liulinsong 2023-03-29 14:07:24 +08:00
parent 36bec35630
commit ef0abacef5
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/virtualkeyboard/virtualkeyboardmanager.cpp
View File

@ -78,11 +78,7 @@ void VirtualKeyboardManager::NotifyIMDeactivated(
}
void VirtualKeyboardManager::NotifyIMListChanged() {
fcitx::FcitxQtControllerProxy fcitxQtControllerProxy(
fcitx5Service, fcitx5ServiceControllerPath,
QDBusConnection::sessionBus(), this);
QDBusPendingReply<QString> reply =
fcitxQtControllerProxy.CurrentInputMethod();
QDBusPendingReply<QString> reply = fcitx5Controller_->CurrentInputMethod();
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)), this,
SLOT(imListChanged(QDBusPendingCallWatcher *)));
@ -210,10 +206,9 @@ void VirtualKeyboardManager::initVirtualKeyboardBackendInterface() {
this));
}
void VirtualKeyboardManager::initFcitx5ControllerInterface() {
fcitx5ControllerInterface_.reset(new QDBusInterface(
fcitx5Service, fcitx5ServiceControllerPath,
fcitx5ServiceControllerInterface, QDBusConnection::sessionBus(), this));
void VirtualKeyboardManager::initFcitx5Controller() {
fcitx5Controller_.reset(new fcitx::FcitxQtControllerProxy(
"org.fcitx.Fcitx5", "/controller", QDBusConnection::sessionBus()));
}
void VirtualKeyboardManager::initAppInputAreaManager() {
@ -262,7 +257,7 @@ void VirtualKeyboardManager::selectCandidate(int index) {
}
void VirtualKeyboardManager::setCurrentInputMethod(const QString &imName) {
fcitx5ControllerInterface_->asyncCall("SetCurrentIM", imName);
fcitx5Controller_->SetCurrentIM(imName);
}
void VirtualKeyboardManager::processKeyEvent(const QString & /*keyval*/,
@ -321,7 +316,7 @@ void VirtualKeyboardManager::backendServiceRegistered(
return;
}
initVirtualKeyboardBackendInterface();
initFcitx5ControllerInterface();
initFcitx5Controller();
}
void VirtualKeyboardManager::backendServiceUnregistered(

7
src/virtualkeyboard/virtualkeyboardmanager.h
View File

@ -76,7 +76,7 @@ private:
void initDBusServiceWatcher();
void initVirtualKeyboardBackendInterface();
void initFcitx5ControllerInterface();
void initFcitx5Controller();
void initAppInputAreaManager();
void initPlacementModeManager();
void initGeometryManager();
@ -97,7 +97,7 @@ private:
nullptr;
std::unique_ptr<QDBusServiceWatcher> serviceWatcher_ = nullptr;
std::unique_ptr<QDBusInterface> virtualKeyboardBackendInterface_ = nullptr;
std::unique_ptr<QDBusInterface> fcitx5ControllerInterface_ = nullptr;
std::unique_ptr<fcitx::FcitxQtControllerProxy> fcitx5Controller_ = nullptr;
bool virtualkeyboardVisible_ = false;
ViewLocalSettings viewSettings_{"kylinsoft", "kylin virtual keyboard"};
@ -107,9 +107,6 @@ private:
QString virtualKeyboardBackendServicePath = "/virtualkeyboard";
QString virtualKeyboardBackendServiceInterface =
"org.fcitx.Fcitx5.VirtualKeyboardBackend1";
QString fcitx5Service = "org.fcitx.Fcitx5";
QString fcitx5ServiceControllerPath = "/controller";
QString fcitx5ServiceControllerInterface = "org.fcitx.Fcitx.Controller1";
};
#endif // VIRTUALKEYBOARDMANAGER_H