Skip to content

Commit abab3f9

Browse files
committed
chore(release): 1.0.0 🎉
Release on June 1, 2024
1 parent b8ec090 commit abab3f9

5 files changed

Lines changed: 55 additions & 25 deletions

File tree

CHANGELOG.md

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,41 @@
33

44
#### 主要功能更新
55
* 純 Swift 重寫,代碼更易維護,更易讀,貢獻代碼的門檻更低。今天就來看看源代碼,嘗試動手吧!
6+
67
#### 其它更新內容
7-
* `style/candidate_format` 格式修改爲 `"[label]. [candidate] [comment]"`,原格式仍能使用,建議遷移至更靈活、直觀的新格式
8-
* `style/horizontal` 將徹底移除,雖然本版程序仍支持,但會被新控件的默認值覆蓋,請使用 `candidate_list_layout`: `stacked`/`linear``text_orientation`: `horizontal`/`vertical`
9-
* `style/label_hilited_color` 已移除,請使用 `hilited_candidate_label_color`
10-
* 在菜單欄新增日志檔案夾,方便快速進入
11-
* 序號居中顯示,更像原生輸入法
12-
* `native` 配色小幅修改,減小字號,更像原生輸入法
13-
* 增加 `--help` 命令行選項
8+
* UI 設置【**敬請留意**
9+
* `style/candidate_format` 格式修改爲 `"[label]. [candidate] [comment]"`,原格式仍能使用,但建議遷移至更靈活、直觀的新格式
10+
* `style/horizontal` 將徹底移除,雖然本版程序仍支持,但會被新控件的默認值覆蓋
11+
請使用 `candidate_list_layout`: `stacked`/`linear``text_orientation`: `horizontal`/`vertical`
12+
* `style/label_hilited_color` 已移除,請使用 `style/hilited_candidate_label_color`
13+
* `native` 配色小幅修改,減小字號,更像原生輸入法
14+
* UI
15+
* 在菜單欄新增日志檔案夾,方便快速進入
16+
* 序號居中顯示,更像原生輸入法
17+
* 新增 `--help` 命令行命令,以便查詢支持的命令
1418
* bug 修復
15-
* 偶發使用<kbd>⇧</kbd>輸入大寫時造成中英切換
19+
* 減少使用<kbd>⇧</kbd>輸入大寫時造成中英切換的可能性
20+
* librime:使用 stdbool 後綴 API,以便與 Swift 更好橋接
21+
1622
#### Major Update
17-
* Migrated code to pure Swift, which is easier to maintain, read and contribute. Build your own Squirrel today!
23+
* Migrated code to pure Swift, which is easier to code, read and learn. Build your own Squirrel today!
24+
1825
#### Other Updates
19-
* `style/candidate_format` now updated to `"[index]. [candidate] [comment]"`, while the old format still works, please migrate to this more readable and flexible format at your convenience
20-
* `style/horizontal` will be dropped, it's still supported but will be overwrite by the default values of new options. Please adopt `candidate_list_layout`: `stacked`/`linear` and `text_orientation`: `horizontal`/`vertical`
21-
* `style/label_hilited_color` is removed, please use `hilited_candidate_label_color` instead
22-
* Added a menu item for logs folder for quick access
23-
* labels will vertically center if label font is smaller than candidate font, better matches macOS builtin IME
24-
* `native` color scheme is updated with smaller font size, better matches macOS builtin IME
26+
* UI settings (**Breaking Changes**)
27+
* `style/candidate_format` now updated to `"[index]. [candidate] [comment]"`, while the old format still works, please consider migrating to this more readable and flexible format at your convenience
28+
* `style/horizontal` will be dropped, it's still supported but will be overwrite by the default values of new options.
29+
Please adopt `candidate_list_layout`: `stacked`/`linear` and `text_orientation`: `horizontal`/`vertical`
30+
* `style/label_hilited_color` is removed, please use `style/hilited_candidate_label_color` instead
31+
* `native` color scheme is updated with smaller font size, to better match macOS builtin IME
32+
* UI
33+
* Added a menu item for logs folder with easy access
34+
* labels will vertically center if label font is smaller than candidate font, to better match macOS builtin IME
2535
* Added `--help` command line argument
2636
* Bug fixes:
27-
* Occasionally, press <kbd>⇧</kbd> to enter Cap case may switch ascii mode
37+
* Reduce the chance that ascii mode may unintentionally switch when pressing <kbd>⇧</kbd> to enter Cap case
38+
* librime: Use stdbool flavored API, for better Swift interoperation
39+
40+
**Full Changelog**: https://github.com/rime/squirrel/compare/0.18...1.0.0
2841

2942
<a name="0.18"></a>
3043
## 0.18 (2024-05-04)

INSTALL.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,12 @@ To clean up **dependencies**, including librime, librime plugins, plum and spark
173173
make clean-deps
174174
```
175175
176-
If you want to clean both, do both.
176+
To clean up **packages**, run:
177+
178+
``` sh
179+
make clean-package
180+
```
181+
182+
If you want to clean all above, do all.
177183
178184
That's it, a verbal journal. Thanks for riming with Squirrel.

Makefile

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ OPENCC_DATA = data/opencc/TSCharacters.ocd2 \
2222
data/opencc/TSPhrases.ocd2 \
2323
data/opencc/t2s.json
2424
SPARKLE_FRAMEWORK = Frameworks/Sparkle.framework
25+
SPARKLE_SIGN = package/sign_update
26+
PACKAGE = package/Squirrel.pkg
2527
DEPS_CHECK = $(RIME_LIBRARY) $(PLUM_DATA) $(OPENCC_DATA) $(SPARKLE_FRAMEWORK)
2628

2729
OPENCC_DATA_OUTPUT = librime/share/opencc/*.*
@@ -116,21 +118,23 @@ $(SPARKLE_FRAMEWORK):
116118

117119
sparkle:
118120
xcodebuild -project Sparkle/Sparkle.xcodeproj -configuration Release $(BUILD_SETTINGS) build
119-
xcodebuild -project Sparkle/Sparkle.xcodeproj -scheme sign_update -configuration Release -derivedDataPath Sparkle/build $(BUILD_SETTINGS) build
120121
$(MAKE) copy-sparkle-framework
121122

123+
$(SPARKLE_SIGN):
124+
xcodebuild -project Sparkle/Sparkle.xcodeproj -scheme sign_update -configuration Release -derivedDataPath Sparkle/build $(BUILD_SETTINGS) build
125+
cp Sparkle/build/Build/Products/Release/sign_update package/
126+
122127
copy-sparkle-framework:
123128
mkdir -p Frameworks
124129
cp -RP Sparkle/build/Release/Sparkle.framework Frameworks/
125-
cp Sparkle/build/Build/Products/Release/sign_update package/
126130

127131
clean-sparkle:
128132
rm -rf Frameworks/* > /dev/null 2>&1 || true
129133
rm -rf Sparkle/build > /dev/null 2>&1 || true
130134

131135
.PHONY: package archive
132136

133-
package: release
137+
$(PACKAGE):
134138
ifdef DEV_ID
135139
bash package/sign_app "$(DEV_ID)" "$(DERIVED_DATA_PATH)"
136140
endif
@@ -143,7 +147,9 @@ ifdef DEV_ID
143147
xcrun stapler staple package/Squirrel.pkg
144148
endif
145149

146-
archive: package
150+
package: release $(PACKAGE)
151+
152+
archive: package $(SPARKLE_SIGN)
147153
bash package/make_archive
148154

149155
DSTROOT = /Library/Input Methods
@@ -175,6 +181,11 @@ clean:
175181
rm data/plum/* > /dev/null 2>&1 || true
176182
rm data/opencc/* > /dev/null 2>&1 || true
177183

184+
clean-package:
185+
rm -rf package/*appcast.xml > /dev/null 2>&1 || true
186+
rm -rf package/*.pkg > /dev/null 2>&1 || true
187+
rm -rf package/sign_update > /dev/null 2>&1 || true
188+
178189
clean-deps:
179190
$(MAKE) -C plum clean
180191
$(MAKE) -C librime clean

data/squirrel.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ style:
5757
# adjust the base line of vertical text
5858
#base_offset: 0
5959
font_face: 'Avenir'
60-
font_point: 15
60+
#font_point: 15
6161
#label_font_face: 'Avenir'
62-
label_font_point: 12
62+
#label_font_point: 12
6363
#comment_font_face: 'Avenir'
64-
comment_font_point: 15
64+
#comment_font_point: 15
6565

6666
preset_color_schemes:
6767
native:

sources/SquirrelInputController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import InputMethodKit
1010
final class SquirrelInputController: IMKInputController {
1111
private static let keyRollOver = 50
1212

13-
private var client: IMKTextInput?
13+
private weak var client: IMKTextInput?
1414
private let rimeAPI: RimeApi_stdbool = rime_get_api_stdbool().pointee
1515
private var preedit: String = ""
1616
private var selRange: NSRange = .empty

0 commit comments

Comments
 (0)