Merge pull request #68 from zonble/master

Adds the traditional BPMF mode

.github/workflows/ci.yaml

@@ -3,9 +3,9 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build_ubuntu_21:
+  build_ubuntu_22:
     runs-on: ubuntu-latest
-    container: ubuntu:impish-20220316
+    container: ubuntu:jammy-20220531
 
     steps:
       - uses: actions/checkout@v1
@@ -15,7 +15,7 @@ jobs:
           apt-get update
           apt install -y clang
           apt install -y cmake extra-cmake-modules gettext libfmt-dev
-          apt install -y fcitx5=5.0.5-1ubuntu2 libfcitx5core-dev=5.0.5-1ubuntu2 libfcitx5config-dev=5.0.5-1ubuntu2 libfcitx5utils-dev=5.0.5-1ubuntu2
+          apt install -y fcitx5 libfcitx5core-dev libfcitx5config-dev libfcitx5utils-dev
       - name: Build
         run: |
           mkdir -p build
@@ -36,7 +36,7 @@ jobs:
 
   build_ubuntu_20:
     runs-on: ubuntu-latest
-    container: ubuntu:focal-20220316
+    container: ubuntu:focal-20220531
 
     steps:
       - uses: actions/checkout@v1

CMakeLists.txt

@@ -31,6 +31,8 @@ message(STATUS "CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}")
 
 # McBopomofo data
 configure_file(data/data.txt mcbopomofo-data.txt)
+configure_file(data/data-plain-bpmf.txt mcbopomofo-data-plain-bpmf.txt)
 configure_file(data/add-phrase-hook.sh mcbopomofo-add-phrase-hook.sh)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mcbopomofo-data.txt" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/data")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mcbopomofo-data-plain-bpmf.txt" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/data")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mcbopomofo-add-phrase-hook.sh" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/data")

data/24x24/apps/fcitx-mcbopomofo.png

@@ -0,0 +1 @@
+org.fcitx.Fcitx5.fcitx-mcbopomofo.png

data/32x32/apps/fcitx-mcbopomofo.png

@@ -0,0 +1 @@
+org.fcitx.Fcitx5.fcitx-mcbopomofo.png

data/CMakeLists.txt

@@ -1,5 +1,5 @@
-foreach(size 64)
+foreach(size 24 32 64)
     install(DIRECTORY ${size}x${size} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-             PATTERN .* EXCLUDE
-             PATTERN *~ EXCLUDE)
-endforeach(size 64)
+        PATTERN .* EXCLUDE
+        PATTERN *~ EXCLUDE)
+endforeach(size 24 32 64)