update changelog

debian/changelog

@@ -1,3 +1,11 @@
+kylin-virtual-keyboard (1.0.2.1-0k0.1tablet18) v101; urgency=medium
+
+  * bug修复：无
+  * 新需求：无
+  * 其他修改：将TrayEntry模块与VirtualKeyboardManager解耦,使得VirtualKeyboardManager不再依赖TrayEntry
+
+ -- hanteng <hanteng@kylinos.cn>  Tue, 07 Mar 2023 11:09:25 +0800
+
 kylin-virtual-keyboard (1.0.2.1-0k0.1tablet17) v101; urgency=medium
 
   * bug修复：无

debian/patches/0031-update-changelog.patch

@@ -0,0 +1,113 @@
+From: hanteng <hanteng@kylinos.cn>
+Date: Tue, 7 Mar 2023 11:11:58 +0800
+Subject: update changelog
+
+---
+ src/main.cpp                   | 3 +++
+ src/trayentry.cpp              | 5 ++---
+ src/trayentry.h                | 6 +++---
+ src/virtualkeyboardmanager.cpp | 5 -----
+ src/virtualkeyboardmanager.h   | 2 --
+ 5 files changed, 8 insertions(+), 13 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index af6b84e..56dbf7f 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -2,6 +2,7 @@
+ #include <QLocale>
+ #include <QTranslator>
+ 
++#include "trayentry.h"
+ #include "virtualkeyboardmanager.h"
+ 
+ int main(int argc, char *argv[]) {
+@@ -15,5 +16,7 @@ int main(int argc, char *argv[]) {
+     }
+ 
+     VirtualKeyboardManager virtualKeyboardManager;
++    TrayEntry trayEntry(&virtualKeyboardManager);
++
+     return app.exec();
+ }
+diff --git a/src/trayentry.cpp b/src/trayentry.cpp
+index 9553537..3d16999 100644
+--- a/src/trayentry.cpp
++++ b/src/trayentry.cpp
+@@ -3,9 +3,8 @@
+ #include <QIcon>
+ #include <QDBusMessage>
+ 
+-TrayEntry::TrayEntry(VirtualKeyboardManager *virtualKeyboardManager,
+-                     QObject *parent)
+-: QObject(parent), virtualKeyboardManager_(virtualKeyboardManager) {
++TrayEntry::TrayEntry(VirtualKeyboardManager *virtualKeyboardManager)
++:  virtualKeyboardManager_(virtualKeyboardManager) {
+     ConnectFcitxVirtualKeyboardBackend();
+     RegisterTrayEntry();
+ }
+diff --git a/src/trayentry.h b/src/trayentry.h
+index cd453c8..2628649 100644
+--- a/src/trayentry.h
++++ b/src/trayentry.h
+@@ -10,8 +10,7 @@ class TrayEntry : public QObject {
+     Q_OBJECT
+ 
+ public:
+-    explicit TrayEntry(VirtualKeyboardManager *virtualKeyboardManager,
+-                       QObject *parent = nullptr);
++    explicit TrayEntry(VirtualKeyboardManager *virtualKeyboardManager = nullptr);
+     ~TrayEntry() = default;
+ 
+ private:
+@@ -32,4 +31,5 @@ private:
+     QString dbusInterface_ = "org.fcitx.virtualkeyboard.service";
+ };
+ 
+-#endif // TRAYENTRY_H
+\ No newline at end of file
++#endif // TRAYENTRY_H
++
+diff --git a/src/virtualkeyboardmanager.cpp b/src/virtualkeyboardmanager.cpp
+index cef5e5f..50c5eec 100644
+--- a/src/virtualkeyboardmanager.cpp
++++ b/src/virtualkeyboardmanager.cpp
+@@ -10,7 +10,6 @@ VirtualKeyboardManager::VirtualKeyboardManager(QObject *parent)
+     initAppInputAreaManager();
+     initPlacementModeManager();
+     initGeometryManager();
+-    initTrayEntry();
+ 
+     initScreenSignalConnections();
+     initPlacementModeManagerSignalConnections();
+@@ -332,10 +331,6 @@ void VirtualKeyboardManager::fallInputArea() {
+     appInputAreaManager_->fallInputArea();
+ }
+ 
+-void VirtualKeyboardManager::initTrayEntry() {
+-    trayEntry_.reset(new TrayEntry(this, this));
+-}
+-
+ void VirtualKeyboardManager::initScreenSignalConnections() {
+     connect(QGuiApplication::primaryScreen(),
+             SIGNAL(geometryChanged(const QRect &)), this,
+diff --git a/src/virtualkeyboardmanager.h b/src/virtualkeyboardmanager.h
+index 1ae50d3..366b05b 100644
+--- a/src/virtualkeyboardmanager.h
++++ b/src/virtualkeyboardmanager.h
+@@ -84,7 +84,6 @@ private:
+     void initPlacementModeManager();
+     void initGeometryManager();
+     void initDBusService();
+-    void initTrayEntry();
+     void initScreenSignalConnections();
+     void initPlacementModeManagerSignalConnections();
+ 
+@@ -103,7 +102,6 @@ private:
+     std::unique_ptr<ExpansionGeometryManager> expansionGeometryManager_ =
+         nullptr;
+     std::unique_ptr<QDBusServiceWatcher> serviceWatcher_ = nullptr;
+-    std::unique_ptr<TrayEntry> trayEntry_ = nullptr;
+     std::unique_ptr<QDBusInterface> virtualKeyboardBackendInterface_ = nullptr;
+     std::unique_ptr<QDBusInterface> fcitx5ControllerInterface_ = nullptr;
+     bool virtualkeyboardVisible_ = false;

debian/patches/series

@@ -28,3 +28,4 @@
 0028-update-changelog.patch
 0029-update-changelog.patch
 0030-update-changelog.patch
+0031-update-changelog.patch