-

mpv.net/Command.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-
+using System.Windows.Interop;
 using VBNET;
 
 namespace mpvnet
@@ -63,12 +63,20 @@ namespace mpvnet
 
         public static void show_input_editor(string[] args)
         {
-            Process.Start(Application.StartupPath + "\\mpvInputEdit.exe");
+            MainForm.Instance.Invoke(new Action(() => {
+                InputWindow w = new InputWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
         public static void show_conf_editor(string[] args)
         {
-            Process.Start(Application.StartupPath + "\\mpvConfEdit.exe");
+            MainForm.Instance.Invoke(new Action(() => {
+                ConfWindow w = new ConfWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
         public static void show_history(string[] args)
@@ -170,7 +178,7 @@ namespace mpvnet
 
         public static void load_sub(string[] args)
         {
-            MainForm.Instance.BeginInvoke(new Action(() => {
+            MainForm.Instance.Invoke(new Action(() => {
                 using (var d = new OpenFileDialog())
                 {
                     d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));
@@ -185,7 +193,7 @@ namespace mpvnet
 
         public static void load_audio(string[] args)
         {
-            MainForm.Instance.BeginInvoke(new Action(() => {
+            MainForm.Instance.Invoke(new Action(() => {
                 using (var d = new OpenFileDialog())
                 {
                     d.InitialDirectory = Path.GetDirectoryName(mp.get_property_string("path", false));

mpv.net/Controls/SearchTextBoxUserControl.xaml

@@ -0,0 +1,13 @@
+<UserControl x:Class="Controls.SearchTextBoxUserControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid x:Name="SearchTextBoxUserControl1" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+        <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" 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="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>

mpv.net/Controls/SearchTextBoxUserControl.xaml.cs

@@ -0,0 +1,47 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace Controls
+{
+    public partial class SearchTextBoxUserControl : UserControl
+    {
+        public SearchTextBoxUserControl()
+        {
+            InitializeComponent();
+        }
+
+        public string Text { get => SearchTextBox.Text; set => SearchTextBox.Text = value; }
+
+        private string _HintText;
+
+        public string HintText {
+            get => _HintText;
+            set {
+                _HintText = value;
+                UpdateControls();
+            }
+        }
+
+        private void SearchClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            SearchTextBox.Text = "";
+            Keyboard.Focus(SearchTextBox);
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateControls();
+        }
+
+        void UpdateControls()
+        {
+            HintTextBlock.Text = SearchTextBox.Text == "" ? HintText : "";
+
+            if (SearchTextBox.Text == "")
+                SearchClearButton.Visibility = Visibility.Hidden;
+            else
+                SearchClearButton.Visibility = Visibility.Visible;
+        }
+    }
+}

mpv.net/DynamicGUI/DynamicGUI.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Windows.Documents;
+using System.Windows.Navigation;
+
+using Tommy;
+
+namespace DynamicGUI
+{
+    public class Settings
+    {
+        public static List<SettingBase> LoadSettings(string content)
+        {
+            TomlTable table;
+            using (StringReader reader = new StringReader(content))
+                table = TOML.Parse(reader);
+            List<SettingBase> settingsList = new List<SettingBase>(); 
+
+            foreach (TomlTable setting in table["settings"])
+            {
+                SettingBase baseSetting = null;
+
+                if (setting.HasKey("options"))
+                {
+                    OptionSetting optionSetting = new OptionSetting();
+                    baseSetting = optionSetting;
+                    optionSetting.Default = setting["default"];
+                    optionSetting.Value = optionSetting.Default;
+                    optionSetting.StartValue = optionSetting.Default;
+
+                    foreach (TomlTable option in setting["options"])
+                    {
+                        var opt = new OptionSettingOption();
+                        opt.Name = option["name"];
+                        if (option.HasKey("help"))
+                            opt.Help = option["help"];
+                        if (option.HasKey("text"))
+                            opt.Text = option["text"];
+                        else if (opt.Name == optionSetting.Default)
+                            opt.Text = opt.Name + " (Default)";
+                        opt.OptionSetting = optionSetting;
+                        optionSetting.Options.Add(opt);
+                    }
+                }
+                else if (setting["default"].IsString)
+                {
+                    StringSetting stringSetting = new StringSetting();
+                    baseSetting = stringSetting;
+                    stringSetting.Default = setting["default"];
+                    if (setting.HasKey("folder")) stringSetting.IsFolder = true;
+                }
+
+                baseSetting.Name = setting["name"];
+                baseSetting.Filter = setting["filter"];
+                if (setting.HasKey("help")) baseSetting.Help = setting["help"];
+                if (setting.HasKey("helpurl")) baseSetting.HelpURL = setting["helpurl"];
+                if (setting.HasKey("width")) baseSetting.Width = setting["width"];
+                settingsList.Add(baseSetting);
+            }
+            return settingsList;
+        }
+    }
+
+    public abstract class SettingBase
+    {
+        public string Name { 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; }
+    }
+
+    public class StringSetting : SettingBase
+    {
+        public bool IsFolder { get; set; }
+    }
+
+    public class OptionSetting : SettingBase
+    {
+        public List<OptionSettingOption> Options = new List<OptionSettingOption>();
+    }
+
+    public class OptionSettingOption
+    {
+        public string Name { get; set; }
+        public string Help { get; set; }
+
+        public OptionSetting OptionSetting { get; set; }
+
+        private string _Text;
+
+        public string Text
+        {
+            get => string.IsNullOrEmpty(_Text) ? Name : _Text;
+            set => _Text = value;
+        }
+
+        public bool IsChecked
+        {
+            get => OptionSetting.Value == Name ;
+            set {
+                if (value)
+                    OptionSetting.Value = Name;
+            }
+        }
+    }
+
+    interface ISettingControl
+    {
+        bool Contains(string searchString);
+        SettingBase SettingBase { get; }
+    }
+
+    public class HyperlinkEx : Hyperlink
+    {
+        private void HyperLinkEx_RequestNavigate(object sender, RequestNavigateEventArgs e)
+        {
+            Process.Start(e.Uri.AbsoluteUri);
+        }
+
+        public void SetURL(string url)
+        {
+            if (string.IsNullOrEmpty(url)) return;
+            NavigateUri = new Uri(url);
+            RequestNavigate += HyperLinkEx_RequestNavigate;
+            Inlines.Clear();
+            Inlines.Add(url);
+        }
+    }
+}

mpv.net/DynamicGUI/OptionSettingControl.xaml

@@ -0,0 +1,28 @@
+<UserControl x:Name="OptionSettingControl1" x:Class="DynamicGUI.OptionSettingControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DynamicGUI"
+             mc:Ignorable="d" 
+             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="{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" 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" 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" 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>
+        </StackPanel>
+    </Grid>
+</UserControl>

mpv.net/DynamicGUI/OptionSettingControl.xaml.cs

@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DynamicGUI
+{
+    public partial class OptionSettingControl : UserControl, ISettingControl
+    {
+        private OptionSetting OptionSetting;
+
+        public OptionSettingControl(OptionSetting optionSetting)
+        {
+            OptionSetting = optionSetting;
+            InitializeComponent();
+            TitleTextBox.Text = optionSetting.Name;
+            HelpTextBox.Text = optionSetting.Help;
+            ItemsControl.ItemsSource = optionSetting.Options;
+            Link.SetURL(optionSetting.HelpURL);
+            if (string.IsNullOrEmpty(optionSetting.HelpURL))
+                LinkTextBlock.Visibility = Visibility.Collapsed;
+        }
+
+        private string _SearchableText;
+
+        public string SearchableText {
+            get {
+                if (_SearchableText is null)
+                {
+                    _SearchableText = TitleTextBox.Text + HelpTextBox.Text;
+                    foreach (var i in OptionSetting.Options)
+                        _SearchableText += i.Text + i.Help + i.Name;
+                    _SearchableText = _SearchableText.ToLower();
+                }
+                return _SearchableText;
+            }
+        }
+
+        public SettingBase SettingBase => OptionSetting;
+        public bool Contains(string searchString) => SearchableText.Contains(searchString.ToLower());
+    }
+}

mpv.net/DynamicGUI/StringSettingControl.xaml

@@ -0,0 +1,27 @@
+<UserControl x:Name="StringSettingControl1" x:Class="DynamicGUI.StringSettingControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DynamicGUI"
+             mc:Ignorable="d" 
+             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="{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" 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" 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>
+        </StackPanel>
+    </Grid>
+</UserControl>

mpv.net/DynamicGUI/StringSettingControl.xaml.cs

@@ -0,0 +1,57 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DynamicGUI
+{
+    public partial class StringSettingControl : UserControl, ISettingControl
+    {
+        private StringSetting StringSetting;
+        
+        public StringSettingControl(StringSetting stringSetting)
+        {
+            StringSetting = stringSetting;
+            InitializeComponent();
+            TitleTextBox.Text = stringSetting.Name;
+            HelpTextBox.Text = stringSetting.Help;
+            ValueTextBox.Text = stringSetting.Value;
+            if (stringSetting.Width > 0)
+                ValueTextBox.Width = stringSetting.Width;
+            if (!StringSetting.IsFolder)
+                Button.Visibility = Visibility.Hidden;
+            Link.SetURL(StringSetting.HelpURL);
+            if (string.IsNullOrEmpty(stringSetting.HelpURL))
+                LinkTextBlock.Visibility = Visibility.Collapsed;
+        }
+
+        private string _SearchableText;
+
+        public string SearchableText {
+            get {
+                if (_SearchableText is null)
+                    _SearchableText = (TitleTextBox.Text + HelpTextBox.Text +ValueTextBox.Text).ToLower();
+
+                return _SearchableText;
+            }
+        }
+
+        public bool Contains(string searchString) => SearchableText.Contains(searchString.ToLower());
+        public SettingBase SettingBase => StringSetting;
+
+        public string Text
+        {
+            get => StringSetting.Value;
+            set => StringSetting.Value = value;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            using (var d = new System.Windows.Forms.FolderBrowserDialog())
+            {
+                d.Description = "Choose a folder.";
+                d.SelectedPath = ValueTextBox.Text;
+                if (d.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                    ValueTextBox.Text = d.SelectedPath;
+            }
+        }
+    }
+}

mpv.net/License.txt

@@ -1,10 +0,0 @@
-MIT License
-
-Copyright (c) 2017 stax76
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and ssociated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

mpv.net/MainForm.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 
 using VBNET;
 using System.Globalization;
+using System.Diagnostics;
 
 namespace mpvnet
 {
@@ -42,8 +43,9 @@ namespace mpvnet
                 AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
                 Application.ThreadException += Application_ThreadException;
                 Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
-
                 Instance = this;
+                WPF.WPF.Init();
+                System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
                 Hwnd = Handle;
                 MinimumSize = new Size(FontHeight * 16, FontHeight * 9);
                 Text += " " + Application.ProductVersion;
@@ -291,7 +293,7 @@ namespace mpvnet
                 lines = content.Split("\r\n".ToCharArray()).ToList();
             else
             {
-                lines = Properties.Resources.input_conf.Split("\r\n".ToCharArray()).ToList();
+                lines = Properties.Resources.inputConf.Split("\r\n".ToCharArray()).ToList();
                 
                 foreach (string i in content.Split("\r\n".ToCharArray()))
                 {
@@ -397,6 +399,8 @@ namespace mpvnet
                 case 0x0202: // WM_LBUTTONUP
                 case 0x0100: // WM_KEYDOWN
                 case 0x0101: // WM_KEYUP
+                case 0x0104: // WM_SYSKEYDOWN
+                case 0x0105: // WM_SYSKEYUP
                 case 0x020A: // WM_MOUSEWHEEL
                     if (mp.MpvWindowHandle != IntPtr.Zero)
                         Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
@@ -405,14 +409,6 @@ namespace mpvnet
                     if (mp.MpvWindowHandle != IntPtr.Zero)
                         Native.PostMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
                     break;
-                case 0x0104: // WM_SYSKEYDOWN:
-                    if (mp.MpvWindowHandle != IntPtr.Zero)
-                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
-                    break;
-                case 0x0105: // WM_SYSKEYUP:
-                    if (mp.MpvWindowHandle != IntPtr.Zero)
-                        Native.SendMessage(mp.MpvWindowHandle, m.Msg, m.WParam, m.LParam);
-                    break;
                 case 0x203: // Native.WM.LBUTTONDBLCLK
                     if (!IsMouseInOSC())
                         mp.command_string("cycle fullscreen");

mpv.net/Misc.cs

@@ -1,12 +1,17 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
 using System.Windows.Forms;
 
+using Microsoft.Win32;
+
 namespace mpvnet
 {
     public class Misc
@@ -138,4 +143,73 @@ namespace mpvnet
         public string Type { get; set; }
         public int    ID   { get; set; }
     }
+
+    [Serializable]
+    public class InputItem : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+        public string Menu { get; set; } = "";
+        public string Command { get; set; } = "";
+
+        public InputItem() { }
+
+        public InputItem(SerializationInfo info, StreamingContext context) { }
+
+        private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private string _Input = "";
+
+        public string Input {
+            get => _Input;
+            set {
+                _Input = value;
+                NotifyPropertyChanged();
+            }
+        }
+
+        private static ObservableCollection<InputItem> _InputItems;
+
+        public static ObservableCollection<InputItem> InputItems {
+            get {
+                if (_InputItems is null)
+                {
+                    _InputItems = new ObservableCollection<InputItem>();
+
+                    if (File.Exists(mp.InputConfPath))
+                    {
+                        foreach (string line in File.ReadAllLines(mp.InputConfPath))
+                        {
+                            string l = line.Trim();
+                            if (l.StartsWith("#")) continue;
+                            if (!l.Contains(" ")) continue;
+                            InputItem item = new InputItem();
+                            item.Input = l.Substring(0, l.IndexOf(" "));
+                            if (item.Input == "") continue;
+                            l = l.Substring(l.IndexOf(" ") + 1);
+
+                            if (l.Contains("#menu:"))
+                            {
+                                item.Menu = l.Substring(l.IndexOf("#menu:") + 6).Trim();
+                                l = l.Substring(0, l.IndexOf("#menu:"));
+
+                                if (item.Menu.Contains(";"))
+                                    item.Menu = item.Menu.Substring(item.Menu.IndexOf(";") + 1).Trim();
+                            }
+
+                            item.Command = l.Trim();
+                            if (item.Command == "")
+                                continue;
+                            if (item.Command.ToLower() == "ignore")
+                                item.Command = "";
+                            _InputItems.Add(item);
+                        }
+                    }
+                }
+                return _InputItems;
+            }
+        }
+    }
 }

mpv.net/Native.cs

@@ -14,11 +14,11 @@ namespace mpvnet
         [DllImport("user32.dll", CharSet = CharSet.Unicode)]
         public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
 
-        [DllImport("user32.dll", CharSet = CharSet.Auto)]
-        public static extern string SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 
         [DllImport("user32.dll")]
         public static extern void ReleaseCapture();

mpv.net/Properties/Resources.Designer.cs

@@ -72,13 +72,35 @@ namespace mpvnet.Properties {
         ///
         /// # The defaults of this file can be found at:
         ///
-        /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt
+        /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
         ///
-        /// # the [rest of string was truncated]";.
+        /// # the  [rest of string was truncated]";.
         /// </summary>
-        internal static string input_conf {
+        internal static string inputConf {
             get {
-                return ResourceManager.GetString("input_conf", resourceCulture);
+                return ResourceManager.GetString("inputConf", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 
+        /// # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+        /// # and it also defines the context menu of mpv.net. mpv.net has an input
+        /// # editor and an conf editor as alternatives to editing conf text files.
+        /// # The input and conf editors can be found in mpv.net&apos;s context menu at:
+        ///
+        /// # Settings &gt; Show Config Editor
+        /// # Settings &gt; Show Input Editor
+        ///
+        /// # The defaults of this file can be found at:
+        ///
+        /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+        ///
+        /// # the  [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string inputConfHeader {
+            get {
+                return ResourceManager.GetString("inputConfHeader", resourceCulture);
             }
         }
         
@@ -98,9 +120,41 @@ namespace mpvnet.Properties {
         ///screenshot-directory = ~~desktop/
         ///input-default-bindings = no.
         /// </summary>
-        internal static string mpv_conf {
+        internal static string mpvConf {
             get {
-                return ResourceManager.GetString("mpv_conf", resourceCulture);
+                return ResourceManager.GetString("mpvConf", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to [[settings]]
+        ///name = &quot;hwdec&quot;
+        ///default = &quot;no&quot;
+        ///filter = &quot;Video&quot;
+        ///helpurl = &quot;https://mpv.io/manual/master/#options-hwdec&quot;
+        ///help = &quot;--hwdec=&lt;mode&gt; Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:&quot;
+        ///options = [{ name = &quot;no&quot;,           help = &quot;always use software decoding (Default)&quot; },
+        ///           { name = &quot;aut [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string mpvConfToml {
+            get {
+                return ResourceManager.GetString("mpvConfToml", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to [[settings]]
+        ///name = &quot;dark-mode&quot;
+        ///default = &quot;system&quot;
+        ///filter = &quot;mpv.net&quot;
+        ///help = &quot;Enables a dark theme.&quot;
+        ///options = [{ name = &quot;always&quot; },
+        ///           { name = &quot;system&quot; , help = &quot;Windows 10+&quot; },
+        ///		   { name = &quot;never&quot; }].
+        /// </summary>
+        internal static string mpvNetConfToml {
+            get {
+                return ResourceManager.GetString("mpvNetConfToml", resourceCulture);
             }
         }
     }

mpv.net/Properties/Resources.resx

@@ -118,10 +118,19 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="input_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\input.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  <data name="inputConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="mpv_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mpv.conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  <data name="inputConfHeader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\inputConfHeader.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="mpvNetConfToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\mpvNetConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>

mpv.net/Resources/inputConf.txt

@@ -9,11 +9,11 @@
 
  # The defaults of this file can be found at:
 
- # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
 
  # the defaults of mpv can be found at:
 
- # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+ # https://github.com/mpv-player/mpv/blob/master/etc/inputConf
 
  # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
  # which disables mpv's input defaults. Every line in this file begins with a
@@ -145,8 +145,8 @@
  _ 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
- _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/input.conf #menu: Help > Show mpv default keys
- _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt #menu: Help > Show mpv.net default keys
+ _ script-message mpv.net shell-execute https://github.com/mpv-player/mpv/blob/master/etc/inputConf #menu: Help > Show mpv default keys
+ _ script-message mpv.net shell-execute https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt #menu: Help > Show mpv.net default keys
  _ script-message mpv.net shell-execute https://mpv-net.github.io/mpv.net-web-site/ #menu: Help > Show mpv.net web site
 
  _ ignore           #menu: -

mpv.net/Resources/inputConfHeader.txt

@@ -0,0 +1,25 @@
+
+ # This file defines the input (keys and mouse) bindings of mpv and mpv.net
+ # and it also defines the context menu of mpv.net. mpv.net has an input
+ # editor and an conf editor as alternatives to editing conf text files.
+ # The input and conf editors can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # the defaults of mpv can be found at:
+
+ # https://github.com/mpv-player/mpv/blob/master/etc/inputConf
+
+ # mpv.net's defaults of mpv.conf contain: 'input-default-bindings = no'
+ # which disables mpv's input defaults. Every line in this file begins with a
+ # space character to make it easier to do a text search, so if you want to know
+ # if 'o' has already a binding you can make a text search on ' o '.
+
+ # mpv input commands: https://github.com/stax76/mpv.net/wiki/mpv-input-commands
+
+ # mpv input keys:     https://github.com/stax76/mpv.net/wiki/mpv-input-keys

mpv.net/Resources/mpvConfToml.txt

@@ -0,0 +1,282 @@
+[[settings]]
+name = "hwdec"
+default = "no"
+filter = "Video"
+helpurl = "https://mpv.io/manual/master/#options-hwdec"
+help = "--hwdec=<mode> Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:"
+options = [{ name = "no",           help = "always use software decoding (Default)" },
+           { name = "auto",         help = "enable best hw decoder (see below)" },
+           { name = "yes",          help = "exactly the same as auto" },
+           { name = "auto-copy",    help = "enable best hw decoder with copy-back (see below)" },
+           { name = "dxva2",        help = "requires --vo=gpu with --gpu-context=d3d11, --gpu-context=angle or --gpu-context=dxinterop (Windows only)" },
+           { name = "dxva2-copy",   help = "copies video back to system RAM (Windows only)" },
+           { name = "d3d11va",      help = "requires --vo=gpu with --gpu-context=d3d11 or --gpu-context=angle (Windows 8+ only)" },
+           { name = "d3d11va-copy", help = "copies video back to system RAM (Windows 8+ only)" },
+           { name = "cuda",         help = "requires --vo=gpu (Any platform CUDA is available)" },
+           { name = "cuda-copy",    help = "copies video back to system RAM (Any platform CUDA is available)" },
+           { name = "nvdec",        help = "requires --vo=gpu (Any platform CUDA is available)" },
+           { name = "nvdec-copy",   help = "copies video back to system RAM (Any platform CUDA is available)" },
+           { name = "crystalhd",    help = "copies video back to system RAM (Any platform supported by hardware)" },
+           { name = "rkmpp",        help = "requires --vo=gpu (some RockChip devices only)" }]
+
+[[settings]]
+name = "gpu-api"
+default = "auto"
+filter = "Video"
+help = "--gpu-api=<type> Controls which type of graphics APIs will be accepted."
+options = [{ name = "auto",   help = "Use any available API (Default)" },
+           { name = "opengl", help = "Allow only OpenGL (requires OpenGL 2.1+ or GLES 2.0+)" },
+           { name = "vulkan", help = "Allow only Vulkan (requires a valid/working --spirv-compiler)" },
+           { name = "d3d11",  help = "Allow only --gpu-context=d3d11" }]
+
+[[settings]]
+name = "gpu-context"
+default = "auto"
+filter = "Video"
+help = "--gpu-context=<sys> The value auto (the default) selects the GPU context. You can also pass help to get a complete list of compiled in backends (sorted by autoprobe order)."
+options = [{ name = "auto",      help = "auto-select (Default)" },
+           { name = "win",       help = "Win32/WGL" },
+           { name = "winvk",     help = "VK_KHR_win32_surface" },
+           { name = "angle",     help = "Direct3D11 through the OpenGL ES translation layer ANGLE. This supports almost everything the win backend does (if the ANGLE build is new enough)." },
+           { name = "dxinterop", help = "(experimental) Win32, using WGL for rendering and Direct3D 9Ex for presentation. Works on Nvidia and AMD. Newer Intel chips with the latest drivers may also work." },
+           { name = "d3d11",     help = "Win32, with native Direct3D 11 rendering." }]
+
+[[settings]]
+name = "vo"
+default = "gpu"
+filter = "Video"
+helpurl = "https://mpv.io/manual/master/#video-output-drivers-vo"
+help = "--gpu=<mode> Video output drivers to be used. Default = gpu.\n\nFor more information visit:"
+options = [{ name = "gpu",      help = "General purpose, customizable, GPU-accelerated video output driver. It supports extended scaling methods, dithering, color management, custom shaders, HDR, and more. (Default)" },
+           { name = "direct3d", help = "Video output driver that uses the Direct3D interface" }]
+
+[[settings]]
+name = "video-sync"
+default = "audio"
+filter = "Video"
+help = "--video-sync=<audio|...> How the player synchronizes audio and video.\n\nFor more information visit:"
+helpurl = "https://mpv.io/manual/master/#options-video-sync"
+options = [{ name = "audio" },
+           { name = "display-resample" },
+           { name = "display-resample-vdrop" },
+           { name = "display-resample-desync" },
+           { name = "display-vdrop" },
+           { name = "display-adrop" },
+           { name = "display-desync" },
+           { name = "desync" }]
+
+[[settings]]
+name = "scale"
+default = "bilinear"
+filter = "Video"
+help = "--scale=<filter> The GPU renderer filter function to use when upscaling video. There are some more filters, but most are not as useful. For a complete list, pass help as value, e.g.: mpv --scale=help"
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "cscale"
+default = "bilinear"
+filter = "Video"
+help = "--cscale=<filter> As --scale, but for interpolating chroma information. If the image is not subsampled, this option is ignored entirely."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dscale"
+default = "bilinear"
+filter = "Video"
+help = "--dscale=<filter> Like --scale, but apply these filters on downscaling instead. If this option is unset, the filter implied by --scale will be applied."
+options = [{ name = "bilinear",         help = "Bilinear hardware texture filtering (fastest, very low quality). This is the default for compatibility reasons." },
+           { name = "spline36",         help = "Mid quality and speed. This is the default when using gpu-hq." },
+           { name = "lanczos",          help = "Lanczos scaling. Provides mid quality and speed. Generally worse than spline36, but it results in a slightly sharper image which is good for some content types. The number of taps can be controlled with  scale-radius, but is best left unchanged. (This filter is an alias for sinc-windowed sinc)" },
+           { name = "ewa_lanczos",      help = "Elliptic weighted average Lanczos scaling. Also known as Jinc. Relatively slow, but very good quality. The radius can be controlled with scale-radius. Increasing the radius makes the filter sharper but adds more ringing. (This filter is an alias for jinc-windowed jinc)" },
+           { name = "ewa_lanczossharp", help = "A slightly sharpened version of ewa_lanczos, preconfigured to use an ideal radius and parameter. If your hardware can run it, this is probably what you should use by default." },
+           { name = "mitchell",         help = "Mitchell-Netravali. The B and C parameters can be set with  --scale-param1 and --scale-param2. This filter is very good at downscaling (see --dscale)." },
+           { name = "oversample",       help = "A version of nearest neighbour that (naively) oversamples pixels, so that pixels overlapping edges get linearly interpolated instead of rounded. This essentially removes the small imperfections and judder artifacts caused by nearest-neighbour interpolation, in exchange for adding some blur. This filter is good at temporal interpolation, and also known as \"smoothmotion\" (see --tscale)." },
+           { name = "linear",           help = "A --tscale filter." }]
+
+[[settings]]
+name = "dither-depth"
+default = "no"
+filter = "Video"
+help = "--dither-depth=<N|no|auto> Set dither target depth to N. Default: no. Note that the depth of the connected video display device cannot be detected. Often, LCD panels will do dithering on their own, which conflicts with this option and leads to ugly output."
+options = [{ name = "no",   help = "Disable any dithering done by mpv." },
+           { name = "auto", help = "Automatic selection. If output bit depth cannot be detected, 8 bits per component are assumed." },
+           { name = "8",    help = "Dither to 8 bit output." }]
+
+[[settings]]
+name = "correct-downscaling"
+default = "no"
+filter = "Video"
+help = "--correct-downscaling When using convolution based filters, extend the filter size when downscaling. Increases quality, but reduces performance while downscaling.\n\nThis will perform slightly sub-optimally for anamorphic video (but still better than without it) since it will extend the size to match only the milder of the scale factors between the axes."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "sigmoid-upscaling"
+default = "no"
+filter = "Video"
+help = "--sigmoid-upscaling When upscaling, use a sigmoidal color transform to avoid emphasizing ringing artifacts. This also implies --linear-scaling."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "deband"
+default = "no"
+filter = "Video"
+help = "--deband Enable the debanding algorithm. This greatly reduces the amount of visible banding, blocking and other quantization artifacts, at the expense of very slightly blurring some of the finest details. In practice, it's virtually always an improvement - the only reason to disable it would be for performance."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "volume"
+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 = ""
+filter = "Screen"
+help = "--screen=<default|0-32> In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the video on. Default: default."
+
+[[settings]]
+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. For more information visit:"
+helpurl = "https://mpv.io/manual/master/#property-expansion"
+
+[[settings]]
+name = "fullscreen"
+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"
+filter = "Playback"
+help = "--keep-open-pause=<yes|no> If set to no, instead of pausing when --keep-open is active, just stop at end of file and continue playing forward when you seek backwards until end where it stops again. Default: yes."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "keep-open"
+default = "no"
+filter = "Playback"
+help = "--keep-open=<yes|no|always> Do not terminate when playing or seeking beyond the end of the file, and there is not next file to be played (and --loop is not used). Instead, pause the player. When trying to seek beyond end of the file, the player will attempt to seek to the last frame.\n\nNormally, this will act like set pause yes on EOF, unless the  --keep-open-pause=no option is set."
+options = [{ name = "yes",    help = "Don't terminate if the current file is the last playlist entry. Equivalent to --keep-open without arguments."},
+           { name = "no",     help = "If the current file ends, go to the next file or terminate. (Default.)" },
+           { name = "always", help = "Like yes, but also applies to files before the last playlist entry. This means playback will never automatically advance to the next file."}]
+
+[[settings]]
+name = "loop-file"
+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."
+
+[[settings]]
+name = "save-position-on-quit"
+default = "no"
+filter = "Playback"
+help = "--save-position-on-quit=<yes|no> Always save the current playback position on quit. When this file is played again later, the player will seek to the old playback position on start. This does not happen if playback of a file is stopped in any other way than quitting. For example, going to the next file in the playlist will not save the position, and start playback at beginning the next time the file is played.\n\nThis behavior is disabled by default, but is always available when quitting the player with Shift+Q."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "input-ar-delay"
+default = ""
+filter = "Input"
+help = "--input-ar-delay=<integer> Delay in milliseconds before we start to autorepeat a key (0 to disable)."
+
+[[settings]]
+name = "input-ar-rate"
+default = ""
+filter = "Input"
+help = "--input-ar-rate=<integer> Number of key presses to generate per second on autorepeat."
+
+[[settings]]
+name = "hr-seek"
+default = "absolute"
+filter = "Playback"
+help = "--hr-seek=<no|absolute|yes> Select when to use precise seeks that are not limited to keyframes. Such seeks require decoding video from the previous keyframe up to the target position and so can take some time depending on decoding performance. For some video formats, precise seeks are disabled. This option selects the default choice to use for seeks; it is possible to explicitly override that default in the definition of key bindings and in input commands."
+options = [{ name = "yes",      help = "Use precise seeks whenever possible." },
+           { name = "no",       help = "Never use precise seeks." },
+           { name = "absolute", help = "Use precise seeks if the seek is to an absolute position in the file, such as a chapter seek, but not for relative seeks like the default behavior of arrow keys (default)." },
+           { name = "always",   help = "Same as yes (for compatibility)." }]
+
+[[settings]]
+name = "track-auto-selection"
+default = "yes"
+filter = "Playback"
+help = "--track-auto-selection=<yes|no> Enable the default track auto-selection (default: yes). Enabling this will make the player select streams according to --aid, --alang, and others. If it is disabled, no tracks are selected. In addition, the player will not exit if no tracks are selected, and wait instead (this wait mode is similar to pausing, but the pause option is not set).\n\nThis is useful with --lavfi-complex: you can start playback in this mode, and then set select tracks at runtime by setting the filter graph. Note that if --lavfi-complex is set before playback is started, the referenced tracks are always selected."
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+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."

mpv.net/Resources/mpvNetConfToml.txt

@@ -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" }]

mpv.net/WPF/Resources.xaml

@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:WPF="clr-namespace:WPF">
+    
+        <Style TargetType="TextBox">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
+                            </Trigger>
+                            <Trigger Property="IsFocused" Value="true">
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static WPF:WPF.ThemeBrush}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+</ResourceDictionary>

mpv.net/WPF/WPF.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Windows;
+using System.Windows.Media;
+
+namespace WPF
+{
+    public class WPF
+    {
+        public static void Init()
+        {
+            EnsureApplicationResources();
+        }
+
+        public static void EnsureApplicationResources()
+        {
+            if (Application.Current == null)
+            {
+                new Application();
+                Application.Current.Resources.MergedDictionaries.Add(
+                    Application.LoadComponent(new Uri("mpvnet;component/WPF/Resources.xaml",
+                        UriKind.Relative)) as ResourceDictionary);
+            }
+        }
+
+        public static Brush ThemeBrush {
+            get {
+                if (Environment.OSVersion.Version.Major < 10)
+                    return new SolidColorBrush(Colors.DarkSlateGray);
+                else
+                    return SystemParameters.WindowGlassBrush;
+            }
+        }
+    }
+}

mpv.net/Windows/ConfWindow.xaml

@@ -0,0 +1,39 @@
+<Window xmlns:Controls="clr-namespace:Controls"  x:Name="ConfWindow1"  x:Class="mpvnet.ConfWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:WPF="clr-namespace:WPF"
+        mc:Ignorable="d"
+        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen" Title="Conf Editor">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="4*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10*" />
+            <ColumnDefinition Width="60*" />
+        </Grid.ColumnDefinitions>
+        <Controls:SearchTextBoxUserControl HintText="Find a setting" 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 WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding}" FontSize="16" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to disk</TextBlock>
+        </StackPanel>
+    </Grid>
+</Window>

mpv.net/Windows/ConfWindow.xaml.cs

@@ -0,0 +1,259 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+using DynamicGUI;
+using Microsoft.Win32;
+
+namespace mpvnet
+{
+    public partial class ConfWindow : Window
+    {
+        private List<SettingBase> MpvSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvConfToml);
+        private List<SettingBase> MpvNetSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvNetConfToml);
+        private Dictionary<string, Dictionary<string, string>> Comments = new Dictionary<string, Dictionary<string, string>>();
+
+        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+
+        public ConfWindow()
+        {
+            InitializeComponent();
+            DataContext = this;
+            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();
+        }
+
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(ConfWindow), 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 confSettings)
+                {
+                    if (setting.Name == pair.Key)
+                    {
+                        setting.Value = pair.Value;
+                        setting.StartValue = pair.Value;
+                        continue;
+                    }
+                }
+
+                switch (setting)
+                {
+                    case StringSetting s:
+                        var sc = new StringSettingControl(s);
+                        sc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(sc);
+                        break;
+                    case OptionSetting s:
+                        var oc = new OptionSettingControl(s);
+                        oc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
+                        MainStackPanel.Children.Add(oc);
+                        break;
+                }
+            }
+        }
+
+        private Dictionary<string, string> _mpvConf;
+
+        public Dictionary<string, string> MpvConf {
+            get {
+                if (_mpvConf == null) _mpvConf = LoadConf(mp.MpvConfPath);
+                return _mpvConf;
+            }
+        }
+
+        private Dictionary<string, string> _mpvNetConf;
+
+        public Dictionary<string, string> MpvNetConf {
+            get {
+                if (_mpvNetConf == null) _mpvNetConf = LoadConf(mp.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()
+        {
+            bool isDirty = false;
+
+            foreach (SettingBase i in MpvSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            foreach (SettingBase i in MpvNetSettingsDefinitions)
+                if (i.StartValue != i.Value)
+                    isDirty = true;
+
+            if (!isDirty)
+                return;
+
+            WriteToDisk(mp.MpvConfPath, MpvConf, MpvSettingsDefinitions);
+            WriteToDisk(mp.MpvNetConfPath, MpvNetConf, MpvNetSettingsDefinitions);
+
+            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 = "";
+
+            foreach (var i in FilterStrings)
+                if (SearchControl.Text == i + ":")
+                    activeFilter = i;
+
+            if (activeFilter == "")
+            {
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).Contains(SearchControl.Text))
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+                FilterListBox.SelectedItem = null;
+            }
+            else
+                foreach (UIElement i in MainStackPanel.Children)
+                    if ((i as ISettingControl).SettingBase.Filter == activeFilter)
+                        i.Visibility = Visibility.Visible;
+                    else
+                        i.Visibility = Visibility.Collapsed;
+
+            MainScrollViewer.ScrollToTop();
+        }
+        
+        private void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
+        {
+            SearchControl.SearchTextBox.SelectAll();
+            Keyboard.Focus(SearchControl.SearchTextBox);
+        }
+
+        private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (e.AddedItems.Count > 0)
+                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+        }
+
+        private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start(Path.GetDirectoryName(mp.MpvConfPath));
+        }
+
+        private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://mpv.io/manual/master/");
+        }
+
+        private void SupportTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Process.Start("https://github.com/stax76/mpv.net#Support");
+        }
+
+        private void ApplyTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            WriteToDisk();
+        }
+    }
+}

mpv.net/Windows/InputWindow.xaml

@@ -0,0 +1,44 @@
+<Window xmlns:Controls="clr-namespace:Controls"  x:Class="mpvnet.InputWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Input Editor" Height="500" Width="750" FontSize="13"
+        Loaded="Window_Loaded" Closed="Window_Closed" ShowInTaskbar="False">
+    <Window.Resources>
+        <Style x:Key="DataGrid_Font_Centering" TargetType="{x:Type DataGridCell}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Controls:SearchTextBoxUserControl HintText="Type ? to get help." x:Name="SearchControl" Width="300" Margin="0,20,0,20" Grid.ColumnSpan="2" />
+        <DataGrid Grid.Row="1" x:Name="DataGrid" CommandManager.PreviewCanExecute="DataGrid_PreviewCanExecute" AutoGenerateColumns="False" CellStyle="{StaticResource DataGrid_Font_Centering}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Menu"  Binding="{Binding Menu}"/>
+                <DataGridTemplateColumn Header="Input">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button MinHeight="20" Click="ButtonClick">
+                                <TextBlock Text="{Binding Input}"></TextBlock>
+                            </Button>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</Window>

mpv.net/Windows/InputWindow.xaml.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Input;
+
+namespace mpvnet
+{
+    public partial class InputWindow : Window
+    {
+        ICollectionView CollectionView;
+
+        public InputWindow()
+        {
+            InitializeComponent();
+            SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
+            DataGrid.SelectionMode = DataGridSelectionMode.Single;
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = InputItem.InputItems };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((InputItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            DataGrid.ItemsSource = CollectionView;
+        }
+
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+
+            if (SearchControl.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>\n\nIf only one character is entered the search will be performed only in the input.", "Filtering", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        bool Filter(InputItem item)
+        {
+            string searchText = SearchControl.SearchTextBox.Text.ToLower();
+            if (searchText == "") return true;
+
+            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:"))
+                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());
+            else if (item.Command.ToLower().Contains(searchText) ||
+                item.Menu.ToLower().Contains(searchText) ||
+                item.Input.ToLower().Contains(searchText))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        private void ButtonClick(object sender, RoutedEventArgs e)
+        {
+            InputItem item = ((Button)e.Source).DataContext as InputItem;
+            if (item is null) return;
+            LearnWindow w = new LearnWindow();
+            w.Owner = this;
+            w.InputItem = item;
+            w.ShowDialog();
+
+            var items = new Dictionary<string, InputItem>();
+
+            foreach (InputItem i in InputItem.InputItems)
+                if (items.ContainsKey(i.Input) && i.Input != "_")
+                    MessageBox.Show($"Duplicate found:\n\n{i.Input}: {i.Menu}\n\n{items[i.Input].Input}: {items[i.Input].Menu}\n\nPlease note that you can chain multiple commands in the same line by using a semicolon as separator.", "Duplicate Found", MessageBoxButton.OK, MessageBoxImage.Warning);
+                else
+                    items[i.Input] = i;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e) => Keyboard.Focus(SearchControl.SearchTextBox);
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            string backupDir = Path.GetDirectoryName(mp.InputConfPath) + "\\backup\\";
+
+            if (!Directory.Exists(backupDir))
+                Directory.CreateDirectory(backupDir);
+
+            if (File.Exists(mp.InputConfPath))
+                File.Copy(mp.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf", true);
+
+            string text = Properties.Resources.inputConfHeader + "\r\n";
+
+            foreach (InputItem item in InputItem.InputItems)
+            {
+                string line = " " + item.Input.PadRight(10);
+
+                if (item.Command.Trim() == "")
+                    line += " ignore";
+                else
+                    line += " " + item.Command.Trim();
+
+                if (item.Menu.Trim() != "")
+                    line = line.PadRight(40) + " #menu: " + item.Menu;
+
+                text += line + "\r\n";
+            }
+
+            File.WriteAllText(mp.InputConfPath, text);
+
+            MessageBox.Show("Changes will be available on next mpv.net startup.",
+                Title, MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
+        {
+            DataGrid grid = (DataGrid)sender;
+
+            if (e.Command == DataGrid.DeleteCommand)
+                if (MessageBox.Show($"Confirm to delete: {(grid.SelectedItem as InputItem).Input} ({(grid.SelectedItem as InputItem).Menu})", "Confirm Delete", MessageBoxButton.OKCancel, MessageBoxImage.Question) != MessageBoxResult.OK)
+                    e.Handled = true;
+        }
+    }
+}

mpv.net/Windows/LearnWindow.xaml

@@ -0,0 +1,24 @@
+<Window x:Class="mpvnet.LearnWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="40" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Label x:Name="MenuLabel" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"></Label>
+        <Label x:Name="KeyLabel" Grid.Row="1" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16"></Label>
+        <Button x:Name="ConfirmButton" Grid.Row="2" Click="ConfirmButton_Click">Confirm</Button>
+        <Button x:Name="ClearButton" Grid.Row="2" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
+    </Grid>
+</Window>

mpv.net/Windows/LearnWindow.xaml.cs

@@ -0,0 +1,299 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
+using WF = System.Windows.Forms;
+
+namespace mpvnet
+{
+    public partial class LearnWindow : Window
+    {
+        public InputItem InputItem { get; set; }
+        public string NewKey { get; set; } = "";
+
+        public LearnWindow()
+        {
+            InitializeComponent();
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            WF.Message m = new WF.Message();
+            m.HWnd = hwnd;
+            m.Msg = msg;
+            m.WParam = wParam;
+            m.LParam = lParam;
+            ProcessKeyEventArgs(ref m);
+            return m.Result;
+        }
+
+        void OnKeyUp(WF.KeyEventArgs e)
+        {
+            if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
+                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)
+
+                return;
+
+            string text = "";
+            uint charValue = MapVirtualKey((uint)e.KeyCode, 2);
+
+            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)
+                    text = text.Substring(1);
+
+            switch (e.KeyCode)
+            {
+                case WF.Keys.NumPad0:
+                case WF.Keys.NumPad1:
+                case WF.Keys.NumPad2:
+                case WF.Keys.NumPad3:
+                case WF.Keys.NumPad4:
+                case WF.Keys.NumPad5:
+                case WF.Keys.NumPad6:
+                case WF.Keys.NumPad7:
+                case WF.Keys.NumPad8:
+                case WF.Keys.NumPad9:
+                    text = "KP" + e.KeyCode.ToString()[6].ToString(); break;
+                case WF.Keys.Space:
+                    text = "Space"; break;
+                case WF.Keys.Enter:
+                    text = "Enter"; break;
+                case WF.Keys.Tab:
+                    text = "Tab"; break;
+                case WF.Keys.Back:
+                    text = "BS"; break;
+                case WF.Keys.Delete:
+                    text = "Del"; break;
+                case WF.Keys.Insert:
+                    text = "Ins"; break;
+                case WF.Keys.Home:
+                    text = "Home"; break;
+                case WF.Keys.End:
+                    text = "End"; break;
+                case WF.Keys.PageUp:
+                    text = "PGUP"; break;
+                case WF.Keys.PageDown:
+                    text = "PGDWN"; break;
+                case WF.Keys.Escape:
+                    text = "Esc"; break;
+                case WF.Keys.PrintScreen:
+                    text = "Print"; break;
+                case WF.Keys.Play:
+                    text = "Play"; break;
+                case WF.Keys.Pause:
+                    text = "Pause"; break;
+                case WF.Keys.MediaPlayPause:
+                    text = "PlayPause"; break;
+                case WF.Keys.MediaStop:
+                    text = "Stop"; break;
+                case WF.Keys.MediaNextTrack:
+                    text = "Next"; break;
+                case WF.Keys.MediaPreviousTrack:
+                    text = "Prev"; break;
+                case WF.Keys.VolumeUp:
+                    text = "Volume_Up"; break;
+                case WF.Keys.VolumeDown:
+                    text = "Volume_Down"; break;
+                case WF.Keys.VolumeMute:
+                    text = "Mute"; break;
+                case WF.Keys.BrowserHome:
+                    text = "Homepage"; break;
+                case WF.Keys.LaunchMail:
+                    text = "Mail"; break;
+                case WF.Keys.BrowserFavorites:
+                    text = "Favorites"; break;
+                case WF.Keys.BrowserSearch:
+                    text = "Search"; break;
+                case WF.Keys.Sleep:
+                    text = "Sleep"; break;
+                case WF.Keys.Cancel:
+                    text = "Cancel"; break;
+            }
+
+            bool shiftWasHandled = false;
+
+            bool isAlt   = GetKeyState(18) < (short)0;
+            bool isShift = GetKeyState(16) < (short)0;
+            bool isCtrl  = GetKeyState(17) < (short)0;
+
+            if (text.Length == 1 && isShift && text[0] != GetModifiedKey(text[0]))
+            {
+                text = GetModifiedKey(text[0]).ToString();
+                shiftWasHandled = true;
+            }
+
+            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);
+        }
+
+        void SetKey(string key)
+        {
+            NewKey = key;
+            MenuLabel.Content = InputItem.Menu;
+            KeyLabel.Content = key;
+        }
+
+        [DllImport("user32.dll")]
+        static extern uint MapVirtualKey(uint uCode, uint uMapType);
+
+        public static WF.Keys ModifierKeys {
+            get {
+                WF.Keys keys = WF.Keys.None;
+                if (GetKeyState(17) < (short)0)
+                    keys |= WF.Keys.Control;
+                if (GetKeyState(16) < (short)0)
+                    keys |= WF.Keys.Shift;
+                if (GetKeyState(18) < (short)0)
+                    keys |= WF.Keys.Alt;
+                return keys;
+            }
+        }
+
+        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_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
+
+            if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
+                OnKeyUp(new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
+            else if (m.Msg == WM_APPCOMMAND)
+            {
+                switch ((AppCommand)(m.LParam.ToInt32() >> 16))
+                {
+                    case AppCommand.MEDIA_CHANNEL_DOWN:
+                        SetKey("Channel_Down");
+                        break;
+                    case AppCommand.MEDIA_CHANNEL_UP:
+                        SetKey("Channel_Up");
+                        break;
+                    case AppCommand.MEDIA_FAST_FORWARD:
+                        SetKey("Forward");
+                        break;
+                    case AppCommand.MEDIA_REWIND:
+                        SetKey("Rewind");
+                        break;
+                    case AppCommand.MEDIA_PAUSE:
+                        SetKey("Pause");
+                        break;
+                    case AppCommand.MEDIA_PLAY:
+                        SetKey("Play");
+                        break;
+                    case AppCommand.MEDIA_PLAY_PAUSE:
+                        SetKey("PlayPause");
+                        break;
+                    case AppCommand.MEDIA_NEXTTRACK:
+                        SetKey("Next");
+                        break;
+                    case AppCommand.MEDIA_PREVIOUSTRACK:
+                        SetKey("Prev");
+                        break;
+                    case AppCommand.MEDIA_RECORD:
+                        SetKey("Record");
+                        break;
+                    case AppCommand.MEDIA_STOP:
+                        SetKey("Stop");
+                        break;
+                    case AppCommand.VolumeUp:
+                        SetKey("Volume_Up");
+                        break;
+                    case AppCommand.VolumeDown:
+                        SetKey("Volume_Down");
+                        break;
+                    case AppCommand.VolumeMute:
+                        SetKey("Mute");
+                        break;
+                }
+            }
+        }
+
+        internal enum AppCommand
+        {
+            MEDIA_CHANNEL_DOWN = 52,
+            MEDIA_CHANNEL_UP = 51,
+            MEDIA_FAST_FORWARD = 49,
+            MEDIA_NEXTTRACK = 11,
+            MEDIA_PAUSE = 47,
+            MEDIA_PLAY = 46,
+            MEDIA_PLAY_PAUSE = 14,
+            MEDIA_PREVIOUSTRACK = 12,
+            MEDIA_RECORD = 48,
+            MEDIA_REWIND = 50,
+            MEDIA_STOP = 13,
+            VolumeMute = 8,
+            VolumeDown = 9,
+            VolumeUp = 10
+        }
+
+        [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);
+            source.AddHook(new HwndSourceHook(WndProc));
+            SetKey(InputItem.Input);
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs e)
+        {
+            InputItem.Input = NewKey;
+            Close();
+        }
+
+        private void ClearButton_Click(object sender, RoutedEventArgs e)
+        {
+            InputItem.Input = "_";
+            Close();
+        }
+
+        private void Window_MouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (e.Delta > 0)
+                SetKey("WHEEL_UP");
+            else
+                SetKey("WHEEL_DOWN");
+        }
+    }
+}

mpv.net/mp.cs

@@ -75,11 +75,34 @@ namespace mpvnet
             get {
                 if (_MpvConfFolder == null)
                 {
-                    if (Directory.Exists(Application.StartupPath + "\\portable_config"))
-                        _MpvConfFolder = Application.StartupPath + "\\portable_config\\";
+                    string portableFolder = Application.StartupPath + "\\portable_config\\";
+                    string appdataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
+
+                    if (!Directory.Exists(portableFolder) && !Directory.Exists(appdataFolder))
+                    {
+                        using (TaskDialog<string> td = new TaskDialog<string>())
+                        {
+                            td.MainInstruction = "Choose a settings folder.";
+                            td.Content = "[https://mpv.io/manual/master/#files-on-windows MPV documentation about files on Windows.]";
+                            td.AddCommandLink("appdata", appdataFolder);
+                            td.AddCommandLink("portable", portableFolder);
+                            _MpvConfFolder = td.Show();
+                        }
+                    }
                     else
-                        _MpvConfFolder = Environment.GetFolderPath(
-                            Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
+                        if (Directory.Exists(portableFolder))
+                            _MpvConfFolder = portableFolder;
+                        else
+                            _MpvConfFolder = appdataFolder;
+
+                    if (string.IsNullOrEmpty(_MpvConfFolder)) _MpvConfFolder = appdataFolder;
+                    if (!Directory.Exists(_MpvConfFolder)) Directory.CreateDirectory(_MpvConfFolder);
+
+                    if (!File.Exists(_MpvConfFolder + "\\input.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\input.conf", Properties.Resources.inputConf);
+
+                    if (!File.Exists(_MpvConfFolder + "\\mpv.conf"))
+                        File.WriteAllText(_MpvConfFolder + "\\mpv.conf", Properties.Resources.mpvConf);
                 }
                 return _MpvConfFolder;
             }
@@ -121,15 +144,7 @@ namespace mpvnet
 
         public static void Init()
         {
-            if (!Directory.Exists(mp.MpvConfFolder))
-                Directory.CreateDirectory(mp.MpvConfFolder);
-
-            if (!File.Exists(mp.MpvConfPath))
-                File.WriteAllText(mp.MpvConfPath, Properties.Resources.mpv_conf);
-
-            if (!File.Exists(mp.InputConfPath))
-                File.WriteAllText(mp.InputConfPath, Properties.Resources.input_conf);
-
+            string dummy = MpvConfFolder;
             LoadLibrary("mpv-1.dll");
             MpvHandle = mpv_create();
             set_property_string("input-default-bindings", "yes");
@@ -162,11 +177,12 @@ namespace mpvnet
                 if (Path.GetExtension(scriptPath) == ".ps1")
                     PowerShellScript.Init(scriptPath);
 
-            foreach (var scriptPath in Directory.GetFiles(mp.MpvConfFolder + "Scripts"))
-                if (Path.GetExtension(scriptPath) == ".py")
-                    PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
-                else if (Path.GetExtension(scriptPath) == ".ps1")
-                    PowerShellScript.Init(scriptPath);
+            if (Directory.Exists(mp.MpvConfFolder + "Scripts"))
+                foreach (var scriptPath in Directory.GetFiles(mp.MpvConfFolder + "Scripts"))
+                    if (Path.GetExtension(scriptPath) == ".py")
+                        PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                    else if (Path.GetExtension(scriptPath) == ".ps1")
+                        PowerShellScript.Init(scriptPath);
         }
 
         public static void EventLoop()
@@ -235,32 +251,34 @@ namespace mpvnet
                             ScriptInputDispatch?.Invoke();
                             break;
                         case mpv_event_id.MPV_EVENT_CLIENT_MESSAGE:
-                            if (ClientMessage != null)
+                            var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
+                            string[] args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+
+                            if (args != null && args.Length > 1 && args[0] == "mpv.net")
                             {
-                                var client_messageData = (mpv_event_client_message)Marshal.PtrToStructure(evt.data, typeof(mpv_event_client_message));
-                                string[] args = NativeUtf8StrArray2ManagedStrArray(client_messageData.args, client_messageData.num_args);
+                                bool found = false;
 
-                                if (args != null && args.Length > 1 && args[0] == "mpv.net")
+                                foreach (var i in mpvnet.Command.Commands)
                                 {
-                                    bool found = false;
+                                    if (args[1] == i.Name)
+                                    {
+                                        found = true;
+                                        i.Action.Invoke(args.Skip(2).ToArray());
+                                        MainForm.Instance.BeginInvoke(new Action(() => {
+                                            Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
+                                            Native.SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam);
+                                        }));
 
-                                    foreach (var i in mpvnet.Command.Commands)
-                                    {
-                                        if (args[1] == i.Name)
-                                        {
-                                            found = true;
-                                            i.Action.Invoke(args.Skip(2).ToArray());
-                                        }
-                                    }
-                                    if (!found)
-                                    {
-                                        List<string> names = mpvnet.Command.Commands.Select((item) => item.Name).ToList();
-                                        names.Sort();
-                                        Msg.ShowError($"No command '{args[1]}' found.", $"Available commands are:\n\n{string.Join("\n", names)}\n\nHow to bind these commands can be seen in the [https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt default input bindings and menu definition].");
                                     }
                                 }
-                                ClientMessage?.Invoke(args);
+                                if (!found)
+                                {
+                                    List<string> names = mpvnet.Command.Commands.Select((item) => item.Name).ToList();
+                                    names.Sort();
+                                    Msg.ShowError($"No command '{args[1]}' found.", $"Available commands are:\n\n{string.Join("\n", names)}\n\nHow to bind these commands can be seen in the [https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt default input bindings and menu definition].");
+                                }
                             }
+                            ClientMessage?.Invoke(args);
                             break;
                         case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
                             VideoReconfig?.Invoke();

mpv.net/mpv.net.csproj

@@ -120,6 +120,8 @@
       <HintPath>IronPython\Microsoft.Scripting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -129,20 +131,41 @@
       <HintPath>..\packages\Microsoft.PowerShell.5.ReferenceAssemblies.1.1.0\lib\net4\System.Management.Automation.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Addon.cs" />
+    <Page Include="Controls\SearchTextBoxUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="WPF\Resources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Compile Include="Controls\SearchTextBoxUserControl.xaml.cs">
+      <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\DynamicGUI.cs" />
+    <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
+      <DependentUpon>OptionSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\StringSettingControl.xaml.cs">
+      <DependentUpon>StringSettingControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DynamicGUI\Tommy.cs" />
     <Compile Include="MediaInfo.cs" />
     <Compile Include="Menu.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="PowerShellScript.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="PowerShellScript.cs" />
     <Compile Include="PythonScript.cs" />
     <Compile Include="libmpv.cs" />
     <Compile Include="MainForm.cs">
@@ -158,8 +181,18 @@
     <Compile Include="NativeHelp.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Windows\ConfWindow.xaml.cs">
+      <DependentUpon>ConfWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\LearnWindow.xaml.cs">
+      <DependentUpon>LearnWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\InputWindow.xaml.cs">
+      <DependentUpon>InputWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="trash.cs" />
     <Compile Include="UI.cs" />
+    <Compile Include="WPF\WPF.cs" />
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -183,15 +216,18 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Content Include="Resources\mpv.conf.txt" />
+    <Content Include="Resources\mpvConf.txt" />
+    <Content Include="Resources\mpvConfToml.txt" />
+    <Content Include="Resources\mpvNetConfToml.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="mpv.ico" />
+    <Content Include="Resources\inputConfHeader.txt" />
     <Content Include="screenshot.jpg" />
-    <Content Include="Resources\input.conf.txt" />
+    <Content Include="Resources\inputConf.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VBNET\VBNET.vbproj">
@@ -199,6 +235,28 @@
       <Name>VBNET</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Page Include="DynamicGUI\OptionSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="DynamicGUI\StringSettingControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\ConfWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\LearnWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\InputWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.