refactor: 重构代码

* 重构代码
* 合并最新 fcitx5-configtool

Issues: linuxdeepin/developer-center#5701,
  linuxdeepin/developer-center#7752,
  linuxdeepin/developer-center#7753

Author: zsien

.gitignore

@@ -1,4 +1,8 @@
-*.user*
-*.qm
-build/
-
+build/*
+*.kdev4
+.kdev_include_paths
+.directory
+*.kate-swp
+*.orig
+*~
+.*

.reuse/dep5

@@ -24,12 +24,12 @@ Copyright: Deepin Technology Co., Ltd.
 License: CC-BY-4.0
 
 # desktop
-Files: *.desktop
+Files: *.desktop *.desktop.in
 Copyright: None
 License: CC0-1.0
 
 # translation
-Files: *.ts
+Files: *.ts *.po *.pot **/LINGUAS
 Copyright: Deepin Technology Co., Ltd.
 License: GPL-3.0-or-later
 

.tx/config

@@ -4,8 +4,8 @@ minimum_perc = 80
 mode = developer
 
 [o:linuxdeepin:p:deepin-desktop-environment:r:deepin-fcitx5configtool-plugin]
-file_filter = translations/deepin-fcitx5configtool-plugin_<lang>.ts
-source_file = translations/deepin-fcitx5configtool-plugin.ts
+file_filter = src/dcc-module/translations/deepin-fcitx5configtool-plugin_<lang>.ts
+source_file = src/dcc-module/translations/deepin-fcitx5configtool-plugin.ts
 source_lang = en
 type = QT
 

CMakeLists.txt

@@ -1,26 +1,70 @@
-#cmake版本设置
-cmake_minimum_required(VERSION 3.7)
-project(deepin-fcitx5configtool-plugin VERSION 5.0.5)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
-include(GNUInstallDirs)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-set(DEFAULT_XKB_RULES "evdev" CACHE STRING "Xkb rules name")
+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+  message(FATAL_ERROR "In-source builds are disabled.
+    Please create a subfolder and use `cmake ..` inside it.
+    NOTE: cmake will now create CMakeCache.txt and CMakeFiles/*.
+          You must delete them, or cmake will refuse to work.")
+endif()
 
-find_package(XKeyboardConfig REQUIRED)
+project(fcitx5-configtool VERSION 5.1.2)
+
+set(QT_MIN_VERSION "5.12.0")
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(FeatureSummary)
+include(ECMSetupVersion)
+include(GenerateExportHeader)
+option(ENABLE_KCM "Enable KDE Config Module" On)
+option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)
+option(ENABLE_TEST "Enable test" Off)
+add_definitions(-DTRANSLATION_DOMAIN=\"org.fcitx.fcitx5.kcm\")
+add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\")
+add_definitions(-DQT_NO_KEYWORDS)
+
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X11Extras Concurrent)
+find_package(DtkCore REQUIRED)
+find_package(DtkWidget REQUIRED)
+
+find_package(KF5ItemViews REQUIRED)
+
+find_package(Fcitx5Core 5.0.4 REQUIRED)
+find_package(Fcitx5Config REQUIRED)
+find_package(Fcitx5Utils REQUIRED)
+find_package(Fcitx5Qt5DBusAddons REQUIRED)
+find_package(Fcitx5Qt5WidgetsAddons 5.0.2 REQUIRED)
+find_package(Qt5Svg)
+set_package_properties(Qt5Svg PROPERTIES
+    DESCRIPTION "May be used for show icons"
+    TYPE RUNTIME)
+
+get_target_property(FCITX5_QT5_GUI_WRAPPER Fcitx5Qt5::gui-wrapper IMPORTED_LOCATION)
+
+find_package(KF5WidgetsAddons REQUIRED)
 find_package(IsoCodes REQUIRED)
+kde_enable_exceptions()
+
+include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
+
+find_package(PkgConfig REQUIRED)
+find_package(Gettext REQUIRED)
+find_package(X11 REQUIRED)
+find_package(XKeyboardConfig REQUIRED)
+pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET)
+
+set(DEFAULT_XKB_RULES "evdev" CACHE STRING "Xkb rules name")
+
 configure_file(config.h.in config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_compile_definitions(FCITX_GETTEXT_DOMAIN="fcitx5-configtool")
-
-#加载子目录
+add_subdirectory(po)
 add_subdirectory(src)
+add_subdirectory(layout)
 
-#调用外部程序  生成qm文件
-execute_process(COMMAND bash translate_generation.sh
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-## qm files
-file(GLOB QM_FILES "translations/*.qm")
-install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dde-control-center/translations)
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

Messages.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+gen_pot kde:appdata:desktop:ui fcitx5-configtool po/fcitx5-configtool layout/ src/configtool/ src/lib/ src/migrator/
+gen_pot kde:appdata:desktop:ui org.fcitx.fcitx5.kcm po/org.fcitx.fcitx5.kcm src/kcm/ src/plasmathemegenerator/

README

@@ -8,13 +8,11 @@
 
 #cmakedefine PROJECT_VERSION "@PROJECT_VERSION@"
 #cmakedefine XKEYBOARDCONFIG_XKBBASE "@XKEYBOARDCONFIG_XKBBASE@"
+#cmakedefine DEFAULT_XKB_RULES "@DEFAULT_XKB_RULES@"
 #cmakedefine ISOCODES_ISO639_2_JSON "@ISOCODES_ISO639_2_JSON@"
 #cmakedefine ISOCODES_ISO639_3_JSON "@ISOCODES_ISO639_3_JSON@"
 #cmakedefine ISOCODES_ISO639_5_JSON "@ISOCODES_ISO639_5_JSON@"
 
-#define XKEYBOARDCONFIG_XKBBASE "@XKEYBOARDCONFIG_XKBBASE@"
-#define DEFAULT_XKB_RULES "@DEFAULT_XKB_RULES@"
-
 #define FCITX5_QT5_GUI_WRAPPER "@FCITX5_QT5_GUI_WRAPPER@"
 
 #endif // _KCM_FCITX5_CONFIG_H_