Skip to content

Commit 44eb55f

Browse files
author
AENERV7
committed
fix: macOS icns icon generation, cross-platform placeholder, restore zh-TW sz_version
1 parent d7621a4 commit 44eb55f

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,18 @@ jobs:
3535
- name: Install frontend dependencies
3636
run: npm install
3737

38-
- name: Generate macOS icon from ICO
38+
- name: Generate macOS icons from ICO
3939
if: matrix.os == 'macos-latest'
4040
run: |
4141
brew install imagemagick
4242
magick src-tauri/icons/icon.ico -resize 512x512 -background none -alpha on -type TrueColorAlpha PNG32:src-tauri/icons/icon.png
43+
mkdir -p src-tauri/icons/icon.iconset
44+
for size in 16 32 64 128 256 512; do
45+
magick src-tauri/icons/icon.ico -resize ${size}x${size} -background none -alpha on -type TrueColorAlpha PNG32:src-tauri/icons/icon.iconset/icon_${size}x${size}.png
46+
double=$((size * 2))
47+
magick src-tauri/icons/icon.ico -resize ${double}x${double} -background none -alpha on -type TrueColorAlpha PNG32:src-tauri/icons/icon.iconset/icon_${size}x${size}@2x.png
48+
done
49+
iconutil -c icns src-tauri/icons/icon.iconset -o src-tauri/icons/icon.icns
4350
4451
- name: Build Tauri app
4552
run: npx tauri build --target ${{ matrix.target }}

dist/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ <h2 data-i18n="lang_title" style="margin-top:1.5rem;"></h2>
249249
pw_placeholder: "在此输入解压密码,每行一个...",
250250
pw_count: (n) => `共 ${n} 条密码`,
251251
sz_title: "7-Zip 路径", sz_desc: "7-Zip 或 7-Zip ZS 可执行文件所在文件夹",
252-
sz_placeholder: "例如: C:\\Program Files\\7-Zip",
252+
sz_placeholder: "例如: C:\\Program Files\\7-Zip 或 /opt/homebrew/bin",
253253
sz_invalid: "路径无效:未找到 7-Zip 或 7-Zip ZS 可执行文件",
254254
sz_version: (v) => `7-Zip 版本: ${v}`,
255255
saving: "保存中...",
@@ -287,7 +287,7 @@ <h2 data-i18n="lang_title" style="margin-top:1.5rem;"></h2>
287287
pw_placeholder: "在此輸入解壓密碼,每行一個...",
288288
pw_count: (n) => `共 ${n} 條密碼`,
289289
sz_title: "7-Zip 路徑", sz_desc: "7-Zip 或 7-Zip ZS 可執行檔所在資料夾",
290-
sz_placeholder: "例如: C:\\Program Files\\7-Zip",
290+
sz_placeholder: "例如: C:\\Program Files\\7-Zip 或 /opt/homebrew/bin",
291291
sz_invalid: "路徑無效:未找到 7-Zip 或 7-Zip ZS 可執行檔",
292292
sz_version: (v) => `7-Zip 版本: ${v}`,
293293
saving: "儲存中...",
@@ -325,7 +325,7 @@ <h2 data-i18n="lang_title" style="margin-top:1.5rem;"></h2>
325325
pw_placeholder: "Enter extraction passwords, one per line...",
326326
pw_count: (n) => `${n} password(s) in total`,
327327
sz_title: "7-Zip Path", sz_desc: "Folder containing the 7-Zip or 7-Zip ZS executable",
328-
sz_placeholder: "e.g. C:\\Program Files\\7-Zip",
328+
sz_placeholder: "e.g. C:\\Program Files\\7-Zip or /opt/homebrew/bin",
329329
sz_invalid: "Invalid path: 7-Zip or 7-Zip ZS executable not found",
330330
sz_version: (v) => `7-Zip version: ${v}`,
331331
saving: "Saving...",

0 commit comments

Comments
 (0)