From 4c76a69079027ce29e847cd710857f87c1ed9fc4 Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Sun, 22 Dec 2024 19:52:58 +0900 Subject: [PATCH 1/4] refactor: remove debug log from display attribute provider --- libIME/src/display_attribute.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libIME/src/display_attribute.rs b/libIME/src/display_attribute.rs index 2d956ef..d44136c 100644 --- a/libIME/src/display_attribute.rs +++ b/libIME/src/display_attribute.rs @@ -21,12 +21,10 @@ struct DisplayAttributeProvider; impl ITfDisplayAttributeProvider_Impl for DisplayAttributeProvider_Impl { fn EnumDisplayAttributeInfo(&self) -> Result { - log::debug!("EnumDisplayAttributeInfo"); Ok(EnumTfDisplayAttributeInfo::default().into()) } fn GetDisplayAttributeInfo(&self, guid: *const GUID) -> Result { - log::debug!("GetDisplayAttributeInfo"); if guid.is_null() { return Err(E_INVALIDARG.into()); } @@ -58,7 +56,6 @@ fn register_display_attribute( } else { return Err(E_FAIL.into()); } - log::debug!("Registered atom = {}", atom); atom_out.write(atom); } Ok(()) @@ -70,7 +67,6 @@ unsafe extern "C" fn RegisterDisplayAttribute( da: TF_DISPLAYATTRIBUTE, atom_out: *mut u32, ) -> HRESULT { - log::debug!("RegisterDisplayAttribute called"); match register_display_attribute(guid, da, atom_out) { Ok(_) => S_OK, Err(e) => e.into(), @@ -79,7 +75,6 @@ unsafe extern "C" fn RegisterDisplayAttribute( #[no_mangle] unsafe extern "C" fn CreateDisplayAttributeProvider(ret: *mut *mut c_void) { - log::debug!("Creating DisplayAttributeProvider"); ret.write( DisplayAttributeProvider .into_object() @@ -108,7 +103,6 @@ impl IEnumTfDisplayAttributeInfo_Impl for EnumTfDisplayAttributeInfo_Impl { rginfo: *mut Option, pcfetched: *mut u32, ) -> Result<()> { - log::debug!("EnumTfDisplayAttributeInfo::Next"); let mut count = 0; let mut rginfo_ptr = rginfo; if let Ok(attrs) = ATTRS.read() { From 25ab2bf0235023778c73422a5d8abc5c93fd0e52 Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Sun, 22 Dec 2024 19:53:51 +0900 Subject: [PATCH 2/4] chore(release): update CHANGELOG.md --- CHANGELOG.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf9fb6..a62af81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,44 @@ All notable changes to this project will be documented in this file. +## [24.10.1] - 2024-12-22 + +### 🚀 Features + +- Show chi/eng mode toast after toggle capslock +- Add version number to dialog title +- Listen to registry change event + +### 🐛 Bug Fixes + +- Remove init code from DllMain and static link libchewing +- Setting CHEWING_USER_PATH +- Correctly provide display attribute +- End composition and hide windows on blur +- Attempt to fix incorrect light theme detection + +### 🚜 Refactor + +- Remove debug log +- Remove debug log from display attribute provider + +### 🎨 Styling + +- Update icon + +### ⚙️ Miscellaneous Tasks + +- Update nightly build description in nightly.yml +- Automatically generate version info +- Trigger version info generation in PR context +- Fix cargo xtask command argument +- Log generated version info +- Only generate build revision in nightly mode +- Simplify version number scheme +- Use github_run_number +- Use different version for PR and nightly +- Fix version mentioned in nightly title + ## [24.10] - 2024-12-15 ### 🚀 Features From 9f461cac97c3cc641b51cfe02691916c008c75bb Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Sun, 22 Dec 2024 19:57:41 +0900 Subject: [PATCH 3/4] chore(release): bump version to 24.10.1.0 --- CMakeLists.txt | 4 ++-- Cargo.lock | 4 ++-- .../ChewingPreferences.exe.manifest | 4 ++-- installer/version.wxi | 2 +- libIME/Cargo.toml | 2 +- tsfreg/Cargo.toml | 2 +- version.rc | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0578e11..11e1aaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ add_subdirectory(ChewingTextService) add_subdirectory(ChewingPreferences) set(CPACK_PACKAGE_CHECKSUM SHA256) -set(CPACK_PACKAGE_VERSION 24.10) +set(CPACK_PACKAGE_VERSION 24.10.1) set(CPACK_SOURCE_IGNORE_FILES "/build" "/target" "/dist" "/\\\\..*") set(CPACK_SOURCE_GENERATOR ZIP) -include(CPack) \ No newline at end of file +include(CPack) diff --git a/Cargo.lock b/Cargo.lock index 1d42bab..f32f032 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "libime2" -version = "24.10.349" +version = "24.10.1" dependencies = [ "log", "nine_patch_drawable", @@ -93,7 +93,7 @@ dependencies = [ [[package]] name = "tsfreg" -version = "24.10.349" +version = "24.10.1" dependencies = [ "windows", ] diff --git a/ChewingPreferences/ChewingPreferences.exe.manifest b/ChewingPreferences/ChewingPreferences.exe.manifest index 3f2bbc9..8ff6e2a 100644 --- a/ChewingPreferences/ChewingPreferences.exe.manifest +++ b/ChewingPreferences/ChewingPreferences.exe.manifest @@ -2,7 +2,7 @@ @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/installer/version.wxi b/installer/version.wxi index 1bb49ea..c805e32 100644 --- a/installer/version.wxi +++ b/installer/version.wxi @@ -1,4 +1,4 @@ - + diff --git a/libIME/Cargo.toml b/libIME/Cargo.toml index 0ff4bf2..87e6ae3 100644 --- a/libIME/Cargo.toml +++ b/libIME/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libime2" -version = "24.10.349" +version = "24.10.1" edition = "2021" [lib] diff --git a/tsfreg/Cargo.toml b/tsfreg/Cargo.toml index 93c88c7..f736045 100644 --- a/tsfreg/Cargo.toml +++ b/tsfreg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tsfreg" -version = "24.10.349" +version = "24.10.1" edition = "2021" [dependencies] diff --git a/version.rc b/version.rc index 4e12aab..3d104f2 100644 --- a/version.rc +++ b/version.rc @@ -1,8 +1,8 @@ -#define VER_FILEVERSION 24,10,356,0 -#define VER_FILEVERSION_STR "24.10.356.0\0" -#define VER_PRODUCTVERSION 24,10,356,0 -#define VER_PRODUCTVERSION_STR "24.10.356.0\0" -#define ABOUT_CAPTION_WITH_VER "關於新酷音輸入法 (24.10.356.0)\0" -#define ABOUT_VERSION_STR "版本：24.10.356.0\0" -#define ABOUT_RELEASE_DATE_STR "發行日期：2024 年 12 月 21 日\0" -#define PREFS_TITLE_WITH_VER "設定新酷音輸入法 (24.10.356.0)\0" +#define VER_FILEVERSION 24,10,1,0 +#define VER_FILEVERSION_STR "24.10.1.0\0" +#define VER_PRODUCTVERSION 24,10,1,0 +#define VER_PRODUCTVERSION_STR "24.10.1.0\0" +#define ABOUT_CAPTION_WITH_VER "關於新酷音輸入法 (24.10.1.0)\0" +#define ABOUT_VERSION_STR "版本：24.10.1.0\0" +#define ABOUT_RELEASE_DATE_STR "發行日期：2024 年 12 月 22 日\0" +#define PREFS_TITLE_WITH_VER "設定新酷音輸入法 (24.10.1.0)\0" From d0ca128e775824f3256aaabdf7f45f5f7c3cc654 Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Sun, 22 Dec 2024 19:59:04 +0900 Subject: [PATCH 4/4] chore(deps): update dependencies --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f32f032..3c81944 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.90" +version = "2.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d53cbcb5a243bd33b7858b1d7f4aca2153490815872d86d955d6ea29f743c035" dependencies = [ "proc-macro2", "quote",