diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 92fd400c79..17a978f666 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -157,7 +157,7 @@ jobs: run: | # Set paths app_path="src-tauri/target/${{ matrix.target }}/release/bundle/macos/Saladict.app" - dmg_path="src-tauri/target/${{ matrix.target }}/release/bundle/dmg/Saladict_${{needs.change-version.outputs.version}}_${{ contains(matrix.target, 'aarch64') && 'aarch64' || 'x86_64' }}.dmg" + dmg_path="src-tauri/target/${{ matrix.target }}/release/bundle/dmg/saladict_${{needs.change-version.outputs.version}}_${{ contains(matrix.target, 'aarch64') && 'aarch64' || 'x86_64' }}.dmg" ocr_arm64_path="${app_path}/Contents/Resources/resources/ocr-aarch64-apple-darwin" ocr_x86_path="${app_path}/Contents/Resources/resources/ocr-x86_64-apple-darwin" @@ -221,8 +221,8 @@ jobs: run: | cd src-tauri/target/aarch64-apple-darwin/release/bundle/macos rm -f Saladict.app.tar.gz Saladict.app.tar.gz.sig - tar -czf Saladict_${{needs.change-version.outputs.version}}_aarch64.app.tar.gz Saladict.app - pnpm tauri signer sign -k "$TAURI_PRIVATE_KEY" -p "$TAURI_KEY_PASSWORD" "$PWD/Saladict_${{needs.change-version.outputs.version}}_aarch64.app.tar.gz" + tar -czf saladict_${{needs.change-version.outputs.version}}_aarch64.app.tar.gz Saladict.app + pnpm tauri signer sign -k "$TAURI_PRIVATE_KEY" -p "$TAURI_KEY_PASSWORD" "$PWD/saladict_${{needs.change-version.outputs.version}}_aarch64.app.tar.gz" - name: Change File Name if: matrix.target == 'x86_64-apple-darwin' @@ -232,8 +232,8 @@ jobs: run: | cd src-tauri/target/x86_64-apple-darwin/release/bundle/macos rm -f Saladict.app.tar.gz Saladict.app.tar.gz.sig - tar -czf Saladict_${{needs.change-version.outputs.version}}_x64.app.tar.gz Saladict.app - pnpm tauri signer sign -k "$TAURI_PRIVATE_KEY" -p "$TAURI_KEY_PASSWORD" "$PWD/Saladict_${{needs.change-version.outputs.version}}_x64.app.tar.gz" + tar -czf saladict_${{needs.change-version.outputs.version}}_x64.app.tar.gz Saladict.app + pnpm tauri signer sign -k "$TAURI_PRIVATE_KEY" -p "$TAURI_KEY_PASSWORD" "$PWD/saladict_${{needs.change-version.outputs.version}}_x64.app.tar.gz" - name: Upload Artifacts uses: actions/upload-artifact@v4 @@ -378,9 +378,9 @@ jobs: $env:TAURI_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" $env:TAURI_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" pnpm tauri build -b nsis,updater --target ${{ matrix.target }} - Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.exe Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.exe - Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.nsis.zip Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.nsis.zip - Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.nsis.zip.sig Saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.nsis.zip.sig + Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.exe saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.exe + Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.nsis.zip saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.nsis.zip + Rename-Item .\src-tauri\target\${{ matrix.target }}\release\bundle\nsis\saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}-setup.nsis.zip.sig saladict_${{needs.change-version.outputs.version}}_${{ matrix.arch }}_fix_webview2_runtime-setup.nsis.zip.sig - name: Upload Artifacts uses: actions/upload-artifact@v4 with: diff --git a/README.md b/README.md index 60ef56b0e6..df20030a8e 100644 --- a/README.md +++ b/README.md @@ -184,9 +184,9 @@ winget install allentown521.Saladict 1. 在 [Release](https://github.com/allentown521/saladict/releases/latest) 页面下载最新 `exe` 安装包。 - - 64 位机器下载 `Saladict_{version}_x64-setup.exe` - - 32 位机器下载 `Saladict_{version}_x86-setup.exe` - - arm64 机器下载 `Saladict_{version}_arm64-setup.exe` + - 64 位机器下载 `saladict_{version}_x64-setup.exe` + - 32 位机器下载 `saladict_{version}_x86-setup.exe` + - arm64 机器下载 `saladict_{version}_arm64-setup.exe` 2. 双击安装包进行安装。 @@ -196,7 +196,7 @@ winget install allentown521.Saladict 检查是否卸载/禁用了 WebView2,如果卸载/禁用了 WebView2,请手动安装 WebView2 或将其恢复。 - 如果是企业版系统不方便安装或无法安装 WebView2,请尝试在 [Release](https://github.com/allentown521/saladict/releases/latest) 下载内置 WebView2 的版本 `Saladict_{version}_{arch}_fix_webview2_runtime-setup.exe` + 如果是企业版系统不方便安装或无法安装 WebView2,请尝试在 [Release](https://github.com/allentown521/saladict/releases/latest) 下载内置 WebView2 的版本 `saladict_{version}_{arch}_fix_webview2_runtime-setup.exe` 若问题仍然存在请尝试使用 Windows7 兼容模式启动。 @@ -215,7 +215,7 @@ M-series Macs 用户可以从 Mac App Store 安装。 ### 手动安装 -1. 从 [Release](https://github.com/allentown521/saladict/releases/latest) 页面下载最新的 `dmg` 安装包。(如果您使用的是 M1 芯片,请下载名为`Saladict_{version}_aarch64.dmg`的安装包,否则请下载名为`Saladict_{version}_x64.dmg`的安装包) +1. 从 [Release](https://github.com/allentown521/saladict/releases/latest) 页面下载最新的 `dmg` 安装包。(如果您使用的是 M1 芯片,请下载名为`saladict_{version}_aarch64.dmg`的安装包,否则请下载名为`saladict_{version}_x64.dmg`的安装包) 2. 双击下载的文件后将 沙拉翻译 拖入 Applications 文件夹即可完成安装。 ### 通过 Brew 安装 @@ -289,7 +289,7 @@ GET "/ocr_translate?screenshot=true" => 截图翻译, ### 调用流程 1. 使用其他截图工具截图 -2. 将截图保存在 `$CACHE/allen.town.focus.saladict/pot_screenshot_cut.png` +2. 将截图保存在 `$CACHE/allen.town.focus.saladict/Saladict_screenshot_cut.png` 3. 向`127.0.0.1:port/ocr_recognize?screenshot=false`发送请求即可调用成功 > `$CACHE`为系统缓存目录,例如在 Windows 上为`C:\Users\{用户名}\AppData\Local\allen.town.focus.saladict\pot_screenshot_cut.png` @@ -357,8 +357,8 @@ bind = ALT, C, exec, grim -g "$(slurp)" ~/.cache/allen.town.focus.saladict/pot_s 由于目前 沙拉翻译 在 Wayland 下还无法获取到正确的鼠标坐标,所以内部的实现无法工作。 对于某些桌面环境/窗口管理器,可以通过设置窗口规则来实现窗口跟随鼠标位置,这里以 Hyprland 为例: ```conf -windowrulev2 = float, class:(pot), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating -windowrulev2 = move cursor 0 0, class:(pot), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. +windowrulev2 = float, class:(saladict), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating +windowrulev2 = move cursor 0 0, class:(saladict), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. ```
diff --git a/README_EN.md b/README_EN.md index 623ae2a87f..4933dce125 100644 --- a/README_EN.md +++ b/README_EN.md @@ -151,7 +151,7 @@ The built-in services are limited. But you can expand the app's functionality th You can find plugins you need in the [Plugin List](https://saladict-app.aichatone.com/plugin.html), and then go to the plugin repo to download it. -The file extension of pot plugin is `.potext`. After downloading the `.potext` file, go to Preferences - Service Settings - Add External Plugin - Install External Plugin to select the corresponding `.potext` to install it. It will then be added to the service list and can be used like a built-in service. +The file extension of Saladict plugin is `.potext`. After downloading the `.potext` file, go to Preferences - Service Settings - Add External Plugin - Install External Plugin to select the corresponding `.potext` to install it. It will then be added to the service list and can be used like a built-in service. ### Troubleshooting @@ -185,9 +185,9 @@ winget install allentown521.Saladict 1. Download the installation package ending in `.exe` from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) page. - - 64-bit machine download `Saladict_{version}_x64-setup.exe` - - 32-bit machine download `Saladict_{version}_x86-setup.exe` - - arm64 machine download `Saladict_{version}_arm64-setup.exe` + - 64-bit machine download `saladict_{version}_x64-setup.exe` + - 32-bit machine download `saladict_{version}_x86-setup.exe` + - arm64 machine download `saladict_{version}_arm64-setup.exe` 2. Double click the downloaded file to install it. @@ -197,7 +197,7 @@ winget install allentown521.Saladict Check if WebView2 is uninstalled/disabled, if so, install WebView2 manually or restore it. - If the enterprise edition system is inconvenient to install or cannot install WebView2, please try to download the fix WebView2 version `Saladict_{version} at [Release](https://github.com/allentown521/saladict/releases/latest) _{arch}_fix_webview2_runtime-setup.exe` + If the enterprise edition system is inconvenient to install or cannot install WebView2, please try to download the fix WebView2 version `saladict_{version} at [Release](https://github.com/allentown521/saladict/releases/latest) _{arch}_fix_webview2_runtime-setup.exe` If the issue persists, please try starting in Windows 7 compatibility mode. @@ -220,13 +220,13 @@ For M-series Macs, you can install it from Mac App Store brew tap allentown521/homebrew-saladict ``` -2. Install pot: +2. Install Saladict: ```bash brew install --cask saladict ``` -3. Upgrade pot +3. Upgrade Saladict ```bash brew upgrade --cask saladict @@ -234,12 +234,12 @@ brew upgrade --cask saladict ### Install Manually -1. Download the installation package ending in `.dmg` from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) page. (If you are using M1, please download the installation package named `Saladict_{version}_aarch64.dmg`, otherwise download the installation package named `Saladict_{version}_x64.dmg`) +1. Download the installation package ending in `.dmg` from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) page. (If you are using M1, please download the installation package named `saladict_{version}_aarch64.dmg`, otherwise download the installation package named `saladict_{version}_x64.dmg`) 2. Double click the downloaded file to install it. ### Troubleshooting -- If you encounter a permission prompt every time you open it, or if you cannot perform a shortcut translation, please go to Settings -> Privacy & Security -> Supporting Features to remove pot, and then re-add pot. +- If you encounter a permission prompt every time you open it, or if you cannot perform a shortcut translation, please go to Settings -> Privacy & Security -> Supporting Features to remove Saladict, and then re-add Saladict. ## Linux @@ -256,7 +256,7 @@ Please note that: There are two deb package, `universal` is based on `glibc2.28`
-Saladict provides a complete HTTP interface for integration with other software. You can call pot by sending HTTP requests to `127.0.0.1:port`, where `port` is the listening port of pot, default to `60606`, and can be changed in the app settings. +Saladict provides a complete HTTP interface for integration with other software. You can call Saladict by sending HTTP requests to `127.0.0.1:port`, where `port` is the listening port of Saladict, default to `60606`, and can be changed in the app settings. ## API Docs: @@ -278,7 +278,7 @@ GET "/ocr_translate?screenshot=true" => Translate screenshot - Call translation by selection: - To call pot's translation by selection, simply send a request to `127.0.0.1:port`: + To call Saladict's translation by selection, simply send a request to `127.0.0.1:port`: E.g. using curl: @@ -288,7 +288,7 @@ GET "/ocr_translate?screenshot=true" => Translate screenshot ## OCR without internal screenshot -This allows you to perform OCR/translation without using pot's internal screenshot, so you can use your own screenshot tools. It also solves the problem where pot's internal screenshot doesn't work on some platforms. +This allows you to perform OCR/translation without using Saladict's internal screenshot, so you can use your own screenshot tools. It also solves the problem where Saladict's internal screenshot doesn't work on some platforms. ### Workflow: @@ -311,16 +311,16 @@ rm ~/.cache/allen.town.focus.saladict/pot_screenshot_cut.png && flameshot gui -s ### SnipDo (Windows) 1. Download and install SnipDo in the [Microsoft Store](https://apps.microsoft.com/store/detail/snipdo/9NPZ2TVKJVT7) -2. Download the SnipDo extension of pot from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) (Saladict.pbar) +2. Download the SnipDo extension of Saladict from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) (Saladict.pbar) 3. Double click the downloaded file to install it. -4. Selection some text, you can see the pot icon in the upper right corner of the selection, click the icon to translate. +4. Selection some text, you can see the Saladict icon in the upper right corner of the selection, click the icon to translate. ### PopClip (MacOS) 1. Download and install PopClip in the [Official Website](https://www.popclip.app/) -2. Download the PopClip extension of pot from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) (Saladict.popclipextz) +2. Download the PopClip extension of Saladict from the Latest [Release](https://github.com/allentown521/saladict/releases/latest) (Saladict.popclipextz) 3. Double click the downloaded file to install it. -4. Enable the pot extension in PopClip settings, and then you can translate by selecting text. +4. Enable the Saladict extension in PopClip settings, and then you can translate by selecting text. ### Starry (Linux) @@ -334,16 +334,16 @@ Github: [ccslykx/Starry](https://github.com/ccslykx/Starry) -Due to the varying levels of support for Wayland among different distributions, pot itself cannot achieve perfect compatibility. However, here are some solutions to common issues that can be implemented through proper configuration, allowing pot to run flawlessly on Wayland. +Due to the varying levels of support for Wayland among different distributions, Saladict itself cannot achieve perfect compatibility. However, here are some solutions to common issues that can be implemented through proper configuration, allowing Saladict to run flawlessly on Wayland. ## Shortcut key cannot be used -Due to Tauri's lack of support for Wayland, the shortcut key scheme in the pot application cannot be used under Wayland. -You can set the system shortcut and send a request with `curl` to call pot, see [External Calls](#external-calls) for details +Due to Tauri's lack of support for Wayland, the shortcut key scheme in the Saladict application cannot be used under Wayland. +You can set the system shortcut and send a request with `curl` to call Saladict, see [External Calls](#external-calls) for details ## Screenshot doesn't work -In some pure Wayland desktop environments/window managers (such as Hyprland), the built-in screenshot feature of pot cannot be used. In this case, you can use other screenshot tools instead. For more details, please refer to the section [Not Using Built-in Screenshot](#not-using-built-in-screenshot). +In some pure Wayland desktop environments/window managers (such as Hyprland), the built-in screenshot feature of Saladict cannot be used. In this case, you can use other screenshot tools instead. For more details, please refer to the section [Not Using Built-in Screenshot](#not-using-built-in-screenshot). Below is a configuration example for Hyprland using `grim` and `slurp` to achieve screenshot functionality: @@ -356,12 +356,12 @@ Other desktop environments/window managers also have similar operations. ## The translation window follows the mouse position. -Due to the current inability of pot to obtain accurate mouse coordinates under Wayland, its internal implementation cannot function properly. +Due to the current inability of Saladict to obtain accurate mouse coordinates under Wayland, its internal implementation cannot function properly. For certain desktop environments/window managers, it is possible to achieve window following mouse position by setting window rules. Here we take Hyprland as an example: ```conf -windowrulev2 = float, class:(pot), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating -windowrulev2 = move cursor 0 0, class:(pot), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. +windowrulev2 = float, class:(saladict), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating +windowrulev2 = move cursor 0 0, class:(saladict), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. ```
@@ -403,7 +403,7 @@ Rust >= 1.80.0 2. Install dependencies ```bash - cd pot-desktop + cd saladict pnpm install ``` diff --git a/README_KR.md b/README_KR.md index 0bc6addd5d..81645be183 100644 --- a/README_KR.md +++ b/README_KR.md @@ -185,9 +185,9 @@ winget install allentown521.Saladict 1. 최신버전 다운로드 페이지 [Release](https://github.com/allentown521/saladict/releases/latest)에서 `.exe` 파일을 다운받습니다. - - 64-bit 버전 사용시, `Saladict_{version}_x64-setup.exe` - - 32-bit 버전 사용시, `Saladict_{version}_x86-setup.exe` - - arm64 버전 사용시, `Saladict_{version}_arm64-setup.exe` + - 64-bit 버전 사용시, `saladict_{version}_x64-setup.exe` + - 32-bit 버전 사용시, `saladict_{version}_x86-setup.exe` + - arm64 버전 사용시, `saladict_{version}_arm64-setup.exe` 2. 더블클릭하여 설치를 합니다. @@ -197,7 +197,7 @@ winget install allentown521.Saladict 윈도우-브라우저에서 사용하는 WebView2 기능이 설치되지 않았거나 비활성화 된 경우 입니다. 이 때는 WebView2 를 설치하거나 기능을 재설정 하십시오. - 회사/기업 사용자의 경우 WebView2 기능이 설치되지 않았거나 비활성화된 경우가 있습니다. 이 경우 다음을 설치하십시오. WebView2 version `Saladict_{version} at [Release](https://github.com/allentown521/saladict/releases/latest) _{arch}_fix_webview2_runtime-setup.exe` + 회사/기업 사용자의 경우 WebView2 기능이 설치되지 않았거나 비활성화된 경우가 있습니다. 이 경우 다음을 설치하십시오. WebView2 version `saladict_{version} at [Release](https://github.com/allentown521/saladict/releases/latest) _{arch}_fix_webview2_runtime-setup.exe` 문제가 해결되지 않는 경우, Windows 7 compatibility mode에서 시도해 보십시오. @@ -235,7 +235,7 @@ brew upgrade --cask saladict ### 수동설치 -1. 최신버전 다운로드 페이지 [Release](https://github.com/allentown521/saladict/releases/latest)에서 `.dmg` 파일을 다운받습니다. (M1 사용자이면, 다음 파일명을 다운로드 합니다 `Saladict{version}_aarch64.dmg`, 기타 사용자는 다음 파일을 다운로드 합니다. `Saladict_{version}_x64.dmg`) +1. 최신버전 다운로드 페이지 [Release](https://github.com/allentown521/saladict/releases/latest)에서 `.dmg` 파일을 다운받습니다. (M1 사용자이면, 다음 파일명을 다운로드 합니다 `Saladict{version}_aarch64.dmg`, 기타 사용자는 다음 파일을 다운로드 합니다. `saladict_{version}_x64.dmg`) 2. 더블클릭하여 설치를 합니다. ### 문제해결 @@ -289,7 +289,7 @@ GET "/ocr_translate?screenshot=true" => Translate screenshot ## 자체스크린샷 미사용 OCR 기능 -OCR 및 번역을 위해서 pot은 자체 스크린샷(화면캡쳐)기능을 사용하지 않을 수 있습니다. 자체 화면캡쳐 툴을 사용하면 특정환경에서 자체 스크린샷 기능이 정상적으로 동작하지 않는 것을 해결할 수 있습니다. +OCR 및 번역을 위해서 Saladict은 자체 스크린샷(화면캡쳐)기능을 사용하지 않을 수 있습니다. 자체 화면캡쳐 툴을 사용하면 특정환경에서 자체 스크린샷 기능이 정상적으로 동작하지 않는 것을 해결할 수 있습니다. ### Workflow: @@ -335,16 +335,16 @@ Github: [ccslykx/Starry](https://github.com/ccslykx/Starry)
-배포판마다 Wayland에 대한 지원 수준이 다르기 때문에 pot 자체로는 완벽한 호환성을 달성할 수 없습니다. 하지만 다음은 적절한 구성을 통해 구현할 수 있는 몇 가지 일반적인 문제에 대한 해결책으로, Wayland에서 pot을 완벽하게 실행할 수 있습니다. +배포판마다 Wayland에 대한 지원 수준이 다르기 때문에 Saladict 자체로는 완벽한 호환성을 달성할 수 없습니다. 하지만 다음은 적절한 구성을 통해 구현할 수 있는 몇 가지 일반적인 문제에 대한 해결책으로, Wayland에서 Saladict을 완벽하게 실행할 수 있습니다. ## 단축키를 적용할 수 없을 때, -타우리Tauri는 웨이랜드Wayland를 지원하지 않기 때문에, pot의 단축키 기능은 웨이랜드Waylan에서 사용할 수 없습니다. +타우리Tauri는 웨이랜드Wayland를 지원하지 않기 때문에, Saladict의 단축키 기능은 웨이랜드Waylan에서 사용할 수 없습니다. 시스템 단축키를 설정하고 `curl`로 요청을 보내 팟을 호출할 수 있으며, 자세한 내용은[External Calls](#external-calls) 을 참조하세요. ## 단축키가 동작하지 않을 때, -일부 순수 웨이랜드Wayland 데스크톱 환경/창 관리자(예: 하이프랜드)에서는 pot의 기본 제공 스크린샷 기능을 사용할 수 없습니다. 이 경우 다른 스크린샷 도구를 대신 사용할 수 있습니다. 자세한 내용은 [Not Using Built-in Screenshot](#not-using-built-in-screenshot) 섹션을 참조하세요. +일부 순수 웨이랜드Wayland 데스크톱 환경/창 관리자(예: 하이프랜드)에서는 Saladict의 기본 제공 스크린샷 기능을 사용할 수 없습니다. 이 경우 다른 스크린샷 도구를 대신 사용할 수 있습니다. 자세한 내용은 [Not Using Built-in Screenshot](#not-using-built-in-screenshot) 섹션을 참조하세요. 아래는 스크린샷 기능을 구현하기 위해 `grim`과 `slurp`를 사용하는 Hyprland의 구성 예시입니다: @@ -360,8 +360,8 @@ bind = ALT, C, exec, grim -g "$(slurp)" ~/.cache/allen.town.focus.saladict/pot_s 현재 웨이랜드Wayland에서 정확한 마우스 좌표를 얻을 수 없기 때문에 내부 구현이 제대로 작동하지 않습니다. 특정 데스크톱 환경/창 관리자의 경우 창 규칙을 설정하여 마우스 위치에 따른 창을 구현할 수 있습니다. 여기서는 하이프랜드Hyprland를 예로 들어보겠습니다: ```conf -windowrulev2 = float, class:(pot), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating -windowrulev2 = move cursor 0 0, class:(pot), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. +windowrulev2 = float, class:(saladict), title:(Translator|OCR|PopClip|Screenshot Translate) # Translation window floating +windowrulev2 = move cursor 0 0, class:(saladict), title:(Translator|PopClip|Screenshot Translate) # Translation window follows the mouse position. ```
@@ -403,7 +403,7 @@ Rust >= 1.80.0 2. dependencies를 설치합니다 ```bash - cd pot-desktop + cd saladict pnpm install ``` diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 7aeb13f6ca..5403b5bbb9 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2,51 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "Saladict" -version = "0.0.0" -dependencies = [ - "accessibility-ng", - "accessibility-sys-ng", - "arboard", - "base64 0.22.1", - "cocoa 0.24.1", - "core-foundation", - "core-graphics 0.22.3", - "dirs 5.0.1", - "enigo", - "font-kit", - "image 0.25.4", - "lingua", - "log", - "macos-accessibility-client", - "mouce", - "mouse_position", - "objc", - "once_cell", - "parking_lot", - "reqwest 0.12.9", - "reqwest_dav", - "screenshots", - "selection", - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-autostart", - "tauri-plugin-fs-watch", - "tauri-plugin-log", - "tauri-plugin-single-instance", - "tauri-plugin-sql", - "tauri-plugin-store", - "thiserror", - "tiny_http", - "walkdir", - "window-shadows", - "windows 0.39.0", - "zip 2.2.0", -] - [[package]] name = "accessibility-ng" version = "0.1.6" @@ -5436,6 +5391,51 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "saladict" +version = "0.0.0" +dependencies = [ + "accessibility-ng", + "accessibility-sys-ng", + "arboard", + "base64 0.22.1", + "cocoa 0.24.1", + "core-foundation", + "core-graphics 0.22.3", + "dirs 5.0.1", + "enigo", + "font-kit", + "image 0.25.4", + "lingua", + "log", + "macos-accessibility-client", + "mouce", + "mouse_position", + "objc", + "once_cell", + "parking_lot", + "reqwest 0.12.9", + "reqwest_dav", + "screenshots", + "selection", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-autostart", + "tauri-plugin-fs-watch", + "tauri-plugin-log", + "tauri-plugin-single-instance", + "tauri-plugin-sql", + "tauri-plugin-store", + "thiserror", + "tiny_http", + "walkdir", + "window-shadows", + "windows 0.39.0", + "zip 2.2.0", +] + [[package]] name = "same-file" version = "1.0.6" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b9c132ab33..64f4082ea5 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "Saladict" +name = "saladict" version = "0.0.0" description = "Saladict App" authors = ["saladict-app"] diff --git a/updater/updater-for-fix-runtime.mjs b/updater/updater-for-fix-runtime.mjs index 81fdcef10a..dec13f09d8 100644 --- a/updater/updater-for-fix-runtime.mjs +++ b/updater/updater-for-fix-runtime.mjs @@ -10,12 +10,12 @@ async function resolveUpdater() { let version = await getVersion(TOKEN); let changelog = await getChangeLog(TOKEN); - const windows_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64_fix_webview2_runtime-setup.nsis.zip`; - const windows_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64_fix_webview2_runtime-setup.nsis.zip.sig`); - const windows_i686 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x86_fix_webview2_runtime-setup.nsis.zip`; - const windows_i686_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x86_fix_webview2_runtime-setup.nsis.zip.sig`); - const windows_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_arm64_fix_webview2_runtime-setup.nsis.zip`; - const windows_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_arm64_fix_webview2_runtime-setup.nsis.zip.sig`); + const windows_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64_fix_webview2_runtime-setup.nsis.zip`; + const windows_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64_fix_webview2_runtime-setup.nsis.zip.sig`); + const windows_i686 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x86_fix_webview2_runtime-setup.nsis.zip`; + const windows_i686_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x86_fix_webview2_runtime-setup.nsis.zip.sig`); + const windows_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_arm64_fix_webview2_runtime-setup.nsis.zip`; + const windows_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_arm64_fix_webview2_runtime-setup.nsis.zip.sig`); let updateData = { name: version, diff --git a/updater/updater.mjs b/updater/updater.mjs index 6d1eb5d00a..74fe256419 100644 --- a/updater/updater.mjs +++ b/updater/updater.mjs @@ -10,18 +10,18 @@ async function resolveUpdater() { let version = await getVersion(TOKEN); let changelog = await getChangeLog(TOKEN); - const darwin_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_aarch64.app.tar.gz`; - const darwin_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_aarch64.app.tar.gz.sig`); - const darwin_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64.app.tar.gz`; - const darwin_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64.app.tar.gz.sig`); - const windows_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64-setup.nsis.zip`; - const windows_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x64-setup.nsis.zip.sig`); - const windows_i686 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x86-setup.nsis.zip`; - const windows_i686_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_x86-setup.nsis.zip.sig`); - const windows_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_arm64-setup.nsis.zip`; - const windows_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_arm64-setup.nsis.zip.sig`); - const linux_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_amd64.AppImage.tar.gz`; - const linux_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/Saladict_${version}_amd64.AppImage.tar.gz.sig`); + const darwin_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_aarch64.app.tar.gz`; + const darwin_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_aarch64.app.tar.gz.sig`); + const darwin_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64.app.tar.gz`; + const darwin_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64.app.tar.gz.sig`); + const windows_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64-setup.nsis.zip`; + const windows_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x64-setup.nsis.zip.sig`); + const windows_i686 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x86-setup.nsis.zip`; + const windows_i686_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_x86-setup.nsis.zip.sig`); + const windows_aarch64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_arm64-setup.nsis.zip`; + const windows_aarch64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_arm64-setup.nsis.zip.sig`); + const linux_x86_64 = `https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_amd64.AppImage.tar.gz`; + const linux_x86_64_sig = await getSignature(`https://github.com/allentown521/saladict/releases/download/${version}/saladict_${version}_amd64.AppImage.tar.gz.sig`); let updateData = { name: version,