merge 5900cm & fix & update

hooke007 · Jun 6, 2022 · 1ac61d3 · 1ac61d3
1 parent f7f8aa5
commit 1ac61d3
Show file tree

Hide file tree

Showing 18 changed files with 1,255 additions and 785 deletions.
diff --git a/src/Misc/Commands.cs b/src/Misc/Commands.cs
@@ -244,7 +244,7 @@ public static void OpenFromClipboard() => App.InvokeOnMainThread(() =>
 
                 if (files.Count == 0)
                 {
-                    App.ShowError("The clipboard does not contain a valid URL or file.");
+                    App.ShowError("剪贴板中不包含有效的链接或文件！");
                     return;
                 }
 
@@ -611,11 +611,11 @@ public static void RegisterFileAssociations(string perceivedType)
                     proc.WaitForExit();
 
                     if (proc.ExitCode == 0)
-                        Msg.ShowInfo("File associations were successfully " + 
-                            (perceivedType == "unreg" ? "removed" : "created") +
-                            ".\n\nFile Explorer icons will refresh after process restart.");
+                        Msg.ShowInfo("文件关联已成功" + 
+                            (perceivedType == "注销" ? "移除" : "创建") +
+                            "！\n\n资源管理器的相关图标将在进程重启后刷新");
                     else
-                        Msg.ShowError("Error creating file associations.");
+                        Msg.ShowError("关联出错！");
                 }
             } catch { }
         }

diff --git a/src/Misc/Conf.cs b/src/Misc/Conf.cs
@@ -37,7 +37,7 @@ public static List<SettingBase> LoadConf(string content)
                             opt.Name = i.Value;
 
                         if (opt.Name == optionSetting.Default)
-                            opt.Text = opt.Name + " (Default)";
+                            opt.Text = opt.Name + "（默认）";
 
                         opt.OptionSetting = optionSetting;
                         optionSetting.Options.Add(opt);

diff --git a/src/Misc/MainForm.Designer.cs b/src/Misc/MainForm.Designer.cs
diff --git a/src/Misc/MainForm.cs b/src/Misc/MainForm.cs
@@ -220,7 +220,7 @@ bool IsMouseInOSC()
             if (FormBorderStyle == FormBorderStyle.None)
                 top = ClientSize.Height * 0.1f;
 
-            return pos.Y > ClientSize.Height * 0.85 || pos.Y < top;
+            return pos.Y > ClientSize.Height * 0.80 || pos.Y < top;
         }
 
         void UpdateMenu()

diff --git a/src/Misc/Player.cs b/src/Misc/Player.cs
@@ -139,13 +139,14 @@ public void Init(IntPtr handle)
             SetPropertyBool("input-default-bindings", true);
             SetPropertyBool("input-builtin-bindings", false);
 
-            SetPropertyString("watch-later-options", "mute");
+            SetPropertyString("watch-later-options", "vid,aid,sid");
             SetPropertyString("screenshot-directory", "~~desktop/");
             SetPropertyString("osd-playing-msg", "${media-title}");
             SetPropertyString("osc", "yes");
             SetPropertyString("force-window", "yes");
             SetPropertyString("config-dir", ConfigFolder);
             SetPropertyString("config", "yes");
+            SetPropertyString("include", "~~/profiles.conf");
 
             ProcessCommandLine(true);
 

diff --git a/src/Properties/Resources.resx b/src/Properties/Resources.resx
@@ -119,10 +119,10 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="editor_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\editor_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\editor_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="input_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="mpvnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>