Merge pull request #175 from chewing/release-prep

Prepare for release 2.0.0

CHANGELOG.md

@@ -0,0 +1,48 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [v2.0.0-rc1] - 2024-02-10
+
+### Added
+
+- On non-gnome desktop with systray icon enabled, IBus will display the
+  currently selected input mode.
+
+### Changed
+
+- IBus-Chewing Preferences has been rewritten in GTK4 and libadwaita.
+- Removed GOB2 dependency. Now gobjects are written in plain C99.
+- Removed cmake-fedora dependency. Now CMakeLists.txt only depends on built-in
+  modules.
+- New CMake presets can be used for building with different configurations.
+
+### Deprecated
+
+- X11 support has been deprecated. IBus-chewing no longer requires X11 to build.
+  Running in X11 environment will continue to work as long as IBus still
+  supports X11/XIM.
+
+### Removed
+
+- GtkStatusIcon based systray icon has been removed. Now there is only one icon
+  provided by IBus to avoid confusion.
+- Sync IM status back to CapsLock has been removed.
+
+### Fixed
+
+- Modifier key handling has been improved. Super key will no longer conflict
+  with desktop shortcut handling.
+- Shift key handling in English mode has been improved. Now Shift+Arrow key will
+  work correctly for highlighting text or scroll window.
+- Shift_L or Shift_R can be individually asssigned as Eng/Chi toggle key.
+
+## 1.x releases
+
+See [ChangeLog-1.x](./ChangeLog-1.x)
+
+[unreleased]: https://github.com/chewing/ibus-chewing/compare/1.6.2...HEAD
+[v2.0.0-rc1]: https://github.com/chewing/ibus-chewing/compare/1.6.2...HEAD

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.21.0)
 
-project(ibus-chewing VERSION 1.6.2 LANGUAGES C)
+project(ibus-chewing VERSION 2.0.0 LANGUAGES C)
 set(PRJ_SUMMARY "The Chewing engine for IBus input platform")
 set(SUMMARY_TRANSLATIONS "zh_TW" "IBus新酷音輸入法")
 
@@ -27,8 +27,7 @@ set(MAINTAINER "Ding-Yi Chen <dchen at redhat.com>")
 set(VENDOR "Red Hat, APAC, Inc.")
 set(LICENSE "GPLv2+")
 set(PRJ_GROUP "System Environment/Libraries")
-set(RPM_SPEC_URL "https://github.com/definite/${PROJECT_NAME}")
-set(RPM_SPEC_SOURCES "https://github.com/definite/%{name}/releases/download/%{version}/%{name}-%{version}-Source.tar.gz")
+set(RRJ_URL "https://github.com/chewing/${PROJECT_NAME}")
 
 enable_testing()
 include(GNUInstallDirs)
@@ -51,6 +50,7 @@ pkg_check_modules(GTK4 REQUIRED IMPORTED_TARGET gtk4)
 pkg_check_modules(LIBADWAITA REQUIRED IMPORTED_TARGET libadwaita-1)
 
 find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)
+find_program(GLIB_COMPILE_SCHEMAS NAMES glib-compile-schemas)
 
 set(CMAKE_C_STANDARD 99)
 add_compile_definitions(_XOPEN_SOURCE)
@@ -74,6 +74,7 @@ add_compile_definitions(
     DATA_DIR=${CMAKE_INSTALL_FULL_DATADIR}
     PRJ_DATA_DIR=${PRJ_DATA_DIR}
     PRJ_VER=${PRJ_VER}
+    PRJ_URL=${PRJ_URL}
     LIBEXEC_DIR=${LIBEXEC_DIR}
     CHEWING_DATADIR_REAL=${CHEWING_DATADIR_REAL}
 )
@@ -101,7 +102,7 @@ add_subdirectory(po)
 add_subdirectory(src bin)
 add_subdirectory(test)
 
-install(FILES AUTHORS README.md ChangeLog COPYING USER-GUIDE
+install(FILES AUTHORS README.md CHANGELOG.md ChangeLog-1.x COPYING USER-GUIDE
     DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES ${CMAKE_BINARY_DIR}/data/chewing.xml
     DESTINATION ${CMAKE_INSTALL_DATADIR}/ibus/component)

ChangeLog → ChangeLog-1.x

@@ -10,7 +10,7 @@
     + GitHub Issue: #165 Support vertical lookup table and optimize turn page keys
     + GitHub Issue: #166 Tweak ibus-setup dialog window and replace some deprecated APIs
     + GitHub Issue: #167 Add dropdown menu for Chi-Eng-Mode toggle key
-- Fix: 
+- Fix:
     + GitHub Issue: #130 Destroy *preEditText, *auxText and *outgoingText when disable to prevent leak
     + GitHub Issue: #144, 149 Ignore keystrokes in English mode
 - Acknowledge:

README.md

@@ -15,6 +15,16 @@ Bugs and enhancement can be filed to either:
  * [GitHub ibus-chewing](https://github.com/definite/ibus-chewing/issues)
 
 
+ibus-chewing releases can be verified with the following [minisign][] public key
+
+    RWRzJFnXiLZleAyCIv1talBjyRewelcy9gzYQq9pd3SKSFBPoy57sf5s
+
+For example, to verify the 2.0.0 release
+
+    minisign -Vm ibus-chewing-2.0.0-Source.tar.xz -P RWRzJFnXiLZleAyCIv1talBjyRewelcy9gzYQq9pd3SKSFBPoy57sf5s
+
+[minisign]: https://jedisct1.github.io/minisign/
+
 # Development
 
 We use LLVM coding style to make our review easier, so if you like to
@@ -38,3 +48,9 @@ ln -s ../../pre-commit .git/hooks/pre-commit
 export G_MESSAGES_DEBUG=all
 ibus-daemon -rvx
 ```
+
+# Translation
+
+There is a weblate instance at
+https://translate.fedoraproject.org/projects/ibus-chewing/ for easier
+contribution.

data/chewing.xml.in

@@ -6,7 +6,7 @@
     <version>@PRJ_VER@</version>
     <license>@LICENSE@</license>
     <author>Peng Huang, Ding-Yi Chen</author>
-    <homepage>@RPM_SPEC_URL@</homepage>
+    <homepage>@PRJ_URL@</homepage>
     <exec>@LIBEXEC_DIR@/ibus-engine-chewing --ibus</exec>
     <textdomain>ibus-chewing</textdomain>
     <engines>

rsign.pub

@@ -0,0 +1,2 @@
+untrusted comment: minisign public key: 7865B688D7592473
+RWRzJFnXiLZleAyCIv1talBjyRewelcy9gzYQq9pd3SKSFBPoy57sf5s

src/CMakeLists.txt

@@ -77,7 +77,7 @@ add_executable(ibus-engine-chewing
     main.c
 )
 target_compile_definitions(ibus-engine-chewing
-    PRIVATE VERBOSE_LEVEL=$<IF:$<CONFIG:Debug>,DEBUG,MSG>)
+    PRIVATE VERBOSE_LEVEL=$<IF:$<CONFIG:Debug>,DEBUG,WARN>)
 target_include_directories(ibus-engine-chewing
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -89,6 +89,9 @@ set(GSETTINGS_SCHEMAS_DIR ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas)
 install(FILES setup/${PROJECT_GSCHEMA_XML}
     DESTINATION ${GSETTINGS_SCHEMAS_DIR}
 )
+if(GLIB_COMPILE_SCHEMAS)
+    install(CODE "execute_process(COMMAND glib-compile-schemas ${CMAKE_INSTALL_PREFIX}/${GSETTINGS_SCHEMAS_DIR})")
+endif()
 
 install(TARGETS ibus-engine-chewing ibus-setup-chewing
     DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})

src/IBusChewingProperties.c

@@ -60,7 +60,7 @@ MkdgPropertySpec propSpecs[] = {
      NULL},
     /*== The callback will be handled in IBusChewingEngine.gob ==*/
     {G_TYPE_BOOLEAN, "show-systray", PAGE_KEYBOARD, N_("Show systray icons"),
-     IBUS_CHEWING_PROPERTIES_SUBSECTION, "1", NULL, NULL, 0, 1, NULL, 0,
+     IBUS_CHEWING_PROPERTIES_SUBSECTION, "0", NULL, NULL, 0, 1, NULL, 0,
      N_("On: Show Chinese/English and Full/Half shape status as a systray "
         "icon\n"
         "Off: Do not show the status icon"),
@@ -76,7 +76,7 @@ MkdgPropertySpec propSpecs[] = {
      N_("Use Ctrl + Numbers (2-9) to add new phrase before the cursor"), NULL},
     {G_TYPE_BOOLEAN, "clean-buffer-focus-out", PAGE_EDITING,
      N_("Clean pre-edit buffer when focus out"),
-     IBUS_CHEWING_PROPERTIES_SUBSECTION, "0", NULL, NULL, 0, 1,
+     IBUS_CHEWING_PROPERTIES_SUBSECTION, "1", NULL, NULL, 0, 1,
      cleanBufferFocusOut_apply_callback, 0,
      N_("On: Clean pre-edit buffer when focus out to prevent program crash\n"
         "Off: Keep what you already type for convenience"),
@@ -97,7 +97,7 @@ MkdgPropertySpec propSpecs[] = {
      NULL},
     {G_TYPE_STRING, "chi-eng-mode-toggle", PAGE_EDITING,
      N_("Chinese/Alphanumeric Mode Toggle Key"),
-     IBUS_CHEWING_PROPERTIES_SUBSECTION, "caps_lock", chiEngToggle, NULL, 0, 0,
+     IBUS_CHEWING_PROPERTIES_SUBSECTION, "shift", chiEngToggle, NULL, 0, 0,
      chiEngToggle_apply_callback,
      MKDG_PROPERTY_FLAG_NO_NEW | MKDG_PROPERTY_FLAG_HAS_TRANSLATION, NULL,
      NULL},
@@ -116,7 +116,7 @@ MkdgPropertySpec propSpecs[] = {
     /* Sync between CapsLock and IM */
     {G_TYPE_STRING, "sync-caps-lock", PAGE_EDITING,
      N_("Sync between CapsLock and IM"), IBUS_CHEWING_PROPERTIES_SUBSECTION,
-     "keyboard", syncCapsLock_strs, "Sync", 0, 1, syncCapsLock_apply_callback,
+     "disable", syncCapsLock_strs, "Sync", 0, 1, syncCapsLock_apply_callback,
      MKDG_PROPERTY_FLAG_NO_NEW | MKDG_PROPERTY_FLAG_HAS_TRANSLATION,
      N_("Occasionally, the CapsLock status does not match the IM, this option "
         "determines how these status be synchronized. Valid values:\n"
@@ -131,7 +131,7 @@ MkdgPropertySpec propSpecs[] = {
         "options are disabled or ignored."),
      NULL},
     {G_TYPE_UINT, "cand-per-page", PAGE_SELECTING, N_("Candidate per page"),
-     IBUS_CHEWING_PROPERTIES_SUBSECTION, "5", NULL, NULL, 4, 10,
+     IBUS_CHEWING_PROPERTIES_SUBSECTION, "10", NULL, NULL, 4, 10,
      candPerPage_apply_callback, 0, N_("Number of candidate per page."), NULL},
     {G_TYPE_BOOLEAN, "show-page-number", PAGE_SELECTING, N_("Show page number"),
      IBUS_CHEWING_PROPERTIES_SUBSECTION, "0", NULL, NULL, 0, 1,
@@ -144,11 +144,11 @@ MkdgPropertySpec propSpecs[] = {
         "cursor to the front."),
      NULL},
     {G_TYPE_BOOLEAN, "space-as-selection", PAGE_SELECTING,
-     N_("Space to select"), IBUS_CHEWING_PROPERTIES_SUBSECTION, "0", NULL, NULL,
+     N_("Space to select"), IBUS_CHEWING_PROPERTIES_SUBSECTION, "1", NULL, NULL,
      0, 1, spaceAsSelection_apply_callback, 0,
      "Press Space to select the candidate.", NULL},
     {G_TYPE_BOOLEAN, "vertical-lookup-table", PAGE_SELECTING,
-     N_("Vertical Lookup Table"), IBUS_CHEWING_PROPERTIES_SUBSECTION, "0", NULL,
+     N_("Vertical Lookup Table"), IBUS_CHEWING_PROPERTIES_SUBSECTION, "1", NULL,
      NULL, 0, 1, verticalLookupTable_apply_callback, 0,
      "Use vertical lookup table.", NULL},
     {G_TYPE_INVALID, "", "", "", IBUS_CHEWING_PROPERTIES_SUBSECTION, "", NULL,