Merge pull request #8 from Menghuan1918/dev

Menghuan1918 · web-flow · commit c04a1ee8e89c · 2024-05-21T19:45:20.000+08:00
Dev
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -4,8 +4,6 @@
 name: Python application[Linux, Windows]
 
 on:
-  pull_request:
-    branches: [ "master" ]
   workflow_dispatch:
 
 permissions:
diff --git a/README.md b/README.md
@@ -92,8 +92,13 @@ By default the configuration file is saved in `$HOME/.config/Smartinput/config`.
 > 
 > Arch/Manjaro:`sudo pacman -S xclip`.
 
-Download the packaged binary from [releases](https://github.com/Menghuan1918/Smartinput/releases), unzip the folder and run Refresh_Desktopfile.sh, which will automatically install it into the desktop launcher. To uninstall, run Refresh_Desktopfile.sh uninstall and delete the folder.
-Modify the configuration file program and it will work!
+Download the packaged binary from [releases](https://github.com/Menghuan1918/Smartinput/releases).The configuration file is automatically stored in `$HOME/.config/Smartinput/config` after the first run
+
+## Linux
+Unzip and run `Refresh_Desktopfile.sh`, it will be automatically installed in the system desktop
+
+## Windows
+Unzip and run `main.exe`
 
 Or you can clone the source code to use it, please refer to:
 
diff --git a/README_CN.md b/README_CN.md
@@ -89,8 +89,13 @@ Smartinput
 > 
 > Arch/Manjaro:`sudo pacman -S xclip`
 
-从[releases](https://github.com/Menghuan1918/Smartinput/releases)下载打包好的二进制文件，将文件夹解压并运行Refresh_Desktopfile.sh，其会自动安装到桌面启动项中。卸载请运行Refresh_Desktopfile.sh uninstall并删除文件夹。
-修改好配置文件程序后就能用了！
+从[releases](https://github.com/Menghuan1918/Smartinput/releases)下载打包好的二进制文件，配置文件在首次运行后自动存放在`$HOME/.config/Smartinput/config`中
+
+## Linux
+解压后运行`Refresh_Desktopfile.sh`即可，会自动安装到系统桌面中
+
+## Windows
+解压后运行`main.exe`即可
 
 或者你也可以克隆源代码进行使用，请参照：
 
diff --git a/translations.ts b/translations.ts
@@ -4,90 +4,114 @@
 <context>
     <name>TextSelectionMonitor</name>
     <message>
-        <location filename="main.py" line="86"/>
+        <location filename="main.py" line="74"/>
+        <source>Copy</source>
+        <translation>复制</translation>
+    </message>
+    <message>
+        <location filename="main.py" line="120"/>
         <source>Text selection ON/OFF</source>
         <translation>划线取词开关</translation>
     </message>
     <message>
-        <location filename="main.py" line="91"/>
+        <location filename="main.py" line="125"/>
         <source>Processing mode</source>
         <translation>处理模式</translation>
     </message>
     <message>
-        <location filename="main.py" line="92"/>
+        <location filename="main.py" line="126"/>
         <source>Pop-up confirmation</source>
         <translation>弹窗确认</translation>
     </message>
     <message>
-        <location filename="main.py" line="95"/>
+        <location filename="main.py" line="129"/>
         <source>Direct show</source>
         <translation>直接处理</translation>
     </message>
     <message>
-        <location filename="main.py" line="103"/>
+        <location filename="main.py" line="137"/>
         <source>Listening mode</source>
         <translation>监听模式</translation>
     </message>
     <message>
-        <location filename="main.py" line="104"/>
+        <location filename="main.py" line="138"/>
         <source>Mixed</source>
         <translation>混合</translation>
     </message>
     <message>
-        <location filename="main.py" line="107"/>
+        <location filename="main.py" line="141"/>
         <source>Clipboard</source>
         <translation>剪切板</translation>
     </message>
     <message>
-        <location filename="main.py" line="110"/>
+        <location filename="main.py" line="144"/>
         <source>Mouse Selection</source>
         <translation>鼠标选择文本</translation>
     </message>
     <message>
-        <location filename="main.py" line="119"/>
+        <location filename="main.py" line="153"/>
         <source>Response mode selection</source>
         <translation>响应模式选择</translation>
     </message>
     <message>
-        <location filename="main.py" line="120"/>
+        <location filename="main.py" line="154"/>
         <source>Intelligent parsing</source>
         <translation>智能解析</translation>
     </message>
     <message>
-        <location filename="main.py" line="124"/>
+        <location filename="main.py" line="158"/>
         <source>Translated text</source>
         <translation>文本翻译</translation>
     </message>
     <message>
-        <location filename="main.py" line="128"/>
+        <location filename="main.py" line="162"/>
         <source>Parse text</source>
         <translation>解析文本</translation>
     </message>
     <message>
-        <location filename="main.py" line="138"/>
+        <location filename="main.py" line="172"/>
         <source>Quit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="main.py" line="170"/>
+        <location filename="main.py" line="202"/>
         <source>Turn on text selection</source>
         <translation>开启划线取词</translation>
     </message>
     <message>
-        <location filename="main.py" line="172"/>
+        <location filename="main.py" line="204"/>
         <source>Turn off text selection</source>
         <translation>关闭划线取词</translation>
     </message>
     <message>
-        <location filename="main.py" line="227"/>
-        <source>Process...Please wait</source>
-        <translation>正在处理....请稍候</translation>
+        <location filename="main.py" line="261"/>
+        <source>Processing: Sending request...</source>
+        <translation>正在处理：发送请求到API...</translation>
     </message>
     <message>
-        <location filename="main.py" line="329"/>
+        <location filename="main.py" line="282"/>
+        <source>Processing: Normal</source>
+        <translation>正在处理：一切正常</translation>
+    </message>
+    <message>
+        <location filename="main.py" line="287"/>
+        <source>API error</source>
+        <translation>API异常</translation>
+    </message>
+    <message>
+        <location filename="main.py" line="290"/>
+        <source>Done</source>
+        <translation>完成</translation>
+    </message>
+    <message>
+        <location filename="main.py" line="297"/>
         <source>Copied to clipboard</source>
         <translation>已复制到剪切板</translation>
     </message>
+    <message>
+        <source>Process...Please wait</source>
+        <translation type="vanished">正在处理....请稍候</translation>
+    </message>
     <message>
         <source>Trun on text selection</source>
         <translation type="vanished">开启划线取词</translation>
diff --git a/translations_zh.qm b/translations_zh.qm
diff --git a/version b/version
@@ -1 +1 @@
-1.0.4C
+1.0.4D
diff --git a/whats_new b/whats_new
@@ -1,32 +1,15 @@
-# 🪄Install
-The configuration file is automatically stored in `$HOME/.config/Smartinput/config` after the first run
-
-## Linux
-Unzip and run `Refresh_Desktopfile.sh`, it will be automatically installed in the system desktop
-
-## Windows
-Unzip and run `main.exe`
-
 # 🐛Bug fix
 - Sometimes on wayland it can not catch clip
 - Mouse pointer not in the correct position when outputting text 
-- A dead-end loop that can cause a crash
+- A dead-end loop that can cause a crash(This is why V1.0.4B/C not exist)
 
 # ✨ New feature
 - Add a current status indicator prompt
 
-# 🪄安装
-配置文件在首次运行后自动存放在`$HOME/.config/Smartinput/config`中
-
-## Linux
-解压后运行`Refresh_Desktopfile.sh`即可，会自动安装到系统桌面中
-
-## Windows
-解压后运行`main.exe`即可
-
 # 🐛Bug修复
 - Wayland下有时候不能捕获剪切板
 - 在输出文本时鼠标指针没在正确的位置
+- 一个可能导致崩溃的死循环(这就是为什么V1.0.4B/C不存在的原因)
 
 # ✨ 新特征
 - 添加了当前状态指示提示
