3.6.1

CSScriptAddon/CSScriptAddon.vb

@@ -1,29 +0,0 @@
-Imports System.ComponentModel.Composition
-Imports System.IO
-Imports System.Windows.Forms
-
-Imports mpvnet
-
-Imports CSScriptLibrary
-
-<Export(GetType(IAddon))>
-Public Class CSScriptAddon
-    Implements IAddon
-
-    Sub New()
-        Dim scriptDir = mp.mpvConfFolderPath + "scripts"
-        If Not Directory.Exists(scriptDir) Then Return
-        Dim csFiles = Directory.GetFiles(scriptDir, "*.cs").ToList
-        csFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\\Scripts", "*.cs"))
-        If csFiles.Count = 0 Then Return
-        CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
-
-        For Each i In csFiles
-            Try
-                CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
-            Catch ex As Exception
-                MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error)
-            End Try
-        Next
-    End Sub
-End Class

LICENSE.txt

@@ -1,10 +1,21 @@
 MIT License
 
-Copyright (c) 2017 stax76
+Copyright (c) 2017-2019 Frank Skare (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:
+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 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.
+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.

README.md

@@ -1,10 +1,30 @@
 # mpv.net
 
-mpv.net is a libmpv based media player for Windows, it looks and works like mpv and also shares the same settings as mpv and therefore the mpv documentation applies.
+mpv.net is a modern media player for Windows that looks and works just like [mpv](https://mpv.io).
 
-mpv and mpv.net have a learning curve.
+#### Based on libmpv
 
-mpv manual: <https://mpv.io/manual/master/>
+mpv.net is based on libmpv which offers a straightforward C API that was designed from the ground up to make mpv usable as a library and facilitate easy integration into other applications.
+
+#### CLI options
+
+mpv.net has the same [CLI options](https://mpv.io/manual/master/#options) as mpv.
+
+#### High quality video output
+
+mpv/libmpv has an OpenGL based video output that is capable of many features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more.
+
+#### On Screen Controller
+
+mpv.net uses the OSC of mpv/libmpv offering play controls with a modern flat design.
+
+#### GPU video decoding
+
+mpv/libmpv leverages the FFmpeg hwaccel APIs to support DXVA2 video decoding acceleration.
+
+#### Active development
+
+mpv.net is under active development. Want a feature? Post a [patch](https://github.com/stax76/mpv.net/pulls) or [request it](https://github.com/stax76/mpv.net/issues)!
 
 Table of contents
 -----------------
@@ -14,88 +34,193 @@ Table of contents
 - [Context Menu](#context-menu)
 - [Settings](#settings)
 - [Scripting](#scripting)
+- [Add-ons](#add-ons)
+- [Architecture](#architecture)
 - [Support](#support)
+- [Links](#links)
+- [Download](#download)
 - [Changelog](#changelog)
 
 ### Features
 
-- Customizable context menu defined in the same file as the key bindings
-- Searchable options dialog with modern UI as mpv compatible standalone application
-- Searchable input (key/mouse) binding editor with modern UI as mpv compatible standalone application
-- Modern UI using the OS theme color and dark mode
-- Rich addon API for .NET languages, over 700 available mpv properties
-- Rich scripting API for Python, C#, Lua, JavaScript and PowerShell
-- mpv's OSC (on screen controller (play control bar)), IPC, conf files
+- Customizable context menu defined in the same file as the key bindings ([Screenshot](#context-menu-screenshot))
+- Searchable config dialog ([Screenshot](#config-editor-screenshot))
+- Searchable input (key/mouse) binding editor ([Screenshot](#input-editor-screenshot))
+- Searchable command palette to quickly launch commands and look for keys ([Screenshot](#command-palette-screenshot))
+- Modern UI with dark mode ([Screenshot](#config-editor-screenshot))
+- Addon/extension API for .NET languages
+- Scripting API for Python, C#, Lua, JavaScript and PowerShell ([wiki](https://github.com/stax76/mpv.net/wiki/Scripting))
+- mpv's OSC, IPC and conf files
+- Support of the same [CLI options](https://mpv.io/manual/master/#options) as mpv
+- DXVA2 video decoding acceleration
+- OpenGL based video output capable of features loved by videophiles, such as video scaling with popular high quality algorithms, color management, frame timing, interpolation, HDR, and more
+- Search feature powered by [Everything](https://www.voidtools.com) to find and play media ([Screenshot](#media-search-screenshot))
 
 ### Screenshots
 
-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvnet.png)
+#### Main Window Screenshot
 
-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvnetContextMenu.png)
+![Main Window](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Main.png)
 
-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvConfEdit.png)
+#### Context Menu Screenshot
 
-![](https://raw.githubusercontent.com/stax76/mpv.net/master/screenshots/mpvInputEdit.png)
+Context menu defined in the input.conf file with dark mode support.
+
+![Context Menu](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Menu.png)
+
+#### Config Editor Screenshot
+
+A searchable config editor as alternative to edit the mpv.conf file manually.
+
+![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png)
+
+#### Input Editor Screenshot
+
+A searchable key and mouse binding editor.
+
+![Input Editor](https://raw.githubusercontent.com/stax76/mpv.net/master/img/InputEditor.png)
+
+#### Command Palette Screenshot
+
+Forgot where a command in the menu is located or what shortcut key it has?
+Just press Ctrl+Shift+P and find it easily in the searchable command palette.
+
+![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/img/CommandPalette.png)
+
+#### Media Search Screenshot
+
+Media search feature powered by [Everything](https://www.voidtools.com) to find and play media.
+
+![Media Search](https://raw.githubusercontent.com/stax76/mpv.net/master/img/MediaSearch.png)
 
 ### Context Menu
 
-The context menu can be customized via input.conf file located at:
-```
-C:\Users\username\AppData\Roaming\mpv\input.conf
+The context menu can be customized via input.conf file located in the config directory:
+
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\input.conf
 ```
+
 if it's missing mpv.net generates it with the following defaults:
 
-<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>
+
+input.conf defines mpv's key and mouse bindings and mpv.net uses comments to define the context menu.
 
 ### Settings
 
-mpv.net shares the settings with mpv, settings can be edited in a settings dialog or in a config file called mpv.conf located at:
-```
-C:\Users\user\AppData\Roaming\mpv\mpv.conf
-```
-if it's missing mpv.net generates it with the following defaults:
+mpv.net is able to share the settings with mpv and mpv.net uses the same logic to decide from where the settings are loaded. The default location is:
 
-<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt>
+```Text
+C:\Users\%username%\AppData\Roaming\mpv\mpv.conf
+```
+
+If a directory named portable_config next to the mpvnet.exe exists, all config will be loaded from this directory only.
+
+```Text
+<startup>\portable_config\mpv.conf
+```
+
+In case there isn't any config folder mpv.net asks where to create it. If no mpv.conf file exists mpv.net generates it with the following defaults:
+
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt>
+
+Config files located in the same directory as mpvnet.exe are loaded with lower priority. Some config files are loaded only once, which means that e.g. of 2 input.conf files located in two config directories, only the one from the directory with higher priority will be loaded.
 
 ### Scripting
 
-Scripting is supported via Python, C#, Lua, JavaScript and PowerShell
+[Scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting)
 
-https://github.com/stax76/mpv.net/wiki/Scripting-(CSharp,-Python,-JavaScript,-Lua,-PowerShell)
+### Add-ons
+
+[Add-on wiki page](https://github.com/stax76/mpv.net/wiki/Addons)
+
+### Architecture
+
+mpv.net is written in C# 7.0 and runs on the .NET framework 4.7 or higher.
+
+The Add-on implementation is based on the Managed Extensibility Framework,
+the entire application code is accessible for add-ons and Python scripts.
+
+Python scripting is implemented with IronPython which uses Python 2.7.
+
+The main/video window is WinForms based, other windows are WPF based.
+
+The config editor adds it's controls dynamically and uses TOML to define it's
+content, there are only two simple types, StringSetting and OptionSetting.
+
+mpv.net was started 2017 and consists of about 9000 lines of code.
+
+Third party components are:
+
+- [libmpv](https://mpv.io/)
+- [MediaInfo](https://mediaarea.net/en/MediaInfo)
+- [Tommy (TOML parser)](https://github.com/dezhidki/Tommy)
+- [IronPython](https://ironpython.net/)
+- [CS-Script](http://www.csscript.net/)
 
 ### Support
 
-<https://forum.doom9.org/showthread.php?t=174841>
+[Support thread in Doom9 forum](https://forum.doom9.org/showthread.php?t=174841)
 
-<https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows>
+[Support thread in VideoHelp forum](https://forum.videohelp.com/threads/392514-mpv-net-a-extendable-media-player-for-windows)
 
-<https://github.com/stax76/mpv.net/issues>
+[Issue tracker to report bugs and request features](https://github.com/stax76/mpv.net/issues)
+
+### Links
+
+mpv manual: <https://mpv.io/manual/master/>
+
+mpv wiki: <https://github.com/mpv-player/mpv/wiki>
+
+mpv.net wiki: <https://github.com/stax76/mpv.net/wiki>
+
+mpv apps: <https://github.com/mpv-player/mpv/wiki/Applications-using-mpv>
+
+mpv user scripts: <https://github.com/mpv-player/mpv/wiki/User-Scripts>
+
+mpv default key bindings: <https://github.com/mpv-player/mpv/blob/master/etc/input.conf>
+
+mpv.net default key bindings: <https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt>
+
+mpv download: <https://mpv.io/installation/>
+
+mpv.net download: <https://github.com/stax76/mpv.net/releases>
+
+mpv bugs and requests: <https://mpv.io/bug-reports/>
+
+mpv.net bugs and requests: <https://github.com/stax76/mpv.net/issues>
+
+### Download
+
+<https://github.com/stax76/mpv.net/releases>
 
 ### Changelog
 
-### 2.9 (2019-04-16)
+### 3.6.1
 
-- clicking the right top corner in full screen mode
-  closes the player but it did not work on all displays
-- the info display was changed to display the filename on top
-  so it's not displayed in the middle of the screen
-- on start up of the conf editor all text is now selected in the
-  search text box so it's ready for a new search to be typed
-- the conf editor was changed to write the settings to disk
-  only if the settings were actually modified, also the message
-  that says that the settings will be available on next start
-  is now only shown if the settings were actually modified.
-- there was an instance in the context menu where the sub menu
-  arrow was overlapping with the text
-- in the input editor when only one character is entered in the
-  search text box the search is performed only in the input and
-  not in the command or menu
-- in the input editor the routine that generates the input string
-  was completely rewritten because it was adding Shift where it
-  wasn't necessary (it took a huge amount of time to implement)
-- the context menu has a new track menu where the active track
-  can be seen and selected, it shows video, audio and subtitle
-  tracks with various metadata. [Menu default definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt#L104).
-  The screenshots were updated showing the [new track menu](https://github.com/stax76/mpv.net#screenshots).
+- there was a bug causing an exception if both the input editor and config editor
+  is opened, as soon as one is opened, the other can't be opened
 
-[go to download page](https://github.com/stax76/mpv.net/releases)
+### 3.6
+
+- playing files from rar archives caused an exception
+- there was a bug that caused underscores beeing removed from input like MBTN_LEFT_DBL
+- the search clear button in the input editor had a render issue in dark mode
+- new search feature added to search and play media files, requires
+  [Everything](https://www.voidtools.com) to be installed. [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L29)
+
+### 3.5
+
+- when the main windows gets activated and the clipboard content starts with http
+  mpv.net will ask to play the URL, previously this was restricted to YouTube URLs
+- Python script errors show line and column whenever it is supported by IronPython
+- if conf files exist in the startup directory mpv.net will use the startup
+  directory as config directory instead of creating default conf files in appdata
+- renamed commands are handled now by migration code instead of being broken
+
+### 3.4
+
+- new feature added to manage file associations from within the app. It can be found in the menu at: Tools > Manage... [Default Binding](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L149)
+- new zip download option added
+- new x86 download option added

VBNET/My Project/Application.Designer.vb

@@ -1,13 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-

VBNET/My Project/Application.myapp

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>false</MySubMain>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>1</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>

VBNET/My Project/AssemblyInfo.vb

@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' General Information about an assembly is controlled through the following
-' set of attributes. Change these attribute values to modify the information
-' associated with an assembly.
-
-' Review the values of the assembly attributes
-
-<Assembly: AssemblyTitle("VBNET")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("VBNET")>
-<Assembly: AssemblyCopyright("Copyright ©  2019")>
-<Assembly: AssemblyTrademark("")>
-
-<Assembly: ComVisible(False)>
-
-'The following GUID is for the ID of the typelib if this project is exposed to COM
-<Assembly: Guid("a5571ff4-12ae-4e1a-ad2b-863b07d1b952")>
-
-' Version information for an assembly consists of the following four values:
-'
-'      Major Version
-'      Minor Version
-'      Build Number
-'      Revision
-'
-' You can specify all the values or you can default the Build and Revision Numbers
-' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("1.0.*")>
-
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>

VBNET/My Project/Resources.Designer.vb

@@ -1,62 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-    
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
-    Friend Module Resources
-
-        Private resourceMan As Global.System.Resources.ResourceManager
-
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-
-        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VBNET.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-
-        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace

VBNET/My Project/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

VBNET/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
-#Region "My.Settings Auto-Save Functionality"
-#If _MyType = "WindowsForms" Then
-        Private Shared addedHandler As Boolean
-
-        Private Shared addedHandlerLockObject As New Object
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-            If My.Application.SaveMySettingsOnExit Then
-                My.Settings.Save()
-            End If
-        End Sub
-#End If
-#End Region
-
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-
-#If _MyType = "WindowsForms" Then
-                   If Not addedHandler Then
-                        SyncLock addedHandlerLockObject
-                            If Not addedHandler Then
-                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                                addedHandler = True
-                            End If
-                        End SyncLock
-                    End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.VBNET.My.MySettings
-            Get
-                Return Global.VBNET.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace

VBNET/My Project/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

VBNET/TaskDialog.vb

@@ -1,678 +0,0 @@
-Imports System.IO
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-Imports System.Text
-Imports System.Text.RegularExpressions
-Imports System.Threading
-
-Public Delegate Function PFTASKDIALOGCALLBACK(hwnd As IntPtr,
-                                              msg As UInteger,
-                                              wParam As IntPtr,
-                                              lParam As IntPtr,
-                                              lpRefData As IntPtr) As Integer
-Public Class Msg
-    Public Shared Property SupportURL As String
-
-    Public Shared Sub Show(mainInstruction As String, Optional content As String = Nothing)
-        Show(mainInstruction, content, MsgIcon.Info, MsgButtons.Ok)
-    End Sub
-
-    Public Shared Sub ShowError(mainInstruction As String, Optional content As String = Nothing)
-        If mainInstruction = "" Then mainInstruction = content
-        If mainInstruction = "" Then Exit Sub
-
-        Using td As New TaskDialog(Of String)
-            td.AllowCancel = False
-
-            If content = "" Then
-                If mainInstruction.Length < 80 Then
-                    td.MainInstruction = mainInstruction
-                Else
-                    td.Content = mainInstruction
-                End If
-            Else
-                td.MainInstruction = mainInstruction
-                td.Content = content
-            End If
-
-            td.MainIcon = MsgIcon.Error
-            td.Footer = "[copymsg Copy Message]"
-            If SupportURL <> "" Then td.Footer += $"   [{SupportURL} Contact Support]"
-            td.Show()
-        End Using
-    End Sub
-
-    Public Shared Sub ShowException(e As Exception)
-        Try
-            Using td As New TaskDialog(Of String)
-                td.MainInstruction = e.GetType.Name
-                td.Content = e.Message
-                td.MainIcon = MsgIcon.Error
-                td.ExpandedInformation = e.ToString
-                td.Footer = "[copymsg Copy Message]"
-                If SupportURL <> "" Then td.Footer += $"   [{SupportURL} Contact Support]"
-                td.Show()
-            End Using
-        Catch
-            MsgBox(e.GetType.Name + vbCrLf + vbCrLf + e.Message + vbCrLf + vbCrLf + e.ToString, MsgBoxStyle.Critical)
-        End Try
-    End Sub
-
-    Private Shared ShownMessages As String
-
-    Public Shared Sub ShowWarning(mainInstruction As String,
-                                  Optional content As String = Nothing,
-                                  Optional onlyOnce As Boolean = False)
-
-        If onlyOnce AndAlso ShownMessages?.Contains(mainInstruction + content) Then Exit Sub
-        Show(mainInstruction, content, MsgIcon.Warning, MsgButtons.Ok)
-        If onlyOnce Then ShownMessages += mainInstruction + content
-    End Sub
-
-    Public Shared Function ShowQuestion(mainInstruction As String,
-        Optional buttons As MsgButtons = MsgButtons.OkCancel) As MsgResult
-
-        Return Show(mainInstruction, Nothing, MsgIcon.None, buttons)
-    End Function
-
-    Public Shared Function ShowQuestion(mainInstruction As String,
-                                        content As String,
-                                        Optional buttons As MsgButtons = MsgButtons.OkCancel) As MsgResult
-        Return Show(mainInstruction, content, MsgIcon.None, buttons)
-    End Function
-
-    Public Shared Function Show(mainInstruction As String,
-                                content As String,
-                                icon As MsgIcon,
-                                buttons As MsgButtons,
-                                Optional defaultButton As MsgResult = MsgResult.None) As MsgResult
-
-        If mainInstruction Is Nothing Then mainInstruction = ""
-
-        Using td As New TaskDialog(Of MsgResult)
-            td.AllowCancel = False
-            td.DefaultButton = defaultButton
-            td.MainIcon = icon
-
-            If content Is Nothing Then
-                If mainInstruction.Length < 80 Then
-                    td.MainInstruction = mainInstruction
-                Else
-                    td.Content = mainInstruction
-                End If
-            Else
-                td.MainInstruction = mainInstruction
-                td.Content = content
-            End If
-
-            If buttons = MsgButtons.OkCancel Then
-                td.AddButton("OK", MsgResult.OK)
-                td.AddButton("Cancel", MsgResult.Cancel) 'don't use system language
-            Else
-                td.CommonButtons = buttons
-            End If
-
-            Return td.Show()
-        End Using
-    End Function
-End Class
-
-Public Class TaskDialog(Of T)
-    Inherits TaskDialogNative
-    Implements IDisposable
-
-    Private IdValueDic As New Dictionary(Of Integer, T)
-    Private IdTextDic As New Dictionary(Of Integer, String)
-    Private CommandLinkShieldList As New List(Of Integer)
-    Private ButtonArray As IntPtr, RadioButtonArray As IntPtr
-    Private Buttons As New List(Of TASKDIALOG_BUTTON)
-    Private RadioButtons As New List(Of TASKDIALOG_BUTTON)
-
-    Private Config As TASKDIALOGCONFIG
-
-    Sub New()
-        Config = New TASKDIALOGCONFIG()
-
-        Config.cbSize = CUInt(Marshal.SizeOf(Config))
-        Config.hwndParent = GetHandle()
-        Config.hInstance = IntPtr.Zero
-        Config.dwFlags = TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION
-        Config.dwCommonButtons = MsgButtons.None
-        Config.MainIcon = New TASKDIALOGCONFIG_ICON_UNION(0)
-        Config.FooterIcon = New TASKDIALOGCONFIG_ICON_UNION(0)
-        Config.cxWidth = 0
-
-        Config.cButtons = 0
-        Config.cRadioButtons = 0
-        Config.pButtons = IntPtr.Zero
-        Config.pRadioButtons = IntPtr.Zero
-        Config.nDefaultButton = 0
-        Config.nDefaultRadioButton = 0
-
-        Config.pszWindowTitle = DirectCast(Assembly.GetEntryAssembly().GetCustomAttributes(GetType(AssemblyProductAttribute), True)(0), AssemblyProductAttribute).Product
-        Config.pszMainInstruction = ""
-        Config.pszContent = ""
-        Config.pszVerificationText = Nothing
-        Config.pszExpandedInformation = Nothing
-        Config.pszExpandedControlText = Nothing
-        Config.pszCollapsedControlText = Nothing
-        Config.pszFooter = Nothing
-
-        Config.pfCallback = New PFTASKDIALOGCALLBACK(AddressOf DialogProc)
-    End Sub
-
-    Function GetHandle() As IntPtr
-        Dim sb As New StringBuilder(260)
-        Dim foregroundHandle = GetForegroundWindow()
-        GetWindowModuleFileName(foregroundHandle, sb, 260)
-
-        If Path.GetFileName(sb.ToString.Replace(".vshost", "")) =
-            Path.GetFileName(System.Reflection.Assembly.GetEntryAssembly().Location) Then
-
-            Return foregroundHandle
-        End If
-    End Function
-
-#Region "Constants"
-    Const TDE_CONTENT As Integer = 0
-    Const TDE_EXPANDED_INFORMATION As Integer = 1
-    Const TDE_FOOTER As Integer = 2
-    Const TDE_MAIN_INSTRUCTION As Integer = 3
-
-    Const TDN_CREATED As Integer = 0
-    Const TDN_NAVIGATED As Integer = 1
-    Const TDN_BUTTON_CLICKED As Integer = 2
-    Const TDN_HYPERLINK_CLICKED As Integer = 3
-    Const TDN_TIMER As Integer = 4
-    Const TDN_DESTROYED As Integer = 5
-    Const TDN_RADIO_BUTTON_CLICKED As Integer = 6
-    Const TDN_DIALOG_CONSTRUCTED As Integer = 7
-    Const TDN_VERIFICATION_CLICKED As Integer = 8
-    Const TDN_HELP As Integer = 9
-    Const TDN_EXPANDO_BUTTON_CLICKED As Integer = 10
-
-    Const TDM_NAVIGATE_PAGE As Integer = &H400 + 101
-    Const TDM_CLICK_BUTTON As Integer = &H400 + 102 'wParam = Button ID
-    Const TDM_SET_MARQUEE_PROGRESS_BAR As Integer = &H400 + 103 'wParam = 0 (nonMarque) wParam != 0 (Marquee)
-    Const TDM_SET_PROGRESS_BAR_STATE As Integer = &H400 + 104 'wParam = new progress state
-    Const TDM_SET_PROGRESS_BAR_RANGE As Integer = &H400 + 105 'lParam = MAKELPARAM(nMinRange, nMaxRange)
-    Const TDM_SET_PROGRESS_BAR_POS As Integer = &H400 + 106 'wParam = new position
-    Const TDM_SET_PROGRESS_BAR_MARQUEE As Integer = &H400 + 107 'wParam = 0 (stop marquee), wParam != 0 (start marquee), lparam = speed (milliseconds between repaints)
-    Const TDM_SET_ELEMENT_TEXT As Integer = &H400 + 108 'wParam = element (TASKDIALOG_ELEMENTS), lParam = new element text (LPCWSTR)
-    Const TDM_CLICK_RADIO_BUTTON As Integer = &H400 + 110 'wParam = Radio Button ID
-    Const TDM_ENABLE_BUTTON As Integer = &H400 + 111 'lParam = 0 (disable), lParam != 0 (enable), wParam = Button ID
-    Const TDM_ENABLE_RADIO_BUTTON As Integer = &H400 + 112 'lParam = 0 (disable), lParam != 0 (enable), wParam = Radio Button ID
-    Const TDM_CLICK_VERIFICATION As Integer = &H400 + 113 'wParam = 0 (unchecked), 1 (checked), lParam = 1 (set key focus)
-    Const TDM_UPDATE_ELEMENT_TEXT As Integer = &H400 + 114 'wParam = element (TASKDIALOG_ELEMENTS), lParam = new element text (LPCWSTR)
-    Const TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE As Integer = &H400 + 115 'wParam = Button ID, lParam = 0 (elevation not required), lParam != 0 (elevation required)
-    Const TDM_UPDATE_ICON As Integer = &H400 + 116 'wParam = icon element (TASKDIALOG_ICON_ELEMENTS), lParam = new icon (hIcon if TDF_USE_HICON_* was set, PCWSTR otherwise)
-#End Region
-
-#Region "Properties"
-
-    Private AllowCancelValue As Boolean
-
-    WriteOnly Property AllowCancel() As Boolean
-        Set(Value As Boolean)
-            If Value Then
-                Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION
-            ElseIf (Config.dwFlags And TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION) = TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION Then
-                Config.dwFlags = Config.dwFlags Xor TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION
-            End If
-        End Set
-    End Property
-
-    Property MainInstruction() As String
-        Get
-            Return Config.pszMainInstruction
-        End Get
-        Set(Value As String)
-            Config.pszMainInstruction = Value
-        End Set
-    End Property
-
-    Property Content() As String
-        Get
-            Return Config.pszContent
-        End Get
-        Set(Value As String)
-            Config.pszContent = ExpandWikiMarkup(Value)
-        End Set
-    End Property
-
-    Property ExpandedInformation() As String
-        Get
-            Return Config.pszExpandedInformation
-        End Get
-        Set(Value As String)
-            Config.pszExpandedInformation = ExpandWikiMarkup(Value)
-        End Set
-    End Property
-
-    Property VerificationText() As String
-        Get
-            Return Config.pszVerificationText
-        End Get
-        Set(Value As String)
-            Config.pszVerificationText = Value
-        End Set
-    End Property
-
-    Property DefaultButton() As MsgResult
-        Get
-            Return CType(Config.nDefaultButton, MsgResult)
-        End Get
-        Set(Value As MsgResult)
-            Config.nDefaultButton = Value
-        End Set
-    End Property
-
-    Property Footer() As String
-        Get
-            Return Config.pszFooter
-        End Get
-        Set(Value As String)
-            Config.pszFooter = ExpandWikiMarkup(Value)
-        End Set
-    End Property
-
-    WriteOnly Property MainIcon() As MsgIcon
-        Set(Value As MsgIcon)
-            Config.MainIcon = New TASKDIALOGCONFIG_ICON_UNION(Value)
-        End Set
-    End Property
-
-    Private SelectedIDValue As Integer = -1
-
-    Property SelectedID As Integer
-        Get
-            Return SelectedIDValue
-        End Get
-        Set(value As Integer)
-            For Each i In IdValueDic
-                If i.Key = value Then SelectedIDValue = value
-            Next
-        End Set
-    End Property
-
-    Private SelectedValueValue As T
-
-    Property SelectedValue() As T
-        Get
-            If IdValueDic.ContainsKey(SelectedID) Then Return IdValueDic(SelectedID)
-            Return SelectedValueValue
-        End Get
-        Set(value As T)
-            SelectedValueValue = value
-        End Set
-    End Property
-
-    Private SelectedTextValue As String
-
-    Property SelectedText() As String
-        Get
-            If IdTextDic.ContainsKey(SelectedID) Then Return IdTextDic(SelectedID)
-            Return SelectedTextValue
-        End Get
-        Set(value As String)
-            SelectedTextValue = value
-        End Set
-    End Property
-
-    Property CheckBoxChecked() As Boolean
-        Get
-            Return (Config.dwFlags And TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED) = TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED
-        End Get
-        Set(value As Boolean)
-            If value Then
-                Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED
-            ElseIf CheckBoxChecked Then
-                Config.dwFlags = Config.dwFlags Xor TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED
-            End If
-        End Set
-    End Property
-
-    Private CommonButtonsValue As MsgButtons
-
-    Property CommonButtons() As MsgButtons
-        Get
-            Return Config.dwCommonButtons
-        End Get
-        Set(Value As MsgButtons)
-            Config.dwCommonButtons = Value
-        End Set
-    End Property
-
-    Private TimeoutValue As Integer
-
-    Property Timeout As Integer
-        Get
-            Return CInt(TimeoutValue / 1000)
-        End Get
-        Set(Value As Integer)
-            TimeoutValue = Value * 1000
-
-            If Value > 0 Then
-                Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_CALLBACK_TIMER
-            End If
-        End Set
-    End Property
-#End Region
-
-#Region "Methods"
-
-    Sub AddButton(text As String, value As T)
-        Dim id = 1000 + IdValueDic.Count + 1
-        IdValueDic(id) = value
-        Buttons.Add(New TASKDIALOG_BUTTON(id, text))
-    End Sub
-
-    Function ExpandWikiMarkup(value As String) As String
-        If value.Contains("[") Then
-            Dim re As New Regex("\[(.*?) (.+?)\]")
-            Dim m = re.Match(value)
-
-            If m.Success Then
-                Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_ENABLE_HYPERLINKS
-                value = re.Replace(value, "<a href=""$1"">$2</a>")
-            End If
-        End If
-
-        Return value
-    End Function
-
-    Sub AddCommandLink(text As String, Optional value As T = Nothing)
-        Dim id = 1000 + IdValueDic.Count + 1
-        Dim temp As Object = text
-        IdValueDic(id) = If(value Is Nothing, CType(temp, T), value)
-        IdTextDic(id) = text
-        Buttons.Add(New TASKDIALOG_BUTTON(id, text))
-        Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS
-    End Sub
-
-    Sub AddCommandLink(text As String,
-                       description As String,
-                       value As T,
-                       Optional setShield As Boolean = False)
-
-        Dim id = 1000 + IdValueDic.Count + 1
-        IdValueDic(id) = value
-        If setShield Then CommandLinkShieldList.Add(id)
-        If description <> "" Then text = text + vbCrLf + description
-        Buttons.Add(New TASKDIALOG_BUTTON(id, text))
-        Config.dwFlags = Config.dwFlags Or TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS
-    End Sub
-
-    Sub AddRadioButton(text As String, value As T)
-        Dim id = 1000 + IdValueDic.Count + 1
-        IdValueDic(id) = value
-        RadioButtons.Add(New TASKDIALOG_BUTTON(id, text))
-    End Sub
-
-    Function Show() As T
-        MarshalDialogControlStructs()
-        Dim isChecked As Boolean
-        Dim hr = TaskDialogIndirect(Config, Nothing, Nothing, isChecked)
-        CheckBoxChecked = isChecked
-        If hr < 0 Then Marshal.ThrowExceptionForHR(hr)
-        If TypeOf SelectedValue Is MsgResult Then SelectedValue = DirectCast(CObj(SelectedID), T)
-        Return SelectedValue
-    End Function
-
-    Private ExitTickCount As Integer
-
-    Private Function DialogProc(hwnd As IntPtr,
-                                msg As UInteger,
-                                wParam As IntPtr,
-                                lParam As IntPtr,
-                                lpRefData As IntPtr) As Integer
-        Select Case msg
-            Case TDN_BUTTON_CLICKED, TDN_RADIO_BUTTON_CLICKED
-                If TypeOf SelectedValue Is MsgResult Then
-                    SelectedIDValue = wParam.ToInt32
-                Else
-                    SelectedID = wParam.ToInt32
-                End If
-            Case TDN_TIMER
-                If ExitTickCount = 0 Then
-                    ExitTickCount = Environment.TickCount + Timeout * 1000
-                End If
-
-                If Environment.TickCount > ExitTickCount Then
-                    SendMessage(hwnd, TDM_CLICK_BUTTON, New IntPtr(MsgResult.OK), IntPtr.Zero)
-                End If
-            Case TDN_HYPERLINK_CLICKED
-                Dim url = Marshal.PtrToStringUni(lParam)
-
-                If url.StartsWith("mailto") OrElse url.StartsWith("http") Then
-                    Process.Start(url)
-                ElseIf url = "copymsg" Then
-                    Dim thread As New Thread(
-                        New ThreadStart(Sub()
-                                            System.Windows.Forms.Clipboard.SetText(MainInstruction + vbCrLf + vbCrLf + Content + vbCrLf + vbCrLf + ExpandedInformation)
-                                            MsgBox("Message was copied to clipboard.",
-                                                   MsgBoxStyle.Information,
-                                                   DirectCast(Assembly.GetEntryAssembly().GetCustomAttributes(GetType(AssemblyProductAttribute), True)(0), AssemblyProductAttribute).Product)
-                                        End Sub))
-                    thread.SetApartmentState(ApartmentState.STA)
-                    thread.Start()
-                End If
-            Case TDN_CREATED
-                For Each i In CommandLinkShieldList
-                    SendMessage(hwnd, TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE, New IntPtr(i), New IntPtr(1))
-                Next
-        End Select
-    End Function
-
-    Private Sub MarshalDialogControlStructs()
-        If Not Buttons Is Nothing AndAlso Buttons.Count > 0 Then
-            ButtonArray = AllocateAndMarshalButtons(Buttons)
-            Config.pButtons = ButtonArray
-            Config.cButtons = CUInt(Buttons.Count)
-        End If
-
-        If Not RadioButtons Is Nothing AndAlso RadioButtons.Count > 0 Then
-            RadioButtonArray = AllocateAndMarshalButtons(RadioButtons)
-            Config.pRadioButtons = RadioButtonArray
-            Config.cRadioButtons = CUInt(RadioButtons.Count)
-        End If
-    End Sub
-
-    Private Shared Function AllocateAndMarshalButtons(structs As List(Of TASKDIALOG_BUTTON)) As IntPtr
-        Dim initialPtr = Marshal.AllocHGlobal(Marshal.SizeOf(GetType(TASKDIALOG_BUTTON)) * structs.Count)
-        Dim currentPtr = initialPtr
-
-        For Each button In structs
-            Marshal.StructureToPtr(button, currentPtr, False)
-            currentPtr = CType((currentPtr.ToInt64 + Marshal.SizeOf(button)), IntPtr)
-        Next
-
-        Return initialPtr
-    End Function
-
-#End Region
-
-#Region "IDispose Pattern"
-
-    Private disposed As Boolean
-
-    Sub Dispose() Implements IDisposable.Dispose
-        Dispose(True)
-        GC.SuppressFinalize(Me)
-    End Sub
-
-    Protected Overrides Sub Finalize()
-        Try
-            Dispose(False)
-        Finally
-            MyBase.Finalize()
-        End Try
-    End Sub
-
-    Protected Sub Dispose(disposing As Boolean)
-        If Not disposed Then
-            disposed = True
-
-            If ButtonArray <> IntPtr.Zero Then
-                Marshal.FreeHGlobal(ButtonArray)
-                ButtonArray = IntPtr.Zero
-            End If
-
-            If RadioButtonArray <> IntPtr.Zero Then
-                Marshal.FreeHGlobal(RadioButtonArray)
-                RadioButtonArray = IntPtr.Zero
-            End If
-
-            If disposing Then
-            End If
-        End If
-    End Sub
-
-#End Region
-
-End Class
-
-Public Class TaskDialogNative
-    <DllImport("comctl32", CharSet:=CharSet.Unicode, SetLastError:=True)>
-    Shared Function TaskDialogIndirect(<[In]()> pTaskConfig As TASKDIALOGCONFIG, <Out()> ByRef pnButton As Integer, <Out()> ByRef pnRadioButton As Integer, <MarshalAs(UnmanagedType.Bool)> <Out()> ByRef pVerificationFlagChecked As Boolean) As Integer
-    End Function
-
-    <DllImport("user32.dll")>
-    Shared Function GetForegroundWindow() As IntPtr
-    End Function
-
-    <DllImport("user32.dll", CharSet:=CharSet.Unicode)>
-    Shared Function GetWindowModuleFileName(hwnd As IntPtr,
-                                            lpszFileName As StringBuilder,
-                                            cchFileNameMax As UInteger) As UInteger
-    End Function
-
-    <DllImport("user32.dll")>
-    Shared Function SendMessage(handle As IntPtr,
-                                message As Int32,
-                                wParam As IntPtr,
-                                lParam As IntPtr) As IntPtr
-    End Function
-
-    <StructLayout(LayoutKind.Sequential, CharSet:=CharSet.Unicode, Pack:=4)>
-    Public Class TASKDIALOGCONFIG
-        Public cbSize As UInteger
-        Public hwndParent As IntPtr
-        Public hInstance As IntPtr
-        Public dwFlags As TASKDIALOG_FLAGS
-        Public dwCommonButtons As MsgButtons
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszWindowTitle As String
-        Public MainIcon As TASKDIALOGCONFIG_ICON_UNION
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszMainInstruction As String
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszContent As String
-        Public cButtons As UInteger
-        Public pButtons As IntPtr
-        Public nDefaultButton As Integer
-        Public cRadioButtons As UInteger
-        Public pRadioButtons As IntPtr
-        Public nDefaultRadioButton As Integer
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszVerificationText As String
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszExpandedInformation As String
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszExpandedControlText As String
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszCollapsedControlText As String
-        Public FooterIcon As TASKDIALOGCONFIG_ICON_UNION
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszFooter As String
-        Public pfCallback As PFTASKDIALOGCALLBACK
-        Public lpCallbackData As IntPtr
-        Public cxWidth As UInteger
-    End Class
-
-    Public Enum TASKDIALOG_FLAGS
-        NONE = 0
-        TDF_ENABLE_HYPERLINKS = &H1
-        TDF_USE_HICON_MAIN = &H2
-        TDF_USE_HICON_FOOTER = &H4
-        TDF_ALLOW_DIALOG_CANCELLATION = &H8
-        TDF_USE_COMMAND_LINKS = &H10
-        TDF_USE_COMMAND_LINKS_NO_ICON = &H20
-        TDF_EXPAND_FOOTER_AREA = &H40
-        TDF_EXPANDED_BY_DEFAULT = &H80
-        TDF_VERIFICATION_FLAG_CHECKED = &H100
-        TDF_SHOW_PROGRESS_BAR = &H200
-        TDF_SHOW_MARQUEE_PROGRESS_BAR = &H400
-        TDF_CALLBACK_TIMER = &H800
-        TDF_POSITION_RELATIVE_TO_WINDOW = &H1000
-        TDF_RTL_LAYOUT = &H2000
-        TDF_NO_DEFAULT_RADIO_BUTTON = &H4000
-    End Enum
-
-    <StructLayout(LayoutKind.Explicit, CharSet:=CharSet.Unicode)>
-    Public Structure TASKDIALOGCONFIG_ICON_UNION
-        Sub New(i As Integer)
-            spacer = IntPtr.Zero
-            pszIcon = 0
-            hMainIcon = i
-        End Sub
-
-        <FieldOffset(0)>
-        Public hMainIcon As Integer
-        <FieldOffset(0)>
-        Public pszIcon As Integer
-        <FieldOffset(0)>
-        Public spacer As IntPtr
-    End Structure
-
-    <StructLayout(LayoutKind.Sequential,
-    CharSet:=CharSet.Unicode, Pack:=4)>
-    Public Structure TASKDIALOG_BUTTON
-        Sub New(n As Integer, txt As String)
-            nButtonID = n
-            pszButtonText = txt
-        End Sub
-
-        Public nButtonID As Integer
-        <MarshalAs(UnmanagedType.LPWStr)>
-        Public pszButtonText As String
-    End Structure
-End Class
-
-Public Enum MsgButtons
-    None = &H0
-    Ok = &H1
-    Yes = &H2
-    No = &H4
-    Cancel = &H8
-    Retry = &H10
-    RetryCancel = Retry Or Cancel
-    Close = &H20
-    OkCancel = Ok Or Cancel
-    YesNo = Yes Or No
-    YesNoCancel = YesNo Or Cancel
-End Enum
-
-Public Enum MsgIcon
-    None = 0
-    Warning = 65535 'TD_WARNING_ICON
-    [Error] = 65534 'TD_ERROR_ICON
-    Info = 65533 'TD_INFORMATION_ICON
-    Shield = 65532 'TD_SHIELD_ICON
-    SecurityShieldBlue = 65531
-    SecurityWarning = 65530
-    SecurityError = 65529
-    SecuritySuccess = 65528
-    SecurityShieldGray = 65527
-End Enum
-
-Public Enum MsgResult
-    None = 0
-    OK = 1
-    Cancel = 2
-    Abort = 3
-    Retry = 4
-    Ignore = 5
-    Yes = 6
-    No = 7
-End Enum

VBNET/VBNET.vbproj

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A1D11294-05BF-4D77-B008-AECF1AA93C9F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>VBNET</RootNamespace>
-    <AssemblyName>VBNET</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>42353,42354,42355</NoWarn>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>
-    </DocumentationFile>
-    <NoWarn>42353,42354,42355</NoWarn>
-    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>On</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="TaskDialog.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>

addons/CSScriptAddon/CSScriptAddon.vb

@@ -0,0 +1,35 @@
+Imports System.ComponentModel.Composition
+Imports System.IO
+Imports System.Windows.Forms
+
+Imports mpvnet
+
+Imports CSScriptLibrary
+
+<Export(GetType(IAddon))>
+Public Class CSScriptAddon
+    Implements IAddon
+
+    Sub New()
+        Dim scriptFiles As New List(Of String)
+
+        If Directory.Exists(mp.MpvConfFolder + "scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(mp.MpvConfFolder + "scripts", "*.cs"))
+        End If
+
+        If Directory.Exists(Application.StartupPath + "\scripts") Then
+            scriptFiles.AddRange(Directory.GetFiles(Application.StartupPath + "\scripts", "*.cs"))
+        End If
+
+        If scriptFiles.Count = 0 Then Return
+        CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom
+
+        For Each i In scriptFiles
+            Try
+                CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(i))
+            Catch ex As Exception
+                Msg.ShowException(ex)
+            End Try
+        Next
+    End Sub
+End Class

addons/CSScriptAddon/CSScriptAddon.vbproj

@@ -47,6 +47,48 @@
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x86\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\mpv.net\bin\x64\Addons\CSScriptAddon\</OutputPath>
+    <Optimize>true</Optimize>
+    <NoWarn>42105,42106,42107,42353,42354,42355</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="CSScriptLibrary, Version=3.27.5.0, Culture=neutral, PublicKeyToken=70fcc3d18c749033, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -114,7 +156,7 @@
     <Content Include="CSScriptLibrary.dll" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
       <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
       <Name>mpv.net</Name>
       <Private>False</Private>

addons/RatingAddon/RatingAddon.cs

@@ -10,7 +10,7 @@ namespace RatingAddon
     [Export(typeof(IAddon))]
     public class RatingAddon : IAddon
     {
-        private Dictionary<string, int> Dic = new Dictionary<string, int>();
+        Dictionary<string, int> Dic = new Dictionary<string, int>();
 
         public RatingAddon()
         {
@@ -18,7 +18,7 @@ namespace RatingAddon
             mp.Shutdown += mpv_Shutdown;
         }
 
-        private void mpv_Shutdown()
+        void mpv_Shutdown()
         {
             foreach (var i in Dic)
             {
@@ -44,7 +44,7 @@ namespace RatingAddon
             }            
         }
 
-        private void mpv_ClientMessage(string[] args)
+        void mpv_ClientMessage(string[] args)
         {
             int rating;
 

addons/RatingAddon/RatingAddon.csproj

@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x86\Debug\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -40,7 +40,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\mpv.net\bin\x86\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x86\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -50,7 +50,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\mpv.net\bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -58,7 +58,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\mpv.net\bin\x64\Release\</OutputPath>
+    <OutputPath>..\mpv.net\bin\x64\Addons\RatingAddon\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -82,7 +82,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\mpv.net\mpv.net.csproj">
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
       <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
       <Name>mpv.net</Name>
       <Private>False</Private>

addons/TestAddon/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TestAddon")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TestAddon")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("06f854b0-00f9-4b53-94d9-0be65a7c55d8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

addons/TestAddon/TestAddon.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.Composition;
+
+using mpvnet;
+
+namespace TestAddon
+{
+    [Export(typeof(IAddon))]
+    public class TestAddon : IAddon
+    {
+        // do some init work in constructor
+        public TestAddon()
+        {
+            // Observe changes of the fullscreen property.
+            // You can find a list of available mpv properties
+            // in mpv.net's wiki on github or use mpv --list-properties.
+            // You can test properties in mpv.net in the menu at:
+            // Tools > Execute mpv command
+            // where you can enter: show-text ${fullscreen}
+            mp.observe_property_bool("fullscreen", OnFullscreenChange);
+        }
+
+        void OnFullscreenChange(bool val)
+        {
+            mp.commandv("show-text", "fullscreen: " + val.ToString());
+        }
+    }
+}

addons/TestAddon/TestAddon.csproj

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TestAddon</RootNamespace>
+    <AssemblyName>TestAddon</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="TestAddon.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\mpv.net\mpv.net.csproj">
+      <Project>{1751f378-8edf-4b62-be6d-304c7c287089}</Project>
+      <Name>mpv.net</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

mpv.net.sln

@@ -5,11 +5,11 @@ VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "addons\CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CSScriptAddon", "CSScriptAddon\CSScriptAddon.vbproj", "{71808A87-8B1C-4DF8-957C-D79C3B164CCA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingAddon", "addons\RatingAddon\RatingAddon.csproj", "{55C88710-539D-4402-84C8-31694841C731}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBNET", "VBNET\VBNET.vbproj", "{A1D11294-05BF-4D77-B008-AECF1AA93C9F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAddon", "addons\TestAddon\TestAddon.csproj", "{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,6 +33,18 @@ Global
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.Build.0 = Release|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.ActiveCfg = Release|x86
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x86.Build.0 = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|x64
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|x86
+		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64
@@ -45,30 +57,18 @@ Global
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|x86
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x64.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Debug|x86.Build.0 = Debug|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x64.Build.0 = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.ActiveCfg = Release|Any CPU
-		{71808A87-8B1C-4DF8-957C-D79C3B164CCA}.Release|x86.Build.0 = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|x64.Build.0 = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Debug|x86.Build.0 = Debug|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|x64.ActiveCfg = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|x64.Build.0 = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1D11294-05BF-4D77-B008-AECF1AA93C9F}.Release|x86.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x64.Build.0 = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{06F854B0-00F9-4B53-94D9-0BE65A7C55D8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

mpv.net/Addon.cs

@@ -5,8 +5,6 @@ using System.ComponentModel.Composition.Hosting;
 using System.IO;
 using System.Windows.Forms;
 
-using VBNET;
-
 namespace mpvnet
 {
     public class Addon
@@ -14,7 +12,7 @@ namespace mpvnet
         [ImportMany]
         public IEnumerable<IAddon> Addons = null;
 
-        private readonly CompositionContainer CompositionContainer;
+        readonly CompositionContainer CompositionContainer;
 
         public Addon()
         {
@@ -28,7 +26,7 @@ namespace mpvnet
                     foreach (string i in Directory.GetDirectories(dir))
                         catalog.Catalogs.Add(new DirectoryCatalog(i, "*Addon.dll"));
 
-                dir = mp.mpvConfFolderPath + "\\Addons";
+                dir = mp.MpvConfFolder + "\\Addons";
 
                 if (Directory.Exists(dir))
                     foreach (string i in Directory.GetDirectories(dir))

mpv.net/Command.cs

@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-
-using VBNET;
+using System.Windows.Interop;
 
 namespace mpvnet
 {
@@ -15,7 +14,7 @@ namespace mpvnet
         public string Name { get; set; }
         public Action<string[]> Action { get; set; }
 
-        private static List<Command> commands;
+        static List<Command> commands;
 
         public static List<Command> Commands
         {
@@ -27,7 +26,7 @@ namespace mpvnet
                     Type type = typeof(Command);
                     MethodInfo[] methods = type.GetMethods(System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
 
-                    foreach (var i in methods)
+                    foreach (MethodInfo i in methods)
                     {
                         ParameterInfo[] parameters = i.GetParameters();
 
@@ -45,35 +44,65 @@ namespace mpvnet
         public static void open_files(string[] args)
         {
             MainForm.Instance.Invoke(new Action(() => {
-                using (var d = new OpenFileDialog())
-                {
-                    d.Multiselect = true;
-                    d.Filter = Misc.GetFilter(Misc.FileTypes);
-
+                using (var d = new OpenFileDialog() { Multiselect = true })
                     if (d.ShowDialog() == DialogResult.OK)
                         mp.LoadFiles(d.FileNames);
-                }
             }));
         }
 
         public static void open_conf_folder(string[] args)
         {
-            Process.Start(mp.mpvConfFolderPath);
+            Process.Start(mp.MpvConfFolder);
         }
 
         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_about(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                AboutWindow w = new AboutWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_command_palette(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                var w = new CommandPaletteWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
+        }
+
+        public static void show_media_search(string[] args)
+        {
+            MainForm.Instance.Invoke(new Action(() => {
+                var w = new EverythingWindow();
+                new WindowInteropHelper(w).Owner = MainForm.Instance.Handle;
+                w.ShowDialog();
+            }));
         }
 
         public static void show_history(string[] args)
         {
-            var fp = mp.mpvConfFolderPath + "history.txt";
+            var fp = mp.MpvConfFolder + "history.txt";
 
             if (File.Exists(fp))
                 Process.Start(fp);
@@ -89,61 +118,58 @@ namespace mpvnet
         {
             try
             {
-                FileInfo fileInfo = new FileInfo(mp.get_property_string("path"));
+                string performer, title, album, genre, date, duration, text = "";
+                long fileSize = 0;
+                string path = mp.get_property_string("path");
+                int width = mp.get_property_int("video-params/w");
+                int height = mp.get_property_int("video-params/h");
 
-                using (MediaInfo mediaInfo = new MediaInfo(fileInfo.FullName))
+                if (File.Exists(path))
                 {
-                    string width = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Width");
+                    fileSize = new FileInfo(path).Length;
 
-                    if (width == "")
+                    if (App.AudioTypes.Contains(Path.GetExtension(path).ToLower().TrimStart('.')))
                     {
-                        string performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
-                        string title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
-                        string album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
-                        string genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
-                        string date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
-                        string duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");
+                        using (MediaInfo mediaInfo = new MediaInfo(path))
+                        {
+                            performer = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Performer");
+                            title = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Title");
+                            album = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Album");
+                            genre = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Genre");
+                            date = mediaInfo.GetInfo(MediaInfoStreamKind.General, "Recorded_Date");
+                            duration = mediaInfo.GetInfo(MediaInfoStreamKind.Audio, "Duration/String");
 
-                        string text = "";
+                            if (performer != "") text += "Artist: " + performer + "\n";
+                            if (title != "") text += "Title: " + title + "\n";
+                            if (album != "") text += "Album: " + album + "\n";
+                            if (genre != "") text += "Genre: " + genre + "\n";
+                            if (date != "") text += "Year: " + date + "\n";
+                            if (duration != "") text += "Length: " + duration + "\n";
 
-                        if (performer != "") text += "Artist: " + performer + "\n";
-                        if (title != "")     text += "Title: "  + title + "\n";
-                        if (album != "")     text += "Album: "  + album + "\n";
-                        if (genre != "")     text += "Genre: "  + genre + "\n";
-                        if (date != "")      text += "Year: "   + date + "\n";
-                        if (duration != "")  text += "Length: " + duration + "\n";
-
-                        mp.commandv("show-text", text, "5000");
+                            mp.commandv("show-text", text, "5000");
+                            return;
+                        }
                     }
-                    else
-                    {
-                        string height = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "Height");
-                        TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
-                        TimeSpan duration = TimeSpan.FromSeconds(mp.get_property_number("duration"));
-                        string bitrate = mediaInfo.GetInfo(MediaInfoStreamKind.Video, "BitRate");
-
-                        if (bitrate == "")
-                            bitrate = "0";
-
-                        double bitrate2 = Convert.ToDouble(bitrate) / 1000.0 / 1000.0;
-                        string videoCodec = mp.get_property_string("video-format").ToUpper();
-                        string filename = fileInfo.Name;
-
-                        string text = filename + "\n" +
-                            FormatTime(position.TotalMinutes) + ":" +
-                            FormatTime(position.Seconds) + " / " +
-                            FormatTime(duration.TotalMinutes) + ":" +
-                            FormatTime(duration.Seconds) + "\n" +
-                            $"{width} x {height}\n" +
-                            $"{bitrate2.ToString("f1")} Mb/s\n" +
-                            Convert.ToInt32(fileInfo.Length / 1024 / 1024).ToString() + " MB\n" +
-                            $"{videoCodec}\n";
-
-                        mp.commandv("show-text", text, "5000");
-                    }
-
-                    string FormatTime(double value) => ((int)value).ToString("00");
                 }
+
+                TimeSpan position = TimeSpan.FromSeconds(mp.get_property_number("time-pos"));
+                TimeSpan duration2 = TimeSpan.FromSeconds(mp.get_property_number("duration"));
+                string videoCodec = mp.get_property_string("video-format").ToUpper();
+
+                text = Path.GetFileName(path) + "\n" +
+                    FormatTime(position.TotalMinutes) + ":" +
+                    FormatTime(position.Seconds) + " / " +
+                    FormatTime(duration2.TotalMinutes) + ":" +
+                    FormatTime(duration2.Seconds) + "\n" +
+                    $"{width} x {height}\n";
+
+                if (fileSize > 0)
+                    text += Convert.ToInt32(fileSize / 1024.0 / 1024.0).ToString() + " MB\n";
+
+                text += $"{videoCodec}\n";
+
+                mp.commandv("show-text", text, "5000");
+                string FormatTime(double value) => ((int)value).ToString("00");
             }
             catch (Exception)
             {
@@ -153,8 +179,9 @@ namespace mpvnet
         public static void execute_mpv_command(string[] args)
         {
             MainForm.Instance.Invoke(new Action(() => {
-                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter a mpv command to be executed.");
+                string command = Microsoft.VisualBasic.Interaction.InputBox("Enter a mpv command to be executed.", "Execute Command", RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand"));
                 if (string.IsNullOrEmpty(command)) return;
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "RecentExecutedCommand", command);
                 mp.command_string(command, false);
             }));
         }
@@ -164,13 +191,13 @@ namespace mpvnet
             MainForm.Instance.Invoke(new Action(() => {
                 string command = Microsoft.VisualBasic.Interaction.InputBox("Enter URL to be opened.");
                 if (string.IsNullOrEmpty(command)) return;
-                mp.LoadURL(command);
+                mp.LoadFiles(command);
             }));
         }
 
         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 +212,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));
@@ -197,5 +224,52 @@ namespace mpvnet
                 }
             }));
         }
+
+        public static void cycle_audio(string[] args)
+        {
+            string filePath = mp.get_property_string("path", false);
+            if (!File.Exists(filePath)) return;
+
+            using (MediaInfo mi = new MediaInfo(filePath))
+            {
+                MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                if (audTracks.Length < 2) return;
+                int aid = mp.get_property_int("aid");
+                aid += 1;
+                if (aid > audTracks.Length) aid = 1;
+                mp.commandv("set", "aid", aid.ToString());
+                mp.commandv("show-text", audTracks[aid - 1].Text.Substring(3), "5000");
+            }
+        }
+
+        public static void manage_file_associations(string[] args)
+        {
+            using (var td = new TaskDialog<string>())
+            {
+                td.MainInstruction = "Choose an option.";
+                td.MainIcon = MsgIcon.Shield;
+
+                td.AddCommandLink("Register video file extensions", "video");
+                td.AddCommandLink("Register audio file extensions", "audio");
+                td.AddCommandLink("Unregister file extensions",     "unreg");
+
+                string result = td.Show();
+
+                if (!string.IsNullOrEmpty(result))
+                {
+                    using (var proc = new Process())
+                    {
+                        proc.StartInfo.FileName = Application.ExecutablePath;
+                        proc.StartInfo.Arguments = "--reg-file-assoc " + result;
+                        proc.StartInfo.Verb = "runas";
+                        try {
+                            proc.Start();
+                        }
+                        catch (Exception)
+                        { }
+                    }
+                }
+            }
+        }
     }
 }

mpv.net/Controls/SearchTextBoxUserControl.xaml.cs

@@ -13,6 +13,16 @@ namespace Controls
 
         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 = "";
@@ -21,7 +31,12 @@ namespace Controls
 
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
-            HintTextBlock.Text = SearchTextBox.Text == "" ? "Find a setting" : "";
+            UpdateControls();
+        }
+
+        void UpdateControls()
+        {
+            HintTextBlock.Text = SearchTextBox.Text == "" ? HintText : "";
 
             if (SearchTextBox.Text == "")
                 SearchClearButton.Visibility = Visibility.Hidden;

mpv.net/DynamicGUI/DynamicGUI.cs

@@ -4,16 +4,17 @@ 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 filepath)
+        public static List<SettingBase> LoadSettings(string content)
         {
             TomlTable table;
-            using (StreamReader reader = new StreamReader(File.OpenRead(filepath)))
+            using (StringReader reader = new StringReader(content))
                 table = TOML.Parse(reader);
             List<SettingBase> settingsList = new List<SettingBase>(); 
 

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

@@ -6,32 +6,32 @@ using System.Threading;
 using System.Windows.Forms;
 using System.Linq;
 using System.Collections.Generic;
-
-using VBNET;
-using System.Threading.Tasks;
 using System.ComponentModel;
+using System.Globalization;
+using System.Diagnostics;
 
 namespace mpvnet
 {
     public partial class MainForm : Form
     {
         public static MainForm Instance { get; set; }
-        public static IntPtr Hwnd;
+        public static IntPtr Hwnd { get; set; }
 
-        private Point  LastCursorPosChanged;
-        private int    LastCursorChangedTickCount;
-        private bool   IgnoreDpiChanged = true;
-        private MenuItemEx TracksMenu;
-        private List<MediaTrack> MediaTracks = new List<MediaTrack>();
-        public new ContextMenuStripEx ContextMenu;
+        public new ContextMenuStripEx ContextMenu { get; set; }
 
-        private float  MpvAutofit = 0.50f;
-        private bool   MpvFullscreen;
-        private int    MpvScreen = -1;
-        private string MpvNetDarkMode = "system";
-        private string MpvSid = "";
-        private string MpvAid = "";
-        private string MpvVid = "";
+        Point  LastCursorPosChanged;
+        int    LastCursorChangedTickCount;
+        bool   IgnoreDpiChanged = true;
+        List<string> RecentFiles;
+
+        public string MpvNetDarkMode { get; set; } = "always";
+        public bool   MpvFullscreen  { get; set; }
+        public float  MpvAutofit { get; set; } = 0.50f;
+        public int    MpvScreen  { get; set; } = -1;
+        public string MpvSid     { get; set; } = "";
+        public string MpvAid     { get; set; } = "";
+        public string MpvVid     { get; set; } = "";
+        public int    MpvEdition { get; set; }
 
         public MainForm()
         {
@@ -42,12 +42,20 @@ 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;
 
+                object recent = RegistryHelp.GetObject("HKCU\\Software\\" + Application.ProductName, "Recent");
+
+                if (recent is string[] r)
+                    RecentFiles = new List<string>(r);
+                else
+                    RecentFiles = new List<string>();
+
                 foreach (var i in mp.mpvConf)
                     ProcessMpvProperty(i.Key, i.Value);
 
@@ -67,50 +75,124 @@ namespace mpvnet
             }
         }
 
-        private void ContextMenu_Opening(object sender, CancelEventArgs e)
+        void ContextMenu_Opening(object sender, CancelEventArgs e)
         {
-            lock (MediaTracks)
+            lock (mp.MediaTracks)
             {
-                TracksMenu.DropDownItems.Clear();
+                MenuItem trackMenuItem = FindMenuItem("Track");
 
-                MediaTrack[] audTracks = MediaTracks.Where(track => track.Type == "a").ToArray();
-                MediaTrack[] subTracks = MediaTracks.Where(track => track.Type == "s").ToArray();
-                MediaTrack[] vidTracks = MediaTracks.Where(track => track.Type == "v").ToArray();
-
-                foreach (MediaTrack track in vidTracks)
+                if (trackMenuItem != null)
                 {
-                    var mi = ContextMenu.Add("Track > " + track.Text);
-                    mi.Action = () => { mp.commandv("set", "vid", track.ID.ToString()); };
-                    mi.Checked = MpvVid == track.ID.ToString();
-                }
+                    trackMenuItem.DropDownItems.Clear();
 
-                if (vidTracks.Length > 0)
-                    ContextMenu.Add("Track > -");
+                    MediaTrack[] audTracks = mp.MediaTracks.Where(track => track.Type == "a").ToArray();
+                    MediaTrack[] subTracks = mp.MediaTracks.Where(track => track.Type == "s").ToArray();
+                    MediaTrack[] vidTracks = mp.MediaTracks.Where(track => track.Type == "v").ToArray();
+                    MediaTrack[] ediTracks = mp.MediaTracks.Where(track => track.Type == "e").ToArray();
 
-                foreach (MediaTrack track in audTracks)
-                {
-                    var mi = ContextMenu.Add("Track > " + track.Text);
-                    mi.Action = () => { mp.commandv("set", "aid", track.ID.ToString()); };
-                    mi.Checked = MpvAid == track.ID.ToString();
-                }
+                    foreach (MediaTrack track in vidTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "vid", track.ID.ToString()); };
+                        mi.Checked = MpvVid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
 
-                if (subTracks.Length > 0)
-                    ContextMenu.Add("Track > -");
+                    if (vidTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
 
-                foreach (MediaTrack track in subTracks)
-                {
-                    var mi = ContextMenu.Add("Track > " + track.Text);
-                    mi.Action = () => { mp.commandv("set", "sid", track.ID.ToString()); };
-                    mi.Checked = MpvSid == track.ID.ToString();
-                }
+                    foreach (MediaTrack track in audTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "aid", track.ID.ToString()); };
+                        mi.Checked = MpvAid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
 
-                if (subTracks.Length > 0)
-                {
-                    var mi = ContextMenu.Add("Track > S: No subtitles");
-                    mi.Action = () => { mp.commandv("set", "sid", "no"); };
-                    mi.Checked = MpvSid == "no";
+                    if (subTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in subTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "sid", track.ID.ToString()); };
+                        mi.Checked = MpvSid == track.ID.ToString();
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (subTracks.Length > 0)
+                    {
+                        MenuItem mi = new MenuItem("S: No subtitles");
+                        mi.Action = () => { mp.commandv("set", "sid", "no"); };
+                        mi.Checked = MpvSid == "no";
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
+
+                    if (ediTracks.Length > 0)
+                        trackMenuItem.DropDownItems.Add(new ToolStripSeparator());
+
+                    foreach (MediaTrack track in ediTracks)
+                    {
+                        MenuItem mi = new MenuItem(track.Text);
+                        mi.Action = () => { mp.commandv("set", "edition", track.ID.ToString()); };
+                        mi.Checked = MpvEdition == track.ID;
+                        trackMenuItem.DropDownItems.Add(mi);
+                    }
                 }
             }
+
+            lock (mp.Chapters)
+            {
+                MenuItem chaptersMenuItem = FindMenuItem("Chapters");
+
+                if (chaptersMenuItem != null)
+                {
+                    chaptersMenuItem.DropDownItems.Clear();
+
+                    foreach (var i in mp.Chapters)
+                    {
+                        MenuItem mi = new MenuItem(i.Key);
+                        mi.ShortcutKeyDisplayString = TimeSpan.FromSeconds(i.Value).ToString().Substring(0, 8) + "     ";
+                        mi.Action = () => { mp.commandv("seek", i.Value.ToString(CultureInfo.InvariantCulture), "absolute"); };
+                        chaptersMenuItem.DropDownItems.Add(mi);
+                    }
+                }
+            }
+
+            MenuItem recent = FindMenuItem("Recent");
+
+            if (recent != null)
+            {
+                recent.DropDownItems.Clear();
+
+                foreach (string path in RecentFiles)
+                    MenuItem.Add(recent.DropDownItems, path, () => mp.LoadFiles(path));
+
+                recent.DropDownItems.Add(new ToolStripSeparator());
+                MenuItem mi = new MenuItem("Clear List");
+                mi.Action = () => RecentFiles.Clear();
+                recent.DropDownItems.Add(mi);
+            }
+        }
+
+        public MenuItem FindMenuItem(string text) => FindMenuItem(text, ContextMenu.Items);
+
+        MenuItem FindMenuItem(string text, ToolStripItemCollection items)
+        {
+            foreach (var item in items)
+            {
+                if (item is MenuItem mi)
+                {
+                    if (mi.Text.StartsWith(text) && mi.Text.Trim() == text)
+                        return mi;
+                    if (mi.DropDownItems.Count > 0)
+                    {
+                        MenuItem val = FindMenuItem(text, mi.DropDownItems);
+                        if (val != null) return val;
+                    }
+                }
+            }
+            return null;
         }
 
         protected void SetScreen(int targetIndex)
@@ -225,186 +307,71 @@ namespace mpvnet
         public void BuildMenu()
         {
             string content = File.ReadAllText(mp.InputConfPath);
-            List<string> lines = null;
-            Dictionary<string, string> commandInputDic = new Dictionary<string, string>();
+            var items = CommandItem.GetItems(content);
 
-            if (content.Contains("#menu:"))
-                lines = content.Split("\r\n".ToCharArray()).ToList();
-            else
+            if (!content.Contains("#menu:"))
             {
-                lines = Properties.Resources.input_conf.Split("\r\n".ToCharArray()).ToList();
-                
-                foreach (string i in content.Split("\r\n".ToCharArray()))
-                {
-                    string line = i.Trim();
-                    if (line.StartsWith("#") || !line.Contains(" ")) continue;
-                    string input = line.Substring(0, line.IndexOf(" ")).Trim();
-                    string command = line.Substring(line.IndexOf(" ") + 1).Trim();
-                    commandInputDic[command] = input;
-                }
+                var defaultItems = CommandItem.GetItems(Properties.Resources.inputConf);
+                foreach (CommandItem item in items)
+                    foreach (CommandItem defaultItem in defaultItems)
+                        if (item.Command == defaultItem.Command)
+                            defaultItem.Input = item.Input;
+                items = defaultItems;
             }
 
-            foreach (string i in lines)
+            foreach (CommandItem item in items)
             {
-                if (!i.Contains("#menu:")) continue;
-                string left = i.Substring(0, i.IndexOf("#menu:")).Trim();
-                if (left.StartsWith("#")) continue;
-                string command = left.Substring(left.IndexOf(" ") + 1).Trim();
-                string menu = i.Substring(i.IndexOf("#menu:") + "#menu:".Length).Trim();
-                string input = left.Substring(0, left.IndexOf(" "));
-                if (input == "_") input = "";
-                if (menu.Contains(";")) input = menu.Substring(0, menu.IndexOf(";")).Trim();
-                string path = menu.Substring(menu.IndexOf(";") + 1).Trim().Replace("&", "&&");
-                if (path == "" || command == "") continue;
-
-                if (commandInputDic.Count > 0)
-                    if (commandInputDic.ContainsKey(command))
-                        input = commandInputDic[command];
-                    else
-                        input = "";
-
-                MenuItemEx menuItem = ContextMenu.Add(path, () => {
+                if (string.IsNullOrEmpty(item.Path))
+                    continue;
+                string path = item.Path.Replace("&", "&&");
+                MenuItem menuItem = ContextMenu.Add(path, () => {
                     try {
-                        mp.command_string(command);
-                    }
-                    catch (Exception ex) {
+                        mp.command_string(item.Command);
+                    } catch (Exception ex) {
                         Msg.ShowException(ex);
                     }
                 });
-                
                 if (menuItem != null)
-                {
-                    menuItem.ShortcutKeyDisplayString = input.Replace("_", "") + "    ";
-
-                    if (TracksMenu == null && menuItem.Text.StartsWith("Track ") &&
-                        menuItem.Text.Trim() == "Track")
-
-                        TracksMenu = menuItem;
-                }
+                    menuItem.ShortcutKeyDisplayString = item.Input + "    ";
             }
         }
 
-        private void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
+        void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
 
-        private string LastHistory;
-
-        private void mp_PlaybackRestart()
+        private void Mp_FileLoaded()
         {
-            string filePath = mp.get_property_string("path");
-            BeginInvoke(new Action(() => { Text = Path.GetFileName(filePath) + " - mpv.net " + Application.ProductVersion; }));
-
-            Task.Run(new Action(() => {
-                string historyFilepath = mp.mpvConfFolderPath + "history.txt";
-
-                if (LastHistory != filePath && File.Exists(historyFilepath))
-                {
-                    File.AppendAllText(historyFilepath, DateTime.Now.ToString() + " " +
-                        Path.GetFileNameWithoutExtension(filePath) + "\r\n");
-                    LastHistory = filePath;
-                }
-
-                lock (MediaTracks)
-                {
-                    MediaTracks.Clear();
-
-                    using (MediaInfo mi = new MediaInfo(filePath))
-                    {
-                        int count = mi.GetCount(MediaInfoStreamKind.Video);
-
-                        for (int i = 0; i < count; i++)
-                        {
-                            MediaTrack track = new MediaTrack();
-                            Add(track, mi.GetVideo(i, "Format"));
-                            Add(track, mi.GetVideo(i, "Format_Profile"));
-                            Add(track, mi.GetVideo(i, "Width") + "x" + mi.GetVideo(i, "Height"));
-                            Add(track, mi.GetVideo(i, "FrameRate") + " FPS");
-                            Add(track, mi.GetVideo(i, "Language/String"));
-                            Add(track, mi.GetVideo(i, "Forced") == "Yes" ? "Forced" : "");
-                            Add(track, mi.GetVideo(i, "Default") == "Yes" ? "Default" : "");
-                            Add(track, mi.GetVideo(i, "Title"));
-                            track.Text = "V: " + track.Text.Trim(" ,".ToCharArray());
-                            track.Type = "v";
-                            track.ID = i + 1;
-                            MediaTracks.Add(track);
-                        }
-
-                        count = mi.GetCount(MediaInfoStreamKind.Audio);
-
-                        for (int i = 0; i < count; i++)
-                        {
-                            MediaTrack track = new MediaTrack();
-                            Add(track, mi.GetAudio(i, "Language/String"));
-                            Add(track, mi.GetAudio(i, "Format"));
-                            Add(track, mi.GetAudio(i, "Format_Profile"));
-                            Add(track, mi.GetAudio(i, "BitRate/String"));
-                            Add(track, mi.GetAudio(i, "Channel(s)/String"));
-                            Add(track, mi.GetAudio(i, "SamplingRate/String"));
-                            Add(track, mi.GetAudio(i, "Forced") == "Yes" ? "Forced" : "");
-                            Add(track, mi.GetAudio(i, "Default") == "Yes" ? "Default" : "");
-                            Add(track, mi.GetAudio(i, "Title"));
-                            track.Text = "A: " + track.Text.Trim(" ,".ToCharArray());
-                            track.Type = "a";
-                            track.ID = i + 1;
-                            MediaTracks.Add(track);
-                        }
-
-                        count = mi.GetCount(MediaInfoStreamKind.Text);
-
-                        for (int i = 0; i < count; i++)
-                        {
-                            MediaTrack track = new MediaTrack();
-                            Add(track, mi.GetText(i, "Language/String"));
-                            Add(track, mi.GetText(i, "Format"));
-                            Add(track, mi.GetText(i, "Format_Profile"));
-                            Add(track, mi.GetText(i, "Forced") == "Yes" ? "Forced" : "");
-                            Add(track, mi.GetText(i, "Default") == "Yes" ? "Default" : "");
-                            Add(track, mi.GetText(i, "Title"));
-                            track.Text = "S: " + track.Text.Trim(" ,".ToCharArray());
-                            track.Type = "s";
-                            track.ID = i + 1;
-                            MediaTracks.Add(track);
-                        }
-
-                        void Add(MediaTrack track, string val)
-                        {
-                            if (!string.IsNullOrEmpty(val) && !(track.Text != null && track.Text.Contains(val)))
-                                track.Text += " " + val + ",";
-                        }                        
-                    }
-                }
+            string path = mp.get_property_string("path");
+            BeginInvoke(new Action(() => {
+                if (File.Exists(path) || path.StartsWith("http"))
+                    Text = Path.GetFileName(path) + " - mpv.net " + Application.ProductVersion;
+                else
+                    Text = "mpv.net " + Application.ProductVersion;
             }));
+            if (RecentFiles.Contains(path)) RecentFiles.Remove(path);
+            RecentFiles.Insert(0, path);
+            if (RecentFiles.Count > 15) RecentFiles.RemoveAt(15);
         }
 
-        class MediaTrack
-        {
-            public string Text { get; set; }
-            public string Type { get; set; }
-            public int    ID   { get; set; }
-        }
+        void Mp_Idle() => BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
 
-        private void Mp_Idle()
-        {
-            BeginInvoke(new Action(() => { Text = "mpv.net " + Application.ProductVersion; }));
-        }
+        void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
 
-        private void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
-
-        private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+        void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
         {
             Msg.ShowException(e.Exception);
         }
 
-        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
            Msg.ShowError(e.ExceptionObject.ToString());
         }
 
-        private void mp_VideoSizeChanged()
+        void mp_VideoSizeChanged()
         {
             BeginInvoke(new Action(() => SetFormPositionAndSizeKeepHeight()));
         }
 
-        private void mp_Shutdown()
+        void mp_Shutdown()
         {
             BeginInvoke(new Action(() => Close()));  
         }
@@ -436,12 +403,16 @@ namespace mpvnet
 
         protected override void WndProc(ref Message m)
         {
+            //Debug.WriteLine(m);
+
             switch (m.Msg)
             {
                 case 0x0201: // WM_LBUTTONDOWN
                 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);
@@ -450,14 +421,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");
@@ -502,7 +465,7 @@ namespace mpvnet
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
                 mp.LoadFiles(e.Data.GetData(DataFormats.FileDrop) as String[]);
             if (e.Data.GetDataPresent(DataFormats.Text))
-                mp.LoadURL(e.Data.GetData(DataFormats.Text).ToString());
+                mp.LoadFiles(e.Data.GetData(DataFormats.Text).ToString());
         }
 
         protected override void OnMouseDown(MouseEventArgs e)
@@ -531,12 +494,9 @@ namespace mpvnet
                 CursorHelp.Show();
         }
 
-        bool IsMouseInOSC()
-        {
-            return PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
-        }
+        bool IsMouseInOSC() => PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
 
-        private void Timer_Tick(object sender, EventArgs e)
+        void Timer_Tick(object sender, EventArgs e)
         {
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
             {
@@ -551,14 +511,6 @@ namespace mpvnet
             }
         }
 
-        public DialogResult ShowMsgBox(string message, MessageBoxIcon icon)
-        {
-            var buttons = MessageBoxButtons.OK;
-            if (icon == MessageBoxIcon.Question) buttons = MessageBoxButtons.OKCancel;
-            var fn = new Func<DialogResult>(() => MessageBox.Show(message, Application.ProductName, buttons, icon));
-            return (DialogResult)Invoke(fn);
-        }
-
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
@@ -568,9 +520,10 @@ namespace mpvnet
             mp.observe_property_string("sid", mpPropChangeSid);
             mp.observe_property_string("aid", mpPropChangeAid);
             mp.observe_property_string("vid", mpPropChangeVid);
+            mp.observe_property_int("edition", mpPropChangeEdition);
             mp.Shutdown += mp_Shutdown;
             mp.VideoSizeChanged += mp_VideoSizeChanged;
-            mp.PlaybackRestart += mp_PlaybackRestart;
+            mp.FileLoaded += Mp_FileLoaded;
             mp.Idle += Mp_Idle;
         }
 
@@ -582,10 +535,12 @@ namespace mpvnet
 
         void mpPropChangeVid(string value) => MpvVid = value;
 
+        void mpPropChangeEdition(int value) => MpvEdition = value;
+
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
-            if ((MpvNetDarkMode == "system" && Misc.IsDarkTheme) || MpvNetDarkMode == "always")
+            if ((MpvNetDarkMode == "system" && Sys.IsDarkTheme) || MpvNetDarkMode == "always")
                 ToolStripRendererEx.ColorTheme = Color.Black;
             ContextMenu = new ContextMenuStripEx(components);
             ContextMenu.Opened += ContextMenu_Opened;
@@ -593,14 +548,15 @@ namespace mpvnet
             BuildMenu();
             ContextMenuStrip = ContextMenu;
             IgnoreDpiChanged = false;
-            CheckYouTube();
+            CheckURL();
         }
 
         protected override void OnFormClosed(FormClosedEventArgs e)
         {
             base.OnFormClosed(e);
+            RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "Recent", RecentFiles.ToArray());
             mp.commandv("quit");
-            mp.AutoResetEvent.WaitOne(3000); 
+            mp.AutoResetEvent.WaitOne(3000);
         }
 
         protected override void OnLostFocus(EventArgs e)
@@ -612,19 +568,19 @@ namespace mpvnet
         protected override void OnActivated(EventArgs e)
         {
             base.OnActivated(e);
-            CheckYouTube();
+            CheckURL();
         }
 
-        private string LastURL;
-
-        void CheckYouTube()
+        void CheckURL()
         {
             string clipboard = Clipboard.GetText();
-            if (clipboard.StartsWith("https://www.youtube.com/watch?") && LastURL != clipboard && Visible)
+
+            if (clipboard.StartsWith("http") && RegistryHelp.GetString("HKCU\\Software\\" + Application.ProductName, "LastURL") != clipboard && Visible)
             {
-                LastURL = clipboard;
-                if (Msg.ShowQuestion("Play YouTube URL?") == MsgResult.OK)
-                    mp.LoadURL(clipboard);
+                RegistryHelp.SetObject("HKCU\\Software\\" + Application.ProductName, "LastURL", clipboard);
+
+                if (Msg.ShowQuestion("Play URL?", clipboard) == MsgResult.OK)
+                    mp.LoadFiles(clipboard);
             }
         }
     }

mpv.net/MediaInfo.cs

@@ -3,8 +3,8 @@ using System.Runtime.InteropServices;
 
 public class MediaInfo : IDisposable
 {
-    private IntPtr Handle;
-    private static bool Loaded;
+    IntPtr Handle;
+    static bool Loaded;
 
     public MediaInfo(string sourcepath)
     {
@@ -42,7 +42,7 @@ public class MediaInfo : IDisposable
         return Marshal.PtrToStringUni(MediaInfo_Get(Handle, MediaInfoStreamKind.Text, streamNumber, parameter, MediaInfoInfoKind.Text, MediaInfoInfoKind.Name));
     }
 
-    private bool Disposed;
+    bool Disposed;
 
     public void Dispose()
     {
@@ -57,32 +57,32 @@ public class MediaInfo : IDisposable
     ~MediaInfo() { Dispose(); }
 
     [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr LoadLibrary(string path);
+    static extern IntPtr LoadLibrary(string path);
 
     [DllImport("MediaInfo.dll")]
-    private static extern IntPtr MediaInfo_New();
+    static extern IntPtr MediaInfo_New();
 
     [DllImport("MediaInfo.dll")]
-    private static extern void MediaInfo_Delete(IntPtr handle);
+    static extern void MediaInfo_Delete(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern int MediaInfo_Open(IntPtr handle, string fileName);
+    static extern int MediaInfo_Open(IntPtr handle, string fileName);
 
     [DllImport("MediaInfo.dll")]
-    private static extern int MediaInfo_Close(IntPtr handle);
+    static extern int MediaInfo_Close(IntPtr handle);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern IntPtr MediaInfo_Get(IntPtr handle,
-                                               MediaInfoStreamKind streamKind,
-                                               int streamNumber,
-                                               string parameter,
-                                               MediaInfoInfoKind kindOfInfo,
-                                               MediaInfoInfoKind kindOfSearch);
+    static extern IntPtr MediaInfo_Get(IntPtr handle,
+                                       MediaInfoStreamKind streamKind,
+                                       int streamNumber,
+                                       string parameter,
+                                       MediaInfoInfoKind kindOfInfo,
+                                       MediaInfoInfoKind kindOfSearch);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    private static extern int MediaInfo_Count_Get(IntPtr handle,
-                                                  MediaInfoStreamKind streamKind,
-                                                  int streamNumber);
+    static extern int MediaInfo_Count_Get(IntPtr handle,
+                                          MediaInfoStreamKind streamKind,
+                                          int streamNumber);
 }
 
 public enum MediaInfoStreamKind

mpv.net/Menu.cs

@@ -23,33 +23,33 @@ public class ContextMenuStripEx : ContextMenuStrip
         Renderer = new ToolStripRendererEx();
     }
 
-    public MenuItemEx Add(string path)
+    public MenuItem Add(string path)
     {
         return Add(path, null);
     }
 
-    public MenuItemEx Add(string path, Action action, bool enabled = true)
+    public MenuItem Add(string path, Action action, bool enabled = true)
     {
-        MenuItemEx ret = MenuItemEx.Add(Items, path, action);
+        MenuItem ret = MenuItem.Add(Items, path, action);
         if (ret == null) return null;
         ret.Enabled = enabled;
         return ret;
     }
 }
 
-public class MenuItemEx : ToolStripMenuItem
+public class MenuItem : ToolStripMenuItem
 {
     public Action Action { get; set; }
 
-    public MenuItemEx()
+    public MenuItem()
     {
     }
 
-    public MenuItemEx(string text) : base(text)
+    public MenuItem(string text) : base(text)
     {
     }
 
-    public MenuItemEx(string text, Action action) : base(text)
+    public MenuItem(string text, Action action) : base(text)
     {
         Action = action;
     }
@@ -61,12 +61,7 @@ public class MenuItemEx : ToolStripMenuItem
         base.OnClick(e);
     }
 
-    public static MenuItemEx Add<T>(ToolStripItemCollection items, string path, Action<T> action, T value)
-    {
-        return Add(items, path, () => action(value));
-    }
-
-    public static MenuItemEx Add(ToolStripItemCollection items, string path, Action action)
+    public static MenuItem Add(ToolStripItemCollection items, string path, Action action)
     {
         string[] a = path.Split(new[] { " > ", " | " }, StringSplitOptions.RemoveEmptyEntries);
         var itemsCollection = items;
@@ -95,7 +90,7 @@ public class MenuItemEx : ToolStripMenuItem
                         itemsCollection.Add(new ToolStripSeparator());
                     else
                     {
-                        MenuItemEx item = new MenuItemEx(a[x] + "    ", action);
+                        MenuItem item = new MenuItem(a[x] + "    ", action);
                         itemsCollection.Add(item);
                         itemsCollection = item.DropDownItems;
                         return item;
@@ -103,7 +98,7 @@ public class MenuItemEx : ToolStripMenuItem
                 }
                 else
                 {
-                    MenuItemEx item = new MenuItemEx();
+                    MenuItem item = new MenuItem();
                     item.Text = a[x] + "    ";
                     itemsCollection.Add(item);
                     itemsCollection = item.DropDownItems;
@@ -149,7 +144,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
     public static Color ColorToolStrip3 { get; set; }
     public static Color ColorToolStrip4 { get; set; }
 
-    private int TextOffset;
+    int TextOffset;
 
     public ToolStripRendererEx()
     {
@@ -266,10 +261,10 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
 
     protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
     {
-        if (e.Item.GetType() != typeof(MenuItemEx))
+        if (e.Item.GetType() != typeof(MenuItem))
             return;
 
-        MenuItemEx item = e.Item as MenuItemEx;
+        MenuItem item = e.Item as MenuItem;
 
         e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
 
@@ -321,28 +316,28 @@ public struct HSLColor
         Luminosity = l;
     }
 
-    private double hue;
+    double _Hue;
 
     public int Hue {
-        get => System.Convert.ToInt32(hue * 240);
-        set => hue = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Hue * 240);
+        set => _Hue = CheckRange(value / 240.0);
     }
 
-    private double saturation;
+    double _Saturation;
 
     public int Saturation {
-        get => System.Convert.ToInt32(saturation * 240);
-        set => saturation = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Saturation * 240);
+        set => _Saturation = CheckRange(value / 240.0);
     }
 
-    private double luminosity;
+    double _Luminosity;
 
     public int Luminosity {
-        get => System.Convert.ToInt32(luminosity * 240);
-        set => luminosity = CheckRange(value / 240.0);
+        get => System.Convert.ToInt32(_Luminosity * 240);
+        set => _Luminosity = CheckRange(value / 240.0);
     }
 
-    private double CheckRange(double value)
+    double CheckRange(double value)
     {
         if (value < 0)
             value = 0;
@@ -367,21 +362,21 @@ public struct HSLColor
     {
         double r = 0, g = 0, b = 0;
 
-        if (luminosity != 0)
+        if (_Luminosity != 0)
         {
-            if (saturation == 0)
+            if (_Saturation == 0)
             {
-                b = luminosity;
-                g = luminosity;
-                r = luminosity;
+                b = _Luminosity;
+                g = _Luminosity;
+                r = _Luminosity;
             }
             else
             {
                 double temp2 = GetTemp2(this);
-                double temp1 = 2.0 * luminosity - temp2;
-                r = GetColorComponent(temp1, temp2, hue + 1.0 / 3.0);
-                g = GetColorComponent(temp1, temp2, hue);
-                b = GetColorComponent(temp1, temp2, hue - 1.0 / 3.0);
+                double temp1 = 2.0 * _Luminosity - temp2;
+                r = GetColorComponent(temp1, temp2, _Hue + 1.0 / 3.0);
+                g = GetColorComponent(temp1, temp2, _Hue);
+                b = GetColorComponent(temp1, temp2, _Hue - 1.0 / 3.0);
             }
         }
 
@@ -391,7 +386,7 @@ public struct HSLColor
             System.Convert.ToInt32(255 * b));
     }
 
-    private static double GetColorComponent(double temp1, double temp2, double temp3)
+    static double GetColorComponent(double temp1, double temp2, double temp3)
     {
         temp3 = MoveIntoRange(temp3);
 
@@ -405,7 +400,7 @@ public struct HSLColor
             return temp1;
     }
 
-    private static double MoveIntoRange(double temp3)
+    static double MoveIntoRange(double temp3)
     {
         if (temp3 < 0)
             temp3 += 1;
@@ -414,14 +409,14 @@ public struct HSLColor
         return temp3;
     }
 
-    private static double GetTemp2(HSLColor hslColor)
+    static double GetTemp2(HSLColor hslColor)
     {
         double temp2;
 
-        if (hslColor.luminosity < 0.5)
-            temp2 = hslColor.luminosity * (1.0 + hslColor.saturation);
+        if (hslColor._Luminosity < 0.5)
+            temp2 = hslColor._Luminosity * (1.0 + hslColor._Saturation);
         else
-            temp2 = hslColor.luminosity + hslColor.saturation - (hslColor.luminosity * hslColor.saturation);
+            temp2 = hslColor._Luminosity + hslColor._Saturation - (hslColor._Luminosity * hslColor._Saturation);
 
         return temp2;
     }
@@ -429,17 +424,17 @@ public struct HSLColor
     public static HSLColor Convert(Color c)
     {
         HSLColor r = new HSLColor();
-        r.hue = c.GetHue() / 360.0;
-        r.luminosity = c.GetBrightness();
-        r.saturation = c.GetSaturation();
+        r._Hue = c.GetHue() / 360.0;
+        r._Luminosity = c.GetBrightness();
+        r._Saturation = c.GetSaturation();
         return r;
     }
 
     public void SetRGB(int red, int green, int blue)
     {
         HSLColor hc = HSLColor.Convert(Color.FromArgb(red, green, blue));
-        hue = hc.hue;
-        saturation = hc.saturation;
-        luminosity = hc.luminosity;
+        _Hue = hc._Hue;
+        _Saturation = hc._Saturation;
+        _Luminosity = hc._Luminosity;
     }
 }

mpv.net/Misc.cs

@@ -1,21 +1,35 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Drawing;
 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
+    public class App
     {
-        public static readonly string[] FileTypes = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
+        public static string[] VideoTypes { get; } = "mkv mp4 mpg avi mov webm vob wmv flv avs 264 h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts m4v".Split(" ".ToCharArray());
+        public static string[] AudioTypes { get; } = "mp3 mp2 ac3 ogg opus flac wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 mka aac mpa".Split(" ".ToCharArray());
 
-        public static string GetFilter(IEnumerable<string> values) => "*." + 
-            String.Join(";*.", values) + "|*." + String.Join(";*.", values) + "|All Files|*.*";
+        public static bool IsDarkMode { 
+            get {
+                string darkMode = MainForm.Instance.MpvNetDarkMode;
+                return (darkMode == "system" && Sys.IsDarkTheme) || darkMode == "always";
+            }
+        }
+    }
 
+    public class Sys
+    {
         public static bool IsDarkTheme {
             get {
                 object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
@@ -23,6 +37,20 @@ namespace mpvnet
                 return (int)value == 0;
             }
         }
+
+        public static bool IsDirectoryWritable(string dirPath)
+        {
+            try
+            {
+                using (FileStream fs = File.Create(Path.Combine(dirPath,
+                    Path.GetRandomFileName()), 1, FileOptions.DeleteOnClose))
+                { }
+                return true;
+            }
+            catch
+            { }
+            return false;
+        }
     }
 
     public class StringLogicalComparer : IComparer, IComparer<string>
@@ -42,33 +70,31 @@ namespace mpvnet
         static string ExeFilename = Path.GetFileName(Application.ExecutablePath);
         static string ExeFilenameNoExt = Path.GetFileNameWithoutExtension(Application.ExecutablePath);
         static string[] Types;
-        public static string[] VideoTypes = "mpg avi vob mp4 mkv avs 264 mov wmv flv h264 asf webm mpeg mpv y4m avc hevc 265 h265 m2v m2ts vpy mts webm m4v".Split(" ".ToCharArray());
-        public static string[] AudioTypes = "mp2 mp3 ac3 wav w64 m4a dts dtsma dtshr dtshd eac3 thd thd+ac3 ogg mka aac opus flac mpa".Split(" ".ToCharArray());
 
         public static void Register(string[] types)
         {
             Types = types;
 
-            RegistryHelp.SetValue(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
-            RegistryHelp.SetValue($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
-            RegistryHelp.SetValue($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
-            RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationDescription", "mpv.net media player");
-            RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationName", "mpv.net");
-            RegistryHelp.SetValue($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
-            RegistryHelp.SetValue($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
+            RegistryHelp.SetObject(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
+            RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationDescription", "mpv.net media player");
+            RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv\Capabilities", "ApplicationName", "mpv.net");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
+            RegistryHelp.SetObject($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
 
             foreach (string ext in Types)
             {
-                RegistryHelp.SetValue($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
-                RegistryHelp.SetValue($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
-                RegistryHelp.SetValue($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
-                if (VideoTypes.Contains(ext))
-                    RegistryHelp.SetValue($"HKCR\\" + "." + ext, "PerceivedType", "video");
-                if (AudioTypes.Contains(ext))
-                    RegistryHelp.SetValue($"HKCR\\" + "." + ext, "PerceivedType", "audio");
-                RegistryHelp.SetValue($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
-                RegistryHelp.SetValue($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
-                RegistryHelp.SetValue(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
+                RegistryHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
+                RegistryHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
+                if (App.VideoTypes.Contains(ext))
+                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
+                if (App.AudioTypes.Contains(ext))
+                    RegistryHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
+                RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
+                RegistryHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+                RegistryHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
             }
         }
 
@@ -93,12 +119,28 @@ namespace mpvnet
 
     public class RegistryHelp
     {
-        public static void SetValue(string path, string name, string value)
+        public static void SetObject(string path, string name, object value)
         {
             using (RegistryKey rk = GetRootKey(path).CreateSubKey(path.Substring(5), RegistryKeyPermissionCheck.ReadWriteSubTree))
                 rk.SetValue(name, value);
         }
 
+        public static string GetString(string path, string name)
+        {
+            object val = GetObject(path, name);
+            if (val == null || !(val is string)) return "";
+            return val.ToString();
+        }
+
+        public static object GetObject(string path, string name)
+        {
+            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5)))
+                if (rk != null)
+                    return rk.GetValue(name, "");
+                else
+                    return null;
+        }
+
         public static void RemoveKey(string path)
         {
             GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
@@ -122,4 +164,133 @@ namespace mpvnet
             }
         }
     }
+
+    public class MediaTrack
+    {
+        public string Text { get; set; }
+        public string Type { get; set; }
+        public int    ID   { get; set; }
+    }
+
+    public class CommandItem : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public string Path { get; set; } = "";
+        public string Command { get; set; } = "";
+
+        public CommandItem() { }
+
+        public CommandItem(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();
+            }
+        }
+
+        public static ObservableCollection<CommandItem> GetItems(string content)
+        {
+            var items = new ObservableCollection<CommandItem>();
+
+            if (!string.IsNullOrEmpty(content))
+            {
+                foreach (string line in content.Split('\r', '\n'))
+                {
+                    string val = line.Trim();
+                    if (val.StartsWith("#")) continue;
+                    if (!val.Contains(" ")) continue;
+                    CommandItem item = new CommandItem();
+                    item.Input = val.Substring(0, val.IndexOf(" "));
+                    if (item.Input == "_") item.Input = "";
+                    val = val.Substring(val.IndexOf(" ") + 1);
+
+                    if (val.Contains("#menu:"))
+                    {
+                        item.Path = val.Substring(val.IndexOf("#menu:") + 6).Trim();
+                        val = val.Substring(0, val.IndexOf("#menu:"));
+                        if (item.Path.Contains(";"))
+                            item.Path = item.Path.Substring(item.Path.IndexOf(";") + 1).Trim();
+                    }
+
+                    item.Command = val.Trim();
+                    if (item.Command == "")
+                        continue;
+                    if (item.Command.ToLower() == "ignore")
+                        item.Command = "";
+                    MigrateCommands(item);
+                    items.Add(item);
+                }
+            }
+            return items;
+        }
+
+        private static ObservableCollection<CommandItem> _Items;
+
+        public static ObservableCollection<CommandItem> Items {
+            get {
+                if (_Items is null)
+                    _Items = GetItems(File.ReadAllText(mp.InputConfPath));
+                return _Items;
+            }
+        }
+
+        public static void MigrateCommands(CommandItem item)
+        {
+            switch (item.Command)
+            {
+                case "script-message mpv.net show-prefs":
+                    item.Command = "script-message mpv.net show-conf-editor";
+                    break;
+                case "script-message mpv.net show-keys":
+                    item.Command = "script-message mpv.net show-input-editor";
+                    break;
+                case "script-message mpv.net history":
+                    item.Command = "script-message mpv.net show-history";
+                    break;
+                case "script-message mpv.net open-config-folder":
+                    item.Command = "script-message open-conf-folder";
+                    break;
+            }
+        }
+    }
+
+    public class CursorHelp
+    {
+        static bool IsVisible = true;
+
+        public static void Show()
+        {
+            if (!IsVisible)
+            {
+                Cursor.Show();
+                IsVisible = true;
+            }
+        }
+
+        public static void Hide()
+        {
+            if (IsVisible)
+            {
+                Cursor.Hide();
+                IsVisible = false;
+            }
+        }
+
+        public static bool IsPosDifferent(Point screenPos)
+        {
+            return
+                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
+                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
+        }
+    }
 }

mpv.net/Native.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Drawing;
-using System.IO;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace mpvnet
 {
@@ -14,11 +12,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();
@@ -26,12 +24,23 @@ namespace mpvnet
         [DllImport("user32.dll")]
         public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);
 
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetWindowLongPtrW(IntPtr hWnd, int nIndex);
-
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
 
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
+        private static extern IntPtr GetWindowLong32(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr")]
+        private static extern IntPtr GetWindowLong64(IntPtr hWnd, int nIndex);
+
+        public static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex)
+        {
+            if (IntPtr.Size == 8)
+                return GetWindowLong64(hWnd, nIndex);
+            else
+                return GetWindowLong32(hWnd, nIndex);
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public struct RECT
         {

mpv.net/NativeHelp.cs

@@ -32,7 +32,7 @@ namespace mpvnet
 
         public static void AddWindowBorders(IntPtr hwnd, ref Native.RECT rc)
         {
-            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtrW(hwnd, -16 /* GWL_STYLE */), false);
+            Native.AdjustWindowRect(ref rc, (uint)Native.GetWindowLongPtr(hwnd, -16 /* GWL_STYLE */), false);
         }
     }
 }

mpv.net/PowerShellScript.cs

@@ -4,8 +4,6 @@ using System.Threading;
 using System.Management.Automation.Runspaces;
 using System.Reflection;
 using System.Threading.Tasks;
-using System.Windows.Forms;
-using VBNET;
 
 namespace mpvnet
 {

mpv.net/Program.cs

@@ -14,21 +14,20 @@ namespace mpvnet
 
                 if (args.Length == 3 && args[1] == "--reg-file-assoc")
                 {
-                    if (args[2] == "audio") FileAssociation.Register(FileAssociation.AudioTypes);
-                    if (args[2] == "video") FileAssociation.Register(FileAssociation.VideoTypes);
-                    if (args[2] == "unregister") FileAssociation.Unregister();
+                    if (args[2] == "audio") FileAssociation.Register(App.AudioTypes);
+                    if (args[2] == "video") FileAssociation.Register(App.VideoTypes);
+                    if (args[2] == "unreg") FileAssociation.Unregister();
                     return;
                 }
+
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                Application.Run(new MainForm());
             }
             catch (Exception ex)
             {
-                MessageBox.Show(ex.ToString(), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
+                Msg.ShowException(ex);
             }
-
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainForm());
         }
     }
 }

mpv.net/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("mpv.net")]
-[assembly: AssemblyDescription("libmpv based media player")]
+[assembly: AssemblyDescription("A lightweight media player")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("mpv.net")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("3.6.1.0")]
+[assembly: AssemblyFileVersion("3.6.1.0")]

mpv.net/Properties/Resources.Designer.cs

@@ -60,47 +60,33 @@ namespace mpvnet.Properties {
             }
         }
         
-        /// <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/input.conf.txt
-        ///
-        /// # the [rest of string was truncated]&quot;;.
-        /// </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 
-        ///# mpv manual: https://mpv.io/manual/master/
-        ///
-        ///# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
-        ///
-        ///input-ar-delay = 500
-        ///input-ar-rate = 20
-        ///volume = 50
-        ///hwdec = yes
-        ///keep-open = yes
-        ///keep-open-pause = no
-        ///osd-playing-msg = ${filename}
-        ///screenshot-directory = ~~desktop/
-        ///input-default-bindings = no.
-        /// </summary>
-        internal static string mpv_conf {
+        internal static string inputConfHeader {
             get {
-                return ResourceManager.GetString("mpv_conf", resourceCulture);
+                return ResourceManager.GetString("inputConfHeader", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConf {
+            get {
+                return ResourceManager.GetString("mpvConf", resourceCulture);
+            }
+        }
+        
+        internal static string mpvConfToml {
+            get {
+                return ResourceManager.GetString("mpvConfToml", resourceCulture);
+            }
+        }
+        
+        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/PythonScript.cs

@@ -1,10 +1,12 @@
 using System;
 using System.Reflection;
-using System.Windows.Forms;
-using IronPython.Hosting;
+
+using Microsoft.Scripting;
 using Microsoft.Scripting.Hosting;
-using VBNET;
-using PyRT = IronPython.Runtime;
+
+using IronPython.Hosting;
+using IronPython.Runtime;
+using IronPython.Runtime.Operations;
 
 namespace mpvnet
 {
@@ -22,35 +24,36 @@ namespace mpvnet
                 scope.ImportModule("clr");
                 engine.Execute("import clr", scope);
                 engine.Execute("clr.AddReference(\"mpvnet\")", scope);
+                engine.Execute("import mpvnet", scope);
                 engine.Execute("from mpvnet import *", scope);
                 engine.Execute(code, scope);
             }
             catch (Exception ex)
             {
-                Msg.ShowException(ex);
+                if (ex is SyntaxErrorException e)
+                    Msg.ShowError($"{e.Line}, {e.Column}: " + ex.Message);
+                else
+                    Msg.ShowException(ex);
             }
         }
     }
 
     public class PythonEventObject
     {
-        public PyRT.PythonFunction PythonFunction { get; set; }
+        public PythonFunction PythonFunction { get; set; }
         public EventInfo EventInfo { get; set; }
         public Delegate Delegate { get; set; }
 
-        public void Invoke()
-        {
-            PyRT.Operations.PythonCalls.Call(PythonFunction);
-        }
+        public void Invoke() => PythonCalls.Call(PythonFunction);
 
         public void InvokeEndFileEventMode(EndFileEventMode arg)
         {
-            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+            PythonCalls.Call(PythonFunction, new[] { arg });
         }
 
         public void InvokeStrings(string[] arg)
         {
-            PyRT.Operations.PythonCalls.Call(PythonFunction, new[] { arg });
+            PythonCalls.Call(PythonFunction, new[] { arg });
         }
     }
 }

mpv.net/Resources/inputConf.txt

@@ -1,15 +1,15 @@
 
  # 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:
+ # editor and an config editor as alternative to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
 
  # Settings > Show Config Editor
  # Settings > Show Input Editor
 
  # The defaults of this file can be found at:
 
- # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/input.conf.txt
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
 
  # the defaults of mpv can be found at:
 
@@ -26,9 +26,12 @@
 
  o           script-message mpv.net open-files #menu: Open > Open Files...
  u           script-message mpv.net open-url   #menu: Open > Open URL...
+ Ctrl+S      script-message mpv.net show-media-search #menu: Open > Show media search...
  _           ignore                            #menu: Open > -
  Alt+a       script-message mpv.net load-audio #menu: Open > Load external audio files...
  Alt+s       script-message mpv.net load-sub   #menu: Open > Load external subtitle files...
+ _           ignore                            #menu: Open > -
+ _           ignore                            #menu: Open > Recent
 
  _           ignore                 #menu: -
  Space       cycle pause            #menu: Play/Pause
@@ -36,8 +39,8 @@
  _           ignore                 #menu: -
  Enter       cycle fullscreen       #menu: Toggle Fullscreen
  
- F11         playlist-prev          #menu: Navigate > Previous
- F12         playlist-next          #menu: Navigate > Next
+ F11         playlist-prev          #menu: Navigate > Previous File
+ F12         playlist-next          #menu: Navigate > Next File
  _           ignore                 #menu: Navigate > -
  PGUP        add chapter  1         #menu: Navigate > Next Chapter
  PGDWN       add chapter -1         #menu: Navigate > Previous Chapter
@@ -53,6 +56,8 @@
  _           ignore                 #menu: Navigate > -
  Ctrl+Right  no-osd seek  300       #menu: Navigate > Jump 5 min forward
  Ctrl+Left   no-osd seek -300       #menu: Navigate > Jump 5 min backward
+ _           ignore                 #menu: Navigate > -
+ _           ignore                 #menu: Navigate > Chapters
 
  Ctrl++      add video-zoom  0.1    #menu: Pan & Scan > Increase Size
  Ctrl+-      add video-zoom -0.1    #menu: Pan & Scan > Decrease Size
@@ -84,10 +89,10 @@
  d           cycle deinterlace      #menu: Video > Toggle Deinterlace
  a           cycle-values video-aspect "16:9" "4:3" "2.35:1" "-1" #menu: Video > Cycle Aspect Ratio
 
- KP7         cycle audio            #menu: Audio > Cycle/Next
+ KP7         script-message mpv.net cycle-audio #menu: Audio > Cycle/Next
  _           ignore                 #menu: Audio > -
- KP6         add audio-delay  0.100 #menu: Audio > Delay +0.1
- KP9         add audio-delay -0.100 #menu: Audio > Delay -0.1
+ KP6         add audio-delay  0.1   #menu: Audio > Delay +0.1
+ KP9         add audio-delay -0.1   #menu: Audio > Delay -0.1
 
  KP8         cycle sub              #menu: Subtitle > Cycle/Next
  v           cycle sub-visibility   #menu: Subtitle > Toggle Visibility
@@ -108,7 +113,7 @@
  _           ignore                 #menu: Volume > -
  m           cycle mute             #menu: Volume > Mute
 
- [           multiply speed 0.9     #menu: Speed > -10%
+ [           multiply speed 1/1.1   #menu: Speed > -10%
  ]           multiply speed 1.1     #menu: Speed > +10%
  _           ignore                 #menu: Speed > -
  {           multiply speed 0.5     #menu: Speed > Half
@@ -116,12 +121,12 @@
  _           ignore                 #menu: Speed > -
  BS          set speed 1            #menu: Speed > Reset
 
- KP0 script-message rate-file 0     #menu: Addons > Rating > 0stars
- KP1 script-message rate-file 1     #menu: Addons > Rating > 1stars
- KP2 script-message rate-file 2     #menu: Addons > Rating > 2stars
- KP3 script-message rate-file 3     #menu: Addons > Rating > 3stars
- KP4 script-message rate-file 4     #menu: Addons > Rating > 4stars
- KP5 script-message rate-file 5     #menu: Addons > Rating > 5stars
+ KP0 script-message rate-file 0     #menu: Extensions > Rating > 0stars
+ KP1 script-message rate-file 1     #menu: Extensions > Rating > 1stars
+ KP2 script-message rate-file 2     #menu: Extensions > Rating > 2stars
+ KP3 script-message rate-file 3     #menu: Extensions > Rating > 3stars
+ KP4 script-message rate-file 4     #menu: Extensions > Rating > 4stars
+ KP5 script-message rate-file 5     #menu: Extensions > Rating > 5stars
 
  Ctrl+t set ontop yes                             #menu: View > On Top > Enable
  Ctrl+T set ontop no                              #menu: View > On Top > Disable
@@ -136,20 +141,25 @@
  Ctrl+i script-message mpv.net show-input-editor  #menu: Settings > Show Input Editor
  Ctrl+f script-message mpv.net open-conf-folder   #menu: Settings > Open Config Folder
 
- h      script-message mpv.net show-history       #menu: Tools > Show History
- l      ab-loop                                   #menu: Tools > Set/clear A-B loop points
- L      cycle-values loop-file "inf" "no"         #menu: Tools > Toggle infinite file looping
- Ctrl+h cycle-values hwdec "auto" "no"            #menu: Tools > Cycle Hardware Decoding
- _ script-message mpv.net execute-mpv-command     #menu: Tools > Execute mpv command...
+ Ctrl+P script-message mpv.net show-command-palette #menu: Tools > Command Palette
+ h      script-message mpv.net show-history         #menu: Tools > Show History
+ l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
+ L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
+ Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Cycle Hardware Decoding
+ _ script-message mpv.net execute-mpv-command       #menu: Tools > Execute mpv command...
+ _ script-message mpv.net manage-file-associations  #menu: Tools > Manage File Associations...
 
  _ 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/stax76/mpvnet #menu: Help > Show mpv.net web site
+ _ 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: Help > -
+ _ script-message mpv.net show-about              #menu: Help > About mpv.net
 
  _ ignore           #menu: -
  Esc quit           #menu: Exit
  Q quit-watch-later #menu: Exit Watch Later
+
  > playlist-next
  < playlist-prev
  Power quit
@@ -165,4 +175,6 @@
  Wheel_Up    add volume  10
  Wheel_Down  add volume -10
  Prev playlist-prev
- Next playlist-next
+ Next playlist-next
+
+ MBTN_LEFT_DBL cycle fullscreen

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 config editor as alternatives to editing conf text files.
+ # The input and config editor can be found in mpv.net's context menu at:
+
+ # Settings > Show Config Editor
+ # Settings > Show Input Editor
+
+ # The defaults of this file can be found at:
+
+ # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
+
+ # 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/mpvConf.txt

@@ -1,7 +1,7 @@
 
 # mpv manual: https://mpv.io/manual/master/
 
-# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpv.conf.txt
+# mpv.net mpv.conf defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt
 
 input-ar-delay = 500
 input-ar-rate = 20
@@ -11,4 +11,4 @@ keep-open = yes
 keep-open-pause = no
 osd-playing-msg = ${filename}
 screenshot-directory = ~~desktop/
-input-default-bindings = no
+input-default-bindings = no

mpv.net/Resources/mpvNetConfToml.txt

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

mpv.net/TaskDialog.cs

@@ -0,0 +1,656 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows.Forms;
+
+public class Msg
+{
+    private static string ShownMessages;
+
+    public static string SupportURL { get; set; }
+
+    public static void Show(string mainInstruction, string content = null)
+    {
+        Msg.Show(mainInstruction, content, MsgIcon.Info, MsgButtons.Ok, MsgResult.None);
+    }
+
+    public static void ShowError(string mainInstruction, string content = null)
+    {
+        try
+        {
+            using (TaskDialog<string> td = new TaskDialog<string>())
+            {
+                td.AllowCancel = false;
+
+                if (string.IsNullOrEmpty(content))
+                {
+                    if (mainInstruction.Length < 80)
+                        td.MainInstruction = mainInstruction;
+                    else
+                        td.Content = mainInstruction;
+                }
+                else
+                {
+                    td.MainInstruction = mainInstruction;
+                    td.Content = content;
+                }
+
+                td.MainIcon = MsgIcon.Error;
+                td.Footer = "[Copy Message](copymsg)";
+
+                if (!string.IsNullOrEmpty(Msg.SupportURL))
+                    td.Footer += $"   [Contact Support]({SupportURL})";
+
+                td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    public static void ShowException(Exception e)
+    {
+        try
+        {
+            using (TaskDialog<string> td = new TaskDialog<string>())
+            {
+                td.MainInstruction = e.GetType().Name;
+                td.Content = e.Message;
+                td.MainIcon = MsgIcon.Error;
+                td.ExpandedInformation = e.ToString();
+                td.Footer = "[Copy Message](copymsg)";
+
+                if (!string.IsNullOrEmpty(Msg.SupportURL))
+                    td.Footer += $"   [Contact Support]({SupportURL})";
+
+                td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+
+    public static void ShowWarning(string mainInstruction,
+                                   string content = null,
+                                   bool onlyOnce = false)
+    {
+        if (onlyOnce && Msg.ShownMessages != null &&
+            Msg.ShownMessages.Contains(mainInstruction + content))
+            return;
+
+        Msg.Show(mainInstruction, content, MsgIcon.Warning, MsgButtons.Ok, MsgResult.None);
+        if (!onlyOnce) return;
+        Msg.ShownMessages += mainInstruction + content;
+    }
+
+    public static MsgResult ShowQuestion(string mainInstruction,
+                                         MsgButtons buttons = MsgButtons.OkCancel)
+    {
+        return Msg.Show(mainInstruction, null, MsgIcon.None, buttons, MsgResult.None);
+    }
+
+    public static MsgResult ShowQuestion(string mainInstruction,
+                                         string content,
+                                         MsgButtons buttons = MsgButtons.OkCancel)
+    {
+        return Msg.Show(mainInstruction, content, MsgIcon.None, buttons, MsgResult.None);
+    }
+
+    public static MsgResult Show(string mainInstruction,
+                                 string content,
+                                 MsgIcon icon,
+                                 MsgButtons buttons,
+                                 MsgResult defaultButton = MsgResult.None)
+    {
+        try
+        {
+            using (TaskDialog<MsgResult> td = new TaskDialog<MsgResult>())
+            {
+                td.AllowCancel = false;
+                td.DefaultButton = defaultButton;
+                td.MainIcon = icon;
+
+                if (content == null)
+                {
+                    if (mainInstruction.Length < 80)
+                        td.MainInstruction = mainInstruction;
+                    else
+                        td.Content = mainInstruction;
+                }
+                else
+                {
+                    td.MainInstruction = mainInstruction;
+                    td.Content = content;
+                }
+                if (buttons == MsgButtons.OkCancel)
+                {
+                    td.AddButton("OK", MsgResult.OK);
+                    td.AddButton("Cancel", MsgResult.Cancel);
+                }
+                else
+                    td.CommonButtons = buttons;
+                return td.Show();
+            }
+        }
+        catch (Exception ex)
+        {
+            return (MsgResult)MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+                Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}
+
+public class TaskDialog<T> : TaskDialogNative, IDisposable
+{
+    private Dictionary<int, T> IdValueDic;
+    private Dictionary<int, string> IdTextDic;
+    private List<int> CommandLinkShieldList;
+    private IntPtr ButtonArray;
+    private IntPtr RadioButtonArray;
+    private List<TaskDialogNative.TASKDIALOG_BUTTON> Buttons;
+    private List<TaskDialogNative.TASKDIALOG_BUTTON> RadioButtons;
+    private TaskDialogNative.TASKDIALOGCONFIG Config;
+    const int TDE_CONTENT = 0;
+    const int TDE_EXPANDED_INFORMATION = 1;
+    const int TDE_FOOTER = 2;
+    const int TDE_MAIN_INSTRUCTION = 3;
+    const int TDN_CREATED = 0;
+    const int TDN_NAVIGATED = 1;
+    const int TDN_BUTTON_CLICKED = 2;
+    const int TDN_HYPERLINK_CLICKED = 3;
+    const int TDN_TIMER = 4;
+    const int TDN_DESTROYED = 5;
+    const int TDN_RADIO_BUTTON_CLICKED = 6;
+    const int TDN_DIALOG_CONSTRUCTED = 7;
+    const int TDN_VERIFICATION_CLICKED = 8;
+    const int TDN_HELP = 9;
+    const int TDN_EXPANDO_BUTTON_CLICKED = 10;
+    const int TDM_NAVIGATE_PAGE = 1125;
+    const int TDM_CLICK_BUTTON = 1126;
+    const int TDM_SET_MARQUEE_PROGRESS_BAR = 1127;
+    const int TDM_SET_PROGRESS_BAR_STATE = 1128;
+    const int TDM_SET_PROGRESS_BAR_RANGE = 1129;
+    const int TDM_SET_PROGRESS_BAR_POS = 1130;
+    const int TDM_SET_PROGRESS_BAR_MARQUEE = 1131;
+    const int TDM_SET_ELEMENT_TEXT = 1132;
+    const int TDM_CLICK_RADIO_BUTTON = 1134;
+    const int TDM_ENABLE_BUTTON = 1135;
+    const int TDM_ENABLE_RADIO_BUTTON = 1136;
+    const int TDM_CLICK_VERIFICATION = 1137;
+    const int TDM_UPDATE_ELEMENT_TEXT = 1138;
+    const int TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = 1139;
+    const int TDM_UPDATE_ICON = 1140;
+    private T SelectedValueValue;
+    private string SelectedTextValue;
+    private int TimeoutValue;
+    private int ExitTickCount;
+    private bool disposed;
+
+    public TaskDialog()
+    {
+        IdValueDic = new Dictionary<int, T>();
+        IdTextDic = new Dictionary<int, string>();
+        CommandLinkShieldList = new List<int>();
+        Buttons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+        RadioButtons = new List<TaskDialogNative.TASKDIALOG_BUTTON>();
+        _SelectedID = -1;
+        Config = new TaskDialogNative.TASKDIALOGCONFIG();
+        Config.cbSize = (uint)Marshal.SizeOf(Config);
+        Config.hwndParent = GetHandle();
+        Config.hInstance = IntPtr.Zero;
+        Config.dwFlags = TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+        Config.dwCommonButtons = MsgButtons.None;
+        Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+        Config.FooterIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION(0);
+        Config.cxWidth = 0U;
+        Config.cButtons = 0U;
+        Config.cRadioButtons = 0U;
+        Config.pButtons = IntPtr.Zero;
+        Config.pRadioButtons = IntPtr.Zero;
+        Config.nDefaultButton = 0;
+        Config.nDefaultRadioButton = 0;
+        Config.pszWindowTitle = ((AssemblyProductAttribute)Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0]).Product;
+        Config.pszMainInstruction = "";
+        Config.pszContent = "";
+        Config.pfCallback = new PFTASKDIALOGCALLBACK(this.DialogProc);
+    }
+
+    public IntPtr GetHandle()
+    {
+        StringBuilder lpszFileName = new StringBuilder(260);
+        IntPtr foregroundWindow = TaskDialogNative.GetForegroundWindow();
+        TaskDialogNative.GetWindowModuleFileName(foregroundWindow, lpszFileName, 260U);
+
+        if (Path.GetFileName(lpszFileName.ToString().Replace(".vshost", "")) ==
+            Path.GetFileName(Assembly.GetEntryAssembly().Location))
+            return foregroundWindow;
+
+        return IntPtr.Zero;
+    }
+
+    public bool AllowCancel {
+        set {
+            if (value)
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+            else
+                Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ALLOW_DIALOG_CANCELLATION;
+        }
+    }
+
+    public string MainInstruction {
+        get => Config.pszMainInstruction;
+        set => Config.pszMainInstruction = value;
+    }
+
+    public string Content {
+        get => Config.pszContent;
+        set => Config.pszContent = ExpandMarkdownMarkup(value);
+    }
+
+    public string ExpandedInformation {
+        get => Config.pszExpandedInformation;
+        set => Config.pszExpandedInformation = ExpandMarkdownMarkup(value);
+    }
+
+    public string VerificationText {
+        get => Config.pszVerificationText;
+        set => Config.pszVerificationText = value;
+    }
+
+    public MsgResult DefaultButton {
+        get => (MsgResult)Config.nDefaultButton;
+        set => Config.nDefaultButton = (int)value;
+    }
+
+    public string Footer {
+        get => Config.pszFooter;
+        set => Config.pszFooter = ExpandMarkdownMarkup(value);
+    }
+
+    public MsgIcon MainIcon {
+        set => Config.MainIcon = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION((int)value);
+    }
+
+    private int _SelectedID;
+
+    public int SelectedID {
+        get => _SelectedID;
+        set {
+            foreach (var i in IdValueDic)
+                if (i.Key == value) _SelectedID = value;
+        }
+    }
+
+    public T SelectedValue {
+        get {
+            if (IdValueDic.ContainsKey(SelectedID))
+                return IdValueDic[SelectedID];
+            return SelectedValueValue;
+        }
+        set => SelectedValueValue = value;
+    }
+
+    public string SelectedText {
+        get {
+            if (IdTextDic.ContainsKey(SelectedID))
+                return IdTextDic[SelectedID];
+            return SelectedTextValue;
+        }
+        set => SelectedTextValue = value;
+    }
+
+    public bool CheckBoxChecked {
+        get => (Config.dwFlags & TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED) == TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+        set {
+            if (value)
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+            else
+                Config.dwFlags ^= TaskDialogNative.TASKDIALOG_FLAGS.TDF_VERIFICATION_FLAG_CHECKED;
+        }
+    }
+
+    public MsgButtons CommonButtons {
+        get => Config.dwCommonButtons;
+        set => Config.dwCommonButtons = value;
+    }
+
+    public int Timeout {
+        get => Convert.ToInt32(TimeoutValue / 1000.0);
+        set {
+            TimeoutValue = value * 1000;
+            Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_CALLBACK_TIMER;
+        }
+    }
+
+    public void AddButton(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+    }
+
+    public string ExpandMarkdownMarkup(string value)
+    {
+        if (value.Contains("["))
+        {
+            Regex regex = new Regex(@"\[(.+)\]\((.+)\)");
+
+            if (regex.Match(value).Success)
+            {
+                Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_ENABLE_HYPERLINKS;
+                value = regex.Replace(value, "<a href=\"$2\">$1</a>");
+            }
+        }
+        return value;
+    }
+
+    public void AddCommandLink(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value == null ? (T)(object)text : value;
+        IdTextDic[n] = text;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+    }
+
+    public void AddCommandLink(string text, string description, T value, bool setShield = false)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        if (setShield) CommandLinkShieldList.Add(n);
+        if (!string.IsNullOrEmpty(description)) text += "\n" + description;
+        Buttons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+        Config.dwFlags |= TaskDialogNative.TASKDIALOG_FLAGS.TDF_USE_COMMAND_LINKS;
+    }
+
+    public void AddRadioButton(string text, T value)
+    {
+        int n = 1000 + IdValueDic.Count + 1;
+        IdValueDic[n] = value;
+        RadioButtons.Add(new TaskDialogNative.TASKDIALOG_BUTTON(n, text));
+    }
+
+    public T Show()
+    {
+        MarshalDialogControlStructs();
+        TaskDialogNative.TASKDIALOGCONFIG config = Config;
+        int errorCode = TaskDialogNative.TaskDialogIndirect(config, out int dummy1, out int dummy2, out bool isChecked);
+        if (errorCode < 0) Marshal.ThrowExceptionForHR(errorCode);
+        CheckBoxChecked = isChecked;
+        if (SelectedValue is MsgResult) SelectedValue = (T)(object)SelectedID;
+        return SelectedValue;
+    }
+
+    public int DialogProc(IntPtr hwnd, uint msg, IntPtr wParam, IntPtr lParam, IntPtr lpRefData)
+    {
+        switch (msg)
+        {
+            case 0: //TDN_CREATED
+                foreach (var i in CommandLinkShieldList)
+                    SendMessage(hwnd, TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE, new IntPtr(i), new IntPtr(1));
+                break;
+            case 2: //TDN_BUTTON_CLICKED
+            case 6: //TDN_RADIO_BUTTON_CLICKED
+                if (SelectedValue is MsgResult)
+                    _SelectedID = wParam.ToInt32();
+                else
+                    SelectedID = wParam.ToInt32();
+                break;
+            case 3: //TDN_HYPERLINK_CLICKED
+                string stringUni = Marshal.PtrToStringUni(lParam);
+                if (stringUni.StartsWith("mailto") || stringUni.StartsWith("http"))
+                    Process.Start(stringUni);
+                if (stringUni == "copymsg")
+                {
+                    Thread thread = new Thread((ThreadStart)(() => {
+                        Clipboard.SetText(MainInstruction + "\r\n\r\n" + Content + "\r\n\r\n" + ExpandedInformation);
+                        MessageBox.Show("Message was copied to clipboard.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }));
+                    thread.SetApartmentState(ApartmentState.STA);
+                    thread.Start();
+                }
+                break;
+            case 4: //TDN_TIMER
+                if (ExitTickCount == 0) ExitTickCount = Environment.TickCount + Timeout * 1000;
+                if (Environment.TickCount > ExitTickCount)
+                    TaskDialogNative.SendMessage(hwnd, 1126, new IntPtr(1), IntPtr.Zero);
+                break;
+        }
+        return 0;
+    }
+
+    public void MarshalDialogControlStructs()
+    {
+        if (Buttons != null && Buttons.Count > 0)
+        {
+            ButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(Buttons);
+            Config.pButtons = ButtonArray;
+            Config.cButtons = (uint)Buttons.Count;
+        }
+
+        if (RadioButtons == null || RadioButtons.Count <= 0) return;
+        RadioButtonArray = TaskDialog<T>.AllocateAndMarshalButtons(RadioButtons);
+        Config.pRadioButtons = RadioButtonArray;
+        Config.cRadioButtons = (uint)RadioButtons.Count;
+    }
+
+    public static IntPtr AllocateAndMarshalButtons(List<TaskDialogNative.TASKDIALOG_BUTTON> structs)
+    {
+        var initialPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(TASKDIALOG_BUTTON)) * structs.Count);
+        var currentPtr = initialPtr;
+
+        foreach (var button in structs)
+        {
+            Marshal.StructureToPtr(button, currentPtr, false);
+            currentPtr = (IntPtr)(currentPtr.ToInt64() + Marshal.SizeOf(button));
+        }
+
+        return initialPtr;
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    ~TaskDialog()
+    {
+        Dispose(false);
+    }
+
+    protected void Dispose(bool disposing)
+    {
+        if (disposed) return;
+        disposed = true;
+
+        if (ButtonArray != IntPtr.Zero)
+        {
+            Marshal.FreeHGlobal(ButtonArray);
+            ButtonArray = IntPtr.Zero;
+        }
+
+        if (RadioButtonArray != IntPtr.Zero)
+        {
+            Marshal.FreeHGlobal(RadioButtonArray);
+            RadioButtonArray = IntPtr.Zero;
+        }
+    }
+}
+
+public delegate int PFTASKDIALOGCALLBACK(
+    IntPtr hwnd,
+    uint msg,
+    IntPtr wParam,
+    IntPtr lParam,
+    IntPtr lpRefData);
+
+public class TaskDialogNative
+{
+    [DllImport("comctl32", CharSet = CharSet.Unicode, SetLastError = true)]
+    public static extern int TaskDialogIndirect(
+        [In] TaskDialogNative.TASKDIALOGCONFIG pTaskConfig,
+        out int pnButton,
+        out int pnRadioButton,
+        [MarshalAs(UnmanagedType.Bool)] out bool pVerificationFlagChecked);
+
+    [DllImport("user32.dll")]
+    public static extern IntPtr GetForegroundWindow();
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern uint GetWindowModuleFileName(
+        IntPtr hwnd,
+        StringBuilder lpszFileName,
+        uint cchFileNameMax);
+
+    [DllImport("user32.dll")]
+    public static extern IntPtr SendMessage(
+        IntPtr handle,
+        int message,
+        IntPtr wParam,
+        IntPtr lParam);
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+    public class TASKDIALOGCONFIG
+    {
+        public uint cbSize;
+        public IntPtr hwndParent;
+        public IntPtr hInstance;
+        public TaskDialogNative.TASKDIALOG_FLAGS dwFlags;
+        public MsgButtons dwCommonButtons;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszWindowTitle;
+        public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION MainIcon;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszMainInstruction;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszContent;
+        public uint cButtons;
+        public IntPtr pButtons;
+        public int nDefaultButton;
+        public uint cRadioButtons;
+        public IntPtr pRadioButtons;
+        public int nDefaultRadioButton;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszVerificationText;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszExpandedInformation;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszExpandedControlText;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszCollapsedControlText;
+        public TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION FooterIcon;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszFooter;
+        public PFTASKDIALOGCALLBACK pfCallback;
+        public IntPtr lpCallbackData;
+        public uint cxWidth;
+    }
+
+    public enum TASKDIALOG_FLAGS
+    {
+        NONE = 0,
+        TDF_ENABLE_HYPERLINKS = 1,
+        TDF_USE_HICON_MAIN = 2,
+        TDF_USE_HICON_FOOTER = 4,
+        TDF_ALLOW_DIALOG_CANCELLATION = 8,
+        TDF_USE_COMMAND_LINKS = 16,
+        TDF_USE_COMMAND_LINKS_NO_ICON = 32,
+        TDF_EXPAND_FOOTER_AREA = 64,
+        TDF_EXPANDED_BY_DEFAULT = 128,
+        TDF_VERIFICATION_FLAG_CHECKED = 256,
+        TDF_SHOW_PROGRESS_BAR = 512,
+        TDF_SHOW_MARQUEE_PROGRESS_BAR = 1024,
+        TDF_CALLBACK_TIMER = 2048,
+        TDF_POSITION_RELATIVE_TO_WINDOW = 4096,
+        TDF_RTL_LAYOUT = 8192,
+        TDF_NO_DEFAULT_RADIO_BUTTON = 16384,
+    }
+
+    [StructLayout(LayoutKind.Explicit, CharSet = CharSet.Unicode)]
+    public struct TASKDIALOGCONFIG_ICON_UNION
+    {
+        [FieldOffset(0)]
+        public int hMainIcon;
+        [FieldOffset(0)]
+        public int pszIcon;
+        [FieldOffset(0)]
+        public IntPtr spacer;
+
+        public TASKDIALOGCONFIG_ICON_UNION(int i)
+        {
+            this = new TaskDialogNative.TASKDIALOGCONFIG_ICON_UNION();
+            spacer = IntPtr.Zero;
+            pszIcon = 0;
+            hMainIcon = i;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+    public struct TASKDIALOG_BUTTON
+    {
+        public int nButtonID;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string pszButtonText;
+
+        public TASKDIALOG_BUTTON(int n, string txt)
+        {
+            this = new TaskDialogNative.TASKDIALOG_BUTTON();
+            nButtonID = n;
+            pszButtonText = txt;
+        }
+    }
+}
+
+public enum MsgButtons
+{
+    None = 0,
+    Ok = 1,
+    Yes = 2,
+    No = 4,
+    YesNo = 6,
+    Cancel = 8,
+    OkCancel = 9,
+    YesNoCancel = 14,
+    Retry = 16,
+    RetryCancel = 24,
+    Close = 32,
+}
+
+public enum MsgResult
+{
+    None,
+    OK,
+    Cancel,
+    Abort,
+    Retry,
+    Ignore,
+    Yes,
+    No,
+}
+
+public enum MsgIcon
+{
+    None = 0,
+    SecurityShieldGray = 65527,
+    SecuritySuccess = 65528,
+    SecurityError = 65529,
+    SecurityWarning = 65530,
+    SecurityShieldBlue = 65531,
+    Shield = 65532,
+    Info = 65533,
+    Error = 65534,
+    Warning = 65535,
+}

mpv.net/UI.cs

@@ -1,36 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace mpvnet
-{
-    public class CursorHelp
-    {
-        static bool IsVisible = true;
-
-        public static void Show()
-        {
-            if (!IsVisible)
-            {
-                Cursor.Show();
-                IsVisible = true;
-            }
-        }
-
-        public static void Hide()
-        {
-            if (IsVisible)
-            {
-                Cursor.Hide();
-                IsVisible = false;
-            }
-        }
-
-        public static bool IsPosDifferent(Point screenPos)
-        {
-            return
-                Math.Abs(screenPos.X - Control.MousePosition.X) > 10 ||
-                Math.Abs(screenPos.Y - Control.MousePosition.Y) > 10;
-        }
-    }
-}

mpv.net/WPF/Resources.xaml

@@ -1,9 +1,7 @@
-<Application x:Class="mpvConfEdit.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:Controls="clr-namespace:Controls"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
+<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>
@@ -19,12 +17,11 @@
                                 <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                             </Trigger>
                             <Trigger Property="IsFocused" Value="true">
-                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static Controls:Controls.ThemeBrush}"/>
+                                <Setter Property="BorderBrush" TargetName="border" Value="{x:Static WPF:WPF.ThemeBrush}"/>
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
-    </Application.Resources>
-</Application>
+</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/AboutWindow.xaml

@@ -0,0 +1,17 @@
+<Window x:Class="mpvnet.AboutWindow"
+        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="About mpv.net" Height="230" Width="420" FontSize="16" ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
+    <Grid>
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+            <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>
+            <TextBlock HorizontalAlignment="Center">Copyright (c) 2017-2019 Frank Skare (stax76)</TextBlock>
+            <TextBlock Name="Version" HorizontalAlignment="Center" />
+            <TextBlock HorizontalAlignment="Center" Margin="0,0,0,20">MIT License</TextBlock>
+        </StackPanel>
+    </Grid>
+</Window>

mpv.net/Windows/AboutWindow.xaml.cs

@@ -0,0 +1,18 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace mpvnet
+{
+    public partial class AboutWindow : Window
+    {
+        public AboutWindow()
+        {
+            InitializeComponent();
+            Version.Text = $"Version {System.Windows.Forms.Application.ProductVersion}";
+            Foreground = WPF.WPF.ThemeBrush;
+        }
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();
+        protected override void OnMouseDown(MouseButtonEventArgs e) => Close();
+    }
+}

mpv.net/Windows/CommandPaletteWindow.xaml

@@ -0,0 +1,35 @@
+<Window x:Class="mpvnet.CommandPaletteWindow"
+        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="Command Palette" Height="295" Width="400" ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition></RowDefinition>
+        </Grid.RowDefinitions>
+        <TextBox Name="FilterTextBox" PreviewKeyDown="FilterTextBox_PreviewKeyDown" TextChanged="FilterTextBox_TextChanged"></TextBox>
+        <ListView Name="ListView" Grid.Row="1" MouseUp="ListView_MouseUp">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding Path}"></TextBlock>
+                        <TextBlock Grid.Column="1" Text="{Binding Input}" HorizontalAlignment="Right"></TextBlock>
+                    </Grid>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>        
+    </Grid>
+</Window>

mpv.net/Windows/CommandPaletteWindow.xaml.cs

@@ -0,0 +1,122 @@
+using Microsoft.Win32;
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class CommandPaletteWindow : Window
+    {
+        ICollectionView CollectionView;
+
+        public CommandPaletteWindow()
+        {
+            InitializeComponent();
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
+            CollectionView = collectionViewSource.View;
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
+            CollectionView.Filter = yourCostumFilter;
+            ListView.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                ListView.Foreground = Brushes.White;
+                ListView.Background = Brushes.Black;
+                FilterTextBox.Foreground = Brushes.White;
+                FilterTextBox.Background = Brushes.Black;
+            }
+        }
+
+        bool Filter(CommandItem item)
+        {
+            if (item.Command == "" || item.Path == "")
+                return false;
+            string filter = FilterTextBox.Text.ToLower();
+            if (filter == "") return true;
+            if (item.Command.ToLower().Contains(filter) ||
+                item.Input.ToLower().Contains(filter) ||
+                item.Path.ToLower().Contains(filter))
+                return true;
+            return false;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            Keyboard.Focus(FilterTextBox);
+            SelectFirst();
+        }
+
+        void SelectFirst()
+        {
+            if (ListView.Items.Count > 0)
+                ListView.SelectedIndex = 0;
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
+                handled = true;
+            return IntPtr.Zero;
+        }
+
+        private void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index -= 1;
+                        if (index < 0) index = 0;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Down:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index += 1;
+                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Escape:
+                    Close();
+                    break;
+                case Key.Enter:
+                    Execute();
+                    break;
+            }
+        }
+
+        void Execute()
+        {
+            if (ListView.SelectedItem != null)
+            {
+                CommandItem item = ListView.SelectedItem as CommandItem;
+                Close();
+                mp.command_string(item.Command);
+            }
+        }
+
+        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Execute();
+        }
+
+        private void FilterTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            CollectionView.Refresh();
+            SelectFirst();
+        }
+    }
+}

mpv.net/Windows/ConfWindow.xaml

@@ -1,37 +1,36 @@
-<Window xmlns:Controls="clr-namespace:Controls"  x:Name="MainWindow1"  x:Class="mpvConfEdit.MainWindow"
+<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="MainWindow1_Loaded" WindowStartupLocation="CenterScreen">
+        Height="500" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen" Title="Config Editor">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="4*" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="10*" />
-            <ColumnDefinition Width="60*" />
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="6*" />
         </Grid.ColumnDefinitions>
-        <Controls:SearchTextBoxUserControl x:Name="SearchControl" Width="250" Margin="0,20,0,10" Grid.ColumnSpan="2" />
+        <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 Controls:Controls.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+            <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>
+                        <TextBlock Text="{Binding}" FontSize="16" />
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
-            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
-            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
-            <TextBlock x:Name="ApplyTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static Controls:Controls.ThemeBrush}" MouseUp="ApplyTextBlock_MouseUp">Write config to disk</TextBlock>
+            <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>
         </StackPanel>
     </Grid>
 </Window>

mpv.net/Windows/ConfWindow.xaml.cs

@@ -3,37 +3,38 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
 using DynamicGUI;
-using Microsoft.Win32;
 
-namespace mpvConfEdit
+namespace mpvnet
 {
-    public partial class MainWindow : Window
+    public partial class ConfWindow : Window
     {
-        public string MpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        public string MpvNetConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpvnet.conf";
-        private List<SettingBase> MpvSettingsDefinitions = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvConf.toml");
-        private List<SettingBase> MpvNetSettingsDefinitions = Settings.LoadSettings(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\mpvNetConf.toml");
-        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+        private 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 MainWindow()
+        public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
+
+        public ConfWindow()
         {
             InitializeComponent();
             DataContext = this;
-            Title = (Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0] as AssemblyProductAttribute).Product + " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
             LoadSettings(MpvSettingsDefinitions, MpvConf);
             LoadSettings(MpvNetSettingsDefinitions, MpvNetConf);
-            SearchControl.Text = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\mpv.net", "conf editor search", "");
-            SetDarkTheme();
+            SearchControl.Text = RegistryHelp.GetString(@"HKCU\Software\mpv.net", "config editor search");
+            
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Foreground2 = Brushes.Silver;
+                Background = Brushes.Black;
+            }
         }
 
         public Brush Foreground2 {
@@ -42,23 +43,7 @@ namespace mpvConfEdit
         }
 
         public static readonly DependencyProperty Foreground2Property =
-            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(MainWindow), new PropertyMetadata(Brushes.DarkSlateGray));
-
-        void SetDarkTheme()
-        {
-            string darkMode = MpvNetSettingsDefinitions.Where(item => item.Name == "dark-mode").First().Value;
-
-            object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
-            if (value is null) value = 1;
-            bool isDarkTheme = (int)value == 0;
-
-            if (!((darkMode == "system" && isDarkTheme) || darkMode == "always"))
-                return;
-
-            Foreground = Brushes.White;
-            Foreground2 = Brushes.Silver;
-            Background = Brushes.Black;
-        }
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(ConfWindow), new PropertyMetadata(Brushes.DarkSlateGray));
 
         private void LoadSettings(List<SettingBase> settingsDefinitions,
                                   Dictionary<string, string> confSettings)
@@ -82,12 +67,12 @@ namespace mpvConfEdit
                 {
                     case StringSetting s:
                         var sc = new StringSettingControl(s);
-                        sc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        sc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
                         MainStackPanel.Children.Add(sc);
                         break;
                     case OptionSetting s:
                         var oc = new OptionSettingControl(s);
-                        oc.TitleTextBox.Foreground = Controls.Controls.ThemeBrush;
+                        oc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
                         MainStackPanel.Children.Add(oc);
                         break;
                 }
@@ -98,7 +83,7 @@ namespace mpvConfEdit
 
         public Dictionary<string, string> MpvConf {
             get {
-                if (_mpvConf == null) _mpvConf = LoadConf(MpvConfPath);
+                if (_mpvConf == null) _mpvConf = LoadConf(mp.MpvConfPath);
                 return _mpvConf;
             }
         }
@@ -107,7 +92,7 @@ namespace mpvConfEdit
 
         public Dictionary<string, string> MpvNetConf {
             get {
-                if (_mpvNetConf == null) _mpvNetConf = LoadConf(MpvNetConfPath);
+                if (_mpvNetConf == null) _mpvNetConf = LoadConf(mp.MpvNetConfPath);
                 return _mpvNetConf;
             }
         }
@@ -129,7 +114,7 @@ namespace mpvConfEdit
 
                         if (left.StartsWith("#"))
                         {
-                            Comments[filePath][left.TrimStart("#".ToCharArray())] = right;
+                            Comments[filePath][left.TrimStart('#')] = right;
                             continue;
                         }
 
@@ -146,7 +131,7 @@ namespace mpvConfEdit
         {
             base.OnClosed(e);
             WriteToDisk();
-            Registry.SetValue(@"HKEY_CURRENT_USER\Software\mpv.net", "conf editor search", SearchControl.Text);
+            RegistryHelp.SetObject(@"HKCU\Software\mpv.net", "config editor search", SearchControl.Text);
         }
 
         void WriteToDisk()
@@ -164,11 +149,10 @@ namespace mpvConfEdit
             if (!isDirty)
                 return;
 
-            WriteToDisk(MpvConfPath, MpvConf, MpvSettingsDefinitions);
-            WriteToDisk(MpvNetConfPath, MpvNetConf, MpvNetSettingsDefinitions);
+            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);
+            Msg.Show("Changes will be available on next mpv.net startup.");
         }
 
         void WriteToDisk(string filePath,
@@ -227,7 +211,7 @@ namespace mpvConfEdit
             MainScrollViewer.ScrollToTop();
         }
         
-        private void MainWindow1_Loaded(object sender, RoutedEventArgs e)
+        private void ConfWindow1_Loaded(object sender, RoutedEventArgs e)
         {
             SearchControl.SearchTextBox.SelectAll();
             Keyboard.Focus(SearchControl.SearchTextBox);
@@ -241,7 +225,7 @@ namespace mpvConfEdit
 
         private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            Process.Start(Path.GetDirectoryName(MpvConfPath));
+            Process.Start(Path.GetDirectoryName(mp.MpvConfPath));
         }
 
         private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
@@ -254,9 +238,11 @@ namespace mpvConfEdit
             Process.Start("https://github.com/stax76/mpv.net#Support");
         }
 
-        private void ApplyTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
+        protected override void OnKeyDown(KeyEventArgs e)
         {
-            WriteToDisk();
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
         }
     }
 }

mpv.net/Windows/EverythingWindow.xaml

@@ -0,0 +1,23 @@
+<Window x:Class="mpvnet.EverythingWindow"
+        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="Media File Search" Height="300" Width="600" ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition></RowDefinition>
+        </Grid.RowDefinitions>
+        <TextBox Name="FilterTextBox" PreviewKeyDown="FilterTextBox_PreviewKeyDown" TextChanged="FilterTextBox_TextChanged"></TextBox>
+        <ListView Name="ListView" Grid.Row="1" MouseUp="ListView_MouseUp" PreviewKeyDown="ListView_PreviewKeyDown">
+            <ListView.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                </Style>
+            </ListView.ItemContainerStyle>
+        </ListView>        
+    </Grid>
+</Window>

mpv.net/Windows/EverythingWindow.xaml.cs

@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+
+namespace mpvnet
+{
+    public partial class EverythingWindow : Window
+    {
+        public EverythingWindow()
+        {
+            InitializeComponent();
+
+            if (App.IsDarkMode)
+            {
+                ListView.Foreground = Brushes.White;
+                ListView.Background = Brushes.Black;
+                FilterTextBox.Foreground = Brushes.White;
+                FilterTextBox.Background = Brushes.Black;
+            }
+        }
+
+        const int EVERYTHING_REQUEST_FILE_NAME = 0x00000001;
+        const int EVERYTHING_REQUEST_PATH = 0x00000002;
+        const int EVERYTHING_SORT_SIZE_DESCENDING = 6;
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern int Everything_SetSearch(string lpSearchString);
+
+        [DllImport("Everything.dll")]
+        public static extern void Everything_SetRequestFlags(UInt32 dwRequestFlags);
+
+        [DllImport("Everything.dll")]
+        public static extern void Everything_SetSort(UInt32 dwSortType);
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern bool Everything_Query(bool bWait);
+
+        [DllImport("Everything.dll", CharSet = CharSet.Unicode)]
+        public static extern void Everything_GetResultFullPathName(UInt32 nIndex, StringBuilder lpString, UInt32 nMaxCount);
+
+        [DllImport("Everything.dll")]
+        public static extern bool Everything_GetResultSize(UInt32 nIndex, out long lpFileSize);
+
+        [DllImport("Everything.dll")]
+        public static extern UInt32 Everything_GetNumResults();
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            HwndSource source = HwndSource.FromHwnd(new WindowInteropHelper(this).Handle);
+            source.AddHook(new HwndSourceHook(WndProc));
+            Keyboard.Focus(FilterTextBox);
+        }
+
+        void SelectFirst()
+        {
+            if (ListView.Items.Count > 0)
+                ListView.SelectedIndex = 0;
+        }
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
+                handled = true;
+            return IntPtr.Zero;
+        }
+
+        private void FilterTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.Key)
+            {
+                case Key.Up:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index -= 1;
+                        if (index < 0) index = 0;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Down:
+                    {
+                        int index = ListView.SelectedIndex;
+                        index += 1;
+                        if (index > ListView.Items.Count - 1) index = ListView.Items.Count - 1;
+                        ListView.SelectedIndex = index;
+                        ListView.ScrollIntoView(ListView.SelectedItem);
+                    }
+                    break;
+                case Key.Escape:
+                    Close();
+                    break;
+                case Key.Enter:
+                    Execute();
+                    break;
+            }
+        }
+
+        private void ListView_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape) Close();
+            if (e.Key == Key.Enter) Execute();
+        }
+
+        void Execute()
+        {
+            if (ListView.SelectedItem != null)
+                mp.LoadFiles(ListView.SelectedItem as string);
+            Keyboard.Focus(FilterTextBox);
+        }
+
+        private void ListView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Execute();
+        }
+
+        private void FilterTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            string searchtext = FilterTextBox.Text;
+            Task.Run(() => Search(searchtext));
+        }
+
+        object LockObject = new object();
+
+        void Search(string searchtext)
+        {
+            lock (LockObject)
+            {
+                try
+                {
+                    List<string> items = new List<string>();
+                    UInt32 i;
+                    const int bufsize = 500;
+                    StringBuilder buf = new StringBuilder(bufsize);
+                    Everything_SetSearch(searchtext);
+                    Everything_SetRequestFlags(EVERYTHING_REQUEST_FILE_NAME | EVERYTHING_REQUEST_PATH);
+                    Everything_SetSort(EVERYTHING_SORT_SIZE_DESCENDING);
+                    Everything_Query(true);
+                    for (i = 0; i < Everything_GetNumResults(); i++)
+                    {
+                        Everything_GetResultFullPathName(i, buf, bufsize);
+                        string ext = Path.GetExtension(buf.ToString()).TrimStart('.').ToLower();
+                        if (App.AudioTypes.Contains(ext) || App.VideoTypes.Contains(ext))
+                            items.Add(buf.ToString());
+                        if (items.Count > 100) break;
+                    }
+                    Application.Current.Dispatcher.Invoke(() => {
+                        ListView.ItemsSource = items;
+                        SelectFirst();
+                    });
+                }
+                catch (Exception)
+                {
+                    Msg.ShowError("Search query failed.",
+                        "The search feature depends on [Everything](https://www.voidtools.com) being installed.");
+                }
+            }
+        }
+    }
+}

mpv.net/Windows/InputWindow.xaml

@@ -1,20 +1,33 @@
-<Window xmlns:Controls="clr-namespace:Controls"  x:Class="mpvInputEdit.MainWindow"
+<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="MainWindow" Height="500" Width="750" FontSize="13"
-        Loaded="Window_Loaded" Closed="Window_Closed">
+        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 x:Name="SearchControl" Width="300" Margin="0,20,0,20" Grid.ColumnSpan="2" />
+        <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}"/>
+                <DataGridTextColumn Header="Menu"  Binding="{Binding Path}"/>
                 <DataGridTemplateColumn Header="Input">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>

mpv.net/Windows/InputWindow.xaml.cs

@@ -2,38 +2,58 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
+using System.Windows.Media;
 
-namespace mpvInputEdit
+namespace mpvnet
 {
-    public partial class MainWindow : Window
+    public partial class InputWindow : Window
     {
         ICollectionView CollectionView;
+        string InitialInputConfContent;
 
-        public MainWindow()
+        public InputWindow()
         {
             InitializeComponent();
-            Title = (Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), true)[0] as AssemblyProductAttribute).Product + " " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            InitialInputConfContent = GetInputConfContent();
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
             DataGrid.SelectionMode = DataGridSelectionMode.Single;
-            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = App.InputItems };
+            CollectionViewSource collectionViewSource = new CollectionViewSource() { Source = CommandItem.Items };
             CollectionView = collectionViewSource.View;
-            var yourCostumFilter = new Predicate<object>(item => Filter((InputItem)item));
+            var yourCostumFilter = new Predicate<object>(item => Filter((CommandItem)item));
             CollectionView.Filter = yourCostumFilter;
             DataGrid.ItemsSource = CollectionView;
+
+            if (App.IsDarkMode)
+            {
+                Foreground = Brushes.White;
+                Foreground2 = Brushes.Silver;
+                Background = Brushes.Black;
+            }
         }
 
+        public Brush Foreground2 {
+            get { return (Brush)GetValue(Foreground2Property); }
+            set { SetValue(Foreground2Property, value); }
+        }
+
+        public static readonly DependencyProperty Foreground2Property =
+            DependencyProperty.Register("Foreground2", typeof(Brush), typeof(InputWindow), new PropertyMetadata(Brushes.DarkSlateGray));
+
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             CollectionView.Refresh();
+
+            if (SearchControl.SearchTextBox.Text == "?")
+                Msg.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");
         }
 
-        bool Filter(InputItem item)
+        bool Filter(CommandItem item)
         {
+            if (item.Command == "") return false;
             string searchText = SearchControl.SearchTextBox.Text.ToLower();
             if (searchText == "") return true;
 
@@ -48,11 +68,11 @@ namespace mpvInputEdit
                     return item.Input.ToLower().Contains(searchText);
             }
             else if (searchText.StartsWith("m ") || searchText.StartsWith("m:"))
-                return item.Menu.ToLower().Contains(searchText.Substring(2).Trim());
+                return item.Path.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.Path.ToLower().Contains(searchText) ||
                 item.Input.ToLower().Contains(searchText))
             {
                 return true;
@@ -62,55 +82,51 @@ namespace mpvInputEdit
 
         private void ButtonClick(object sender, RoutedEventArgs e)
         {
-            InputItem item = ((Button)e.Source).DataContext as InputItem;
+            CommandItem item = ((Button)e.Source).DataContext as CommandItem;
             if (item is null) return;
-            InputWindow w = new InputWindow();
+            LearnWindow w = new LearnWindow();
             w.Owner = this;
             w.InputItem = item;
             w.ShowDialog();
 
-            var items = new Dictionary<string, InputItem>();
+            var items = new Dictionary<string, CommandItem>();
 
-            foreach (InputItem i in App.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);
+            foreach (CommandItem i in CommandItem.Items)
+                if (items.ContainsKey(i.Input) && i.Input != "")
+                    Msg.Show($"Duplicate found:\n\n{i.Input}: {i.Path}\n\n{items[i.Input].Input}: {items[i.Input].Path}\n\nPlease note that you can chain multiple commands in the same line by using a semicolon as separator.", "Duplicate Found");
                 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 GetInputConfContent()
         {
-            var backupDir = Path.GetDirectoryName(App.InputConfPath) + "\\backup\\";
+            string text = Properties.Resources.inputConfHeader + "\r\n";
 
-            if (!Directory.Exists(backupDir))
-                Directory.CreateDirectory(backupDir);
-
-            if (File.Exists(App.InputConfPath))
-                File.Copy(App.InputConfPath, backupDir + "input conf " + DateTime.Now.ToString("yyyy-MM-dd HH-mm") + ".conf", true);
-
-            string text = "\r\n" + Properties.Settings.Default.input_conf_help + "\r\n\r\n";
-
-            foreach (InputItem item in App.InputItems)
+            foreach (CommandItem item in CommandItem.Items)
             {
-                string line = " " + item.Input.PadRight(10);
+                string input = item.Input == "" ? "_" : item.Input;
+                string line = " " + 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;
+                if (item.Path.Trim() != "")
+                    line = line.PadRight(40) + " #menu: " + item.Path;
 
                 text += line + "\r\n";
             }
+            return text;
+        }
 
-            File.WriteAllText(App.InputConfPath, text);
-
-            MessageBox.Show("Changes will be available on next mpv(.net) startup.",
-                Title, MessageBoxButton.OK, MessageBoxImage.Information);
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            if (InitialInputConfContent == GetInputConfContent()) return;
+            File.WriteAllText(mp.InputConfPath, GetInputConfContent());
+            Msg.Show("Changes will be available on next mpv.net startup.");
         }
 
         private void DataGrid_PreviewCanExecute(object sender, CanExecuteRoutedEventArgs e)
@@ -118,8 +134,15 @@ namespace mpvInputEdit
             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)
+                if (Msg.ShowQuestion($"Confirm to delete: {(grid.SelectedItem as CommandItem).Input} ({(grid.SelectedItem as CommandItem).Path})") != MsgResult.OK)
                     e.Handled = true;
         }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (e.Key == Key.Escape)
+                Close();
+        }
     }
 }

mpv.net/Windows/LearnWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="mpvInputEdit.InputWindow"
+<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"

mpv.net/Windows/LearnWindow.xaml.cs

@@ -5,14 +5,14 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using WF = System.Windows.Forms;
 
-namespace mpvInputEdit
+namespace mpvnet
 {
-    public partial class InputWindow : Window
+    public partial class LearnWindow : Window
     {
-        public InputItem InputItem { get; set; }
+        public CommandItem InputItem { get; set; }
         public string NewKey { get; set; } = "";
 
-        public InputWindow()
+        public LearnWindow()
         {
             InitializeComponent();
         }
@@ -144,7 +144,7 @@ namespace mpvInputEdit
         void SetKey(string key)
         {
             NewKey = key;
-            MenuLabel.Content = InputItem.Menu;
+            MenuLabel.Content = InputItem.Path;
             KeyLabel.Content = key;
         }
 

mpv.net/mp.cs

@@ -11,12 +11,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-using VBNET;
 using static mpvnet.libmpv;
 using static mpvnet.Native;
 
-using PyRT = IronPython.Runtime;
-
 namespace mpvnet
 {
     public delegate void MpvBoolPropChangeHandler(string propName, bool value);
@@ -24,7 +21,7 @@ namespace mpvnet
     public class mp
     {
         public static event Action VideoSizeChanged;
-                                                              // Lua/JS evens       libmpv events
+                                                              // Lua/JS event       libmpv event
 
                                                               //                    MPV_EVENT_NONE
         public static event Action Shutdown;                  // shutdown           MPV_EVENT_SHUTDOWN
@@ -53,20 +50,68 @@ namespace mpvnet
         public static event Action QueueOverflow;             //                    MPV_EVENT_QUEUE_OVERFLOW
         public static event Action Hook;                      //                    MPV_EVENT_HOOK
 
-        public static IntPtr MpvHandle;
-        public static IntPtr MpvWindowHandle;
-        public static Addon Addon;
-        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions = new List<KeyValuePair<string, Action<bool>>>();
-        public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions = new List<KeyValuePair<string, Action<string>>>();
-        public static Size VideoSize = new Size(1920, 1080);
-        public static string mpvConfFolderPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
-        public static string InputConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\input.conf";
-        public static string mpvConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpv.conf";
-        public static string mpvNetConfPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\mpvnet.conf";
-        public static List<PythonScript> PythonScripts => new List<PythonScript>();
-        public static AutoResetEvent AutoResetEvent = new AutoResetEvent(false);
+        public static IntPtr MpvHandle { get; set; }
+        public static IntPtr MpvWindowHandle { get; set; }
+        public static Addon Addon { get; set; }
+        public static List<KeyValuePair<string, Action<bool>>> BoolPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<bool>>>();
+        public static List<KeyValuePair<string, Action<int>>> IntPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<int>>>();
+        public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
+        public static Size VideoSize { get; set; } = new Size(1920, 1080);
+        public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
+        public static AutoResetEvent AutoResetEvent { get; set; } = new AutoResetEvent(false);
+        public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
+        public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
 
-        private static Dictionary<string, string> _mpvConf;
+        public static string InputConfPath  { get; } = MpvConfFolder + "\\input.conf";
+        public static string MpvConfPath    { get; } = MpvConfFolder + "\\mpv.conf";
+        public static string MpvNetConfPath { get; } = MpvConfFolder + "\\mpvnet.conf";
+
+        static string _MpvConfFolder;
+
+        public static string MpvConfFolder {
+            get {
+                if (_MpvConfFolder == null)
+                {
+                    string portableFolder = Application.StartupPath + "\\portable_config\\";
+                    string appdataFolder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\mpv\\";
+                    string startupFolder = Application.StartupPath + "\\";
+
+                    if (!Directory.Exists(appdataFolder) && !Directory.Exists(portableFolder) &&
+                        Sys.IsDirectoryWritable(Application.StartupPath) &&
+                        !File.Exists(startupFolder + "mpv.conf"))
+                    {
+                        using (TaskDialog<string> td = new TaskDialog<string>())
+                        {
+                            td.MainInstruction = "Choose a settings folder.";
+                            td.Content = "[MPV documentation about files on Windows.](https://mpv.io/manual/master/#files-on-windows)";
+                            td.AddCommandLink("appdata", appdataFolder, appdataFolder);
+                            td.AddCommandLink("portable", portableFolder, portableFolder);
+                            td.AddCommandLink("startup", startupFolder, startupFolder);
+                            td.AllowCancel = false;
+                            _MpvConfFolder = td.Show();
+                        }
+                    }
+                    else if (Directory.Exists(portableFolder))
+                        _MpvConfFolder = portableFolder;
+                    else if (Directory.Exists(appdataFolder))
+                        _MpvConfFolder = appdataFolder;
+                    else if (File.Exists(Application.StartupPath + "\\mpv.conf"))
+                        _MpvConfFolder = Application.StartupPath + "\\";
+
+                    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;
+            }
+        }
+
+        static Dictionary<string, string> _mpvConf;
 
         public static Dictionary<string, string> mpvConf {
             get {
@@ -74,8 +119,8 @@ namespace mpvnet
                 {
                     _mpvConf = new Dictionary<string, string>();
 
-                    if (File.Exists(mpvConfPath))
-                        foreach (var i in File.ReadAllLines(mpvConfPath))
+                    if (File.Exists(MpvConfPath))
+                        foreach (var i in File.ReadAllLines(MpvConfPath))
                             if (i.Contains("=") && ! i.StartsWith("#"))
                                 _mpvConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
                 }
@@ -83,7 +128,7 @@ namespace mpvnet
             }
         }
 
-        private static Dictionary<string, string> _mpvNetConf;
+        static Dictionary<string, string> _mpvNetConf;
 
         public static Dictionary<string, string> mpvNetConf {
             get {
@@ -91,8 +136,8 @@ namespace mpvnet
                 {
                     _mpvNetConf = new Dictionary<string, string>();
 
-                    if (File.Exists(mpvNetConfPath))
-                        foreach (string i in File.ReadAllLines(mpvNetConfPath))
+                    if (File.Exists(MpvNetConfPath))
+                        foreach (string i in File.ReadAllLines(MpvNetConfPath))
                             if (i.Contains("=") && !i.StartsWith("#"))
                                 _mpvNetConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
                 }
@@ -102,15 +147,7 @@ namespace mpvnet
 
         public static void Init()
         {
-            if (!Directory.Exists(mp.mpvConfFolderPath))
-                Directory.CreateDirectory(mp.mpvConfFolderPath);
-
-            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");
@@ -143,11 +180,12 @@ namespace mpvnet
                 if (Path.GetExtension(scriptPath) == ".ps1")
                     PowerShellScript.Init(scriptPath);
 
-            foreach (var scriptPath in Directory.GetFiles(mp.mpvConfFolderPath + "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()
@@ -168,6 +206,7 @@ namespace mpvnet
                     {
                         case mpv_event_id.MPV_EVENT_SHUTDOWN:
                             Shutdown?.Invoke();
+                            WriteHistory(null);
                             AutoResetEvent.Set();
                             return;
                         case mpv_event_id.MPV_EVENT_LOG_MESSAGE:
@@ -192,6 +231,7 @@ namespace mpvnet
                         case mpv_event_id.MPV_EVENT_FILE_LOADED:
                             FileLoaded?.Invoke();
                             LoadFolder();
+                            WriteHistory(mp.get_property_string("path"));
                             break;
                         case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
                             TracksChanged?.Invoke();
@@ -215,32 +255,33 @@ 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;
-
-                                    foreach (var i in mpvnet.Command.Commands)
+                                    if (args[1] == i.Name)
                                     {
-                                        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].");
+                                        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);
+                                        }));
                                     }
                                 }
-                                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 [default input bindings and menu definition](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt).");
+                                }
                             }
+                            ClientMessage?.Invoke(args);
                             break;
                         case mpv_event_id.MPV_EVENT_VIDEO_RECONFIG:
                             VideoReconfig?.Invoke();
@@ -266,16 +307,23 @@ namespace mpvnet
                                 foreach (var i in StringPropChangeActions)
                                     if (i.Key == propData.name)
                                         i.Value.Invoke(StringFromNativeUtf8(Marshal.PtrToStructure<IntPtr>(propData.data)));
+
+                            if (propData.format == mpv_format.MPV_FORMAT_INT64)
+                                foreach (var i in IntPropChangeActions)
+                                    if (i.Key == propData.name)
+                                        i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data));
                             break;
                         case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
                             PlaybackRestart?.Invoke();
-                            Size s = new Size(get_property_int("dwidth"), get_property_int("dheight"));
+                            Size vidSize = new Size(get_property_int("dwidth"), get_property_int("dheight"));
 
-                            if (VideoSize != s && s != Size.Empty)
+                            if (VideoSize != vidSize && vidSize != Size.Empty)
                             {
-                                VideoSize = s;
+                                VideoSize = vidSize;
                                 VideoSizeChanged?.Invoke();
-                            }
+                            }                    
+
+                            Task.Run(new Action(() => ReadMetaData()));
                             break;
                         case mpv_event_id.MPV_EVENT_CHAPTER_CHANGE:
                             ChapterChange?.Invoke();
@@ -295,9 +343,9 @@ namespace mpvnet
             }
         }
 
-        private static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
+        static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
 
-        public static void register_event(string name, PyRT.PythonFunction pyFunc)
+        public static void register_event(string name, IronPython.Runtime.PythonFunction pyFunc)
         {
             foreach (var eventInfo in typeof(mp).GetEvents())
             {
@@ -332,7 +380,7 @@ namespace mpvnet
             }
         }
 
-        public static void unregister_event(PyRT.PythonFunction pyFunc)
+        public static void unregister_event(IronPython.Runtime.PythonFunction pyFunc)
         {
             foreach (var eventObjects in PythonEventObjects)
                 if (eventObjects.PythonFunction == pyFunc)
@@ -437,6 +485,16 @@ namespace mpvnet
                 throw new Exception($"{name}: {(mpv_error)err}");
         }
 
+        public static void observe_property_int(string name, Action<int> action)
+        {
+            int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_INT64);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                IntPropChangeActions.Add(new KeyValuePair<string, Action<int>>(name, action));
+        }
+
         public static void observe_property_bool(string name, Action<bool> action)
         {
             int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
@@ -447,18 +505,6 @@ namespace mpvnet
                 BoolPropChangeActions.Add(new KeyValuePair<string, Action<bool>>(name, action));
         }
 
-        public static void unobserve_property_bool(string name, Action<bool> action)
-        {
-            foreach (var i in BoolPropChangeActions.ToArray())
-                if (i.Value == action)
-                    BoolPropChangeActions.Remove(i);
-
-            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
         public static void observe_property_string(string name, Action<string> action)
         {
             int err = mpv_observe_property(MpvHandle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_STRING);
@@ -469,18 +515,6 @@ namespace mpvnet
                 StringPropChangeActions.Add(new KeyValuePair<string, Action<string>>(name, action));
         }
 
-        public static void unobserve_property_string(string name, Action<string> action)
-        {
-            foreach (var i in StringPropChangeActions.ToArray())
-                if (i.Value == action)
-                    StringPropChangeActions.Remove(i);
-
-            int err = mpv_unobserve_property(MpvHandle, (ulong)action.GetHashCode());
-
-            if (err < 0)
-                throw new Exception($"{name}: {(mpv_error)err}");
-        }
-
         protected static void ProcessCommandLine()
         {
             var args = Environment.GetCommandLineArgs().Skip(1);
@@ -488,8 +522,6 @@ namespace mpvnet
             foreach (string i in args)
                 if (!i.StartsWith("--") && File.Exists(i))
                     mp.commandv("loadfile", i, "append");
-                else if (!i.StartsWith("--") && i.StartsWith("http"))
-                    mp.LoadURL(i);
 
             mp.set_property_string("playlist-pos", "0");
 
@@ -509,16 +541,7 @@ namespace mpvnet
             }
         }
 
-        public static void LoadURL(string url)
-        {
-            int count = mp.get_property_int("playlist-count");
-            mp.commandv("loadfile", url, "append");
-            mp.set_property_int("playlist-pos", count);
-            for (int i = 0; i < count; i++)
-                mp.commandv("playlist-remove", "0");
-        }
-
-        public static void LoadFiles(string[] files)
+        public static void LoadFiles(params string[] files)
         {
             int count = mp.get_property_int("playlist-count");
 
@@ -533,27 +556,24 @@ namespace mpvnet
             mp.LoadFolder();
         }
 
-        private static bool WasFolderLoaded;
+        static bool WasFolderLoaded;
 
-        public static void LoadFolder()
+        static void LoadFolder()
         {
-            if (WasFolderLoaded)
-                return;
+            if (WasFolderLoaded) return;
 
             if (get_property_int("playlist-count") == 1)
             {
-                string[] types = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
                 string path = get_property_string("path");
-                if (!Directory.Exists(Path.GetDirectoryName(path))) return;
+                if (!File.Exists(path)) return;
                 List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
-                files = files.Where((file) => types.Contains(Path.GetExtension(file).TrimStart(".".ToCharArray()).ToLower())).ToList();
+                files = files.Where((file) => App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
+                                              App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
                 files.Sort(new StringLogicalComparer());
                 int index = files.IndexOf(path);
                 files.Remove(path);
-
                 foreach (string i in files)
                     commandv("loadfile", i, "append");
-
                 if (index > 0)
                     commandv("playlist-move", "0", (index + 1).ToString());
             }
@@ -561,7 +581,7 @@ namespace mpvnet
             WasFolderLoaded = true;
         }
 
-        public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
+        static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
         {
             int numberOfStrings = arr.Length + 1; // add extra element for extra null pointer last (sentinel)
             byteArrayPointers = new IntPtr[numberOfStrings];
@@ -579,7 +599,7 @@ namespace mpvnet
             return rootPointer;
         }
 
-        public static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
+        static string[] NativeUtf8StrArray2ManagedStrArray(IntPtr pUnmanagedStringArray, int StringCount)
         {
             IntPtr[] pIntPtrArray = new IntPtr[StringCount];
             string[] ManagedStringArray = new string[StringCount];
@@ -591,7 +611,7 @@ namespace mpvnet
             return ManagedStringArray;
         }
 
-        public static string StringFromNativeUtf8(IntPtr nativeUtf8)
+        static string StringFromNativeUtf8(IntPtr nativeUtf8)
         {
             int len = 0;
             while (Marshal.ReadByte(nativeUtf8, len) != 0) ++len;
@@ -600,7 +620,124 @@ namespace mpvnet
             return Encoding.UTF8.GetString(buffer);
         }
 
-        public static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+        static byte[] GetUtf8Bytes(string s) => Encoding.UTF8.GetBytes(s + "\0");
+
+        static string LastHistoryPath;
+        static DateTime LastHistoryStartDateTime;
+
+        static void WriteHistory(string filePath)
+        {
+            int totalMinutes = Convert.ToInt32((DateTime.Now - LastHistoryStartDateTime).TotalMinutes);
+
+            if (File.Exists(LastHistoryPath) && totalMinutes > 1)
+            {
+                string historyFilepath = mp.MpvConfFolder + "history.txt";
+
+                File.AppendAllText(historyFilepath, DateTime.Now.ToString().Substring(0, 16) +
+                    " " + totalMinutes.ToString().PadLeft(3) + " " +
+                    Path.GetFileNameWithoutExtension(LastHistoryPath) + "\r\n");
+            }
+
+            LastHistoryPath = filePath;
+            LastHistoryStartDateTime = DateTime.Now;
+        }
+
+        static void ReadMetaData()
+        {
+            lock (MediaTracks)
+            {
+                MediaTracks.Clear();
+
+                using (MediaInfo mi = new MediaInfo(mp.get_property_string("path")))
+                {
+                    int count = mi.GetCount(MediaInfoStreamKind.Video);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetVideo(i, "Format"));
+                        Add(track, mi.GetVideo(i, "Format_Profile"));
+                        Add(track, mi.GetVideo(i, "Width") + "x" + mi.GetVideo(i, "Height"));
+                        Add(track, mi.GetVideo(i, "FrameRate") + " FPS");
+                        Add(track, mi.GetVideo(i, "Language/String"));
+                        Add(track, mi.GetVideo(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetVideo(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetVideo(i, "Title"));
+                        track.Text = "V: " + track.Text.Trim(' ', ',');
+                        track.Type = "v";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Audio);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetAudio(i, "Language/String"));
+                        Add(track, mi.GetAudio(i, "Format"));
+                        Add(track, mi.GetAudio(i, "Format_Profile"));
+                        Add(track, mi.GetAudio(i, "BitRate/String"));
+                        Add(track, mi.GetAudio(i, "Channel(s)/String"));
+                        Add(track, mi.GetAudio(i, "SamplingRate/String"));
+                        Add(track, mi.GetAudio(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetAudio(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetAudio(i, "Title"));
+                        track.Text = "A: " + track.Text.Trim(' ', ',');
+                        track.Type = "a";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = mi.GetCount(MediaInfoStreamKind.Text);
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        Add(track, mi.GetText(i, "Language/String"));
+                        Add(track, mi.GetText(i, "Format"));
+                        Add(track, mi.GetText(i, "Format_Profile"));
+                        Add(track, mi.GetText(i, "Forced") == "Yes" ? "Forced" : "");
+                        Add(track, mi.GetText(i, "Default") == "Yes" ? "Default" : "");
+                        Add(track, mi.GetText(i, "Title"));
+                        track.Text = "S: " + track.Text.Trim(' ', ',');
+                        track.Type = "s";
+                        track.ID = i + 1;
+                        MediaTracks.Add(track);
+                    }
+
+                    count = get_property_int("edition-list/count");
+
+                    for (int i = 0; i < count; i++)
+                    {
+                        MediaTrack track = new MediaTrack();
+                        track.Text = "E: " + get_property_string($"edition-list/{i}/title");
+                        track.Type = "e";
+                        track.ID = i;
+                        MediaTracks.Add(track);
+                    }
+
+                    void Add(MediaTrack track, string val)
+                    {
+                        if (!string.IsNullOrEmpty(val) && !(track.Text != null && track.Text.Contains(val)))
+                            track.Text += " " + val + ",";
+                    }
+                }
+            }
+
+            lock (Chapters)
+            {
+                Chapters.Clear();
+                int count = get_property_int("chapter-list/count");
+
+                for (int x = 0; x < count; x++)
+                {
+                    string text = get_property_string($"chapter-list/{x}/title");
+                    double time = get_property_number($"chapter-list/{x}/time");
+                    Chapters.Add(new KeyValuePair<string, double>(text, time));
+                }
+            }
+        }
     }
 
     public enum EndFileEventMode

mpv.net/mpv.net.csproj

@@ -35,52 +35,13 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup>
     <StartupObject>mpvnet.Program</StartupObject>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup />
@@ -90,11 +51,51 @@
   <PropertyGroup />
   <PropertyGroup />
   <PropertyGroup>
-    <ApplicationIcon>mpv.ico</ApplicationIcon>
+    <ApplicationIcon>mpvnet.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="IKVM.Reflection, Version=7.2.4630.5, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -120,6 +121,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 +132,53 @@
       <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="Windows\AboutWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\EverythingWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Windows\CommandPaletteWindow.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 +194,27 @@
     <Compile Include="NativeHelp.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TaskDialog.cs" />
+    <Compile Include="Windows\EverythingWindow.xaml.cs">
+      <DependentUpon>EverythingWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\CommandPaletteWindow.xaml.cs">
+      <DependentUpon>CommandPaletteWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\ConfWindow.xaml.cs">
+      <DependentUpon>ConfWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AboutWindow.xaml.cs">
+      <DependentUpon>AboutWindow.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,21 +238,43 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Content Include="Resources\mpv.conf.txt" />
+    <Content Include="..\LICENSE.txt">
+      <Link>LICENSE.txt</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="mpvnet.ico" />
+    <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="screenshot.jpg" />
-    <Content Include="Resources\input.conf.txt" />
+    <Content Include="Resources\inputConfHeader.txt" />
+    <Content Include="Resources\inputConf.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\VBNET\VBNET.vbproj">
-      <Project>{a1d11294-05bf-4d77-b008-aecf1aa93c9f}</Project>
-      <Name>VBNET</Name>
-    </ProjectReference>
+    <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. 

mpvConfEdit/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-    </startup>
-</configuration>

mpvConfEdit/App.xaml.cs

@@ -1,8 +0,0 @@
-using System.Windows;
-
-namespace mpvConfEdit
-{
-    public partial class App : Application
-    {
-    }
-}

mpvConfEdit/Controls.cs

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

mpvConfEdit/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.

mpvConfEdit/Properties/AssemblyInfo.cs

@@ -1,55 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("mpv(.net) conf edit")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("mpv(.net) conf edit")]
-[assembly: AssemblyCopyright("Copyright © 2017-2019 stax76")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page,
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page,
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.8.0.0")]

mpvConfEdit/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace mpvConfEdit.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("mpvConfEdit.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

mpvConfEdit/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

mpvConfEdit/Properties/Settings.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace mpvConfEdit.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

mpvConfEdit/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

mpvConfEdit/app.manifest

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

mpvConfEdit/mpvConfEdit.csproj

@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C4FEAA45-001D-4DC8-8BFA-621527326D09}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>mpvConfEdit</RootNamespace>
-    <AssemblyName>mpvConfEdit</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\mpv.net\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>8.0</LangVersion>
-    <NullableReferenceTypes>true</NullableReferenceTypes>
-    <NullableContextOptions>enable</NullableContextOptions>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\mpv.net\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>mpv.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="Controls.cs" />
-    <Compile Include="DynamicGUI\DynamicGUI.cs" />
-    <Compile Include="DynamicGUI\OptionSettingControl.xaml.cs">
-      <DependentUpon>OptionSettingControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DynamicGUI\StringSettingControl.xaml.cs">
-      <DependentUpon>StringSettingControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DynamicGUI\Tommy.cs" />
-    <Compile Include="SearchTextBoxUserControl.xaml.cs">
-      <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
-    </Compile>
-    <Page Include="DynamicGUI\OptionSettingControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DynamicGUI\StringSettingControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="SearchTextBoxUserControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="app.manifest" />
-    <None Include="mpvNetConf.toml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="mpvConf.toml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="mpv.ico" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

mpvConfEdit/mpvConfEdit.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28714.193
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpvConfEdit", "mpvConfEdit.csproj", "{C4FEAA45-001D-4DC8-8BFA-621527326D09}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4FEAA45-001D-4DC8-8BFA-621527326D09}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {959F2890-E1FC-47A2-856C-A42F8C955D15}
-	EndGlobalSection
-EndGlobal