diff --git a/README.md b/README.md index 4dd4d25..c19b7a7 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,10 @@ npm install 首先进入 `caption-engine` 文件夹，执行如下指令创建虚拟环境： ```bash +# in ./caption-engine folder python -m venv subenv +# or +python3 -m venv subenv ``` 然后激活虚拟环境： @@ -110,11 +113,11 @@ python -m venv subenv ```bash # Windows subenv/Scripts/activate -# Linux +# Linux or macOS source subenv/bin/activate ``` -然后安装依赖（注意如果是 Linux 环境，需要注释掉 `requirements.txt` 中的 `PyAudioWPatch`，该模块仅适用于 Windows 环境）： +然后安装依赖（注意如果是 Linux 或 macOS 环境，需要注释掉 `requirements.txt` 中的 `PyAudioWPatch`，该模块仅适用于 Windows 环境）。这一步可能会报错，一般是因为构建失败，需要根据报错信息安装对应的构建工具包。 ```bash pip install -r requirements.txt diff --git a/resources/credits.md b/build/credits.md similarity index 66% rename from resources/credits.md rename to build/credits.md index f342f27..2d9a753 100644 --- a/resources/credits.md +++ b/build/credits.md @@ -5,7 +5,9 @@ The following icons are used under CC BY 4.0 license: - icon.png +- icon.svg +- icon.icns Source: -- https://icon-icons.com/en/pack/Duetone/2064 \ No newline at end of file +- https://icon-icons.com/en/pack/Duetone/2064 diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist new file mode 100644 index 0000000..273c351 --- /dev/null +++ b/build/entitlements.mac.plist @@ -0,0 +1,12 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.allow-dyld-environment-variables + + + \ No newline at end of file diff --git a/build/icon.icns b/build/icon.icns new file mode 100644 index 0000000..78c4cb0 Binary files /dev/null and b/build/icon.icns differ diff --git a/build/icon.png b/build/icon.png new file mode 100644 index 0000000..409d666 Binary files /dev/null and b/build/icon.png differ diff --git a/build/icon.svg b/build/icon.svg new file mode 100644 index 0000000..836f9d1 --- /dev/null +++ b/build/icon.svg @@ -0,0 +1 @@ +weather, forecast, direction, compass \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a1a32aa..fa0e63a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "auto-caption", - "version": "0.1.0", + "version": "0.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "auto-caption", - "version": "0.1.0", + "version": "0.2.1", "hasInstallScript": true, "dependencies": { "@electron-toolkit/preload": "^3.0.1", @@ -458,9 +458,9 @@ } }, "node_modules/@electron/asar/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -1277,9 +1277,9 @@ } }, "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -1348,9 +1348,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -3354,9 +3354,9 @@ "optional": true }, "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4358,9 +4358,9 @@ } }, "node_modules/dir-compare/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -5146,9 +5146,9 @@ } }, "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -5838,9 +5838,9 @@ } }, "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -6495,9 +6495,9 @@ } }, "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 60f1509..b2611ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "auto-caption", - "version": "0.2.0", + "productName": "Auto Caption", + "version": "0.2.1", "description": "A cross-platform subtitle display software.", "main": "./out/main/index.js", "author": "himeditator", diff --git a/resources/icon.png b/resources/icon.png deleted file mode 100644 index 7cc5a42..0000000 Binary files a/resources/icon.png and /dev/null differ diff --git a/src/main/CaptionWindow.ts b/src/main/CaptionWindow.ts index 77adb75..e460e9e 100644 --- a/src/main/CaptionWindow.ts +++ b/src/main/CaptionWindow.ts @@ -1,7 +1,7 @@ import { shell, BrowserWindow, ipcMain } from 'electron' import path from 'path' import { is } from '@electron-toolkit/utils' -import icon from '../../resources/icon.png?asset' +import icon from '../../build/icon.png?asset' import { controlWindow } from './ControlWindow' class CaptionWindow { @@ -18,7 +18,6 @@ class CaptionWindow { transparent: true, center: true, autoHideMenuBar: true, - ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: path.join(__dirname, '../preload/index.js'), sandbox: false diff --git a/src/main/ControlWindow.ts b/src/main/ControlWindow.ts index fb492a8..3e2d7ce 100644 --- a/src/main/ControlWindow.ts +++ b/src/main/ControlWindow.ts @@ -1,7 +1,7 @@ import { shell, BrowserWindow, ipcMain, nativeTheme } from 'electron' import path from 'path' import { is } from '@electron-toolkit/utils' -import icon from '../../resources/icon.png?asset' +import icon from '../../build/icon.png?asset' import { captionWindow } from './CaptionWindow' import { allConfig } from './utils/AllConfig' import { captionEngine } from './utils/CaptionEngine' @@ -19,7 +19,6 @@ class ControlWindow { show: false, center: true, autoHideMenuBar: true, - ...(process.platform === 'linux' ? { icon } : {}), webPreferences: { preload: path.join(__dirname, '../preload/index.js'), sandbox: false