diff --git a/Changelog.md b/Changelog.md index e845205..0bfbb5c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -25,6 +25,8 @@ - there was a copy paste bug in the file association feature resulting in keys from mpv being overwritten instead of using mpv.net keys. Thanks to floppyD! - there was a exception fixed that happened opening rar files +- instead of using the OS theme color there are now default colors + for dark-color and light-color ### 4.7.7 diff --git a/mpv.net/Properties/Resources.Designer.cs b/mpv.net/Properties/Resources.Designer.cs index fc3c3fd..9f59ce3 100644 --- a/mpv.net/Properties/Resources.Designer.cs +++ b/mpv.net/Properties/Resources.Designer.cs @@ -1,6 +1,24 @@ -namespace mpvnet.Properties { +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mpvnet.Properties { using System; + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -14,6 +32,9 @@ internal Resources() { } + /// + /// Returns the cached ResourceManager instance used by this class. + /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { @@ -25,6 +46,10 @@ } } + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { get { @@ -35,24 +60,70 @@ } } + /// + /// Looks up a localized string similar to + /// # This file defines the input (keys and mouse) bindings of mpv and mpv.net + /// # and it also defines the context menu of mpv.net. mpv.net has an input + /// # editor and an config editor as alternative to editing conf text files. + /// # The input and config editor can be found in mpv.net's context menu at: + /// + /// # Settings > Show Config Editor + /// # Settings > Show Input Editor + /// + /// # The defaults of this file can be found at: + /// + /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt + /// + /// # th [rest of string was truncated]";. + /// internal static string inputConf { get { return ResourceManager.GetString("inputConf", resourceCulture); } } + /// + /// Looks up a localized string similar to + ///# manual: https://mpv.io/manual/master/ + /// + ///# defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt + /// + ///input-ar-delay = 500 + ///input-ar-rate = 20 + ///volume = 50 + ///hwdec = yes + ///keep-open = yes + ///keep-open-pause = no + ///osd-playing-msg = '${filename}' + ///screenshot-directory = '~~desktop/' + ///input-default-bindings = no + ///script-opts=osc-scalewindowed=1.5. + /// internal static string mpvConf { get { return ResourceManager.GetString("mpvConf", resourceCulture); } } + /// + /// Looks up a localized string similar to [[settings]] + ///name = "hwdec" + ///default = "no" + ///filter = "Video" + ///url = "https://mpv.io/manual/master/#options-hwdec" + ///help = "Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:" + ///options = [{ name = "no", help = "always use software decoding" }, + /// { name = "auto", help = "enable be [rest of string was truncated]";. + /// internal static string mpvConfToml { get { return ResourceManager.GetString("mpvConfToml", resourceCulture); } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// internal static System.Drawing.Bitmap mpvnet { get { object obj = ResourceManager.GetObject("mpvnet", resourceCulture); @@ -60,10 +131,41 @@ } } + /// + /// Looks up a localized string similar to dark-color = '#1E90FF' + ///light-color = '#28394F'. + /// + internal static string mpvNetConf { + get { + return ResourceManager.GetString("mpvNetConf", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to [[settings]] + ///name = "dark-mode" + ///default = "always" + ///filter = "General" + ///help = "Enables a dark theme. (mpv.net specific setting)" + ///options = [{ name = "always" }, + /// { name = "system" , help = "Available on Windows 10 or higher" }, + /// { name = "never" }] + /// + ///[[settings]] + ///name = "dark-color" + ///type = "color" + ///filter = "General" + ///help = "Theme color used in dark-mode. Leave empty to use OS theme. (mpv.net specific setting)" + /// + ///[[settings]] + ///name = "light-color" + ///type = "color" + ///filter = "General" [rest of string was truncated]";. + /// internal static string mpvNetConfToml { get { return ResourceManager.GetString("mpvNetConfToml", resourceCulture); } } } -} \ No newline at end of file +} diff --git a/mpv.net/Properties/Resources.resx b/mpv.net/Properties/Resources.resx index ed2b04c..d231c96 100644 --- a/mpv.net/Properties/Resources.resx +++ b/mpv.net/Properties/Resources.resx @@ -130,6 +130,9 @@ ..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mpvNetConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + ..\Resources\mpvNetConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/mpv.net/Resources/mpvNetConf.txt b/mpv.net/Resources/mpvNetConf.txt new file mode 100644 index 0000000..77e3277 --- /dev/null +++ b/mpv.net/Resources/mpvNetConf.txt @@ -0,0 +1,2 @@ +dark-color = '#1E90FF' +light-color = '#28394F' \ No newline at end of file diff --git a/mpv.net/mpv.net.csproj b/mpv.net/mpv.net.csproj index 8fac44d..183e06f 100644 --- a/mpv.net/mpv.net.csproj +++ b/mpv.net/mpv.net.csproj @@ -232,6 +232,7 @@ + diff --git a/mpv.net/mpv/mp.cs b/mpv.net/mpv/mp.cs index b7eeaf1..f636ab9 100644 --- a/mpv.net/mpv/mp.cs +++ b/mpv.net/mpv/mp.cs @@ -185,6 +185,9 @@ namespace mpvnet if (!File.Exists(_ConfigFolder + "\\mpv.conf")) File.WriteAllText(_ConfigFolder + "\\mpv.conf", Properties.Resources.mpvConf); + + if (!File.Exists(_ConfigFolder + "\\mpvnet.conf")) + File.WriteAllText(_ConfigFolder + "\\mpvnet.conf", Properties.Resources.mpvNetConf); } return _ConfigFolder; }