Windows v2.8.4 Desktop v0.7.5

Jeric-X · Jul 27, 2024 · dda9cce · dda9cce
1 parent 4f7f562
commit dda9cce
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,7 @@
-v2.8.3.1
-- 功能：可以设置重试次数，失败超过重试次数下载/上传会暂停(#100)
+v2.8.4
+- 功能：可以设置重试次数，下载失败超过重试次数自动下载会暂停，触发一次上传后会恢复自动下载(#100)
 - 功能：可以设置剪切文件时不上传(#107)
+- 修复：快捷键不允许设置为ctrl + c或command + c (#103)
 
 v2.8.3
 - 修复：不设置hash上传图片/文件到服务器后，桌面客户端会无限重复设置剪贴板

diff --git a/build/macos/Info.plist b/build/macos/Info.plist
@@ -19,8 +19,8 @@
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleVersion</key>
-	<string>0.7.4.1</string>
+	<string>0.7.5</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.7.4.1</string>
+	<string>0.7.5</string>
 </dict>
 </plist>
diff --git a/src/SyncClipboard.Core/I18n/Strings.resx b/src/SyncClipboard.Core/I18n/Strings.resx
@@ -520,7 +520,7 @@
     <value>Send notification after manually upload</value>
   </data>
   <data name="DoNotUploadWhenCut" xml:space="preserve">
-    <value>Don't Upload When Cutting Files</value>
+    <value>Don't upload files when cutting</value>
   </data>
   <data name="RetryTimes" xml:space="preserve">
     <value>Retry Times</value>

diff --git a/src/SyncClipboard.Core/ViewModels/HotkeyViewModel.cs b/src/SyncClipboard.Core/ViewModels/HotkeyViewModel.cs
@@ -20,6 +20,13 @@ public partial class HotkeyViewModel : ObservableObject
     private Hotkey editingHotkey = Hotkey.Nothing;
     partial void OnEditingHotkeyChanged(Hotkey value)
     {
+        var copyHotkey = new Hotkey(OperatingSystem.IsMacOS() ? Key.Meta : Key.Ctrl, Key.C);
+        if (value == copyHotkey)
+        {
+            IsEditingHasError = true;
+            return;
+        }
+
         IsEditingHasError = !_hotkeyManager.IsValidHotkeyForm(value);
     }
 

diff --git a/src/SyncClipboard.Desktop/AppConfig.cs b/src/SyncClipboard.Desktop/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.Desktop";
-    public string AppVersion => "0.7.4.1";
+    public string AppVersion => "0.7.5";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard.Desktop/releases";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard.Desktop/releases/latest";
 }
diff --git a/src/SyncClipboard.Desktop/Changes.md b/src/SyncClipboard.Desktop/Changes.md
@@ -1,6 +1,7 @@
-0.7.4.1
-- 功能：可以设置重试次数，失败超过重试次数下载/上传会暂停(https://github.com/Jeric-X/SyncClipboard/issues/100)
-- 功能：可以设置剪切文件时不上传(https://github.com/Jeric-X/SyncClipboard/issues/107)
+0.7.5
+- 功能：可以设置重试次数，下载失败超过重试次数自动下载会暂停，触发一次上传后会恢复自动下载(https://github.com/Jeric-X/SyncClipboard/issues/100)
+- 功能：可以设置剪切文件时不上传(Linux)(https://github.com/Jeric-X/SyncClipboard/issues/107)
+- 修复：快捷键不允许设置为ctrl + c或command + c (https://github.com/Jeric-X/SyncClipboard/issues/103)
 
 0.7.4
 - 修复：不设置hash上传图片/文件到服务器后，桌面客户端会无限重复设置剪贴板

diff --git a/src/SyncClipboard.WinUI3/AppConfig.cs b/src/SyncClipboard.WinUI3/AppConfig.cs
@@ -6,7 +6,7 @@ internal class AppConfig : IAppConfig
 {
     public string AppId => Env.AppId;
     public string AppStringId => "SyncClipboard.WinUI";
-    public string AppVersion => "2.8.3.1";
+    public string AppVersion => "2.8.4";
     public string UpdateApiUrl => "https://api.github.com/repos/Jeric-X/SyncClipboard/releases";
     public string UpdateUrl => "https://github.com/Jeric-X/SyncClipboard/releases/latest";
 }