Merge pull request #234 from chewing/prepare-24.10.1

Prepare 24.10.1
chewing · Dec 22, 2024 · d77e39f · d77e39f
2 parents 3609b1e + d0ca128
commit d77e39f
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 25 deletions.
diff --git 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

diff --git 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)
+include(CPack)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ChewingPreferences/ChewingPreferences.exe.manifest b/ChewingPreferences/ChewingPreferences.exe.manifest
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
     <assemblyIdentity
         name="Chewing.Windows-chewing-tsf.ChewingPreferences"
-        version="24.10.349.0"
+        version="24.10.1.0"
         processorArchitecture="*"
         type="win32"
     />
@@ -33,4 +33,4 @@
             <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
         </application>
     </compatibility>
-</assembly>
+</assembly>
diff --git a/installer/version.wxi b/installer/version.wxi
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Include>
-    <?define Version = "24.10.356.0"?>
+    <?define Version = "24.10.1.0"?>
 </Include>
diff --git 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/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<IEnumTfDisplayAttributeInfo> {
-        log::debug!("EnumDisplayAttributeInfo");
         Ok(EnumTfDisplayAttributeInfo::default().into())
     }
 
     fn GetDisplayAttributeInfo(&self, guid: *const GUID) -> Result<ITfDisplayAttributeInfo> {
-        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<ITfDisplayAttributeInfo>,
         pcfetched: *mut u32,
     ) -> Result<()> {
-        log::debug!("EnumTfDisplayAttributeInfo::Next");
         let mut count = 0;
         let mut rginfo_ptr = rginfo;
         if let Ok(attrs) = ATTRS.read() {

diff --git 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
@@ -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"