-

README.md

@@ -22,7 +22,8 @@ Table of contents
 - Customizable context menu defined in the same file as the key bindings
 - Searchable options dialog with modern UI as mpv compatible standalone application
 - Searchable input (key/mouse) binding editor with modern UI as mpv compatible standalone application
-- Rich addon API for .NET languages
+- Modern UI using the OS theme color and dark mode
+- Rich addon API for .NET languages, over 700 available mpv properties
 - Rich scripting API for Python, C#, Lua, JavaScript and PowerShell
 - mpv's OSC (on screen controller (play control bar)), IPC, conf files
 
@@ -30,6 +31,8 @@ Table of contents
 
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvnet.png)
 
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvnetContextMenu.png)
+
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvConfEdit.png)
 
 ![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvInputEdit.png)
@@ -56,7 +59,7 @@ if it's missing mpv.net generates it with the following defaults:
 
 ### Scripting
 
-Scripting is supported for Python, C#, Lua, JavaScript and PowerShell
+Scripting is supported via Python, C#, Lua, JavaScript and PowerShell
 
 https://github.com/stax76/mpv.net/wiki/Scripting-(CSharp,-Python,-JavaScript,-Lua,-PowerShell)
 
@@ -70,33 +73,29 @@ https://github.com/stax76/mpv.net/wiki/Scripting-(CSharp,-Python,-JavaScript,-Lu
 
 ### Changelog
 
-### 2.5 (2019-04-08)
+### 2.9 (2019-04-16)
 
-- in case the input conf don't contain a menu definition mpv.net creates the default menu instead no menu like before
+- clicking the right top corner in full screen mode
-- all message boxes were migrated to use the TaskDialog API
+  closes the player but it did not work on all displays
-- an improvement in the previous release unfortunately introduced a bug
+- the info display was changed to display the filename on top
-  causing the conf editor not to save settings
+  so it's not displayed in the middle of the screen
-
+- on start up of the conf editor all text is now selected in the
-### 2.4 (2019-04-06)
+  search text box so it's ready for a new search to be typed
-
+- the conf editor was changed to write the settings to disk
-- new options added to the conf GUI editor: gpu-context, gpu-api, scale, cscale,
+  only if the settings were actually modified, also the message
-  dscale, dither-depth, correct-downscaling, sigmoid-upscaling, deband
+  that says that the settings will be available on next start
-- the conf edit GUI has a 'Apply' feature added to write the conf to mpv.conf
+  is now only shown if the settings were actually modified.
-  without the need to close the conf edit GUI
+- there was an instance in the context menu where the sub menu
-- the input edit GUI shows a message box when a duplicate is detected and it has
+  arrow was overlapping with the text
-  a new feature to reduce the filter scope to eather of input, menu or command and
+- in the input editor when only one character is entered in the
-  the editor writes always the same help on top of input.conf as it is found in the defaults
+  search text box the search is performed only in the input and
-- the conf edit GUI was often starting out of working area bounds and is now starting with center screen
+  not in the command or menu
-- the startup size was reduced and a issue was fixed that when the screen property
+- in the input editor the routine that generates the input string
-  was defined for a screen that isn't connected the startup size wasn't applied
+  was completely rewritten because it was adding Shift where it
-- added feature to load external audio and subtitle files in the menu under:
+  wasn't necessary (it took a huge amount of time to implement)
-  Open > Load external audio|subtitle files (default binding at:
+- the context menu has a new track menu where the active track
-  [input.conf](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt))
+  can be seen and selected, it shows video, audio and subtitle
-- previously the conf edit GUI removed settings from the conf file if the setting
+  tracks with various metadata. [Menu default definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L104).
-  was set to the default, the new behavior is not to remove anything
+  The screenshots were updated showing the [new track menu](https://github.com/stax76/mpv.net#screenshots).
-- the autofit mpv property was partly implemented, you can use 'autofit = 50%' in mpv.conf or
-  '--autofit=50%' on the command line, WxH isn't implemented and only percent values are accepted.
-  There is a new wiki page explaining the mpv.net limitations compared to the original mpv:
-  [Limitations](https://github.com/stax76/mpv.net/wiki/Limitations)
 
 [go to download page](https://github.com/stax76/mpv.net/releases)

VBNET/VBNET.vbproj

@@ -19,7 +19,8 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>VBNET.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <NoWarn>42353,42354,42355</NoWarn>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
@@ -29,7 +30,8 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>VBNET.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <NoWarn>42353,42354,42355</NoWarn>
     <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>

mpv.net/Command.cs

@@ -83,41 +83,15 @@ namespace mpvnet
                     File.WriteAllText(fp, "");
         }
 
-        public static void shell_execute(string[] args)
+        public static void shell_execute(string[] args) => Process.Start(args[0]);
-        {
-            Process.Start(args[0]);
-        }
-
-        public static void set_setting(string[] args)
-        {
-            bool changed = false;
-            var lines = File.ReadAllLines(mp.mpvConfPath);
-
-            for (int i = 0; i < lines.Length; i++)
-            {
-                if (lines[i].Contains("=") &&
-                    lines[i].Substring(0, lines[i].IndexOf("=")).Trim("# ".ToCharArray()) == args[0])
-                {
-                    lines[i] = args[0] + " = " + args[1];
-                    changed = true;
-                }
-            }
-
-            if (changed)
-                File.WriteAllText(mp.mpvConfPath, String.Join(Environment.NewLine, lines));
-            else
-                File.WriteAllText(mp.mpvConfPath, File.ReadAllText(mp.mpvConfPath) + Environment.NewLine + args[0] + " = " + args[1]);
-
-            Msg.Show("Changed settings are available on next startup.");
-        }
 
         public static void show_info(string[] args)
         {
             try
             {
-                var fileInfo = new FileInfo(mp.get_property_string("path"));
+                FileInfo fileInfo = new FileInfo(mp.get_property_string("path"));
 
-                using (var mediaInfo = new MediaInfo(fileInfo.FullName))
+                using (MediaInfo mediaInfo = new MediaInfo(fileInfo.FullName))
                 {
                     string width = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Width");
 
@@ -151,17 +125,19 @@ namespace mpvnet
                         if (bitrate == "")
                             bitrate = "0";
 
-                        var bitrate2 = Convert.ToDouble(bitrate) / 1000.0 / 1000.0;
+                        double bitrate2 = Convert.ToDouble(bitrate) / 1000.0 / 1000.0;
-                        var videoCodec = mp.get_property_string("video-format").ToUpper();
+                        string videoCodec = mp.get_property_string("video-format").ToUpper();
-                        var filename = fileInfo.Name;
+                        string filename = fileInfo.Name;
 
-                        var text =
+                        string text = filename + "\n" +
                             FormatTime(position.TotalMinutes) + ":" +
                             FormatTime(position.Seconds) + " / " +
                             FormatTime(duration.TotalMinutes) + ":" +
                             FormatTime(duration.Seconds) + "\n" +
-                            Convert.ToInt32(fileInfo.Length / 1024 / 1024).ToString() +
+                            $"{width} x {height}\n" +
-                            $" MB - {width} x {height}\n{videoCodec} - {bitrate2.ToString("f1")} Mb/s" + "\n" + filename;
+                            $"{bitrate2.ToString("f1")} Mb/s\n" +
+                            Convert.ToInt32(fileInfo.Length / 1024 / 1024).ToString() + " MB\n" +
+                            $"{videoCodec}\n";
 
                         mp.commandv("show-text", text, "5000");
                     }

mpv.net/MainForm.cs

@@ -8,6 +8,8 @@ using System.Linq;
 using System.Collections.Generic;
 
 using VBNET;
+using System.Threading.Tasks;
+using System.ComponentModel;
 
 namespace mpvnet
 {
@@ -19,11 +21,17 @@ namespace mpvnet
         private Point  LastCursorPosChanged;
         private int    LastCursorChangedTickCount;
         private bool   IgnoreDpiChanged = true;
-        private float mpvAutofit = 0.42f;
+        private MenuItemEx TracksMenu;
-        private bool  mpvFullscreen;
+        private List<MediaTrack> MediaTracks = new List<MediaTrack>();
-        private int   mpvScreen = -1;
+        public new ContextMenuStripEx ContextMenu;
 
-        public ContextMenuStripEx CMS;
+        private float  MpvAutofit = 0.50f;
+        private bool   MpvFullscreen;
+        private int    MpvScreen = -1;
+        private string MpvNetDarkMode = "system";
+        private string MpvSid = "";
+        private string MpvAid = "";
+        private string MpvVid = "";
 
         public MainForm()
         {
@@ -43,12 +51,15 @@ namespace mpvnet
                 foreach (var i in mp.mpvConf)
                     ProcessMpvProperty(i.Key, i.Value);
 
+                foreach (var i in mp.mpvNetConf)
+                    ProcessMpvNetProperty(i.Key, i.Value);
+
                 ProcessCommandLineEarly();
 
-                if (mpvScreen == -1) mpvScreen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
+                if (MpvScreen == -1) MpvScreen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
-                SetScreen(mpvScreen);
+                SetScreen(MpvScreen);
 
-                ChangeFullscreen(mpvFullscreen);
+                ChangeFullscreen(MpvFullscreen);
             }
             catch (Exception ex)
             {
@@ -56,6 +67,52 @@ namespace mpvnet
             }
         }
 
+        private void ContextMenu_Opening(object sender, CancelEventArgs e)
+        {
+            lock (MediaTracks)
+            {
+                TracksMenu.DropDownItems.Clear();
+
+                MediaTrack[] audTracks = MediaTracks.Where(track => track.Type == "a").ToArray();
+                MediaTrack[] subTracks = MediaTracks.Where(track => track.Type == "s").ToArray();
+                MediaTrack[] vidTracks = MediaTracks.Where(track => track.Type == "v").ToArray();
+
+                foreach (MediaTrack track in vidTracks)
+                {
+                    var mi = ContextMenu.Add("Track > " + track.Text);
+                    mi.Action = () => { mp.commandv("set", "vid", track.ID.ToString()); };
+                    mi.Checked = MpvVid == track.ID.ToString();
+                }
+
+                if (vidTracks.Length > 0)
+                    ContextMenu.Add("Track > -");
+
+                foreach (MediaTrack track in audTracks)
+                {
+                    var mi = ContextMenu.Add("Track > " + track.Text);
+                    mi.Action = () => { mp.commandv("set", "aid", track.ID.ToString()); };
+                    mi.Checked = MpvAid == track.ID.ToString();
+                }
+
+                if (subTracks.Length > 0)
+                    ContextMenu.Add("Track > -");
+
+                foreach (MediaTrack track in subTracks)
+                {
+                    var mi = ContextMenu.Add("Track > " + track.Text);
+                    mi.Action = () => { mp.commandv("set", "sid", track.ID.ToString()); };
+                    mi.Checked = MpvSid == track.ID.ToString();
+                }
+
+                if (subTracks.Length > 0)
+                {
+                    var mi = ContextMenu.Add("Track > S: No subtitles");
+                    mi.Action = () => { mp.commandv("set", "sid", "no"); };
+                    mi.Checked = MpvSid == "no";
+                }
+            }
+        }
+
         protected void SetScreen(int targetIndex)
         {
             Screen[] screens = Screen.AllScreens;
@@ -76,7 +133,7 @@ namespace mpvnet
         {
             if (IsFullscreen || mp.VideoSize.Width == 0) return;
             Screen screen = Screen.FromControl(this);
-            int height = Convert.ToInt32(screen.Bounds.Height * mpvAutofit);
+            int height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
             int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
             Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
             var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
@@ -91,7 +148,7 @@ namespace mpvnet
             if (IsFullscreen || mp.VideoSize.Width == 0) return;
             Screen screen = Screen.FromControl(this);
             int height = ClientSize.Height;
-            if (height > screen.Bounds.Height * 0.9) height = Convert.ToInt32(screen.Bounds.Height * mpvAutofit);
+            if (height > screen.Bounds.Height * 0.9) height = Convert.ToInt32(screen.Bounds.Height * MpvAutofit);
             int width = Convert.ToInt32(height * mp.VideoSize.Width / (double)mp.VideoSize.Height);
             Point middlePos = new Point(Left + Width / 2, Top + Height / 2);
             var rect = new Native.RECT(new Rectangle(screen.Bounds.X, screen.Bounds.Y, width, height));
@@ -118,6 +175,7 @@ namespace mpvnet
                         string left = i.Substring(2, i.IndexOf("=") - 2);
                         string right = i.Substring(left.Length + 3);
                         ProcessMpvProperty(left, right);
+                        ProcessMpvNetProperty(left, right);
                     }
                     else
                     {
@@ -127,7 +185,7 @@ namespace mpvnet
                         {
                             case "fs":
                             case "fullscreen":
-                                mpvFullscreen = true;
+                                MpvFullscreen = true;
                                 break;
                         }
                     }
@@ -142,14 +200,24 @@ namespace mpvnet
                 case "autofit":
                     if (value.Length == 3 && value.EndsWith("%"))
                         if (int.TryParse(value.Substring(0, 2), out int result))
-                            mpvAutofit = result / 100f;
+                            MpvAutofit = result / 100f;
                     break;
                 case "fs":
                 case "fullscreen":
-                    mpvFullscreen = value == "yes";
+                    MpvFullscreen = value == "yes";
                     break;
                 case "screen":
-                    mpvScreen = Convert.ToInt32(value);
+                    MpvScreen = Convert.ToInt32(value);
+                    break;
+            }
+        }
+
+        void ProcessMpvNetProperty(string name, string value)
+        {
+            switch (name)
+            {
+                case "dark-mode":
+                    MpvNetDarkMode = value;
                     break;
             }
         }
@@ -195,7 +263,7 @@ namespace mpvnet
                     else
                         input = "";
 
-                var menuItem = CMS.Add(path, () => {
+                MenuItemEx menuItem = ContextMenu.Add(path, () => {
                     try {
                         mp.command_string(command);
                     }
@@ -205,26 +273,113 @@ namespace mpvnet
                 });
                 
                 if (menuItem != null)
-                    menuItem.ShortcutKeyDisplayString = input.Replace("_","") + "   ";
+                {
+                    menuItem.ShortcutKeyDisplayString = input.Replace("_", "") + "    ";
+
+                    if (TracksMenu == null && menuItem.Text.StartsWith("Track ") &&
+                        menuItem.Text.Trim() == "Track")
+
+                        TracksMenu = menuItem;
+                }
             }
         }
 
-        private void CMS_Opened(object sender, EventArgs e) => CursorHelp.Show();
+        private void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
 
         private string LastHistory;
 
         private void mp_PlaybackRestart()
         {
-            var filename = mp.get_property_string("filename");
+            string filePath = mp.get_property_string("path");
-            BeginInvoke(new Action(() => { Text = filename + " - mpv.net " + Application.ProductVersion; }));
+            BeginInvoke(new Action(() => { Text = Path.GetFileName(filePath) + " - mpv.net " + Application.ProductVersion; }));
-            var historyFilepath = mp.mpvConfFolderPath + "history.txt";
 
-            if (LastHistory != filename && File.Exists(historyFilepath))
+            Task.Run(new Action(() => {
+                string historyFilepath = mp.mpvConfFolderPath + "history.txt";
+
+                if (LastHistory != filePath && File.Exists(historyFilepath))
                 {
                     File.AppendAllText(historyFilepath, DateTime.Now.ToString() + " " +
-                    Path.GetFileNameWithoutExtension(filename) + "\r\n");
+                        Path.GetFileNameWithoutExtension(filePath) + "\r\n");
-                LastHistory = filename;
+                    LastHistory = filePath;
                 }
+
+                lock (MediaTracks)
+                {
+                    MediaTracks.Clear();
+
+                    using (MediaInfo mi = new MediaInfo(filePath))
+                    {
+                        int count = mi.GetCount(MediaInfoStreamKind.Video);
+
+                        for (int i = 0; i < count; i++)
+                        {
+                            MediaTrack track = new MediaTrack();
+                            Add(track, mi.GetVideo(i, "Format"));
+                            Add(track, mi.GetVideo(i, "Format_Profile"));
+                            Add(track, mi.GetVideo(i, "Width") + "x" + mi.GetVideo(i, "Height"));
+                            Add(track, mi.GetVideo(i, "FrameRate") + " FPS");
+                            Add(track, mi.GetVideo(i, "Language/String"));
+                            Add(track, mi.GetVideo(i, "Forced") == "Yes" ? "Forced" : "");
+                            Add(track, mi.GetVideo(i, "Default") == "Yes" ? "Default" : "");
+                            Add(track, mi.GetVideo(i, "Title"));
+                            track.Text = "V: " + track.Text.Trim(" ,".ToCharArray());
+                            track.Type = "v";
+                            track.ID = i + 1;
+                            MediaTracks.Add(track);
+                        }
+
+                        count = mi.GetCount(MediaInfoStreamKind.Audio);
+
+                        for (int i = 0; i < count; i++)
+                        {
+                            MediaTrack track = new MediaTrack();
+                            Add(track, mi.GetAudio(i, "Language/String"));
+                            Add(track, mi.GetAudio(i, "Format"));
+                            Add(track, mi.GetAudio(i, "Format_Profile"));
+                            Add(track, mi.GetAudio(i, "BitRate/String"));
+                            Add(track, mi.GetAudio(i, "Channel(s)/String"));
+                            Add(track, mi.GetAudio(i, "SamplingRate/String"));
+                            Add(track, mi.GetAudio(i, "Forced") == "Yes" ? "Forced" : "");
+                            Add(track, mi.GetAudio(i, "Default") == "Yes" ? "Default" : "");
+                            Add(track, mi.GetAudio(i, "Title"));
+                            track.Text = "A: " + track.Text.Trim(" ,".ToCharArray());
+                            track.Type = "a";
+                            track.ID = i + 1;
+                            MediaTracks.Add(track);
+                        }
+
+                        count = mi.GetCount(MediaInfoStreamKind.Text);
+
+                        for (int i = 0; i < count; i++)
+                        {
+                            MediaTrack track = new MediaTrack();
+                            Add(track, mi.GetText(i, "Language/String"));
+                            Add(track, mi.GetText(i, "Format"));
+                            Add(track, mi.GetText(i, "Format_Profile"));
+                            Add(track, mi.GetText(i, "Forced") == "Yes" ? "Forced" : "");
+                            Add(track, mi.GetText(i, "Default") == "Yes" ? "Default" : "");
+                            Add(track, mi.GetText(i, "Title"));
+                            track.Text = "S: " + track.Text.Trim(" ,".ToCharArray());
+                            track.Type = "s";
+                            track.ID = i + 1;
+                            MediaTracks.Add(track);
+                        }
+
+                        void Add(MediaTrack track, string val)
+                        {
+                            if (!string.IsNullOrEmpty(val) && !(track.Text != null && track.Text.Contains(val)))
+                                track.Text += " " + val + ",";
+                        }                        
+                    }
+                }
+            }));
+        }
+
+        class MediaTrack
+        {
+            public string Text { get; set; }
+            public string Type { get; set; }
+            public int    ID   { get; set; }
         }
 
         private void Mp_Idle()
@@ -363,11 +518,7 @@ namespace mpvnet
                 Native.PostMessage(Handle, 0xA1 /* WM_NCLBUTTONDOWN */, HTCAPTION, IntPtr.Zero);
             }
 
-            var sb = Screen.FromControl(this).Bounds;
+            if (Width - e.Location.X < 10 && e.Location.Y < 10)
-            var p1 = new Point(sb.Width, 0);
-            var p2 = PointToScreen(e.Location);
-
-            if (Math.Abs(p1.X - p2.X) < 10 && Math.Abs(p1.Y - p2.Y) < 10)
                 mp.commandv("quit");
         }
 
@@ -394,7 +545,7 @@ namespace mpvnet
             }
             else if (Environment.TickCount - LastCursorChangedTickCount > 1500 &&
                 !IsMouseInOSC() && ClientRectangle.Contains(PointToClient(MousePosition)) &&
-                Form.ActiveForm == this && !CMS.Visible)
+                Form.ActiveForm == this && !ContextMenu.Visible)
             {
                 CursorHelp.Hide();
             }
@@ -414,6 +565,9 @@ namespace mpvnet
             mp.Init();
             mp.observe_property_bool("fullscreen", mpPropChangeFullscreen);
             mp.observe_property_bool("ontop", mpPropChangeOnTop);
+            mp.observe_property_string("sid", mpPropChangeSid);
+            mp.observe_property_string("aid", mpPropChangeAid);
+            mp.observe_property_string("vid", mpPropChangeVid);
             mp.Shutdown += mp_Shutdown;
             mp.VideoSizeChanged += mp_VideoSizeChanged;
             mp.PlaybackRestart += mp_PlaybackRestart;
@@ -422,13 +576,22 @@ namespace mpvnet
 
         void mpPropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
 
+        void mpPropChangeAid(string value) => MpvAid = value;
+
+        void mpPropChangeSid(string value) => MpvSid = value;
+
+        void mpPropChangeVid(string value) => MpvVid = value;
+
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
-            CMS = new ContextMenuStripEx(components);
+            if ((MpvNetDarkMode == "system" && Misc.IsDarkTheme) || MpvNetDarkMode == "always")
-            CMS.Opened += CMS_Opened;
+                ToolStripRendererEx.ColorTheme = Color.Black;
-            ContextMenuStrip = CMS;
+            ContextMenu = new ContextMenuStripEx(components);
+            ContextMenu.Opened += ContextMenu_Opened;
+            ContextMenu.Opening += ContextMenu_Opening;
             BuildMenu();
+            ContextMenuStrip = ContextMenu;
             IgnoreDpiChanged = false;
             CheckYouTube();
         }

mpv.net/MediaInfo.cs

@@ -25,6 +25,23 @@ public class MediaInfo : IDisposable
         return Marshal.PtrToStringUni(MediaInfo_Get(Handle, streamKind, 0, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
     }
 
+    public int GetCount(MediaInfoStreamKind streamKind) => MediaInfo_Count_Get(Handle, streamKind, -1);
+
+    public string GetVideo(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Video, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetAudio(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Audio, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
+    public string GetText(int streamNumber, string parameter)
+    {
+        return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
+    }
+
     private bool Disposed;
 
     public void Dispose()
@@ -37,10 +54,7 @@ public class MediaInfo : IDisposable
         }
     }
 
-    ~MediaInfo()
+    ~MediaInfo() { Dispose(); }
-    {
-        Dispose();
-    }
 
     [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
     private static extern IntPtr LoadLibrary(string path);
@@ -49,16 +63,26 @@ public class MediaInfo : IDisposable
     private static extern IntPtr MediaInfo_New();
 
     [DllImport("MediaInfo.dll")]
-    private static extern void MediaInfo_Delete(IntPtr Handle);
+    private static extern void MediaInfo_Delete(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern int MediaInfo_Open(IntPtr Handle, string FileName);
+    private static extern int MediaInfo_Open(IntPtr handle, string fileName);
 
     [DllImport("MediaInfo.dll")]
-    private static extern int MediaInfo_Close(IntPtr Handle);
+    private static extern int MediaInfo_Close(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr MediaInfo_Get(IntPtr Handle, MediaInfoStreamKind StreamKind, int StreamNumber, string Parameter, MediaInfoInfoKind KindOfInfo, MediaInfoInfoKind KindOfSearch);
+    private static extern IntPtr MediaInfo_Get(IntPtr handle,
+                                               MediaInfoStreamKind streamKind,
+                                               int streamNumber,
+                                               string parameter,
+                                               MediaInfoInfoKind kindOfInfo,
+                                               MediaInfoInfoKind kindOfSearch);
+
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    private static extern int MediaInfo_Count_Get(IntPtr handle,
+                                                  MediaInfoStreamKind streamKind,
+                                                  int streamNumber);
 }
 
 public enum MediaInfoStreamKind
@@ -67,8 +91,10 @@ public enum MediaInfoStreamKind
     Video,
     Audio,
     Text,
-    Chapters,
+    Other,
-    Image
+    Image,
+    Menu,
+    Max,
 }
 
 public enum MediaInfoInfoKind

mpv.net/Menu.cs

@@ -23,110 +23,23 @@ public class ContextMenuStripEx : ContextMenuStrip
         Renderer = new ToolStripRendererEx();
     }
 
-    public ActionMenuItem Add(string path)
+    public MenuItemEx Add(string path)
     {
         return Add(path, null);
     }
 
-    public ActionMenuItem Add(string path, Action action)
+    public MenuItemEx Add(string path, Action action, bool enabled = true)
     {
-        return Add(path, action, true);
+        MenuItemEx ret = MenuItemEx.Add(Items, path, action);
-    }
+        if (ret == null) return null;
-
-    public ActionMenuItem Add(string path, Action action, bool enabled)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        if (ret == null)
-            return null;
         ret.Enabled = enabled;
         return ret;
     }
-
-    public ActionMenuItem Add(string path, Action action, Func<bool> enabledFunc)
-    {
-        var ret = ActionMenuItem.Add(Items, path, action);
-        return ret;
-    }
-}
-
-public class ActionMenuItem : MenuItemEx
-{
-    private Action Action;
-
-    public ActionMenuItem()
-    {
-    }
-
-    public ActionMenuItem(string text, Action action)
-    {
-        this.Text = text;
-        this.Action = action;
-    }
-
-    protected override void OnClick(EventArgs e)
-    {
-        Application.DoEvents();
-        if (Action != null)
-            Action();
-        base.OnClick(e);
-    }
-
-    public static ActionMenuItem Add<T>(ToolStripItemCollection items, string path, Action<T> action, T value)
-    {
-        return Add(items, path, () => action(value));
-    }
-
-    public static ActionMenuItem Add(ToolStripItemCollection items, string path, Action action)
-    {
-        var a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
-        var l = items;
-
-        for (var x = 0; x <= a.Length - 1; x++)
-        {
-            var found = false;
-
-            foreach (var i in l.OfType<ToolStripMenuItem>())
-            {
-                if (x < a.Length - 1)
-                {
-                    if (i.Text == a[x] + " ")
-                    {
-                        found = true;
-                        l = i.DropDownItems;
-                    }
-                }
-            }
-
-            if (!found)
-            {
-                if (x == a.Length - 1)
-                {
-                    if (a[x] == "-")
-                        l.Add(new ToolStripSeparator());
-                    else
-                    {
-                        ActionMenuItem item = new ActionMenuItem(a[x] + " ", action);
-                        l.Add(item);
-                        l = item.DropDownItems;
-                        return item;
-                    }
-                }
-                else
-                {
-                    ActionMenuItem item = new ActionMenuItem();
-                    item.Text = a[x] + " ";
-                    l.Add(item);
-                    l = item.DropDownItems;
-                }
-            }
-        }
-        return null;
-    }
 }
 
 public class MenuItemEx : ToolStripMenuItem
 {
-    public static bool UseTooltips { get; set; }
+    public Action Action { get; set; }
 
     public MenuItemEx()
     {
@@ -136,20 +49,81 @@ public class MenuItemEx : ToolStripMenuItem
     {
     }
 
+    public MenuItemEx(string text, Action action) : base(text)
+    {
+        Action = action;
+    }
+
+    protected override void OnClick(EventArgs e)
+    {
+        Application.DoEvents();
+        Action?.Invoke();
+        base.OnClick(e);
+    }
+
+    public static MenuItemEx Add<T>(ToolStripItemCollection items, string path, Action<T> action, T value)
+    {
+        return Add(items, path, () => action(value));
+    }
+
+    public static MenuItemEx Add(ToolStripItemCollection items, string path, Action action)
+    {
+        string[] a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
+        var itemsCollection = items;
+
+        for (int x = 0; x < a.Length; x++)
+        {
+            bool found = false;
+
+            foreach (var i in itemsCollection.OfType<ToolStripMenuItem>())
+            {
+                if (x < a.Length - 1)
+                {
+                    if (i.Text == a[x] + "    ")
+                    {
+                        found = true;
+                        itemsCollection = i.DropDownItems;
+                    }
+                }
+            }
+
+            if (!found)
+            {
+                if (x == a.Length - 1)
+                {
+                    if (a[x] == "-")
+                        itemsCollection.Add(new ToolStripSeparator());
+                    else
+                    {
+                        MenuItemEx item = new MenuItemEx(a[x] + "    ", action);
+                        itemsCollection.Add(item);
+                        itemsCollection = item.DropDownItems;
+                        return item;
+                    }
+                }
+                else
+                {
+                    MenuItemEx item = new MenuItemEx();
+                    item.Text = a[x] + "    ";
+                    itemsCollection.Add(item);
+                    itemsCollection = item.DropDownItems;
+                }
+            }
+        }
+        return null;
+    }
+
     public override Size GetPreferredSize(Size constrainingSize)
     {
-        var ret = base.GetPreferredSize(constrainingSize);
+        Size size = base.GetPreferredSize(constrainingSize);
-        ret.Height = Convert.ToInt32(Font.Height * 1.4);
+        size.Height = Convert.ToInt32(Font.Height * 1.4);
-        return ret;
+        return size;
     }
 
     public void CloseAll(object item)
     {
         if (item is ToolStripItem)
-        {
+            CloseAll(((ToolStripItem)item).Owner);
-            var d = (ToolStripItem)item;
-            CloseAll(d.Owner);
-        }
 
         if (item is ToolStripDropDown)
         {
@@ -158,20 +132,16 @@ public class MenuItemEx : ToolStripMenuItem
             CloseAll(d.OwnerItem);
         }
     }
-
-    protected override void OnClick(EventArgs e)
-    {
-        Application.DoEvents();
-        base.OnClick(e);
-    }
 }
 
 public class ToolStripRendererEx : ToolStripSystemRenderer
 {
+    public static Color ColorForeground { get; set; } = Color.Black;
+    public static Color ColorTheme { get; set; } = Color.Empty;
     public static Color ColorChecked { get; set; }
     public static Color ColorBorder { get; set; }
     public static Color ColorTop { get; set; }
-    public static Color ColorBottom { get; set; }
+    public static Color ColorSelection { get; set; }
     public static Color ColorBackground { get; set; }
 
     public static Color ColorToolStrip1 { get; set; }
@@ -184,19 +154,32 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
     public ToolStripRendererEx()
     {
         var argb = Convert.ToInt32(Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM", "ColorizationColor", 0));
+
         if (argb == 0)
             argb = Color.LightBlue.ToArgb();
+        if (ColorTheme == Color.Empty)
             InitColors(Color.FromArgb(argb));
+        else
+            InitColors(ColorTheme);
     }
 
     public static void InitColors(Color c)
     {
         ColorBorder = HSLColor.Convert(c).ToColorSetLuminosity(100);
-        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(200);
+        ColorChecked = HSLColor.Convert(c).ToColorSetLuminosity(160);
-        ColorBottom = HSLColor.Convert(c).ToColorSetLuminosity(220);
+        ColorSelection = HSLColor.Convert(c).ToColorSetLuminosity(180);
-        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(230);
+        ColorBackground = HSLColor.Convert(c).ToColorSetLuminosity(210);
         ColorTop = HSLColor.Convert(c).ToColorSetLuminosity(240);
 
+        if (ColorTheme == Color.Black)
+        {
+            ColorBorder = Color.White;
+            ColorBackground = Color.FromArgb(50, 50, 50);
+            ColorSelection = Color.FromArgb(80, 80, 80);
+            ColorForeground = Color.White;
+            ColorChecked = Color.FromArgb(90, 90, 90);
+        }
+
         ColorToolStrip1 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 1)));
         ColorToolStrip2 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.7f)));
         ColorToolStrip3 = ControlPaint.LightLight(ControlPaint.LightLight(ControlPaint.Light(ColorBorder, 0.1f)));
@@ -205,7 +188,10 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
 
     protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
     {
-        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, Color.FromArgb(160, 175, 195), ButtonBorderStyle.Solid);
+        Rectangle r = e.AffectedBounds;
+        r.Inflate(-1, -1);
+        ControlPaint.DrawBorder(e.Graphics, r, ColorBackground, ButtonBorderStyle.Solid);
+        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, ColorBorder, ButtonBorderStyle.Solid);
     }
 
     protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
@@ -222,6 +208,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             else
                 TextOffset = Convert.ToInt32(e.Item.Height * 0.2);
 
+            e.TextColor = ColorForeground;
             e.TextRectangle = new Rectangle(TextOffset, Convert.ToInt32((e.Item.Height - rect.Height) / 2.0), rect.Width, rect.Height);
         }
 
@@ -235,118 +222,88 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             Rectangle r = new Rectangle(-1, -1, e.AffectedBounds.Width, e.AffectedBounds.Height);
 
             using (SolidBrush b = new SolidBrush(ColorToolStrip2))
-            {
                 e.Graphics.FillRectangle(b, r);
         }
     }
-    }
 
     protected override void OnRenderMenuItemBackground(ToolStripItemRenderEventArgs e)
     {
-        e.Item.ForeColor = Color.Black;
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
-
-        var r = new Rectangle(Point.Empty, e.Item.Size);
-        var g = e.Graphics;
 
         if (!(e.Item.Owner is MenuStrip))
-            g.Clear(ColorBackground);
+            e.Graphics.Clear(ColorBackground);
 
         if (e.Item.Selected && e.Item.Enabled)
         {
-            if (e.Item.Owner is MenuStrip)
+            e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
-                DrawButton(e);
+            rect = new Rectangle(rect.X + 2, rect.Y, rect.Width - 4, rect.Height - 1);
-            else
+            rect.Inflate(-1, -1);
-            {
+            using (SolidBrush b = new SolidBrush(ColorSelection))
-                g.SmoothingMode = SmoothingMode.AntiAlias;
+                e.Graphics.FillRectangle(b, rect);
-
-                var r2 = new Rectangle(r.X + 2, r.Y, r.Width - 4, r.Height - 1);
-
-                using (Pen pen = new Pen(ColorBorder))
-                {
-                    g.DrawRectangle(pen, r2);
         }
-
-                r2.Inflate(-1, -1);
-
-                using (SolidBrush b = new SolidBrush(ColorBottom))
-                {
-                    g.FillRectangle(b, r2);
-                }
-            }
-        }
-    }
-
-    public void DrawButton(ToolStripItemRenderEventArgs e)
-    {
-        var gx = e.Graphics;
-        var rect = new Rectangle(Point.Empty, e.Item.Size);
-        var rect2 = new Rectangle(rect.X, rect.Y, rect.Width - 1, rect.Height - 1);
-
-        using (Pen pen = new Pen(ColorBorder))
-            gx.DrawRectangle(pen, rect2);
-
-        rect2.Inflate(-1, -1);
-        var tsb = e.Item as ToolStripButton;
-
-        if (tsb != null && tsb.Checked)
-            using (SolidBrush brush = new SolidBrush(ColorChecked))
-                gx.FillRectangle(brush, rect2);
-        else
-            using (SolidBrush brush = new SolidBrush(ColorBottom))
-                gx.FillRectangle(brush, rect2);
-    }
-
-    protected override void OnRenderDropDownButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        if (e.Item.Selected)
-            DrawButton(e);
-    }
-
-    protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
-    {
-        var button = (ToolStripButton)e.Item;
-        if (e.Item.Selected || button.Checked)
-            DrawButton(e);
     }
 
     protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
     {
-        var value = e.Direction == ArrowDirection.Down ? 0x36 : 0x34;
+        if (e.Direction == ArrowDirection.Down) throw new NotImplementedException();
-        var s = Convert.ToChar(value).ToString();
+        float x1 = e.Item.Width - e.Item.Height * 0.6f;
-        var font = new Font("Marlett", e.Item.Font.Size - 2);
+        float y1 = e.Item.Height * 0.25f;
-        var size = e.Graphics.MeasureString(s, font);
+        float x2 = x1 + e.Item.Height * 0.25f;
-        var x = Convert.ToInt32(e.Item.Width - size.Width);
+        float y2 = e.Item.Height / 2f;
-        var y = Convert.ToInt32((e.Item.Height - size.Height) / 2.0) + 1;
+        float x3 = x1;
-        e.Graphics.DrawString(s, font, Brushes.Black, x, y);
+        float y3 = e.Item.Height * 0.75f;
+        e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
+
+        using (Brush b = new SolidBrush(ColorForeground))
+        {
+            using (Pen p = new Pen(b, Control.DefaultFont.Height / 20f))
+            {
+                e.Graphics.DrawLine(p, x1, y1, x2, y2);
+                e.Graphics.DrawLine(p, x2, y2, x3, y3);
+            }
+        }
     }
 
     protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
     {
-        int x = Convert.ToInt32(e.ImageRectangle.Height * 0.2);
+        if (e.Item.GetType() != typeof(MenuItemEx))
-        e.Graphics.DrawImage(e.Image, new Point(x, x));
+            return;
+
+        MenuItemEx item = e.Item as MenuItemEx;
+
+        e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
+
+        if (!item.Checked)
+            return;
+
+        Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
+        rect = new Rectangle(rect.X + 2, rect.Y, rect.Height - 1, rect.Height - 1);
+        rect.Inflate(-1, -1);
+
+        using (Brush brush = new SolidBrush(ColorChecked))
+            e.Graphics.FillRectangle(brush, rect);
+
+        float ellipseWidth = rect.Height / 3f;
+
+        RectangleF rectF = new RectangleF(rect.X + rect.Height / 2f - ellipseWidth / 2f,
+                                          rect.Y + rect.Height / 2f - ellipseWidth / 2f,
+                                          ellipseWidth,
+                                          ellipseWidth);
+
+        using (Brush brush = new SolidBrush(ColorForeground))
+            e.Graphics.FillEllipse(brush, rectF);
     }
 
     protected override void OnRenderSeparator(ToolStripSeparatorRenderEventArgs e)
-    {
-        if (e.Item.IsOnDropDown)
     {
         e.Graphics.Clear(ColorBackground);
-            int right = e.Item.Width - Convert.ToInt32(TextOffset / 5.0);
         int top = e.Item.Height / 2;
         top -= 1;
-            using (Pen p = new Pen(Color.Gray))
+        int offset = Convert.ToInt32(e.Item.Font.Height * 0.7);
-                e.Graphics.DrawLine(p, new Point(TextOffset, top), new Point(right, top));
+        using (Pen p = new Pen(ColorBorder))
-        }
-        else if (e.Vertical)
-        {
-            var bounds = e.Item.Bounds;
-            using (Pen p = new Pen(SystemColors.ControlDarkDark))
             e.Graphics.DrawLine(p,
-                    Convert.ToInt32(bounds.Width / 2.0),
+                new Point(offset, top),
-                    Convert.ToInt32(bounds.Height * 0.15), 
+                new Point(e.Item.Width - offset, top));
-                    Convert.ToInt32(bounds.Width / 2.0),
-                    Convert.ToInt32(bounds.Height * 0.85));
-        }
     }
 }
 
@@ -366,24 +323,21 @@ public struct HSLColor
 
     private double hue;
 
-    public int Hue
+    public int Hue {
-    {
         get => System.Convert.ToInt32(hue * 240);
         set => hue = CheckRange(value / 240.0);
     }
 
     private double saturation;
 
-    public int Saturation
+    public int Saturation {
-    {
         get => System.Convert.ToInt32(saturation * 240);
         set => saturation = CheckRange(value / 240.0);
     }
 
     private double luminosity;
 
-    public int Luminosity
+    public int Luminosity {
-    {
         get => System.Convert.ToInt32(luminosity * 240);
         set => luminosity = CheckRange(value / 240.0);
     }

mpv.net/Misc.cs

@@ -15,6 +15,14 @@ namespace mpvnet
 
         public static string GetFilter(IEnumerable<string> values) => "*." + 
             String.Join(";*.", values) + "|*." + String.Join(";*.", values) + "|All Files|*.*";
+
+        public static bool IsDarkTheme {
+            get {
+                object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+                if (value is null) value = 1;
+                return (int)value == 0;
+            }
+        }
     }
 
     public class StringLogicalComparer : IComparer, IComparer<string>
@@ -28,16 +36,6 @@ namespace mpvnet
         int IComparer<string>.Compare(string x, string y) => IComparerOfString_Compare(x, y);
     }
 
-    public class OSVersion
-    {
-        public static float Windows7 { get; } = 6.1f;
-        public static float Windows8 { get; } = 6.2f;
-        public static float Windows81 { get; } = 6.3f;
-        public static float Windows10 { get; } = 10f;
-
-        public static float Current => Environment.OSVersion.Version.Major + Environment.OSVersion.Version.Minor / 10f;
-    }
-
     public class FileAssociation
     {
         static string ExePath = Application.ExecutablePath;

mpv.net/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv.net")]
-[assembly: AssemblyCopyright("Copyright © 2017 stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0.0")]
+[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.5.0.0")]
+[assembly: AssemblyFileVersion("2.9.0.0")]

mpv.net/Resources/input.conf.txt

@@ -34,25 +34,25 @@
  Space       cycle pause            #menu: Play/Pause
  s           stop                   #menu: Stop
  _           ignore                 #menu: -
- f           cycle fullscreen       #menu: Toggle Fullscreen
+ Enter       cycle fullscreen       #menu: Toggle Fullscreen
  
  F11         playlist-prev          #menu: Navigate > Previous
  F12         playlist-next          #menu: Navigate > Next
  _           ignore                 #menu: Navigate > -
  PGUP        add chapter  1         #menu: Navigate > Next Chapter
  PGDWN       add chapter -1         #menu: Navigate > Previous Chapter
- 
+ _           ignore                 #menu: Navigate > -
- .           frame-step             #menu: Seek > Next Frame
+ .           frame-step             #menu: Navigate > Jump Next Frame
- ,           frame-back-step        #menu: Seek > Previous Frame
+ ,           frame-back-step        #menu: Navigate > Jump Previous Frame
- _           ignore                 #menu: Seek > -
+ _           ignore                 #menu: Navigate > -
- Right       no-osd seek  7         #menu: Seek > 7 sec forward
+ Right       no-osd seek  7         #menu: Navigate > Jump 7 sec forward
- Left        no-osd seek -7         #menu: Seek > 7 sec backward
+ Left        no-osd seek -7         #menu: Navigate > Jump 7 sec backward
- _           ignore                 #menu: Seek > -
+ _           ignore                 #menu: Navigate > -
- Up          no-osd seek  40        #menu: Seek > 40 sec forward
+ Up          no-osd seek  40        #menu: Navigate > Jump 40 sec forward
- Down        no-osd seek -40        #menu: Seek > 40 sec backward
+ Down        no-osd seek -40        #menu: Navigate > Jump 40 sec backward
- _           ignore                 #menu: Seek > -
+ _           ignore                 #menu: Navigate > -
- Ctrl+Right  no-osd seek  300       #menu: Seek > 5 min forward
+ Ctrl+Right  no-osd seek  300       #menu: Navigate > Jump 5 min forward
- Ctrl+Left   no-osd seek -300       #menu: Seek > 5 min backward
+ Ctrl+Left   no-osd seek -300       #menu: Navigate > Jump 5 min backward
 
  Ctrl++      add video-zoom  0.1    #menu: Pan & Scan > Increase Size
  Ctrl+-      add video-zoom -0.1    #menu: Pan & Scan > Decrease Size
@@ -101,6 +101,8 @@
  _           add sub-scale -0.1     #menu: Subtitle > Decrease Subtitle Font Size
  _           add sub-scale  0.1     #menu: Subtitle > Increase Subtitle Font Size
 
+ _           ignore                 #menu: Track
+
  +           add volume  10         #menu: Volume > Up
  -           add volume -10         #menu: Volume > Down
  _           ignore                 #menu: Volume > -
@@ -126,20 +128,18 @@
  i      script-message mpv.net show-info          #menu: View > File Info
  t      script-binding stats/display-stats        #menu: View > Show Statistics
  T      script-binding stats/display-stats-toggle #menu: View > Toggle Statistics
+ Del    script-binding osc/visibility             #menu: View > Toggle OSC Visibility
+ F8     show-text ${playlist}   5000              #menu: View > Show Playlist
+ F9     show-text ${track-list} 5000              #menu: View > Show Audio/Video/Subtitle List
 
- _ script-message mpv.net set-setting hwdec yes   #menu: Settings > Hardware Decoding > Enable
- _ script-message mpv.net set-setting hwdec no    #menu: Settings > Hardware Decoding > Disable
  Ctrl+c script-message mpv.net show-conf-editor   #menu: Settings > Show Config Editor
  Ctrl+i script-message mpv.net show-input-editor  #menu: Settings > Show Input Editor
  Ctrl+f script-message mpv.net open-conf-folder   #menu: Settings > Open Config Folder
 
  h      script-message mpv.net show-history       #menu: Tools > Show History
  l      ab-loop                                   #menu: Tools > Set/clear A-B loop points
- L cycle-values loop-file "inf" "no"              #menu: Tools > Toggle Infinite Looping
+ L      cycle-values loop-file "inf" "no"         #menu: Tools > Toggle infinite file looping
- Del script-binding osc/visibility                #menu: Tools > Toggle OSC Visibility
  Ctrl+h cycle-values hwdec "auto" "no"            #menu: Tools > Cycle Hardware Decoding
- F8 show-text ${playlist}   5000                  #menu: Tools > Show Playlist
- F9 show-text ${track-list} 5000                  #menu: Tools > Show Audio/Video/Subtitle List
  _ script-message mpv.net execute-mpv-command     #menu: Tools > Execute mpv command...
 
  _ script-message mpv.net shell-execute https://mpv.io/manual/stable/ #menu: Help > Show mpv manual
@@ -152,7 +152,6 @@
  Q quit-watch-later #menu: Exit Watch Later
  > playlist-next
  < playlist-prev
- Enter cycle pause
  Power quit
  Play      cycle pause
  Pause     cycle pause

mpv.net/mp.cs

@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+
 using VBNET;
 using static mpvnet.libmpv;
 using static mpvnet.Native;
@@ -56,10 +57,12 @@ namespace mpvnet
         public static IntPtr MpvWindowHandle;
         public static Addon Addon;
         public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions = new List<KeyValuePair<string, Action<bool>>>();
+        public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions = new List<KeyValuePair<string, Action<string>>>();
         public static Size VideoSize = new Size(1920, 1080);
         public static string mpvConfFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
         public static string InputConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
         public static string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
+        public static string mpvNetConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpvnet.conf";
         public static List<PythonScript> PythonScripts => new List<PythonScript>();
         public static AutoResetEvent AutoResetEvent = new AutoResetEvent(false);
 
@@ -80,6 +83,23 @@ namespace mpvnet
             }
         }
 
+        private static Dictionary<string, string> _mpvNetConf;
+
+        public static Dictionary<string, string> mpvNetConf {
+            get {
+                if (_mpvNetConf == null)
+                {
+                    _mpvNetConf = new Dictionary<string, string>();
+
+                    if (File.Exists(mpvNetConfPath))
+                        foreach (string i in File.ReadAllLines(mpvNetConfPath))
+                            if (i.Contains("=") && !i.StartsWith("#"))
+                                _mpvNetConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
+                }
+                return _mpvNetConf;
+            }
+        }
+
         public static void Init()
         {
             if (!Directory.Exists(mp.mpvConfFolderPath))
@@ -235,12 +255,17 @@ namespace mpvnet
                             Seek?.Invoke();
                             break;
                         case mpv_event_id.MPV_EVENT_PROPERTY_CHANGE:
-                            var event_propertyData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
+                            var propData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
 
-                            if (event_propertyData.format == mpv_format.MPV_FORMAT_FLAG)
+                            if (propData.format == mpv_format.MPV_FORMAT_FLAG)
                                 foreach (var i in BoolPropChangeActions)
-                                    if (i.Key== event_propertyData.name)
+                                    if (i.Key== propData.name)
-                                        i.Value.Invoke(Marshal.PtrToStructure<int>(event_propertyData.data) == 1);
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data) == 1);
+
+                            if (propData.format == mpv_format.MPV_FORMAT_STRING)
+                                foreach (var i in StringPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(StringFromNativeUtf8(Marshal.PtrToStructure<IntPtr>(propData.data)));
                             break;
                         case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
                             PlaybackRestart?.Invoke();
@@ -360,7 +385,7 @@ namespace mpvnet
                 if (err < 0 && throwOnException)
                     throw new Exception($"{name}: {(mpv_error)err}");
 
-                var ret = StringFromNativeUtf8(lpBuffer);
+                string ret = StringFromNativeUtf8(lpBuffer);
                 mpv_free(lpBuffer);
 
                 return ret;
@@ -434,6 +459,28 @@ namespace mpvnet
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
+        public static void observe_property_string(string name, Action<string> action)
+        {
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_STRING);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                StringPropChangeActions.Add(new KeyValuePair<string, Action<string>>(name, action));
+        }
+
+        public static void unobserve_property_string(string name, Action<string> action)
+        {
+            foreach (var i in StringPropChangeActions.ToArray())
+                if (i.Value == action)
+                    StringPropChangeActions.Remove(i);
+
+            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+        }
+
         protected static void ProcessCommandLine()
         {
             var args = Environment.GetCommandLineArgs().Skip(1);

mpvConfEdit/App.xaml

@@ -1,7 +1,7 @@
-<Application x:Class="DynamicGUI.App"
+<Application x:Class="mpvConfEdit.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:DynamicGUI"
+             xmlns:Controls="clr-namespace:Controls"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <Style TargetType="TextBox">
@@ -19,7 +19,7 @@
                                 <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static SystemParameters.WindowGlassBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static Controls:Controls.ThemeBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>

mpvConfEdit/App.xaml.cs

@@ -1,6 +1,6 @@
 using System.Windows;
 
-namespace DynamicGUI
+namespace mpvConfEdit
 {
     public partial class App : Application
     {

mpvConfEdit/Controls.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Controls
+{
+    class Controls
+    {
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DimGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}

mpvConfEdit/DynamicGUI/DynamicGUI.cs

@@ -27,6 +27,7 @@ namespace DynamicGUI
                     baseSetting = optionSetting;
                     optionSetting.Default = setting["default"];
                     optionSetting.Value = optionSetting.Default;
+                    optionSetting.StartValue = optionSetting.Default;
 
                     foreach (TomlTable option in setting["options"])
                     {
@@ -54,7 +55,6 @@ namespace DynamicGUI
                 baseSetting.Filter = setting["filter"];
                 if (setting.HasKey("help")) baseSetting.Help = setting["help"];
                 if (setting.HasKey("helpurl")) baseSetting.HelpURL = setting["helpurl"];
-                if (setting.HasKey("alias")) baseSetting.Alias = setting["alias"];
                 if (setting.HasKey("width")) baseSetting.Width = setting["width"];
                 settingsList.Add(baseSetting);
             }
@@ -65,8 +65,10 @@ namespace DynamicGUI
     public abstract class SettingBase
     {
         public string Name { get; set; }
-        public string Alias { get; set; }
+        public string Value { get; set; }
+        public string StartValue { get; set; }
         public string Help { get; set; }
+        public string Default { get; set; }
         public string HelpURL { get; set; }
         public string Filter { get; set; }
         public int Width { get; set; }
@@ -74,15 +76,11 @@ namespace DynamicGUI
 
     public class StringSetting : SettingBase
     {
-        public string Default { get; set; }
-        public string Value { get; set; }
         public bool IsFolder { get; set; }
     }
 
     public class OptionSetting : SettingBase
     {
-        public string Default { get; set; }
-        public string Value { get; set; }
         public List<OptionSettingOption> Options = new List<OptionSettingOption>();
     }
 

mpvConfEdit/DynamicGUI/OptionSettingControl.xaml

@@ -8,18 +8,18 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{x:Static SystemParameters.WindowGlassBrush}"></TextBox>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
             <ItemsControl x:Name="ItemsControl">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <WrapPanel Orientation="Vertical">
-                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding IsChecked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top"></RadioButton>
+                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding IsChecked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></RadioButton>
-                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0"></TextBox>
+                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
                         </WrapPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0"></TextBox>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"></TextBox>
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpvConfEdit/DynamicGUI/OptionSettingControl.xaml.cs

@@ -15,7 +15,6 @@ namespace DynamicGUI
             HelpTextBox.Text = optionSetting.Help;
             ItemsControl.ItemsSource = optionSetting.Options;
             Link.SetURL(optionSetting.HelpURL);
-
             if (string.IsNullOrEmpty(optionSetting.HelpURL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
         }

mpvConfEdit/DynamicGUI/StringSettingControl.xaml

@@ -9,16 +9,16 @@
              d:DesignWidth="800" >
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{x:Static SystemParameters.WindowGlassBrush}"></TextBox>
+            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
             <Grid Margin="0,0,0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20"/>
+                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
                 <Button x:Name="Button" Height="20" Grid.Column="1" Visibility="{Binding Path=Text, ElementName=StringSettingControl1}" Margin="5,0,0,0" Width="20" Click="Button_Click">...</Button>
             </Grid>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" Margin="0,0,0,10" BorderThickness="0" IsReadOnly="True"></TextBox>
+            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" Margin="0,0,0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpvConfEdit/DynamicGUI/StringSettingControl.xaml.cs

@@ -19,7 +19,6 @@ namespace DynamicGUI
             if (!StringSetting.IsFolder)
                 Button.Visibility = Visibility.Hidden;
             Link.SetURL(StringSetting.HelpURL);
-
             if (string.IsNullOrEmpty(stringSetting.HelpURL))
                 LinkTextBlock.Visibility = Visibility.Collapsed;
         }

mpvConfEdit/MainWindow.xaml

@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Height="600" Width="800" Loaded="MainWindow1_Loaded" WindowStartupLocation="CenterScreen">
+        Height="500" Width="700" Loaded="MainWindow1_Loaded" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -14,12 +14,12 @@
             <ColumnDefinition Width="10*" />
             <ColumnDefinition Width="60*" />
         </Grid.ColumnDefinitions>
-        <Controls:SearchTextBoxUserControl x:Name="SearchControl" Width="300" Margin="0,20,0,10" Grid.ColumnSpan="2" />
+        <Controls:SearchTextBoxUserControl x:Name="SearchControl" Width="250" Margin="0,20,0,10" Grid.ColumnSpan="2" />
         <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="1" Margin="0,0,0,10">
             <StackPanel x:Name="MainStackPanel"></StackPanel>
         </ScrollViewer>
         <StackPanel Margin="20,0,0,0" Grid.Row="1">
-            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static SystemParameters.WindowGlassBrush}">
+            <ListBox x:Name="FilterListBox" ItemsSource="{Binding FilterStrings}" BorderThickness="0" SelectionChanged="ListBox_SelectionChanged" Foreground="{x:Static Controls:Controls.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -28,10 +28,10 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open settings folder</TextBlock>
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
-            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
-            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
-            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static SystemParameters.WindowGlassBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to mpv.conf</TextBlock>
+            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to disk</TextBlock>
         </StackPanel>
     </Grid>
 </Window>

mpvConfEdit/MainWindow.xaml.cs

@@ -8,15 +8,21 @@ using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 using DynamicGUI;
+using Microsoft.Win32;
 
 namespace mpvConfEdit
 {
     public partial class MainWindow : Window
     {
-        public string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
+        public string MpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        private List<SettingBase> DynamicSettings = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvConfEdit.toml");
+        public string MpvNetConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpvnet.conf";
+        private List<SettingBase> MpvSettingsDefinitions = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvConf.toml");
+        private List<SettingBase> MpvNetSettingsDefinitions = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvNetConf.toml");
+        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+        private Dictionary<string, Dictionary<string, string>> Comments = new Dictionary<string, Dictionary<string, string>>();
 
         public MainWindow()
         {
@@ -24,31 +30,65 @@ namespace mpvConfEdit
             DataContext = this;
             Title = (Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0] as AssemblyProductAttribute).Product + " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            LoadSettings(MpvSettingsDefinitions, MpvConf);
+            LoadSettings(MpvNetSettingsDefinitions, MpvNetConf);
+            SearchControl.Text = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\mpv.net", "conf editor search", "");
+            SetDarkTheme();
+        }
 
-            foreach (var setting in DynamicSettings)
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(MainWindow), new PropertyMetadata(Brushes.DarkSlateGray));
+
+        void SetDarkTheme()
+        {
+            string darkMode = MpvNetSettingsDefinitions.Where(item => item.Name == "dark-mode").First().Value;
+
+            object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
+            if (value is null) value = 1;
+            bool isDarkTheme = (int)value == 0;
+
+            if (!((darkMode == "system" && isDarkTheme) || darkMode == "always"))
+                return;
+
+            Foreground = Brushes.White;
+            Foreground2 = Brushes.Silver;
+            Background = Brushes.Black;
+        }
+
+        private void LoadSettings(List<SettingBase> settingsDefinitions,
+                                  Dictionary<string, string> confSettings)
+        {
+            foreach (var setting in settingsDefinitions)
             {
                 if (!FilterStrings.Contains(setting.Filter))
                     FilterStrings.Add(setting.Filter);
-                foreach (var pair in mpvConf)
+
+                foreach (var pair in confSettings)
                 {
-                    if (setting.Name == pair.Key || setting.Alias == pair.Key)
+                    if (setting.Name == pair.Key)
-                        switch (setting)
                     {
-                            case StringSetting s:
+                        setting.Value = pair.Value;
-                                s.Value = pair.Value;
+                        setting.StartValue = pair.Value;
                         continue;
-                            case OptionSetting s:
-                                s.Value = pair.Value;
-                                break;
                     }
                 }
+
                 switch (setting)
                 {
                     case StringSetting s:
-                        MainStackPanel.Children.Add(new StringSettingControl(s));
+                        var sc = new StringSettingControl(s);
+                        sc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        MainStackPanel.Children.Add(sc);
                         break;
                     case OptionSetting s:
-                        MainStackPanel.Children.Add(new OptionSettingControl(s));
+                        var oc = new OptionSettingControl(s);
+                        oc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        MainStackPanel.Children.Add(oc);
                         break;
                 }
             }
@@ -56,103 +96,109 @@ namespace mpvConfEdit
 
         private Dictionary<string, string> _mpvConf;
 
-        public Dictionary<string, string> mpvConf {
+        public Dictionary<string, string> MpvConf {
             get {
-                if (_mpvConf == null)
+                if (_mpvConf == null) _mpvConf = LoadConf(MpvConfPath);
-                {
-                    _mpvConf = new Dictionary<string, string>();
-
-                    if (File.Exists(mpvConfPath))
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
-                            if (i.Contains("=") && !i.Trim().StartsWith("#"))
-                            {
-                                int pos = i.IndexOf("=");
-                                _mpvConf[i.Substring(0, pos).Trim()] = i.Substring(pos + 1).Trim();
-                            }
-                }
                 return _mpvConf;
             }
         }
 
-        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+        private Dictionary<string, string> _mpvNetConf;
+
+        public Dictionary<string, string> MpvNetConf {
+            get {
+                if (_mpvNetConf == null) _mpvNetConf = LoadConf(MpvNetConfPath);
+                return _mpvNetConf;
+            }
+        }
+
+        private Dictionary<string, string> LoadConf(string filePath)
+        {
+            Dictionary<string, string> conf = new Dictionary<string, string>();
+            Comments[filePath] = new Dictionary<string, string>();
+
+            if (File.Exists(filePath))
+            {
+                foreach (string i in File.ReadAllLines(filePath))
+                {
+                    if (i.Contains("="))
+                    {
+                        int pos = i.IndexOf("=");
+                        string left = i.Substring(0, pos).Replace(" ", "").ToLower();
+                        string right = i.Substring(pos + 1).Trim();
+
+                        if (left.StartsWith("#"))
+                        {
+                            Comments[filePath][left.TrimStart("#".ToCharArray())] = right;
+                            continue;
+                        }
+
+                        if (left == "fs") left = "fullscreen";
+                        if (left == "loop") left = "loop-file";
+                        conf[left] = right;
+                    }
+                }
+            }
+            return conf;
+        }
 
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
             WriteToDisk();
+            Registry.SetValue(@"HKEY_CURRENT_USER\Software\mpv.net", "conf editor search", SearchControl.Text);
         }
 
         void WriteToDisk()
         {
-            foreach (var mpvSetting in DynamicSettings)
+            bool isDirty = false;
-            {
-                switch (mpvSetting)
-                {
-                    case StringSetting s:
-                        if ((s.Value ?? "") != s.Default || mpvConf.ContainsKey(s.Name) || mpvConf.ContainsKey(s.Alias ?? ""))
-                            mpvConf[s.Name] = s.Value;
-                        break;
-                    case OptionSetting s:
-                        if ((s.Value ?? "") != s.Default || mpvConf.ContainsKey(s.Name) || mpvConf.ContainsKey(s.Alias ?? ""))
-                            mpvConf[s.Name] = s.Value;
-                        break;
-                }
-            }
 
-            if (!File.Exists(mpvConfPath))
+            foreach (SettingBase i in MpvSettingsDefinitions)
-                File.WriteAllText(mpvConfPath, "");
+                if (i.StartValue != i.Value)
+                    isDirty = true;
 
-            List<string> lines = File.ReadAllLines(mpvConfPath).ToList();
+            foreach (SettingBase i in MpvNetSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
 
-            foreach (var mpvSetting in DynamicSettings)
+            if (!isDirty)
-            {
+                return;
-                foreach (var line in lines.ToArray())
-                {
-                    string test = line.Replace("#", "").Replace(" ", "");
-                    if (test.StartsWith(mpvSetting.Alias + "="))
-                    {
-                        lines.Remove(line);
-                        foreach (var pair in mpvConf.ToArray())
-                            if (test.StartsWith(pair.Key + "="))
-                                mpvConf.Remove(pair.Key);
-                    }
-                }
-            }
 
-            foreach (var pair in mpvConf)
+            WriteToDisk(MpvConfPath, MpvConf, MpvSettingsDefinitions);
-            {
+            WriteToDisk(MpvNetConfPath, MpvNetConf, MpvNetSettingsDefinitions);
-                bool changed = false;
 
-                for (int i = 0; i < lines.Count; i++)
-                {
-                    if (lines[i].Contains("=") &&
-                        lines[i].Substring(0, lines[i].IndexOf("=")).Trim("# ".ToCharArray()) == pair.Key)
-                    {
-                        lines[i] = pair.Key + " = " + pair.Value;
-                        changed = true;
-                    }
-                }
-
-                if (!changed)
-                    lines.Add(pair.Key + " = " + pair.Value);
-            }
-
-            foreach (var mpvSetting in DynamicSettings)
-            {
-                foreach (var line in lines.ToArray())
-                {
-                    string test = line.Replace("#", "").Replace(" ", "");
-
-                    if (test.StartsWith(mpvSetting.Name + "=") && !mpvConf.ContainsKey(mpvSetting.Name))
-                        lines.Remove(line);
-                }
-            }
-
-            File.WriteAllText(mpvConfPath, String.Join(Environment.NewLine, lines));
             MessageBox.Show("Changes will be available on next startup of mpv(.net).",
                 Title, MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
+        void WriteToDisk(string filePath,
+                         Dictionary<string, string> confSettings,
+                         List<SettingBase> settings)
+        {
+            string content = "";
+
+            foreach (var i in Comments[filePath])
+                content += $"#{i.Key} = {i.Value}\r\n";
+
+            foreach (var setting in settings)
+            {
+                if ((setting.Value ?? "") != setting.Default)
+                    confSettings[setting.Name] = setting.Value;
+
+                if (confSettings.ContainsKey(setting.Name) &&
+                    (setting.Value ?? "") == setting.Default ||
+                    (setting.Value ?? "") == "")
+                {
+                    confSettings.Remove(setting.Name);
+                }
+            }
+
+            foreach (var i in confSettings)
+                content = content + $"{i.Key} = {i.Value}\r\n";
+
+            File.WriteAllText(filePath, content);
+        }
+
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             string activeFilter = "";
@@ -183,6 +229,7 @@ namespace mpvConfEdit
         
         private void MainWindow1_Loaded(object sender, RoutedEventArgs e)
         {
+            SearchControl.SearchTextBox.SelectAll();
             Keyboard.Focus(SearchControl.SearchTextBox);
         }
 
@@ -194,7 +241,7 @@ namespace mpvConfEdit
 
         private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            Process.Start(Path.GetDirectoryName(mpvConfPath));
+            Process.Start(Path.GetDirectoryName(MpvConfPath));
         }
 
         private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)

mpvConfEdit/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv(.net) conf edit")]
-[assembly: AssemblyCopyright("Copyright © 2017 stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.8.0.0")]

mpvConfEdit/SearchTextBoxUserControl.xaml

@@ -5,9 +5,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
-    <Grid x:Name="SearchTextBoxUserControl1" Background="White">
+    <Grid x:Name="SearchTextBoxUserControl1" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
-        <TextBlock x:Name="SearchTextBlock" Margin="5,2" Text="Find a setting" Foreground="LightSteelBlue" VerticalAlignment="Center" />
+        <TextBlock x:Name="HintTextBlock" Margin="5,2" Text="Find a setting" Foreground="LightSteelBlue" VerticalAlignment="Center" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
-        <TextBox Name="SearchTextBox" Height="25" Padding="1,2,0,0" BorderThickness="2" Background="Transparent" TextChanged="SearchTextBox_TextChanged" />
+        <TextBox Name="SearchTextBox" Height="25" Padding="1,2,0,0" BorderThickness="2" Background="Transparent" TextChanged="SearchTextBox_TextChanged" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" CaretBrush="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
-        <Button x:Name="SearchClearButton" Background="Transparent" HorizontalAlignment="Right" Margin="2,0,4,0" FontSize="5" Width="17" Height="17" Visibility="Hidden" Click="SearchClearButton_Click">╳</Button>
+        <Button x:Name="SearchClearButton" Background="Transparent" HorizontalAlignment="Right" Margin="2,0,4,0" FontSize="10" Width="17" Height="17" Visibility="Hidden" Click="SearchClearButton_Click" FontFamily="Marlett" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">r</Button>
     </Grid>
 </UserControl>

mpvConfEdit/SearchTextBoxUserControl.xaml.cs

@@ -21,7 +21,7 @@ namespace Controls
 
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            SearchTextBlock.Text = SearchTextBox.Text == "" ? "Find a setting" : "";
+            HintTextBlock.Text = SearchTextBox.Text == "" ? "Find a setting" : "";
 
             if (SearchTextBox.Text == "")
                 SearchClearButton.Visibility = Visibility.Hidden;

mpvConfEdit/app.manifest

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!--
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>

mpvConfEdit/mpvConf.toml

@@ -146,12 +146,38 @@ default = "100"
 filter = "Audio"
 help = "--volume=<integer> Set the startup volume. 0 means silence, 100 means no volume reduction or amplification. Negative values can be passed for compatibility, but are treated as 0. Since mpv 0.18.1, this always controls the internal mixer (aka \"softvol\"). Default: 100"
 
+[[settings]]
+name = "alang"
+default = ""
+filter = "Audio"
+help = "--alang=<languagecode[,languagecode,...]> Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also --aid.\n\nExamples\n\nmpv dvd://1 --alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv --alang=jpn example.mkv plays a Matroska file with Japanese audio."
+
+[[settings]]
+name = "audio-file-auto"
+default = "no"
+filter = "Audio"
+help = "--audio-file-auto=<no|exact|fuzzy|all>, --no-audio-file-auto Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
+options = [{ name = "no",    help = "Don't automatically load external audio files (default)." },
+           { name = "exact", help = "Load the media filename with audio file extension." },
+           { name = "fuzzy", help = "Load all audio files containing media filename." },
+           { name = "all",   help = "Load all audio files in the current and --audio-file-paths directories." }]
+
 [[settings]]
 name = "slang"
 default = ""
 filter = "Subtitle"
 help = "--slang=<languagecode[,languagecode,...]> Specify a priority list of subtitle languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska uses ISO 639-2 three letter language codes while OGM uses a free-form identifier. See also --sid."
 
+[[settings]]
+name = "sub-auto"
+default = "exact"
+filter = "Subtitle"
+help = "--sub-auto=<no|exact|fuzzy|all>, --no-sub-auto Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
+options = [{ name = "no",    help = "Don't automatically load external subtitle files." },
+           { name = "exact", help = "Load the media filename with subtitle file extension (Default)." },
+           { name = "fuzzy", help = "Load all subs containing media filename." },
+           { name = "all",   help = "Load all subs in the current and --sub-file-paths directories." }]
+
 [[settings]]
 name = "screen"
 default = ""
@@ -163,18 +189,31 @@ name = "osd-playing-msg"
 default = ""
 width = 300
 filter = "Screen"
-help = "--osd-playing-msg=<value> Show a message on OSD when playback starts. The string is expanded for properties, e.g. --osd-playing-msg='file: ${filename}' will show the message file: followed by a space and the currently played filename.\n\nFor more information visit:"
+help = "--osd-playing-msg=<value> Show a message on OSD when playback starts. The string is expanded for properties, e.g. --osd-playing-msg='file: ${filename}' will show the message file: followed by a space and the currently played filename. For more information visit:"
 helpurl = "https://mpv.io/manual/master/#property-expansion"
 
 [[settings]]
 name = "fullscreen"
-alias = "fs"
 default = "no"
 filter = "Screen"
 help = "--fullscreen=<yes|no>, fs=<yes|no> Start the player in fullscreen mode. Default: no."
 options = [{ name = "yes" },
            { name = "no" }]
 
+[[settings]]
+name = "screenshot-directory"
+default = ""
+width = 500
+folder = true
+filter = "Screen"
+help = "--screenshot-directory=<value> Store screenshots in this directory. This path is joined with the filename generated by --screenshot-template. If the template filename is already absolute, the directory is ignored.\n\nIf the directory does not exist, it is created on the first screenshot. If it is not a directory, an error is generated when trying to write a screenshot.\n\nThis option is not set by default, and thus will write screenshots to the directory from which mpv was started. In pseudo-gui mode (see PSEUDO GUI MODE), this is set to the desktop."
+
+[[settings]]
+name = "autofit"
+default = "50%"
+filter = "Screen"
+help = "--autofit=<percent value> Set the initial window size in percent. Please note that this setting is only partly implemented in mpv.net, accepted are only integer values with percent sign added. Default: 50%."
+
 [[settings]]
 name = "keep-open-pause"
 default = "yes"
@@ -194,7 +233,6 @@ options = [{ name = "yes",    help = "Don't terminate if the current file is the
 
 [[settings]]
 name = "loop-file"
-alias = "loop"
 default = ""
 filter = "Playback"
 help = "--loop-file=<N|inf|no>, loop=<N|inf|no> Loop a single file N times. inf means forever, no means normal playback. For compatibility, --loop-file and --loop-file=yes are also accepted, and are the same as --loop-file=inf.\n\nThe difference to --loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file.\n\n--loop is an alias for this option."
@@ -207,14 +245,6 @@ help = "--save-position-on-quit=<yes|no> Always save the current playback positi
 options = [{ name = "yes" },
            { name = "no" }]
 
-[[settings]]
-name = "screenshot-directory"
-default = ""
-width = 500
-folder = true
-filter = "Screen"
-help = "--screenshot-directory=<value> Store screenshots in this directory. This path is joined with the filename generated by --screenshot-template. If the template filename is already absolute, the directory is ignored.\n\nIf the directory does not exist, it is created on the first screenshot. If it is not a directory, an error is generated when trying to write a screenshot.\n\nThis option is not set by default, and thus will write screenshots to the directory from which mpv was started. In pseudo-gui mode (see PSEUDO GUI MODE), this is set to the desktop."
-
 [[settings]]
 name = "input-ar-delay"
 default = ""
@@ -227,12 +257,6 @@ default = ""
 filter = "Input"
 help = "--input-ar-rate=<integer> Number of key presses to generate per second on autorepeat."
 
-[[settings]]
-name = "alang"
-default = ""
-filter = "Audio"
-help = "--alang=<languagecode[,languagecode,...]> Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also --aid.\n\nExamples\n\nmpv dvd://1 --alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv --alang=jpn example.mkv plays a Matroska file with Japanese audio."
-
 [[settings]]
 name = "hr-seek"
 default = "absolute"
@@ -256,23 +280,3 @@ name = "loop-playlist"
 default = ""
 filter = "Playback"
 help = "--loop-playlist=<N|inf|force|no>, --loop-playlist Loops playback N times. A value of 1 plays it one time (default), 2 two times, etc. inf means forever. no is the same as 1 and disables looping. If several files are specified on command line, the entire playlist is looped. --loop-playlist is the same as  --loop-playlist=inf.\n\nThe force mode is like inf, but does not skip playlist entries which have been marked as failing. This means the player might waste CPU time trying to loop a file that doesn't exist. But it might be useful for playing webradios under very bad network conditions."
-
-[[settings]]
-name = "audio-file-auto"
-default = "no"
-filter = "Audio"
-help = "--audio-file-auto=<no|exact|fuzzy|all>, --no-audio-file-auto Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
-options = [{ name = "no",    help = "Don't automatically load external audio files (default)." },
-           { name = "exact", help = "Load the media filename with audio file extension." },
-           { name = "fuzzy", help = "Load all audio files containing media filename." },
-           { name = "all",   help = "Load all audio files in the current and --audio-file-paths directories." }]
-
-[[settings]]
-name = "sub-auto"
-default = "exact"
-filter = "Subtitle"
-help = "--sub-auto=<no|exact|fuzzy|all>, --no-sub-auto Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
-options = [{ name = "no",    help = "Don't automatically load external subtitle files." },
-           { name = "exact", help = "Load the media filename with subtitle file extension (Default)." },
-           { name = "fuzzy", help = "Load all subs containing media filename." },
-           { name = "all",   help = "Load all subs in the current and --sub-file-paths directories." }]

mpvConfEdit/mpvConfEdit.csproj

@@ -44,9 +44,13 @@
   <PropertyGroup>
     <ApplicationIcon>mpv.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -66,6 +70,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Controls.cs" />
     <Compile Include="DynamicGUI\DynamicGUI.cs" />
     <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
       <DependentUpon>OptionSettingControl.xaml</DependentUpon>
@@ -120,6 +125,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.manifest" />
+    <None Include="mpvNetConf.toml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -129,7 +138,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="mpvConfEdit.toml">
+    <None Include="mpvConf.toml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

mpvConfEdit/mpvNetConf.toml

@@ -0,0 +1,8 @@
+[[settings]]
+name = "dark-mode"
+default = "system"
+filter = "mpv.net"
+help = "Enables a dark theme."
+options = [{ name = "always" },
+           { name = "system" , help = "Windows 10+" },
+		   { name = "never" }]

mpvInputEdit/App.xaml

@@ -1,7 +1,7 @@
 <Application x:Class="mpvInputEdit.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:mpvInputEdit"
+             xmlns:Controls="clr-namespace:Controls"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <Style TargetType="TextBox">
@@ -19,7 +19,7 @@
                                 <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static SystemParameters.WindowGlassBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static Controls:Controls.ThemeBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>

mpvInputEdit/Controls.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Controls
+{
+    class Controls
+    {
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}

mpvInputEdit/InputWindow.xaml.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
@@ -10,7 +9,6 @@ namespace mpvInputEdit
 {
     public partial class InputWindow : Window
     {
-        string InputString = "";
         public InputItem InputItem { get; set; }
         public string NewKey { get; set; } = "";
 
@@ -32,22 +30,21 @@ namespace mpvInputEdit
 
         void OnKeyUp(WF.KeyEventArgs e)
         {
-            if (e.KeyCode == WF.Keys.None) return;
-            char c = Convert.ToChar(e.KeyCode);
-            string text = InputString;
-
             if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
-                e.KeyCode == WF.Keys.Menu)
+                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)
-            {
-                return;
-            }
 
-            if (text == "")
+                return;
-            {
+
-                text = e.KeyCode.ToString();
+            string text = "";
-                if (text.Length == 1)
+            uint charValue = MapVirtualKey((uint)e.KeyCode, 2);
-                    text = text.ToLowerInvariant();
+
+            if (charValue == 0 || (charValue & 1 << 31) == 1 << 31)
+                text = e.KeyCode.ToString().Trim();
+            else
+                try {
+                    text = Convert.ToChar(charValue).ToString().ToLower().Trim();
                 }
+                catch {}
 
             for (int i = 0; i < 13; i++)
                 if ("D" + i.ToString() == text)
@@ -90,14 +87,6 @@ namespace mpvInputEdit
                     text = "Esc"; break;
                 case WF.Keys.PrintScreen:
                     text = "Print"; break;
-                case WF.Keys.Right:
-                    text = "Right"; break;
-                case WF.Keys.Left:
-                    text = "Left"; break;
-                case WF.Keys.Up:
-                    text = "Up"; break;
-                case WF.Keys.Down:
-                    text = "Down"; break;
                 case WF.Keys.Play:
                     text = "Play"; break;
                 case WF.Keys.Pause:
@@ -130,20 +119,24 @@ namespace mpvInputEdit
                     text = "Cancel"; break;
             }
 
-            if (text == "#")
+            bool shiftWasHandled = false;
-                text = "Sharp";
 
             bool isAlt   = GetKeyState(18) < (short)0;
             bool isShift = GetKeyState(16) < (short)0;
             bool isCtrl  = GetKeyState(17) < (short)0;
 
-            if (!(isAlt && isCtrl && !isShift) && !(isShift && !isAlt && !isCtrl && !int.TryParse(text.Replace("F", ""), out int value)))
+            if (text.Length == 1 && isShift && text[0] != GetModifiedKey(text[0]))
             {
-                if (isAlt) text = "Alt+" + text;
+                text = GetModifiedKey(text[0]).ToString();
-                if (isShift) text = "Shift+" + text;
+                shiftWasHandled = true;
-                if (isCtrl) text = "Ctrl+" + text;
             }
 
+            if (text == "#") text = "Sharp";
+
+            if (isAlt) text = "Alt+" + text;
+            if (isShift && !shiftWasHandled) text = "Shift+" + text;
+            if (isCtrl) text = "Ctrl+" + text;
+
             if (!string.IsNullOrEmpty(text))
                 SetKey(text);
         }
@@ -155,13 +148,8 @@ namespace mpvInputEdit
             KeyLabel.Content = key;
         }
 
-        void OnKeyPress(WF.KeyPressEventArgs e)
+        [DllImport("user32.dll")]
-        {
+        static extern uint MapVirtualKey(uint uCode, uint uMapType);
-            if (char.IsControl(e.KeyChar))
-                InputString = "";
-            else
-                InputString = e.KeyChar.ToString();
-        }
 
         public static WF.Keys ModifierKeys {
             get {
@@ -176,29 +164,31 @@ namespace mpvInputEdit
             }
         }
 
+        public static char GetModifiedKey(char c)
+        {
+            short vkKeyScanResult = VkKeyScan(c);
+
+            if (vkKeyScanResult == -1)
+                return c;
+
+            uint code = (uint)vkKeyScanResult & 0xff;
+            byte[] b = new byte[256];
+            b[0x10] = 0x80;
+            uint r;
+
+            if (1 != ToAscii(code, code, b, out r, 0))
+                return c;
+
+            return (char)r;
+        }
+
         void ProcessKeyEventArgs(ref WF.Message m)
         {
-            int WM_CHAR = 258, WM_SYSCHAR = 262, /*WM_KEYDOWN = 256, WM_SYSKEYDOWN = 260,*/
+            int WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
-                WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
-
-            IntPtr newWParam = IntPtr.Zero;
-            WF.KeyEventArgs ke = null;
-            WF.KeyPressEventArgs kpe = null;
-
-            if (m.Msg == WM_CHAR || m.Msg == WM_SYSCHAR)
-            {
-                kpe = new WF.KeyPressEventArgs(unchecked((char)(long)m.WParam));
-                OnKeyPress(kpe);
-                newWParam = (IntPtr)kpe.KeyChar;
-            }
-            else
-            {
-                ke = new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys);
 
             if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
-                    OnKeyUp(ke);
+                OnKeyUp(new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
-
+            else if (m.Msg == WM_APPCOMMAND)
-                if (m.Msg == WM_APPCOMMAND)
             {
                 switch ((AppCommand)(m.LParam.ToInt32() >> 16))
                 {
@@ -248,10 +238,6 @@ namespace mpvInputEdit
             }
         }
 
-            if (kpe != null)
-                m.WParam = newWParam;
-        }
-
         internal enum AppCommand
         {
             MEDIA_CHANNEL_DOWN = 52,
@@ -273,6 +259,16 @@ namespace mpvInputEdit
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         public static extern short GetKeyState(int keyCode);
 
+        [DllImport("user32.dll")]
+        static extern short VkKeyScan(char c);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern int ToAscii(uint     uVirtKey,
+                                  uint     uScanCode,
+                                  byte[]   lpKeyState,
+                                  out uint lpChar,
+                                  uint     flags);
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);

mpvInputEdit/MainWindow.xaml.cs

@@ -37,15 +37,17 @@ namespace mpvInputEdit
             string searchText = SearchControl.SearchTextBox.Text.ToLower();
             if (searchText == "") return true;
 
-            if (searchText.StartsWith("i ") || searchText.StartsWith("i:"))
+            if (searchText.StartsWith("i ") || searchText.StartsWith("i:") || searchText.Length == 1)
             {
+                if (searchText.Length > 1)
                     searchText = searchText.Substring(2).Trim();
 
                 if (searchText.Length < 3)
                     return item.Input.ToLower().Replace("ctrl+", "").Replace("shift+", "").Replace("alt+", "").Contains(searchText);
                 else
                     return item.Input.ToLower().Contains(searchText);
-            } else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
+            }
+            else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
                 return item.Menu.ToLower().Contains(searchText.Substring(2).Trim());
             else if (searchText.StartsWith("c ") || searchText.StartsWith("c:"))
                 return item.Command.ToLower().Contains(searchText.Substring(2).Trim());
@@ -86,7 +88,7 @@ namespace mpvInputEdit
                 Directory.CreateDirectory(backupDir);
 
             if (File.Exists(App.InputConfPath))
-                File.Copy(App.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf");
+                File.Copy(App.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf", true);
 
             string text = "\r\n" + Properties.Settings.Default.input_conf_help + "\r\n\r\n";
 

mpvInputEdit/Properties/AssemblyInfo.cs

@@ -8,11 +8,11 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv(.net) input edit")]
-[assembly: AssemblyDescription("mpv(.net) key bindings editor")]
+[assembly: AssemblyDescription("mpv(.net) key and mouse bindings editor")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv(.net) input edit")]
-[assembly: AssemblyCopyright("Copyright © 2017 stax76")]
+[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.5.0.0")]

mpvInputEdit/SearchTextBoxUserControl.xaml.cs

@@ -29,7 +29,7 @@ namespace Controls
                 SearchClearButton.Visibility = Visibility.Visible;
 
             if (SearchTextBox.Text == "?")
-                MessageBox.Show("Filtering works by searching in the Input, Menu and Command but it's possible to reduce the filter scope to either of Input, Menu or Command by prefixing as follows:\n\ni <input search>\ni: <input search>\n\nm <menu search>\nm: <menu search>\n\nc <command search>\nc: <command search>", "Filtering", MessageBoxButton.OK, MessageBoxImage.Information);
+                MessageBox.Show("Filtering works by searching in the Input, Menu and Command but it's possible to reduce the filter scope to either of Input, Menu or Command by prefixing as follows:\n\ni <input search>\ni: <input search>\n\nm <menu search>\nm: <menu search>\n\nc <command search>\nc: <command search>\n\nIf only one character is entered the search will be performed only in the input.", "Filtering", MessageBoxButton.OK, MessageBoxImage.Information);
         }
     }
 }

mpvInputEdit/app.manifest

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!--
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
+
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+</assembly>

mpvInputEdit/mpvInputEdit.csproj

@@ -38,6 +38,9 @@
   <PropertyGroup>
     <ApplicationIcon>mpv.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -60,6 +63,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Controls.cs" />
     <Compile Include="SearchTextBoxUserControl.xaml.cs">
       <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
     </Compile>
@@ -106,6 +110,10 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="..\README.md">
+      <Link>README.md</Link>
+    </None>
+    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>