feat: unikey engine

.gitignore

@@ -23,13 +23,14 @@ cmake_install.cmake
 ecm_uninstall.cmake
 install_manifest.txt
 org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml
-org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in
 Makefile
 .vscode/
 compile_commands.json
 !.all-contributorsrc
 refresh-contributor
 
+unikey-im/
+
 # Qt AUTOMOC generated files
 *_autogen/
 
@@ -38,4 +39,4 @@ refresh-contributor
 lotus-version.h
 # Logs
 *.log
-__pycache__/
+__pycache__/

CMakeLists.txt

@@ -28,6 +28,7 @@ find_package(X11 REQUIRED)
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-lotus\") 
+add_definitions(-DQT_NO_KEYWORDS)
 
 find_package(Fcitx5Utils REQUIRED)
 if (Fcitx5Utils_VERSION VERSION_GREATER_EQUAL "5.1.13")
@@ -38,36 +39,36 @@ else()
 endif()
 fcitx5_add_i18n_definition()
 
+add_subdirectory(unikey)
+if (ENABLE_QT)
+    set(QT_MAJOR_VERSION 6)
+    find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Core Gui Widgets)
+    find_package(Fcitx5Qt${QT_MAJOR_VERSION}WidgetsAddons 5.0.12 REQUIRED)
+    add_subdirectory(macro-editor)
+    add_subdirectory(keymap-editor)
+endif()
 add_subdirectory(po)
-add_subdirectory(bamboo)
 add_subdirectory(src)
 add_subdirectory(data)
 add_subdirectory(server)
 add_subdirectory(misc)
 
-if(ENABLE_QT)
-    target_compile_definitions(lotus PRIVATE DISABLE_VERSION_ACTION)
-    add_subdirectory(settings-gui)
-endif(ENABLE_QT)
-
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in"
-    @ONLY
-)
+set(LOTUS_METAINFO_ID org.fcitx.Fcitx5.Addon.Lotus.metainfo)
+set(LOTUS_METAINFO_TRANSLATION_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${LOTUS_METAINFO_ID}.xml.in")
+set(LOTUS_METAINFO_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${LOTUS_METAINFO_ID}.xml")
 
 fcitx5_translate_desktop_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in"
-    org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml
+    "${LOTUS_METAINFO_TRANSLATION_INPUT}"
+    "${LOTUS_METAINFO_ID}.xml"
     XML
 )
 
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
+install(FILES "${LOTUS_METAINFO_OUTPUT}" DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
 
-install(FILES 
+install(FILES
         LICENSES/GPL-3.0-or-later.txt
         LICENSES/LGPL-2.1-or-later.txt
         DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/${PROJECT_NAME}
 )
 
-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

Messages.sh

@@ -12,7 +12,7 @@ xgettext \
 --language=appdata \
 --from-code=UTF-8 \
 -o /tmp/lotus-xml.pot \
-org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in.in
+org.fcitx.Fcitx5.Addon.Lotus.metainfo.xml.in
 
 xgettext \
 --language=Python \
@@ -47,4 +47,4 @@ msgcat \
 /tmp/lotus-conf.pot \
 /tmp/lotus-python.pot \
 /tmp/lotus-desktop.pot \
--o po/fcitx5-lotus.pot
+-o po/fcitx5-lotus.pot