fix theme issue

Changelog.md

@@ -1,3 +1,68 @@
+
+### 5.4.3.0
+
+- new: the color themes can now be customized ([manual](https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme))
+- new: three new sections were added to the [manual](https://github.com/stax76/mpv.net/blob/master/Manual.md):
+       1. [Color Theme](https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme)
+       2. [Hidden and secret features](https://github.com/stax76/mpv.net/blob/master/Manual.md#hidden-and-secret-features)
+       3. [External Tools](https://github.com/stax76/mpv.net/blob/master/Manual.md#external-tools)
+
+- fix: window restore from maximized and from minimized was broken
+- fix: it's possible to multi select files in File Explorer and press
+       enter to open the files, this did however only work when the
+	   auto load folder feature was disabled or the shift key was
+	   pressed (blocks auto load folder). Now it should also work
+	   without shift key and with auto load folder being enabled
+
+- update: libmpv shinchiro 2019-10-27
+- update: youtube-dl 2019-10-31
+
+### 5.4.2.1 Beta
+
+- pressing shift key suppresses auto-load-folder
+- switch --queue added, this will not clear the playlist but append
+  and it will suppress auto-load-folder. To get a 'Add to mpv.net playlist'
+  context menu item in explorer with multi selection support use my
+  [Open with++](https://github.com/stax76/OpenWithPlusPlus#add-to-mpvnet-playlist) shell extension, as far as I know multi selection
+  can not be done using the Registry but only via shell extension
+- window-size mpv property support added ([default bindings](https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt#L137))
+- the config editor keeps profiles and comments in mpv.conf intact!
+- the options in the config editor are better organized
+
+### 5.4.2
+
+- new: the [scripting wiki page](https://github.com/stax76/mpv.net/wiki/Scripting#powershell) was improved
+- new: Toggle Shuffle has been added to the menu defaults
+- new: for URLs the media title is shown in the title bar and in the info command
+       instead of displaying the URL, mpv.conf defaults were changed to use
+       [protocol.https] osd-playing-msg = '${media-title}'
+
+- fix: on the very first start volume was set to 0 and mute was set to yes
+- fix: there was a sound when closed from taskbar
+- fix: the log feature was not working
+- fix: clipboard monitoring removed because it was causing to many issues
+- fix: restore resulted in collapsed window when maximized = yes was used
+
+- update: libmpv shinchiro 2019-10-06
+- update: youtube-dl 2019-10-01
+
+### 5.4.1.1
+
+- a issue with the taskbar-progress feature was fixed
+- improved PowerShell scrip host
+
+### 5.4.1
+
+- fix ArgumentOutOfRangeException
+
+### 5.4
+
+- added taskbar-progress implementation
+- added new setting to start with maximized window
+- long file paths work now even if not enabled by the OS
+- fixed history being written even when history file wasn't created prior
+- libmpv updated to shinchiro 2019-08-31
+
 ### 5.3
 
 - added new feature: Open > Open DVD/Blu-ray Drive/Folder...

LICENSE.txt

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

Manual.md

@@ -7,7 +7,6 @@
 * [Requirements](#requirements)
 * [Installation](#installation)
   + [File Associations](#file-associations)
-  + [Chrome Extension](#chrome-extension)
 * [Context Menu](#context-menu)
   + [Open > Open Files](#open--open-files)
   + [Open > Open URL](#open--open-url)
@@ -89,7 +88,14 @@
   + [Help > About mpv.net](#help--about-mpvnet)
   + [Exit](#exit)
   + [Exit Watch Later](#exit-watch-later)
+* [External Tools](#external-tools)
+  + [Play with mpv](#play-with-mpv)
+  + [External Application Button](#external-application-button)
+  + [Open with++](#open-with)
+  + [MediaInfo.NET](#mediainfonet)  
 * [Command Line Interface](#command-line-interface)
+* [Color Theme](#color-theme)
+* [Hidden and secret features](#hidden-and-secret-features)
 
 ## About mpv.net
 
@@ -103,11 +109,11 @@ mpv.net is meant to be a small single person project, it's designed to be mpv co
 
 The target audience of mpv.net are programmers, nerds and software enthusiasts that need something more advanced than typical media players.
 
-Furthermore mpv.net is well suited for users who are interested to learn mpv, Linux, portable apps and the command line.
+Furthermore mpv.net is well suited for people who are interested to learn mpv.
 
 ## Requirements
 
-mpv.net is based on the .NET Framework and requires Windows 7 as minimum version of the Windows operating system. As of the writing of this manual the minimum required .NET Framework version is 4.7.2.
+mpv.net is based on the .NET Framework and requires Windows 7 as minimum version of the Windows operating system. As of the writing of this manual the minimum required .NET Framework version is 4.8.
 
 For optimal results a modern graphics card is recommended.
 
@@ -123,25 +129,15 @@ x86 should though still be well supported and work but it's not as well tested t
 
 ### File Associations
 
-File Associations can be created using the setup or from within the apps context menu under 'Tools > Manage File Associations'.
+File Associations can be created using the setup or with the context menu under 'Tools > OS Setup'.
 
 Windows 10 prevents apps to register as the default app, to define the default video or audio player app in Windows 10 go to the Windows settings under 'Settings > Apps > Default apps' or shell execute 'ms-settings:defaultapps'.
 
-It's also possible to change the default application using the Open With feature of the context menu in Windows File Explorer.
-
-### Chrome Extension
-
-In order to play videos from sites such as YouTube the Chrome Extension [Play with mpv](https://chrome.google.com/webstore/detail/play-with-mpv/hahklcmnfgffdlchjigehabfbiigleji) can be used.
-
-Due to Chrome Extensions not being able to start a app, another app that communicates with the extension is required, this app can be downloaded [here](http://www.mediafire.com/file/6tmwdjsfknhmsxy/play-with-mpvnet-server.7z/file). The extension works only when the app is running, to have the app always running a link can be created in the auto start folder located at:
-
-`C:\Users\%username%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup`
-
-This will start the app on system start and have it running in the background. When the file association registration of mpv.net was executed then the app should find the location of mpv.net, alternativly the mpv.net folder can be added to the PATH environment variable.
+It's also possible to change the default application using the 'Open with' feature of the context menu in Windows File Explorer.
 
 ## Context Menu
 
-The most important part of the user interface in mpv.net is the context menu, the menu can be customized as it is defined in the same file where the key bindings are defined.
+The most important part of the user interface in mpv.net is the context menu, the menu can be customized as it's defined in the same file where the key bindings are defined.
 
 ### Open > Open Files
 
@@ -155,6 +151,8 @@ A third way is to drag and drop files on the main window.
 
 Whenever the control key is pressed when files or URLs are opened, the playlist is not cleared but the files or URLs are appended to the playlist. This works in all mpv.net features that open files or URLs.
 
+Pressing the shift key while opening a single file will suppress loading all files in the folder.
+
 ### Open > Open URL
 
 The Open URL menu entry can be used to open URLs for example from YouTube.
@@ -815,10 +813,78 @@ Exits mpv.net and remembers the position in the file using the following command
 
 [quit-watch-later command](https://mpv.io/manual/master/#command-interface-quit-watch-later)
 
+##  External Tools
+
+### Play with mpv
+
+In order to play videos from sites such as YouTube the Chrome Extension [Play with mpv](https://chrome.google.com/webstore/detail/play-with-mpv/hahklcmnfgffdlchjigehabfbiigleji) can be used.
+
+Due to Chrome Extensions not being able to start a app, another app that communicates with the extension is required, this app can be downloaded [here](http://www.mediafire.com/file/lezj8lwqt5zf75v/play-with-mpvnet-server.7z/file). The extension works only when the app is running, to have the app always running a link can be created in the auto start folder located at:
+
+`C:\Users\%username%\AppData\Roaming\Microsoft\Windows\Start Menu\Programs\Startup`
+
+This will start the app on system start and have it running in the background. When the file association registration of mpv.net was executed then the app should find the location of mpv.net, alternativly the mpv.net folder can be added to the PATH environment variable.
+
+### External Application Button
+
+Alternatively the Chrome extension [External Application Button](https://github.com/stax76/mpv.net/issues/106) can be used.
+
+### Open with++
+
+Open with++ allows to customize the File Explorer context menu for instance to add a 'Add to mpv.net playlist' menu item.
+
+https://github.com/stax76/OpenWithPlusPlus
+
+https://github.com/stax76/OpenWithPlusPlus#mpvnet
+
+https://github.com/stax76/OpenWithPlusPlus#add-to-mpvnet-playlist
+
+### MediaInfo.NET
+
+MediaInfo.NET is a media info GUI.
+
+https://github.com/stax76/MediaInfo.NET
+
+To start a external application mpv has the run input command (it does not use the shell).
+
+If the path has spaces then it must be enclosed in quotes and then double backslashes must be used for escaping or alternatively forward slashes.
+
+ `_ run D:\Software\MediaInfoNET.exe "${path}" #menu: Tools > Open file with MediaInfo.NET`
+
+ `_ run "D:\\Soft ware\\MediaInfoNET.exe" "${path}" #menu: Tools > Open file with MediaInfo.NET`
+
+ `_ run "D:/Soft ware/MediaInfoNET.exe" "${path}" #menu: Tools > Open file with MediaInfo.NET`
+
 ## Command Line Interface
 
-mpvnet implements a basic CLI to set mpv commands.
+mpvnet implements a command line interface to set mpv commands.
+
+Supported are all mpv properties which are documented at:
+
+<https://mpv.io/manual/master>
 
 Example:
 
-mpvnet --mute=yes <file|URL>
+`mpvnet --mute=yes <file|URL>`
+
+## Color Theme
+
+mpv.net supports custom color themes, the definition of the built-in themes can be found at:
+
+<https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/theme.txt>
+
+Custom themes can be saved at:
+
+`<conf folder>\theme.conf`
+
+The theme.conf file may contain an unlimited amount of themes.
+
+In the config editor under UI there are the settings dark-theme and light-theme to define the themes used in dark and in light mode.
+
+## Hidden and secret features
+
+Selecting multiple files in File Explorer and pressing enter will open the files in mpv.net. Explorer restricts this to maximum 15 files and the order will be random.
+
+Whenever the control key is pressed when files or URLs are opened, the playlist is not cleared but the files or URLs are appended to the playlist. This works in all mpv.net features that open files or URLs.
+
+Pressing the shift key while opening a single file will suppress loading all files in the folder.

README.md

@@ -80,7 +80,8 @@ Table of contents
 - Screenshot feature with many options
 - File history feature to log time and filename
 - A-B loop feature
-- watch later feature to save the position
+- Watch later feature to save the position
+- Files can be enqueued from Explorer using the shell extension [Open with++](https://github.com/stax76/OpenWithPlusPlus#add-to-mpvnet-playlist) and the --queue switch
 - [Manual](#manual)
 
 ### Screenshots
@@ -200,7 +201,7 @@ this decision was made to keep the code simple and lightweight.
 
 Python scripting is implemented with IronPython which uses Python 2.7.
 
-The main window is WinForms based and uses less than 600 lines of code,
+The main window is WinForms based and uses less than 750 lines of code,
 all other windows are WPF based and use even less code.
 
 The config editor adds it's controls dynamically and uses [TOML](https://en.wikipedia.org/wiki/TOML) to define it's

extensions/RatingExtension/RatingExtension.cs

@@ -35,8 +35,8 @@ namespace RatingExtension // the assembly name must end with 'Extension'
                 string basename = Path.GetFileNameWithoutExtension(filepath);
 
                 for (int x = 0; x < 6; x++)
-                    if (basename.Contains(" (" + x.ToString() + "stars)"))
-                        basename = basename.Replace(" (" + x.ToString() + "stars)", "");
+                    if (basename.Contains(" (" + x + "stars)"))
+                        basename = basename.Replace(" (" + x + "stars)", "");
 
                 basename += $" ({rating}stars)";
                 string newPath = Path.Combine(Path.GetDirectoryName(filepath), basename + Path.GetExtension(filepath));

extensions/RatingExtension/RatingExtension.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RatingExtension</RootNamespace>
     <AssemblyName>RatingExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

extensions/ScriptingExtension/ScriptingExtension.cs

@@ -28,9 +28,9 @@ namespace ScriptingExtension // the file name of extensions must end with 'Exten
             if (Directory.Exists(mp.ConfigFolder + "scripts"))
                 scriptFiles.AddRange(Directory.GetFiles(mp.ConfigFolder + "scripts", "*.cs"));
 
-            if (Directory.Exists(PathHelp.StartupPath + "scripts"))
-                foreach (string path in Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs"))
-                    scriptFiles.AddRange(Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs"));
+            if (Directory.Exists(Folder.Startup + "scripts"))
+                foreach (string path in Directory.GetFiles(Folder.Startup + "scripts", "*.cs"))
+                    scriptFiles.AddRange(Directory.GetFiles(Folder.Startup + "scripts", "*.cs"));
 
             if (scriptFiles.Count == 0) return;
             CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom;

extensions/ScriptingExtension/ScriptingExtension.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ScriptingExtension</RootNamespace>
     <AssemblyName>ScriptingExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

extensions/ScriptingExtension/script.cs

@@ -1,40 +1,17 @@
-using System;
-using System.Windows.Forms;
+using System.IO;
 
 using mpvnet;
 
 class Script
 {
-    MainForm Form;
-
-    bool WasPlaying;
-    bool WasPaused;
-
     public Script()
     {
-        Form = MainForm.Instance;
-        Form.Resize += Form_Resize;
+        mp.Shutdown += Shutdown;
     }
 
-    private void Form_Resize(object sender, EventArgs e)
+    private void Shutdown()
     {
-        if (Form.WindowState == FormWindowState.Minimized)
-        {
-            WasPlaying = mp.get_property_string("pause") == "no";
-
-            if (WasPlaying)
-            {
-                mp.command("set pause yes");
-                WasPaused = true;
-            }
-        }
-        else
-        {
-            if (WasPaused)
-            {
-                mp.command("set pause no");
-                WasPaused = false;
-            }
-        }
+        foreach (string file in Directory.GetFiles(@"C:\Users\frank\Desktop\aaa"))
+            File.Delete(file);
     }
 }

mpv.net.sln

@@ -11,40 +11,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingExtension", "exten
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.ActiveCfg = Debug|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x64.Build.0 = Debug|x64
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x86
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x86
-		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|Any CPU.ActiveCfg = Release|x86
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.ActiveCfg = Debug|x64
+		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Debug|x86.Build.0 = Debug|x64
 		{1751F378-8EDF-4B62-BE6D-304C7C287089}.Release|x64.ActiveCfg = Release|x64
 		{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
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|x64
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x86
-		{55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|x86
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x64
+		{55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x64
 		{55C88710-539D-4402-84C8-31694841C731}.Release|x64.ActiveCfg = Release|x64
 		{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
-		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x64.ActiveCfg = Debug|x64
 		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x64.Build.0 = Debug|x64
-		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.ActiveCfg = Debug|x86
-		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.Build.0 = Debug|x86
-		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|Any CPU.ActiveCfg = Release|x86
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.ActiveCfg = Debug|x64
+		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|x86.Build.0 = Debug|x64
 		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x64.ActiveCfg = Release|x64
 		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x64.Build.0 = Release|x64
 		{94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|x86.ActiveCfg = Release|x86

mpv.net/App.config

@@ -3,6 +3,6 @@
     <configSections>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>

mpv.net/Controls/SearchTextBoxUserControl.xaml

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

mpv.net/DynamicGUI/DynamicGUI.cs

@@ -15,8 +15,10 @@ namespace DynamicGUI
         public static List<SettingBase> LoadSettings(string content)
         {
             TomlTable table;
+
             using (StringReader reader = new StringReader(content))
                 table = TOML.Parse(reader);
+
             List<SettingBase> settingsList = new List<SettingBase>(); 
 
             foreach (TomlTable setting in table["settings"])
@@ -34,12 +36,15 @@ namespace DynamicGUI
                     {
                         var opt = new OptionSettingOption();
                         opt.Name = option["name"];
+
                         if (option.HasKey("help"))
                             opt.Help = option["help"];
+
                         if (option.HasKey("text"))
                             opt.Text = option["text"];
                         else if (opt.Name == optionSetting.Default)
                             opt.Text = opt.Name + " (Default)";
+
                         opt.OptionSetting = optionSetting;
                         optionSetting.Options.Add(opt);
                     }
@@ -52,6 +57,7 @@ namespace DynamicGUI
                 }
 
                 baseSetting.Name = setting["name"];
+                baseSetting.File = setting["file"];
                 baseSetting.Filter = setting["filter"];
 
                 if (setting.HasKey("help")) baseSetting.Help = setting["help"];
@@ -65,9 +71,22 @@ namespace DynamicGUI
         }
     }
 
+    public class ConfItem
+    {
+        public string Name { get; set; } = "";
+        public string Value { get; set; } = "";
+        public string Comment { get; set; } = "";
+        public string LineComment { get; set; } = "";
+        public string Section { get; set; } = "";
+        public string File { get; set; } = "";
+        public bool IsSectionItem { get; set; }
+        public SettingBase SettingBase { get; set; }
+    }
+
     public abstract class SettingBase
     {
         public string Name { get; set; }
+        public string File { get; set; }
         public string Value { get; set; }
         public string Help { get; set; }
         public string Default { get; set; }
@@ -75,6 +94,7 @@ namespace DynamicGUI
         public string Filter { get; set; }
         public string Type { get; set; }
         public int Width { get; set; }
+        public ConfItem ConfItem { get; set; }
     }
 
     public class StringSetting : SettingBase
@@ -104,7 +124,10 @@ namespace DynamicGUI
         public bool Checked
         {
             get => OptionSetting.Value == Name ;
-            set { if (value) OptionSetting.Value = Name; }
+            set {
+                if (value)
+                    OptionSetting.Value = Name;
+            }
         }
 
         public Visibility Visibility

mpv.net/DynamicGUI/OptionSettingControl.xaml

@@ -4,22 +4,58 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DynamicGUI"
+             xmlns:UI="clr-namespace:UI"
              mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800">
+             
+             d:DesignHeight="450"
+             d:DesignWidth="800">
+    
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+            <TextBox x:Name="TitleTextBox"
+                     FontSize="24"
+                     Margin="0,10"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}" />
+
             <ItemsControl x:Name="ItemsControl">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
                         <WrapPanel Orientation="Vertical">
-                            <RadioButton x:Name="RadioButton" VerticalContentAlignment="Center" IsChecked="{Binding Checked}" GroupName="{Binding OptionSetting.Name}" Content="{Binding Text}" FontSize="16" FontWeight="Normal" VerticalAlignment="Top" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></RadioButton>
-                            <TextBox x:Name="ItemHelpTextBox" TextWrapping="WrapWithOverflow" Text="{Binding Help}" Visibility="{Binding Visibility}" Margin="10,0,0,0" BorderThickness="0" IsReadOnly="True" Padding="7,0,0,0" MinHeight="0" Foreground="{Binding Path=Foreground2, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+                            <RadioButton x:Name="RadioButton"
+                                         VerticalContentAlignment="Center"
+                                         IsChecked="{Binding Checked}"
+                                         GroupName="{Binding OptionSetting.Name}"
+                                         Content="{Binding Text}"
+                                         FontSize="16"
+                                         FontWeight="Normal"
+                                         VerticalAlignment="Top"
+                                         Foreground="{x:Static UI:Theme.Foreground}"/>
+
+                            <TextBox x:Name="ItemHelpTextBox"
+                                     TextWrapping="WrapWithOverflow"
+                                     Text="{Binding Help}"
+                                     Visibility="{Binding Visibility}"
+                                     Margin="10,0,0,0" BorderThickness="0"
+                                     IsReadOnly="True" Padding="7,0,0,0"
+                                     MinHeight="0"
+                                     Foreground="{x:Static UI:Theme.Foreground2}"
+                                     Background="{x:Static UI:Theme.Background}"/>
+
                         </WrapPanel>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Margin="0,10,0,0" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"></TextBox>
+
+            <TextBox x:Name="HelpTextBox"
+                     TextWrapping="WrapWithOverflow"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Margin="0,10,0,0"
+                     Foreground="{x:Static UI:Theme.Foreground}"
+                     Background="{x:Static UI:Theme.Background}"/>
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpv.net/DynamicGUI/StringSettingControl.xaml

@@ -4,21 +4,52 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DynamicGUI"
+             xmlns:UI="clr-namespace:UI"
              mc:Ignorable="d" 
              d:DesignHeight="450"
              d:DesignWidth="800">
+    
     <Grid Margin="20,0">
         <StackPanel>
-            <TextBox x:Name="TitleTextBox" FontSize="24" Margin="0,10" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+            <TextBox x:Name="TitleTextBox"
+                     FontSize="24"
+                     Margin="0,10"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}"/>
+            
             <Grid Margin="0,0,0,10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBox x:Name="ValueTextBox" Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" Height="20" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" CaretBrush="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" TextChanged="ValueTextBox_TextChanged"/>
-                <Button x:Name="Button" Height="20" Grid.Column="1" Visibility="{Binding Path=Text, ElementName=StringSettingControl1}" Margin="5,0,0,0" Width="20" Click="Button_Click">...</Button>
+                <TextBox x:Name="ValueTextBox"
+                         Text="{Binding Path=Text, ElementName=StringSettingControl1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                         Width="150"
+                         Height="20"
+                         HorizontalAlignment="Left"
+                         Foreground="{x:Static UI:Theme.Foreground}"
+                         Background="{x:Static UI:Theme.Background}"
+                         CaretBrush="{x:Static UI:Theme.Foreground}"
+                         TextChanged="ValueTextBox_TextChanged"/>
+               
+                <Button x:Name="Button"
+                        Height="20"
+                        Grid.Column="1"
+                        Visibility="{Binding Path=Text, ElementName=StringSettingControl1}"
+                        Margin="5,0,0,0"
+                        Width="20"
+                        Click="Button_Click">...</Button>
             </Grid>
-            <TextBox x:Name="HelpTextBox" TextWrapping="WrapWithOverflow" BorderThickness="0" IsReadOnly="True" Foreground="{Binding Path=Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"></TextBox>
+
+            <TextBox x:Name="HelpTextBox"
+                     TextWrapping="WrapWithOverflow"
+                     BorderThickness="0"
+                     IsReadOnly="True"
+                     Foreground="{x:Static UI:Theme.Foreground}"
+                     Background="{x:Static UI:Theme.Background}"/>
+
             <TextBlock x:Name="LinkTextBlock" Margin="0,10">
                 <local:HyperlinkEx x:Name="Link"></local:HyperlinkEx>
             </TextBlock>

mpv.net/DynamicGUI/StringSettingControl.xaml.cs

@@ -61,18 +61,20 @@ namespace DynamicGUI
                     }
                     break;
                 case "color":
-                    using (var d = new WinForms.ColorDialog())
+                    using (var dialog = new WinForms.ColorDialog())
                     {
-                        d.FullOpen = true;
+                        dialog.FullOpen = true;
+
                         try {
                             if (!string.IsNullOrEmpty(ValueTextBox.Text))
                             {
                                 Color col = GetColor(ValueTextBox.Text);
-                                d.Color = System.Drawing.Color.FromArgb(col.A, col.R, col.G, col.B); 
+                                dialog.Color = System.Drawing.Color.FromArgb(col.A, col.R, col.G, col.B); 
                             }
                         } catch {}
-                        if (d.ShowDialog() == WinForms.DialogResult.OK)
-                            ValueTextBox.Text = "#" + d.Color.ToArgb().ToString("X8");
+
+                        if (dialog.ShowDialog() == WinForms.DialogResult.OK)
+                            ValueTextBox.Text = "#" + dialog.Color.ToArgb().ToString("X8");
                     }
                     break;
             }

mpv.net/Misc/App.cs

@@ -3,37 +3,40 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
+using UI;
 
 namespace mpvnet
 {
-    public class App
+    public static class App
     {
-        public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm webm wmv y4m".Split(' ');
+        public static string[] VideoTypes { get; } = "264 265 asf avc avi avs flv h264 h265 hevc m2ts m2v m4v mkv mov mp4 mpeg mpg mpv mts ts vob vpy webm wmv y4m".Split(' ');
         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(' ');
         public static string[] ImageTypes { get; } = {"jpg", "bmp", "gif", "png"};
         public static string[] SubtitleTypes { get; } = { "srt", "ass", "idx", "sup", "ttxt", "ssa", "smi" };
-        public static string[] UrlWhitelist { get; set; } = { "tube", "vimeo", "ard", "zdf" };
 
         public static string RegPath { get; } = @"HKCU\Software\" + Application.ProductName;
         public static string ConfPath { get => mp.ConfigFolder + "mpvnet.conf"; }
-        public static string DarkMode { get; set; } = "always";
         public static string ProcessInstance { get; set; } = "single";
-        public static string DarkColor { get; set; }
-        public static string LightColor { get; set; }
+        public static string DarkMode { get; set; } = "always";
+        public static string DarkTheme { get; set; } = "dark";
+        public static string LightTheme { get; set; } = "light";
 
         public static bool RememberHeight { get; set; } = true;
         public static bool RememberPosition { get; set; }
+        public static bool Maximized { get; set; }
         public static bool DebugMode { get; set; }
         public static bool IsStartedFromTerminal { get; } = Environment.GetEnvironmentVariable("_started_from_console") == "yes";
         public static bool RememberVolume { get; set; } = true;
         public static bool AutoLoadFolder { get; set; } = true;
-        public static bool ThemedMenu { get; set; }
+        public static bool Queue { get; set; }
 
         public static int StartThreshold { get; set; } = 1500;
         public static int RecentCount { get; set; } = 15;
 
         public static float MinimumAspectRatio { get; set; } = 1.3f;
 
+        public static Extension Extension { get; set; }
+
         public static bool IsDarkMode {
             get => (DarkMode == "system" && Sys.IsDarkTheme) || DarkMode == "always";
         }
@@ -62,6 +65,16 @@ namespace mpvnet
                 }
             }
 
+            string themeContent = null;
+
+            if (File.Exists(mp.ConfigFolder + "theme.conf"))
+                themeContent = File.ReadAllText(mp.ConfigFolder + "theme.conf");
+
+            Theme.Init(
+                themeContent,
+                Properties.Resources.theme,
+                IsDarkMode ? DarkTheme : LightTheme);
+
             mp.Shutdown += Shutdown;
             mp.Initialized += Initialized;
         }
@@ -70,8 +83,8 @@ namespace mpvnet
         {
             if (RememberVolume)
             {
-                mp.set_property_int("volume", RegHelp.GetInt(App.RegPath, "Volume"));
-                mp.set_property_string("mute", RegHelp.GetString(App.RegPath, "Mute"));
+                mp.set_property_int("volume", RegHelp.GetInt(App.RegPath, "Volume", 70));
+                mp.set_property_string("mute", RegHelp.GetString(App.RegPath, "Mute", "no"));
             }
         }
 
@@ -106,19 +119,19 @@ namespace mpvnet
             switch (name)
             {
                 case "remember-position": RememberPosition = value == "yes"; return true;
+                case "maximized": Maximized = value == "yes"; return true;
                 case "start-size": RememberHeight = value == "previous"; return true;
                 case "process-instance": ProcessInstance = value; return true;
                 case "dark-mode": DarkMode = value; return true;
                 case "debug-mode": DebugMode = value == "yes"; return true;
-                case "dark-color": DarkColor = value.Trim('\'', '"'); return true;
-                case "light-color": LightColor = value.Trim('\'', '"'); return true;
-                case "url-whitelist": UrlWhitelist = value.Split(' ', ',', ';'); return true;
                 case "remember-volume": RememberVolume = value == "yes"; return true;
                 case "start-threshold": StartThreshold = value.Int(); return true;
                 case "minimum-aspect-ratio": MinimumAspectRatio = value.Float(); return true;
                 case "auto-load-folder": AutoLoadFolder = value == "yes"; return true;
-                case "themed-menu": ThemedMenu = value == "yes"; return true;
                 case "recent-count": RecentCount = value.Int(); return true;
+                case "queue": Queue = value == "yes"; return true;
+                case "dark-theme": DarkTheme = value.Trim('\'', '"'); return true;
+                case "light-theme": LightTheme = value.Trim('\'', '"'); return true;
             }
             return false;
         }

mpv.net/Misc/Command.cs

@@ -38,6 +38,11 @@ namespace mpvnet
                 case "add-files-to-playlist": OpenFiles("append"); break; // deprecated 2019
                 default: Msg.ShowError($"No command '{id}' found."); break;
             }
+
+            MainForm.Instance.BeginInvoke(new Action(() => {
+                Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
+                Native.SendMessage(MainForm.Instance.Handle, m.Msg, m.WParam, m.LParam);           
+            }));
         }
 
         public static void InvokeOnMainThread(Action action) => MainForm.Instance.Invoke(action);
@@ -98,14 +103,15 @@ namespace mpvnet
 
         public static void ShowHistory()
         {
-            var fp = mp.ConfigFolder + "history.txt";
-
-            if (File.Exists(fp))
-                Process.Start(fp);
+            if (File.Exists(mp.ConfigFolder + "history.txt"))
+                Process.Start(mp.ConfigFolder + "history.txt");
             else
+            {
                 if (Msg.ShowQuestion("Create history.txt file in config folder?",
                     "mpv.net will write the date, time and filename of opened files to it.") == MsgResult.OK)
-                    File.WriteAllText(fp, "");
+
+                    File.WriteAllText(mp.ConfigFolder + "history.txt", "");
+            }
         }
 
         public static void ShowInfo()
@@ -115,6 +121,10 @@ namespace mpvnet
                 string performer, title, album, genre, date, duration, text = "";
                 long fileSize = 0;
                 string path = mp.get_property_string("path");
+
+                if (path.Contains("://"))
+                    path = mp.get_property_string("media-title");
+
                 int width = mp.get_property_int("video-params/w");
                 int height = mp.get_property_int("video-params/h");
 
@@ -175,7 +185,7 @@ namespace mpvnet
                     $"{width} x {height}\n";
 
                 if (fileSize > 0)
-                    text += Convert.ToInt32(fileSize / 1024.0 / 1024.0).ToString() + " MB\n";
+                    text += Convert.ToInt32(fileSize / 1024.0 / 1024.0) + " MB\n";
 
                 text += $"{videoFormat}\n{audioCodec}";
 

mpv.net/Misc/Extension.cs

@@ -19,7 +19,7 @@ namespace mpvnet
             try
             {
                 AggregateCatalog catalog = new AggregateCatalog();
-                string dir = PathHelp.StartupPath + "Extensions";
+                string dir = Folder.Startup + "Extensions";
 
                 if (Directory.Exists(dir))
                 {

mpv.net/Misc/Help.cs

@@ -0,0 +1,11 @@
+using System;
+
+class ConsoleHelp
+{
+    public static void WriteError(object obj)
+    {
+        Console.ForegroundColor = ConsoleColor.Red;
+        Console.WriteLine(obj?.ToString());
+        Console.ResetColor();
+    }
+}

mpv.net/Misc/Misc.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -20,7 +21,10 @@ namespace mpvnet
         public static bool IsDarkTheme {
             get {
                 object value = Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", 1);
-                if (value is null) value = 1;
+            
+                if (value is null)
+                    value = 1;
+
                 return (int)value == 0;
             }
         }
@@ -62,43 +66,52 @@ namespace mpvnet
         {
             Types = types;
 
-            RegHelp.SetObject($"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\{ExeFilename}", null, ExePath);
-            RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}", "FriendlyAppName", "mpv.net media player");
-            RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+            RegHelp.SetObject(@"HKCU\Software\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename, null, ExePath);
+            RegHelp.SetObject(@"HKCR\Applications\" + ExeFilename, "FriendlyAppName", "mpv.net media player");
+            RegHelp.SetObject($@"HKCR\Applications\{ExeFilename}\shell\open\command", null, $"\"{ExePath}\" \"%1\"");
             RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationDescription", "mpv.net media player");
             RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities", "ApplicationName", "mpv.net");
-            RegHelp.SetObject($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}", null, "");
-            RegHelp.SetObject($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}", null, "");
+            RegHelp.SetObject(@"HKCR\SystemFileAssociations\video\OpenWithList\" + ExeFilename, null, "");
+            RegHelp.SetObject(@"HKCR\SystemFileAssociations\audio\OpenWithList\" + ExeFilename, null, "");
             RegHelp.SetObject(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net", @"SOFTWARE\Clients\Media\mpv.net\Capabilities");
 
             foreach (string ext in Types)
             {
-                RegHelp.SetObject($"HKCR\\Applications\\{ExeFilename}\\SupportedTypes", "." + ext, "");
-                RegHelp.SetObject($"HKCR\\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
-                RegHelp.SetObject($"HKCR\\" + "." + ext + "\\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
-                if (App.VideoTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "video");
-                if (App.AudioTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "audio");
-                if (App.ImageTypes.Contains(ext)) RegHelp.SetObject($"HKCR\\" + "." + ext, "PerceivedType", "image");
-                RegHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open", null, "Play with " +  Application.ProductName);
-                RegHelp.SetObject($"HKCR\\" + ExeFilenameNoExt + "." + ext + "\\shell\\open\\command", null, $"\"{ExePath}\" \"%1\"");
+                RegHelp.SetObject($@"HKCR\Applications\{ExeFilename}\SupportedTypes", "." + ext, "");
+                RegHelp.SetObject($@"HKCR\" + "." + ext, null, ExeFilenameNoExt + "." + ext);
+                RegHelp.SetObject($@"HKCR\" + "." + ext + @"\OpenWithProgIDs", ExeFilenameNoExt + "." + ext, "");
+
+                if (App.VideoTypes.Contains(ext))
+                    RegHelp.SetObject(@"HKCR\" + "." + ext, "PerceivedType", "video");
+
+                if (App.AudioTypes.Contains(ext))
+                    RegHelp.SetObject(@"HKCR\" + "." + ext, "PerceivedType", "audio");
+
+                if (App.ImageTypes.Contains(ext))
+                    RegHelp.SetObject(@"HKCR\" + "." + ext, "PerceivedType", "image");
+
+                RegHelp.SetObject($@"HKCR\" + ExeFilenameNoExt + "." + ext + @"\shell\open", null, "Play with " +  Application.ProductName);
+                RegHelp.SetObject($@"HKCR\" + ExeFilenameNoExt + "." + ext + @"\shell\open\command", null, $"\"{ExePath}\" \"%1\"");
                 RegHelp.SetObject(@"HKLM\SOFTWARE\Clients\Media\mpv.net\Capabilities\FileAssociations", "." + ext, ExeFilenameNoExt + "." + ext);
             }
         }
 
         public static void Unregister()
         {
-            RegHelp.RemoveKey($"HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\{ExeFilename}");
-            RegHelp.RemoveKey($"HKCR\\Applications\\{ExeFilename}");
-            RegHelp.RemoveKey($"HKLM\\SOFTWARE\\Clients\\Media\\mpv.net");
-            RegHelp.RemoveKey($"HKCR\\SystemFileAssociations\\video\\OpenWithList\\{ExeFilename}");
-            RegHelp.RemoveKey($"HKCR\\SystemFileAssociations\\audio\\OpenWithList\\{ExeFilename}");
+            RegHelp.RemoveKey($@"HKCU\Software\Microsoft\Windows\CurrentVersion\App Paths\" + ExeFilename);
+            RegHelp.RemoveKey($@"HKCR\Applications\" + ExeFilename);
+            RegHelp.RemoveKey($@"HKLM\SOFTWARE\Clients\Media\mpv.net");
+            RegHelp.RemoveKey($@"HKCR\SystemFileAssociations\video\OpenWithList\" + ExeFilename);
+            RegHelp.RemoveKey($@"HKCR\SystemFileAssociations\audio\OpenWithList\" + ExeFilename);
             RegHelp.RemoveValue(@"HKLM\SOFTWARE\RegisteredApplications", "mpv.net");
 
             foreach (string id in Registry.ClassesRoot.GetSubKeyNames())
             {
-                if (id.StartsWith(ExeFilenameNoExt + ".")) Registry.ClassesRoot.DeleteSubKeyTree(id);
-                RegHelp.RemoveValue($"HKCR\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
-                RegHelp.RemoveValue($"HKLM\\Software\\Classes\\" + id + "\\OpenWithProgIDs", ExeFilenameNoExt + id);
+                if (id.StartsWith(ExeFilenameNoExt + "."))
+                    Registry.ClassesRoot.DeleteSubKeyTree(id);
+
+                RegHelp.RemoveValue($@"HKCR\Software\Classes\{id}\OpenWithProgIDs", ExeFilenameNoExt + id);
+                RegHelp.RemoveValue($@"HKLM\Software\Classes\{id}\OpenWithProgIDs", ExeFilenameNoExt + id);
             }
         }
     }
@@ -107,46 +120,43 @@ namespace mpvnet
     {
         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);
+            using (RegistryKey regKey = GetRootKey(path).CreateSubKey(path.Substring(5), RegistryKeyPermissionCheck.ReadWriteSubTree))
+                regKey.SetValue(name, value);
         }
 
-        public static string GetString(string path, string name)
+        public static string GetString(string path, string name, string defaultValue = "")
         {
-            object val = GetObject(path, name);
-            if (val == null || !(val is string)) return "";
-            return val.ToString();
+            object value = GetObject(path, name, defaultValue);
+            return !(value is string) ? defaultValue : value.ToString();
         }
 
-        public static int GetInt(string path, string name)
+        public static int GetInt(string path, string name, int defaultValue = 0)
         {
-            object val = GetObject(path, name);
-            if (val == null || !(val is int)) return 0;
-            return (int)val;
+            object value = GetObject(path, name, defaultValue);
+            return !(value is int) ? defaultValue : (int)value;
         }
 
-        public static object GetObject(string path, string name)
+        public static object GetObject(string path, string name, object defaultValue = null)
         {
-            using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5)))
-                if (rk != null)
-                    return rk.GetValue(name, "");
-                else
-                    return null;
+            using (RegistryKey regKey = GetRootKey(path).OpenSubKey(path.Substring(5)))
+                return regKey == null ? null : regKey.GetValue(name, defaultValue);
         }
 
         public static void RemoveKey(string path)
         {
-            try {
+            try
+            {
                 GetRootKey(path).DeleteSubKeyTree(path.Substring(5), false);
             } catch { }
         }
 
         public static void RemoveValue(string path, string name)
         {
-            try {
-                using (RegistryKey rk = GetRootKey(path).OpenSubKey(path.Substring(5), true))
-                    if (!(rk is null))
-                        rk.DeleteValue(name, false);
+            try
+            {
+                using (RegistryKey regKey = GetRootKey(path).OpenSubKey(path.Substring(5), true))
+                    if (regKey != null)
+                        regKey.DeleteValue(name, false);
             } catch {}
         }
 
@@ -204,26 +214,38 @@ namespace mpvnet
                 foreach (string line in content.Split('\r', '\n'))
                 {
                     string val = line.Trim();
-                    if (val.StartsWith("#")) continue;
-                    if (!val.Contains(" ")) continue;
+
+                    if (val.StartsWith("#"))
+                        continue;
+
+                    if (!val.Contains(" "))
+                        continue;
+
                     CommandItem item = new CommandItem();
                     item.Input = val.Substring(0, val.IndexOf(" "));
-                    if (item.Input == "_") item.Input = "";
+
+                    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);
                 }
@@ -237,6 +259,7 @@ namespace mpvnet
             get {
                 if (_Items is null)
                     _Items = GetItems(File.ReadAllText(mp.InputConfPath));
+
                 return _Items;
             }
         }
@@ -291,8 +314,34 @@ namespace mpvnet
         }
     }
 
+    public class Folder
+    {
+        public static string Startup { get; } = Application.StartupPath + "\\";
+    }
+
     public class PathHelp
     {
-        public static string StartupPath { get; } = Application.StartupPath + "\\";
+        public static string GetBaseName(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+                return "";
+
+            int index = value.IndexOf("/");
+
+            if (index > -1)
+                value = value.Substring(index + 1);
+
+            index = value.IndexOf("\\");
+
+            if (index > -1)
+                value = value.Substring(index + 1);
+
+            index = value.LastIndexOf(".");
+
+            if (index > -1)
+                value = value.Substring(0, index);
+
+            return value;
+        }
     }
 }

mpv.net/Misc/Program.cs

@@ -2,7 +2,6 @@
 using System.Windows.Forms;
 using System.Linq;
 using System.Collections.Generic;
-using System.IO;
 using System.Threading;
 using System.Diagnostics;
 
@@ -18,7 +17,11 @@ namespace mpvnet
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
 
-                if (mp.ConfigFolder == "") return;
+                if (App.IsStartedFromTerminal)
+                    Native.AttachConsole(-1 /*ATTACH_PARENT_PROCESS*/);
+
+                if (mp.ConfigFolder == "")
+                    return;
 
                 string[] args = Environment.GetCommandLineArgs().Skip(1).ToArray();
 
@@ -40,8 +43,14 @@ namespace mpvnet
                     files.Add(App.ProcessInstance);
 
                     foreach (string arg in args)
-                        if (!arg.StartsWith("--") && (arg == "-" || arg.Contains("://") || File.Exists(arg)))
+                    {
+                        if (!arg.StartsWith("--") && (arg == "-" || arg.Contains("://") ||
+                            arg.Contains(":\\") || arg.StartsWith("\\\\")))
+
                             files.Add(arg);
+                        else if (arg == "--queue")
+                            files[0] = "queue";
+                    }
 
                     Process[] procs = Process.GetProcessesByName("mpvnet");
 
@@ -57,18 +66,26 @@ namespace mpvnet
                                 data.cbData = data.lpData.Length * 2 + 1;
                                 Native.SendMessage(proc.MainWindowHandle, 0x004A /*WM_COPYDATA*/, IntPtr.Zero, ref data);
                                 mutex.Dispose();
+
+                                if (App.IsStartedFromTerminal)
+                                    Native.FreeConsole();
+
                                 return;
                             }
                         }
+
                         Thread.Sleep(50);
                     }
+
                     mutex.Dispose();
                     return;
                 }
 
-                if (App.IsStartedFromTerminal) Native.AttachConsole(-1 /*ATTACH_PARENT_PROCESS*/);
                 Application.Run(new MainForm());
-                if (App.IsStartedFromTerminal) Native.FreeConsole();
+
+                if (App.IsStartedFromTerminal)
+                    Native.FreeConsole();
+
                 mutex.Dispose();
             }
             catch (Exception ex)

mpv.net/Misc/Theme.cs

@@ -0,0 +1,96 @@
+
+using System.Collections.Generic;
+using System.Windows.Media;
+
+namespace UI
+{
+    public class Theme
+    {
+        public string Name { get; set; }
+        public Dictionary<string, string> Dictionary { get; } = new Dictionary<string, string>();
+
+        public static List<Theme> DefaultThemes { get; set; }
+        public static List<Theme> CustomThemes { get; set; }
+
+        public static Theme Current { get; set; }
+
+        public static Brush Foreground { get; set; }
+        public static Brush Foreground2 { get; set; }
+        public static Brush Background { get; set; }
+        public static Brush Heading { get; set; }
+
+        public System.Drawing.Color GetWinFormsColor(string key)
+        {
+            return System.Drawing.ColorTranslator.FromHtml(Dictionary[key]);
+        }
+
+        public Brush GetBrush(string key)
+        {
+            return new SolidColorBrush((Color)ColorConverter.ConvertFromString(Dictionary[key]));
+        }
+
+        public static void Init(string customContent, string defaultContent, string activeTheme)
+        {
+            DefaultThemes = Load(defaultContent);
+            CustomThemes = Load(customContent);
+
+            foreach (Theme theme in CustomThemes)
+            {
+                if (theme.Name == activeTheme)
+                {
+                    bool isKeyMissing = false;
+
+                    foreach (string key in DefaultThemes[0].Dictionary.Keys)
+                    {
+                        if (!theme.Dictionary.ContainsKey(key))
+                        {
+                            isKeyMissing = true;
+                            ConsoleHelp.WriteError($"Theme '{activeTheme}' misses '{key}'");
+                            break;
+                        }
+                    }
+
+                    if (!isKeyMissing)
+                        Current = theme;                     
+
+                    break;
+                }
+            }
+
+            if (Current == null)
+                foreach (Theme theme in DefaultThemes)
+                    if (theme.Name == activeTheme)
+                        Current = theme;
+
+            if (Current == null)
+                Current = DefaultThemes[0];
+
+            Foreground = Current.GetBrush("foreground");
+            Foreground2 = Current.GetBrush("foreground2");
+            Background = Current.GetBrush("background");
+            Heading = Current.GetBrush("heading");
+        }
+
+        static List<Theme> Load(string content)
+        {
+            List<Theme> list = new List<Theme>();
+            Theme theme = null;
+
+            foreach (string currentLine in (content ?? "").Split(new [] { '\r', '\n' }))
+            {
+                string line = currentLine.Trim();
+
+                if (line.StartsWith("[") && line.EndsWith("]"))
+                    list.Add(theme = new Theme() { Name = line.Substring(1, line.Length - 2).Trim() });
+
+                if (line.Contains("=") && theme != null)
+                {
+                    string left = line.Substring(0, line.IndexOf("=")).Trim();
+                    theme.Dictionary[left] = line.Substring(line.IndexOf("=") + 1).Trim();
+                }
+            }
+
+            return list;
+        }
+    }
+}

mpv.net/Native/MediaInfo.cs

@@ -10,7 +10,7 @@ public class MediaInfo : IDisposable
     {
         if (!Loaded)
         {
-            if (LoadLibrary("MediaInfo.dll") == IntPtr.Zero)
+            if (Native.LoadLibrary("MediaInfo.dll") == IntPtr.Zero)
                 throw new Exception("Failed to load MediaInfo.dll.");
 
             Loaded = true;
@@ -56,21 +56,24 @@ public class MediaInfo : IDisposable
 
     ~MediaInfo() { Dispose(); }
 
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    static extern IntPtr LoadLibrary(string path);
-
     [DllImport("MediaInfo.dll")]
     static extern IntPtr MediaInfo_New();
 
-    [DllImport("MediaInfo.dll")]
-    static extern void MediaInfo_Delete(IntPtr handle);
+    [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
+    static extern int MediaInfo_Open(IntPtr handle, string path);
 
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
-    static extern int MediaInfo_Open(IntPtr handle, string fileName);
+    static extern IntPtr MediaInfo_Option(IntPtr handle, string optionString, string value);
+
+    [DllImport("MediaInfo.dll")]
+    static extern IntPtr MediaInfo_Inform(IntPtr handle, int reserved);
 
     [DllImport("MediaInfo.dll")]
     static extern int MediaInfo_Close(IntPtr handle);
 
+    [DllImport("MediaInfo.dll")]
+    static extern void MediaInfo_Delete(IntPtr handle);
+
     [DllImport("MediaInfo.dll", CharSet = CharSet.Unicode)]
     static extern IntPtr MediaInfo_Get(IntPtr handle,
                                        MediaInfoStreamKind streamKind,

mpv.net/Native/Native.cs

@@ -2,18 +2,16 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 
-namespace mpvnet
-{
 public class Native
 {
     [DllImport("kernel32.dll")]
     public static extern bool AttachConsole(int dwProcessId);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+    [DllImport("kernel32.dll")]
     public static extern bool FreeConsole();
 
     [DllImport("kernel32.dll")]
-        public static extern IntPtr LoadLibrary(string dllToLoad);
+    public static extern IntPtr LoadLibrary(string path);
 
     [DllImport("user32.dll", CharSet = CharSet.Unicode)]
     public static extern IntPtr FindWindowEx(IntPtr parentHandle, IntPtr childAfter, string lclassName, string windowTitle);
@@ -24,9 +22,12 @@ namespace mpvnet
     [DllImport("user32.dll", CharSet = CharSet.Unicode)]
     public static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, ref COPYDATASTRUCT lParam);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
     public static extern IntPtr PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
 
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    public static extern int RegisterWindowMessage(string id);
+
     [DllImport("user32.dll")]
     public static extern bool AllowSetForegroundWindow(int dwProcessId);
 
@@ -36,7 +37,7 @@ namespace mpvnet
     [DllImport("user32.dll")]
     public static extern bool AdjustWindowRect(ref RECT lpRect, uint dwStyle, bool bMenu);
 
-        [DllImport("user32.dll", SetLastError = true)]
+    [DllImport("user32.dll")]
     public static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, int uFlags);
 
     [DllImport("user32.dll", EntryPoint = "GetWindowLong")]
@@ -77,7 +78,7 @@ namespace mpvnet
             Bottom = bottom;
         }
 
-            public Rectangle ToRectangle() { return Rectangle.FromLTRB(Left, Top, Right, Bottom); }
+        public Rectangle ToRectangle() => Rectangle.FromLTRB(Left, Top, Right, Bottom);
         public Size Size => new Size(Right - Left, Bottom - Top);
         public int Width => Right - Left;
         public int Height => Bottom - Top;
@@ -92,4 +93,3 @@ namespace mpvnet
         public string lpData;
     }
 }
-}

mpv.net/Native/TaskDialog.cs

@@ -50,23 +50,23 @@ public class Msg
                 td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+            MessageBox.Show(e.GetType().Name + "\n\n" + e.Message + "\n\n" + e,
                 Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
 
-    public static void ShowException(Exception e)
+    public static void ShowException(Exception exception)
     {
         try
         {
             using (TaskDialog<string> td = new TaskDialog<string>())
             {
-                td.MainInstruction = e.GetType().Name;
-                td.Content = e.Message;
+                td.MainInstruction = exception.GetType().Name;
+                td.Content = exception.Message;
                 td.MainIcon = MsgIcon.Error;
-                td.ExpandedInformation = e.ToString();
+                td.ExpandedInformation = exception.ToString();
                 td.Footer = "[Copy Message](copymsg)";
 
                 if (!string.IsNullOrEmpty(Msg.SupportURL))
@@ -75,9 +75,9 @@ public class Msg
                 td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+            MessageBox.Show(e.GetType().Name + "\n\n" + e.Message + "\n\n" + e,
                 Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
@@ -144,9 +144,9 @@ public class Msg
                 return td.Show();
             }
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            return (MsgResult)MessageBox.Show(ex.GetType().Name + "\n\n" + ex.Message + "\n\n" + ex.ToString(),
+            return (MsgResult)MessageBox.Show(e.GetType().Name + "\n\n" + e.Message + "\n\n" + e,
                 Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
@@ -235,6 +235,7 @@ public class TaskDialog<T> : TaskDialogNative, IDisposable
 
         if (Path.GetFileName(lpszFileName.ToString().Replace(".vshost", "")) ==
             Path.GetFileName(Assembly.GetEntryAssembly().Location))
+
             return foregroundWindow;
 
         return IntPtr.Zero;

mpv.net/Native/Taskbar.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Taskbar
+{
+    private ITaskbarList3 Instance = (ITaskbarList3)new TaskBarCommunication();
+
+    public IntPtr Handle { get; set; }
+
+    public Taskbar(IntPtr handle) => Handle = handle;
+
+    [ComImportAttribute]
+    [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+    [GuidAttribute("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf")]
+    private interface ITaskbarList3
+    {
+        // ITaskbarList
+        [PreserveSig] void HrInit();
+        [PreserveSig] void AddTab(IntPtr hwnd);
+        [PreserveSig] void DeleteTab(IntPtr hwnd);
+        [PreserveSig] void ActivateTab(IntPtr hwnd);
+        [PreserveSig] void SetActiveAlt(IntPtr hwnd);
+        // ITaskbarList2
+        [PreserveSig] void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+        // ITaskbarList3
+        [PreserveSig] void SetProgressValue(IntPtr hwnd, UInt64 ullCompleted, UInt64 ullTotal);
+        [PreserveSig] void SetProgressState(IntPtr hwnd, TaskbarStates state);
+    }
+
+    [ComImportAttribute]
+    [ClassInterfaceAttribute(ClassInterfaceType.None)]
+    [GuidAttribute("56FDF344-FD6D-11d0-958A-006097C9A090")]
+    private class TaskBarCommunication { }
+
+    public void SetState(TaskbarStates taskbarState)
+    {
+        Instance.SetProgressState(Handle, taskbarState);
+    }
+
+    public void SetValue(double progressValue, double progressMax)
+    {
+        Instance.SetProgressValue(Handle, (UInt64)progressValue, (UInt64)progressMax);
+    }
+}
+
+public enum TaskbarStates
+{
+    NoProgress = 0,
+    Indeterminate = 0x1,
+    Normal = 0x2,
+    Error = 0x4,
+    Paused = 0x8
+}

mpv.net/Properties/AssemblyInfo.cs

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

mpv.net/Properties/Resources.Designer.cs

@@ -60,21 +60,37 @@ namespace mpvnet.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to [[settings]]
+        ///name = &quot;hwdec&quot;
+        ///file = &quot;mpv&quot;
+        ///default = &quot;no&quot;
+        ///filter = &quot;Video&quot;
+        ///url = &quot;https://mpv.io/manual/master/#options-hwdec&quot;
+        ///help = &quot;Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:&quot;
+        ///options = [{ name = &quot;no&quot;,           help = &quot;always use software decoding&quot; },
+        ///           { name = &quot;auto&quot;,         hel [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string confToml {
+            get {
+                return ResourceManager.GetString("confToml", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to 
-        /// # This file defines the input (keys and mouse) bindings of mpv and mpv.net
-        /// # and it also defines the context menu of mpv.net. mpv.net has an input
-        /// # editor and an config editor as alternative to editing conf text files.
-        /// # The input and config editor 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:
+        /// # This file defines the key and mouse bindings and the context menu
+        /// # of mpv.net. A input and config editor can be found in mpv.net&apos;s
+        /// # context menu under &apos;Settings&apos;. The defaults of this file can be found at:
         ///
         /// # https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/inputConf.txt
         ///
-        /// # th [rest of string was truncated]&quot;;.
+        /// # The defaults of mpv can be found at:
+        ///
+        /// # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+        ///
+        /// # mpv.net&apos;s defaults of mpv.conf contain: &apos;input-default-bindings = no&apos;
+        /// # which disables mpv&apos;s  [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string inputConf {
             get {
@@ -83,21 +99,21 @@ namespace mpvnet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 
-        ///# manual: https://mpv.io/manual/master/
-        ///
-        ///# defaults: https://github.com/stax76/mpv.net/blob/master/mpv.net/Resources/mpvConf.txt
-        ///
+        ///   Looks up a localized string similar to input-default-bindings = no
         ///input-ar-delay = 500
         ///input-ar-rate = 20
-        ///volume = 50
-        ///hwdec = yes
         ///keep-open = yes
         ///keep-open-pause = no
         ///osd-playing-msg = &apos;${filename}&apos;
+        ///script-opts = osc-scalewindowed=1.5
         ///screenshot-directory = &apos;~~desktop/&apos;
-        ///input-default-bindings = no
-        ///script-opts=osc-scalewindowed=1.5.
+        ///cscale = spline36
+        ///dscale = spline36
+        ///scale = spline36
+        ///hwdec = yes
+        ///
+        ///[protocol.https]
+        ///osd-playing-msg = &apos;${media-title}&apos;.
         /// </summary>
         internal static string mpvConf {
             get {
@@ -105,22 +121,6 @@ namespace mpvnet.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to [[settings]]
-        ///name = &quot;hwdec&quot;
-        ///default = &quot;no&quot;
-        ///filter = &quot;Video&quot;
-        ///url = &quot;https://mpv.io/manual/master/#options-hwdec&quot;
-        ///help = &quot;Specify the hardware video decoding API that should be used if possible. Whether hardware decoding is actually done depends on the video codec. If hardware decoding is not possible, mpv will fall back on software decoding.\n\nFor more information visit:&quot;
-        ///options = [{ name = &quot;no&quot;,           help = &quot;always use software decoding&quot; },
-        ///           { name = &quot;auto&quot;,         help = &quot;enable be [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string mpvConfToml {
-            get {
-                return ResourceManager.GetString("mpvConfToml", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -132,39 +132,37 @@ namespace mpvnet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to dark-color = &apos;#1E90FF&apos;
-        ///light-color = &apos;#28394F&apos;.
-        /// </summary>
-        internal static string mpvNetConf {
-            get {
-                return ResourceManager.GetString("mpvNetConf", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to [[settings]]
-        ///name = &quot;dark-mode&quot;
-        ///default = &quot;always&quot;
-        ///filter = &quot;General&quot;
-        ///help = &quot;Enables a dark theme. (mpv.net specific setting)&quot;
-        ///options = [{ name = &quot;always&quot; },
-        ///           { name = &quot;system&quot; , help = &quot;Available on Windows 10 or higher&quot; },
-        ///		   { name = &quot;never&quot; }]
+        ///   Looks up a localized string similar to 
+        ///[dark]
         ///
-        ///[[settings]]
-        ///name = &quot;dark-color&quot;
-        ///type = &quot;color&quot;
-        ///filter = &quot;General&quot;
-        ///help = &quot;Theme color used in dark-mode. Leave empty to use OS theme. (mpv.net specific setting)&quot;
+        ///heading = #1E90FF
+        ///foreground = #FFFFFF
+        ///foreground2 = #C0C0C0
+        ///background = #323232
         ///
-        ///[[settings]]
-        ///name = &quot;light-color&quot;
-        ///type = &quot;color&quot;
-        ///filter = &quot;General&quot; [rest of string was truncated]&quot;;.
+        ///menu-foreground = #FFFFFF
+        ///menu-background = #323232
+        ///menu-highlight  = #505050
+        ///menu-border     = #FFFFFF
+        ///menu-checked    = #5A5A5A
+        ///
+        ///[light]
+        ///
+        ///heading = #0068B2
+        ///foreground = #000000
+        ///foreground2 = #4C4C4C
+        ///background = #F7F7F7
+        ///
+        ///menu-foreground = #000000
+        ///menu-background = #DFDFDF
+        ///menu-highlight  = #BFBFBF
+        ///menu-border     = #6A6A6A
+        ///menu-checked    = #AAAAAA
+        ///.
         /// </summary>
-        internal static string mpvNetConfToml {
+        internal static string theme {
             get {
-                return ResourceManager.GetString("mpvNetConfToml", resourceCulture);
+                return ResourceManager.GetString("theme", resourceCulture);
             }
         }
     }

mpv.net/Properties/Resources.resx

@@ -118,22 +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="confToml" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ConfToml.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <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="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="mpvnet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\mpvnet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="mpvNetConf" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\mpvNetConf.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 name="theme" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\theme.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>

mpv.net/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace mpvnet.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

mpv.net/Resources/ConfToml.txt

@@ -1,5 +1,7 @@
-[[settings]]
+
+[[settings]]
 name = "hwdec"
+file = "mpv"
 default = "no"
 filter = "Video"
 url = "https://mpv.io/manual/master/#options-hwdec"
@@ -21,6 +23,7 @@ options = [{ name = "no",           help = "always use software decoding" },
 
 [[settings]]
 name = "gpu-api"
+file = "mpv"
 default = "auto"
 filter = "Video"
 help = "Controls which type of graphics APIs will be accepted. Auto uses d3d11, it should only be changed in case of problems, Vulkan is not recommended."
@@ -31,6 +34,7 @@ options = [{ name = "auto",   help = "Use any available API" },
 
 [[settings]]
 name = "gpu-context"
+file = "mpv"
 default = "auto"
 filter = "Video"
 options = [{ name = "auto",      help = "auto-select" },
@@ -42,6 +46,7 @@ options = [{ name = "auto",      help = "auto-select" },
 
 [[settings]]
 name = "vo"
+file = "mpv"
 default = "gpu"
 filter = "Video"
 help = "Video output drivers to be used.\n\nFor more information visit:"
@@ -51,6 +56,7 @@ options = [{ name = "gpu",      help = "General purpose, customizable, GPU-accel
 
 [[settings]]
 name = "video-sync"
+file = "mpv"
 default = "audio"
 filter = "Video"
 help = "How the player synchronizes audio and video.\n\nFor more information visit:"
@@ -66,6 +72,7 @@ options = [{ name = "audio" },
 
 [[settings]]
 name = "scale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "The GPU renderer filter function to use when upscaling video. There are some more filters, but most are not as useful. For a complete list, pass help as value, e.g.: mpv --scale=help"
@@ -80,6 +87,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "cscale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "As scale, but for interpolating chroma information. If the image is not subsampled, this option is ignored entirely."
@@ -94,6 +102,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "dscale"
+file = "mpv"
 default = "bilinear"
 filter = "Video"
 help = "Like scale, but apply these filters on downscaling instead. If this option is unset, the filter implied by scale will be applied."
@@ -108,6 +117,7 @@ options = [{ name = "bilinear",         help = "Bilinear hardware texture filter
 
 [[settings]]
 name = "dither-depth"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "Set dither target depth to N. Note that the depth of the connected video display device cannot be detected. Often, LCD panels will do dithering on their own, which conflicts with this option and leads to ugly output."
@@ -117,6 +127,7 @@ options = [{ name = "no",   help = "Disable any dithering done by mpv." },
 
 [[settings]]
 name = "correct-downscaling"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "When using convolution based filters, extend the filter size when downscaling. Increases quality, but reduces performance while downscaling.\n\nThis will perform slightly sub-optimally for anamorphic video (but still better than without it) since it will extend the size to match only the milder of the scale factors between the axes."
@@ -125,6 +136,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "sigmoid-upscaling"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "When upscaling, use a sigmoidal color transform to avoid emphasizing ringing artifacts. This also implies linear-scaling."
@@ -133,6 +145,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "deband"
+file = "mpv"
 default = "no"
 filter = "Video"
 help = "Enable the debanding algorithm. This greatly reduces the amount of visible banding, blocking and other quantization artifacts, at the expense of very slightly blurring some of the finest details. In practice, it's virtually always an improvement - the only reason to disable it would be for performance."
@@ -141,18 +154,29 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "volume"
-default = "100"
+file = "mpv"
 filter = "Audio"
 help = "Set the startup volume. 0 means silence, 100 means no volume reduction or amplification. Negative values can be passed for compatibility, but are treated as 0. Since mpv 0.18.1, this always controls the internal mixer (aka \"softvol\"). Default: 100"
 
+[[settings]]
+name = "remember-volume"
+file = "mpvnet"
+default = "yes"
+filter = "Audio"
+help = "Save volume and mute on exit and restore it on start. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
 [[settings]]
 name = "alang"
+file = "mpv"
 filter = "Audio"
 type = "string"
 help = "Specify a priority list of audio languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two-letter language codes, Matroska, MPEG-TS and NUT use ISO 639-2 three-letter language codes, while OGM uses a free-form identifier. See also aid.\n\nExamples\n\nmpv dvd://1 alang=hu,en chooses the Hungarian language track on a DVD and falls back on English if Hungarian is not available.\n\nmpv alang=jpn example.mkv plays a Matroska file with Japanese audio."
 
 [[settings]]
 name = "audio-file-auto"
+file = "mpv"
 default = "no"
 filter = "Audio"
 help = "Load additional audio files matching the video filename. The parameter specifies how external audio files are matched."
@@ -163,12 +187,14 @@ options = [{ name = "no",    help = "Don't automatically load external audio fil
 
 [[settings]]
 name = "slang"
+file = "mpv"
 filter = "Subtitle"
 type = "string"
 help = "Specify a priority list of subtitle languages to use. Different container formats employ different language codes. DVDs use ISO 639-1 two letter language codes, Matroska uses ISO 639-2 three letter language codes while OGM uses a free-form identifier. See also sid."
 
 [[settings]]
 name = "sub-auto"
+file = "mpv"
 default = "exact"
 filter = "Subtitle"
 help = "Load additional subtitle files matching the video filename. The parameter specifies how external subtitle files are matched. exact is enabled by default."
@@ -179,35 +205,41 @@ options = [{ name = "no",    help = "Don't automatically load external subtitle
 
 [[settings]]
 name = "sub-font"
+file = "mpv"
 filter = "Subtitle"
 type = "string"
 help = "Specify font to use for subtitles that do not themselves specify a particular font. The default is  sans-serif."
 
 [[settings]]
 name = "sub-font-size"
+file = "mpv"
 filter = "Subtitle"
 help = "Specify the sub font size. The unit is the size in scaled pixels at a window height of 720. The actual pixel size is scaled with the window height: if the window height is larger or smaller than 720, the actual size of the text increases or decreases as well. Default: 55"
 
 [[settings]]
 name = "sub-color"
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "Specify the color used for unstyled text subtitles.\n\nThe color is specified in the form r/g/b, where each color component is specified as number in the range 0.0 to 1.0. It's also possible to specify the transparency by using r/g/b/a, where the alpha value 0 means fully transparent, and 1.0 means opaque. If the alpha component is not given, the color is 100% opaque.\n\nPassing a single number to the option sets the sub to gray, and the form gray/a lets you specify alpha additionally.\n\nExamples\n\n1.0/0.0/0.0 set sub to opaque red\n1.0/0.0/0.0/0.75 set sub to opaque red with 75% alpha\n0.5/0.75 set sub to 50% gray with 75% alpha\n\nAlternatively, the color can be specified as a RGB hex triplet in the form #RRGGBB, where each 2-digit group expresses a color value in the range 0 (00) to 255 (FF). For example, #FF0000 is red. This is similar to web colors. Alpha is given with #AARRGGBB.\n\nExamples\n\n#FF0000 set sub to opaque red\n#C0808080 set sub to 50% gray with 75% alpha"
 
 [[settings]]
 name = "sub-border-color"
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "See sub-color. Color used for the sub font border. Ignored when sub-back-color is specified (or more exactly: when that option is not set to completely transparent)."
 
 [[settings]]
 name = "sub-back-color"
+file = "mpv"
 type = "color"
 filter = "Subtitle"
 help = "See sub-color. Color used for sub text background. You can use sub-shadow-offset to change its size relative to the text."
 
 [[settings]]
 name = "fullscreen"
+file = "mpv"
 default = "no"
 filter = "Screen"
 help = "Start the player in fullscreen mode."
@@ -216,6 +248,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "border"
+file = "mpv"
 default = "yes"
 filter = "Screen"
 help = "Show window with decoration (titlebar, border)."
@@ -224,11 +257,13 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "screen"
+file = "mpv"
 filter = "Screen"
 help = "<0-32> In multi-monitor configurations (i.e. a single desktop that spans across multiple displays), this option tells mpv which screen to display the video on."
 
 [[settings]]
 name = "osd-playing-msg"
+file = "mpv"
 width = 300
 filter = "Screen"
 type = "string"
@@ -237,12 +272,13 @@ url = "https://mpv.io/manual/master/#property-expansion"
 
 [[settings]]
 name = "osd-font-size"
-default = "55"
+file = "mpv"
 filter = "Screen"
 help = "Specify the OSD font size. See sub-font-size for details. Default: 55"
 
 [[settings]]
 name = "osd-scale-by-window"
+file = "mpv"
 default = "yes"
 filter = "Screen"
 help = "Whether to scale the OSD with the window size. If this is disabled, osd-font-size and other OSD options that use scaled pixels are always in actual pixels. The effect is that changing the window size won't change the OSD font size."
@@ -251,21 +287,64 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "autofit"
+file = "mpv"
 filter = "Screen"
 help = "<int> Initial window height in percent. Default: 50"
 
 [[settings]]
 name = "autofit-smaller"
+file = "mpv"
 filter = "Screen"
 help = "<int> Minimum window height in percent. Default: 40"
 
 [[settings]]
 name = "autofit-larger"
+file = "mpv"
 filter = "Screen"
 help = "<int> Maximum window height in percent. Default: 75"
 
+[[settings]]
+name = "start-size"
+file = "mpvnet"
+default = "previous"
+filter = "Screen"
+help = "Setting to remember the window height in the current session, otherwise the video's native resolution is used. (mpv.net specific setting)"
+options = [{ name = "video", help = "Window size is set to native video resolution" },
+           { name = "previous", help = "Window size is remembered but only from the current session" }]
+
+[[settings]]
+name = "start-threshold"
+file = "mpvnet"
+filter = "Screen"
+help = "Threshold in milliseconds to wait for libmpv returning the video resolution before the window is shown, otherwise default dimensions are used as defined by autofit and start-size. Default: 1500 (mpv.net specific setting)"
+
+[[settings]]
+name = "minimum-aspect-ratio"
+file = "mpvnet"
+filter = "Screen"
+help = "<float> Minimum aspect ratio for the window. Default: 1.3 (mpv.net specific setting)"
+
+[[settings]]
+name = "remember-position"
+file = "mpvnet"
+default = "no"
+filter = "Screen"
+help = "Save the window position on exit. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "maximized"
+file = "mpvnet"
+default = "no"
+filter = "Screen"
+help = "Start with a maximized window. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
 [[settings]]
 name = "screenshot-directory"
+file = "mpv"
 width = 500
 type = "folder"
 filter = "Screen"
@@ -273,6 +352,7 @@ help = "Store screenshots in this directory. This path is joined with the filena
 
 [[settings]]
 name = "screenshot-format"
+file = "mpv"
 default = "jpg"
 filter = "Screen"
 help = "Set the image file type used for saving screenshots."
@@ -281,6 +361,7 @@ options = [{ name = "jpg" },
 
 [[settings]]
 name = "screenshot-tag-colorspace"
+file = "mpv"
 default = "no"
 filter = "Screen"
 help = "Tag screenshots with the appropriate colorspace. Note that not all formats are supported."
@@ -289,6 +370,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "screenshot-high-bit-depth"
+file = "mpv"
 default = "yes"
 filter = "Screen"
 help = "If possible, write screenshots with a bit depth similar to the source video. This is interesting in particular for PNG, as this sometimes triggers writing 16 bit PNGs with huge file sizes. This will also include an unused alpha channel in the resulting files if 16 bit is used."
@@ -297,6 +379,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "screenshot-jpeg-source-chroma"
+file = "mpv"
 default = "yes"
 filter = "Screen"
 help = "Write JPEG files with the same chroma subsampling as the video. If disabled, the libjpeg default is used."
@@ -305,6 +388,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "screenshot-template"
+file = "mpv"
 filter = "Screen"
 type = "string"
 help = "Specify the filename template used to save screenshots. The template specifies the filename without file extension, and can contain format specifiers, which will be substituted when taking a screenshot. By default, the template is mpv-shot%n, which results in filenames like  mpv-shot0012.png for example.\n\nFind the full documentation here:"
@@ -312,21 +396,34 @@ url = "https://mpv.io/manual/master/#options-screenshot-template"
 
 [[settings]]
 name = "screenshot-jpeg-quality"
+file = "mpv"
 filter = "Screen"
 help = "<0-100> Set the JPEG quality level. Higher means better quality. The default is 90."
 
 [[settings]]
 name = "screenshot-png-compression"
+file = "mpv"
 filter = "Screen"
 help = "<0-9> Set the PNG compression level. Higher means better compression. This will affect the file size of the written screenshot file and the time it takes to write a screenshot. Too high compression might occupy enough CPU time to interrupt playback. The default is 7."
 
 [[settings]]
 name = "screenshot-png-filter"
+file = "mpv"
 filter = "Screen"
 help = "<0-5> Set the filter applied prior to PNG compression. 0 is none, 1 is 'sub', 2 is 'up', 3 is 'average', 4 is 'Paeth', and 5 is 'mixed'. This affects the level of compression that can be achieved. For most images, 'mixed' achieves the best compression ratio, hence it is the default."
 
+[[settings]]
+name = "taskbar-progress"
+file = "mpv"
+default = "yes"
+filter = "Playback"
+help = "Show progress in taskbar."
+options = [{ name = "yes" },
+           { name = "no" }]
+
 [[settings]]
 name = "keep-open-pause"
+file = "mpv"
 default = "yes"
 filter = "Playback"
 help = "If set to no, instead of pausing when keep-open is active, just stop at end of file and continue playing forward when you seek backwards until end where it stops again."
@@ -335,6 +432,7 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "keep-open"
+file = "mpv"
 default = "no"
 filter = "Playback"
 help = "Using no, mpv would terminate after the last file but mpv.net never terminates automatically."
@@ -344,29 +442,22 @@ options = [{ name = "yes",    help = "If the current file ends, go to the next f
 
 [[settings]]
 name = "loop-file"
+file = "mpv"
 filter = "Playback"
 help = "<N|inf|no> Loop a single file N times. inf means forever, no means normal playback.\n\nThe difference to loop-playlist is that this doesn't loop the playlist, just the file itself. If the playlist contains only a single file, the difference between the two option is that this option performs a seek on loop, instead of reloading the file. loop is an alias for this option."
 
 [[settings]]
 name = "save-position-on-quit"
+file = "mpv"
 default = "no"
 filter = "Playback"
 help = "Always save the current playback position on quit. When this file is played again later, the player will seek to the old playback position on start. This does not happen if playback of a file is stopped in any other way than quitting. For example, going to the next file in the playlist will not save the position, and start playback at beginning the next time the file is played.\n\nThis behavior is disabled by default, but is always available when quitting the player with Shift+Q."
 options = [{ name = "yes" },
            { name = "no" }]
 
-[[settings]]
-name = "input-ar-delay"
-filter = "Input"
-help = "Delay in milliseconds before we start to autorepeat a key (0 to disable)."
-
-[[settings]]
-name = "input-ar-rate"
-filter = "Input"
-help = "Number of key presses to generate per second on autorepeat."
-
 [[settings]]
 name = "hr-seek"
+file = "mpv"
 default = "absolute"
 filter = "Playback"
 help = "Select when to use precise seeks that are not limited to keyframes. Such seeks require decoding video from the previous keyframe up to the target position and so can take some time depending on decoding performance. For some video formats, precise seeks are disabled. This option selects the default choice to use for seeks; it is possible to explicitly override that default in the definition of key bindings and in input commands."
@@ -377,6 +468,7 @@ options = [{ name = "yes",      help = "Use precise seeks whenever possible." },
 
 [[settings]]
 name = "track-auto-selection"
+file = "mpv"
 default = "yes"
 filter = "Playback"
 help = "Enable the default track auto-selection. Enabling this will make the player select streams according to aid, alang, and others. If it is disabled, no tracks are selected. In addition, the player will not exit if no tracks are selected, and wait instead (this wait mode is similar to pausing, but the pause option is not set).\n\nThis is useful with lavfi-complex: you can start playback in this mode, and then set select tracks at runtime by setting the filter graph. Note that if lavfi-complex is set before playback is started, the referenced tracks are always selected."
@@ -385,5 +477,76 @@ options = [{ name = "yes" },
 
 [[settings]]
 name = "loop-playlist"
+file = "mpv"
 filter = "Playback"
 help = "<N|inf|force|no> Loops playback N times. A value of 1 plays it one time (default), 2 two times, etc. inf means forever. no is the same as 1 and disables looping. If several files are specified on command line, the entire playlist is looped. The force mode is like inf, but does not skip playlist entries which have been marked as failing. This means the player might waste CPU time trying to loop a file that doesn't exist. But it might be useful for playing webradios under very bad network conditions."
+
+[[settings]]
+name = "auto-load-folder"
+file = "mpvnet"
+default = "yes"
+filter = "Playback"
+help = "For single files automatically load the entire directory into the playlist. Can be suppressed via shift key. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "input-ar-delay"
+file = "mpv"
+filter = "Input"
+help = "Delay in milliseconds before we start to autorepeat a key (0 to disable)."
+
+[[settings]]
+name = "input-ar-rate"
+file = "mpv"
+filter = "Input"
+help = "Number of key presses to generate per second on autorepeat."
+
+[[settings]]
+name = "process-instance"
+file = "mpvnet"
+default = "single"
+filter = "General"
+help = "Defines if more then one mpv.net process is allowed. (mpv.net specific setting)\n\nTip: Whenever the control key is pressed when files or URLs are opened, the playlist is not cleared but the files or URLs are appended to the playlist. This not only works on process startup but in all mpv.net features that open files and URLs."
+options = [{ name = "multi",  help = "Create a new process everytime the shell starts mpv.net" },
+           { name = "single", help = "Force a single process everytime the shell starts mpv.net" },
+		   { name = "queue",  help = "Force a single process and add files to playlist" }]
+
+[[settings]]
+name = "recent-count"
+file = "mpvnet"
+filter = "General"
+help = "<int> Amount of recent files to be remembered. Default: 15 (mpv.net specific setting)"
+
+[[settings]]
+name = "debug-mode"
+file = "mpvnet"
+default = "no"
+filter = "General"
+help = "Enable this only when a developer asks for it. (mpv.net specific setting)"
+options = [{ name = "yes" },
+           { name = "no" }]
+
+[[settings]]
+name = "dark-mode"
+file = "mpvnet"
+default = "always"
+filter = "UI"
+help = "Enables a dark theme. (mpv.net specific setting)"
+options = [{ name = "always" },
+           { name = "system" , help = "Available on Windows 10 or higher" },
+		   { name = "never" }]
+
+[[settings]]
+name = "dark-theme"
+file = "mpvnet"
+filter = "UI"
+url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme"
+help = "Color theme used in dark mode. Default: dark"
+
+[[settings]]
+name = "light-theme"
+file = "mpvnet"
+filter = "UI"
+url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#color-theme"
+help = "Color theme used in light mode. Default: light"

mpv.net/Resources/inputConf.txt

@@ -134,6 +134,8 @@
 
  Ctrl+t set ontop yes                             #menu: View > On Top > Enable
  Ctrl+T set ontop no                              #menu: View > On Top > Disable
+ Alt++  no-osd set window-scale 1.2               #menu: View > Window Size > Enlarge
+ Alt+-  no-osd set window-scale 0.8               #menu: View > Window Size > Shrink
  b      cycle border                              #menu: View > Toggle Border
  i      script-message mpv.net show-info          #menu: View > File/Stream Info
  t      script-binding stats/display-stats        #menu: View > Show Statistics
@@ -151,6 +153,7 @@
  Ctrl+r script-message-to repl type ""              #menu: Tools > Show REPL
  l      ab-loop                                     #menu: Tools > Set/clear A-B loop points
  L      cycle-values loop-file "inf" "no"           #menu: Tools > Toggle infinite file looping
+ _      cycle shuffle                               #menu: Tools > Toggle Shuffle
  Ctrl+h cycle-values hwdec "auto" "no"              #menu: Tools > Toggle Hardware Decoding
  _ script-message mpv.net show-setup-dialog         #menu: Tools > OS Setup...
 
@@ -197,4 +200,3 @@
  Ctrl+Wheel_Down no-osd seek -7
  MBTN_Left_DBL   cycle fullscreen
  KP_Enter        cycle fullscreen
- MBTN_Left       ignore

mpv.net/Resources/mpvConf.txt

@@ -10,3 +10,6 @@ cscale = spline36
 dscale = spline36
 scale = spline36
 hwdec = yes
+
+[protocol.https]
+osd-playing-msg = '${media-title}'

mpv.net/Resources/mpvNetConf.txt

@@ -1,2 +0,0 @@
-dark-color = '#1E90FF'
-light-color = '#28394F'

mpv.net/Resources/mpvNetConfToml.txt

@@ -1,99 +0,0 @@
-[[settings]]
-name = "url-whitelist"
-filter = "General"
-type = "string"
-help = "Whitelist setting to monitor the clipboard for URLs to play. (mpv.net specific setting)\n\nDefault: tube vimeo ard zdf\n\nHow to start mpv.net directly from Google Chrome is described in the manual:"
-url = "https://github.com/stax76/mpv.net/blob/master/Manual.md#chrome-extension"
-
-[[settings]]
-name = "process-instance"
-default = "single"
-filter = "General"
-help = "Defines if more then one mpv.net process is allowed. (mpv.net specific setting)\n\nTip: Whenever the control key is pressed when files or URLs are opened, the playlist is not cleared but the files or URLs are appended to the playlist. This not only works on process startup but in all mpv.net features that open files."
-options = [{ name = "multi",  help = "Create a new process everytime the shell starts mpv.net" },
-           { name = "single", help = "Force a single process everytime the shell starts mpv.net" },
-		   { name = "queue",  help = "Force a single process and add files to playlist" }]
-
-[[settings]]
-name = "recent-count"
-filter = "General"
-help = "<int> Amount of recent files to be remembered. Default: 15 (mpv.net specific setting)"
-
-[[settings]]
-name = "start-size"
-default = "previous"
-filter = "Screen"
-help = "Setting to remember the window height in the current session, otherwise the video's native resolution is used. (mpv.net specific setting)"
-options = [{ name = "video", help = "Window size is set to native video resolution" },
-           { name = "previous", help = "Window size is remembered but only from the current session" }]
-
-[[settings]]
-name = "start-threshold"
-filter = "Screen"
-help = "Threshold in milliseconds to wait for libmpv returning the video resolution before the window is shown, otherwise default dimensions are used as defined by autofit and start-size. Default: 1500 (mpv.net specific setting)"
-
-[[settings]]
-name = "minimum-aspect-ratio"
-filter = "Screen"
-help = "<float> Minimum aspect ratio for the window. Default: 1.3 (mpv.net specific setting)"
-
-[[settings]]
-name = "remember-position"
-default = "no"
-filter = "Screen"
-help = "Save the window position on exit. (mpv.net specific setting)"
-options = [{ name = "yes" },
-           { name = "no" }]
-
-[[settings]]
-name = "remember-volume"
-default = "yes"
-filter = "Audio"
-help = "Save volume and mute on exit and restore it on start. (mpv.net specific setting)"
-options = [{ name = "yes" },
-           { name = "no" }]
-
-[[settings]]
-name = "auto-load-folder"
-default = "yes"
-filter = "Playback"
-help = "For single files automatically load the entire directory into the playlist. (mpv.net specific setting)"
-options = [{ name = "yes" },
-           { name = "no" }]
-
-[[settings]]
-name = "dark-mode"
-default = "always"
-filter = "UI"
-help = "Enables a dark theme. (mpv.net specific setting)"
-options = [{ name = "always" },
-           { name = "system" , help = "Available on Windows 10 or higher" },
-		   { name = "never" }]
-
-[[settings]]
-name = "dark-color"
-type = "color"
-filter = "UI"
-help = "Theme color used in dark-mode. Leave empty to use OS theme. (mpv.net specific setting)"
-
-[[settings]]
-name = "light-color"
-type = "color"
-filter = "UI"
-help = "Theme color used when dark-mode is disabled. Leave empty to use OS theme. (mpv.net specific setting)"
-
-[[settings]]
-name = "themed-menu"
-default = "no"
-filter = "UI"
-help = "Follow theme color in context menu. (mpv.net specific setting)"
-options = [{ name = "yes" },
-           { name = "no" }]
-
-[[settings]]
-name = "debug-mode"
-default = "no"
-filter = "General"
-help = "Enable this only when a developer asks for it. (mpv.net specific setting)"
-options = [{ name = "yes" },
-           { name = "no" }]

mpv.net/Resources/theme.txt

@@ -0,0 +1,27 @@
+
+[dark]
+
+heading = #1E90FF
+foreground = #FFFFFF
+foreground2 = #C0C0C0
+background = #323232
+
+menu-foreground = #FFFFFF
+menu-background = #323232
+menu-highlight  = #505050
+menu-border     = #FFFFFF
+menu-checked    = #5A5A5A
+
+
+[light]
+
+heading = #0068B2
+foreground = #000000
+foreground2 = #4C4C4C
+background = #F7F7F7
+
+menu-foreground = #000000
+menu-background = #DFDFDF
+menu-highlight  = #BFBFBF
+menu-border     = #6A6A6A
+menu-checked    = #AAAAAA

mpv.net/Scripting/PowerShellScript.cs

@@ -3,13 +3,13 @@ using System.IO;
 using System.Threading;
 using System.Management.Automation.Runspaces;
 using System.Reflection;
-using System.Threading.Tasks;
+using System.Management.Automation;
 
 namespace mpvnet
 {
     public class PowerShellScript
     {
-        public static object Execute(string code, string[] parameters)
+        public static void Execute(string filepath, params string[] parameters)
         {
             using (Runspace runspace = RunspaceFactory.CreateRunspace())
             {
@@ -23,57 +23,53 @@ namespace mpvnet
                         "Using namespace System\n" +
                         "[System.Reflection.Assembly]::LoadWithPartialName(\"mpvnet\")\n");
 
-                    pipeline.Commands.AddScript(code);
+                    pipeline.Commands.AddScript(File.ReadAllText(filepath));
 
                     if (parameters != null)
-                        foreach (var i in parameters)
+                        foreach (string i in parameters)
                             pipeline.Commands[1].Parameters.Add(null, i);
 
-                    try
-                    {
-                        var ret = pipeline.Invoke();
-                        if (ret.Count > 0) return ret[0];
-                    }
-                    catch (Exception e)
-                    {
-                        try
-                        {
-                            using (Pipeline pipeline2 = runspace.CreatePipeline())
-                            {
-                                pipeline2.Commands.AddScript("$PSVersionTable.PSVersion.Major * 10 +" +
-                                    "$PSVersionTable.PSVersion.Minor");
+                    PowerShellOutput output = new PowerShellOutput();
+                    output.ModuleName = Path.GetFileName(filepath);
 
-                                if (Convert.ToInt32(pipeline2.Invoke()[0].ToString()) < 51)
-                                    throw new Exception();
+                    pipeline.Output.DataReady += output.Output_DataReady;
+                    pipeline.Error.DataReady += output.Error_DataReady;
+
+                    runspace.SessionStateProxy.SetVariable("Output", output);
+
+                    try {
+                        pipeline.Invoke();
                     }
+                    catch (RuntimeException e) {
+                        Msg.ShowError("PowerShell Exception", e.Message + "\n\n" +
+                            e.ErrorRecord.ScriptStackTrace.Replace(" <ScriptBlock>, <No file>", "") +
+                            "\n\n" + Path.GetFileName(filepath));
                     }
-                        catch (Exception e2)
-                        {
-                            Msg.ShowError("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", e2.ToString());
-                            return null;
-                        }
+                    catch (Exception e) {
                         Msg.ShowException(e);
                     }
+
+                    pipeline.Output.DataReady -= output.Output_DataReady;
+                    pipeline.Error.DataReady -= output.Error_DataReady;
                 }
             }
-            return null;
         }
 
-        public static void Init(string filePath)
+        public static void Init(string filepath)
         {
             foreach (var eventInfo in typeof(mp).GetEvents())
             {
                 if (eventInfo.Name.ToLower() ==
-                    Path.GetFileNameWithoutExtension(filePath).ToLower().Replace("-", ""))
+                    Path.GetFileNameWithoutExtension(filepath).ToLower().Replace("-", ""))
                 {
                     PowerShellEventObject eventObject = new PowerShellEventObject();
                     MethodInfo mi;
-                    eventObject.FilePath = filePath;
+                    eventObject.Filepath = filepath;
 
                     if (eventInfo.EventHandlerType == typeof(Action))
                         mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.Invoke));
                     else if (eventInfo.EventHandlerType == typeof(Action<EndFileEventMode>))
-                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFileEventMode));
+                        mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeEndFile));
                     else if (eventInfo.EventHandlerType == typeof(Action<string[]>))
                         mi = eventObject.GetType().GetMethod(nameof(PowerShellEventObject.InvokeStrings));
                     else
@@ -86,7 +82,37 @@ namespace mpvnet
                     return;
                 }
             }
-            Task.Run(() => PowerShellScript.Execute(File.ReadAllText(filePath), null));
+            Execute(filepath);
+        }
+
+        class PowerShellOutput
+        {
+            public string ModuleName { get; set; }
+
+            public bool WriteStandard { get; set; } = true;
+            public bool WriteError { get; set; } = true;
+
+            public void Output_DataReady(object sender, EventArgs e)
+            {
+                if (!WriteStandard)
+                    return;
+
+                var output = sender as PipelineReader<PSObject>;
+
+                while (output.Count > 0)
+                    Console.WriteLine("[" + ModuleName + "] " + output.Read().ToString());
+            }
+
+            public void Error_DataReady(object sender, EventArgs e)
+            {
+                if (!WriteError)
+                    return;
+
+                var output = sender as PipelineReader<Object>;
+
+                while (output.Count > 0)
+                    ConsoleHelp.WriteError("[" + ModuleName + "] " + output.Read().ToString());
+            }
         }
     }
 
@@ -94,18 +120,10 @@ namespace mpvnet
     {
         public EventInfo EventInfo { get; set; }
         public Delegate Delegate { get; set; }
-        public string FilePath { get; set; }
+        public string Filepath { get; set; }
 
-        public void Invoke() => Task.Run(() => PowerShellScript.Execute(File.ReadAllText(FilePath), null));
-
-        public void InvokeEndFileEventMode(EndFileEventMode arg)
-        {
-            Task.Run(() => PowerShellScript.Execute(File.ReadAllText(FilePath), new [] { arg.ToString() }));
-        }
-
-        public void InvokeStrings(string[] args)
-        {
-            Task.Run(() => PowerShellScript.Execute(File.ReadAllText(FilePath), args));
-        }
+        public void Invoke() => PowerShellScript.Execute(Filepath);
+        public void InvokeEndFile(EndFileEventMode arg) => PowerShellScript.Execute(Filepath, arg.ToString());
+        public void InvokeStrings(string[] args) => PowerShellScript.Execute(Filepath, args);
     }
 }

mpv.net/Scripting/PythonScript.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Reflection;
 
 using Microsoft.Scripting;
@@ -15,7 +16,7 @@ namespace mpvnet
         ScriptEngine engine;
         ScriptScope scope;
 
-        public PythonScript(string code)
+        public PythonScript(string scriptPath)
         {
             try
             {
@@ -26,14 +27,14 @@ namespace mpvnet
                 engine.Execute("clr.AddReference(\"mpvnet\")", scope);
                 engine.Execute("import mpvnet", scope);
                 engine.Execute("from mpvnet import *", scope);
-                engine.Execute(code, scope);
+                engine.Execute(File.ReadAllText(scriptPath), scope);
             }
             catch (Exception ex)
             {
                 if (ex is SyntaxErrorException e)
-                    Msg.ShowError($"{e.Line}, {e.Column}: " + ex.Message);
+                    Msg.ShowError(e.GetType().Name,$"{e.Line}, {e.Column}: " + e.Message + "\n\n" + Path.GetFileName(scriptPath));
                 else
-                    Msg.ShowException(ex);
+                    Msg.ShowError(ex.GetType().Name, ex.Message + "\n\n" + Path.GetFileName(scriptPath));
             }
         }
     }

mpv.net/WPF/AboutWindow.xaml

@@ -3,9 +3,19 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="About mpv.net" Height="230" Width="400" FontSize="16" ShowInTaskbar="False"
-        WindowStartupLocation="CenterOwner" ResizeMode="NoResize">
+        
+        Title="About mpv.net"
+        Height="230"
+        Width="400"
+        FontSize="16"
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}">
+    
     <Grid>
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <TextBlock FontSize="48" HorizontalAlignment="Center" Margin="0,0,0,10">mpv.net</TextBlock>

mpv.net/WPF/AboutWindow.xaml.cs

@@ -10,7 +10,7 @@ namespace mpvnet
         {
             InitializeComponent();
             Version.Text = $"mpv.net Version {System.Windows.Forms.Application.ProductVersion} ({File.GetLastWriteTime(System.Windows.Forms.Application.ExecutablePath).ToShortDateString()})";
-            mpvVersion.Text = $"{mp.get_property_string("mpv-version")} ({File.GetLastWriteTime(PathHelp.StartupPath + "mpv-1.dll").ToShortDateString()})";
+            mpvVersion.Text = $"{mp.get_property_string("mpv-version")} ({File.GetLastWriteTime(Folder.Startup + "mpv-1.dll").ToShortDateString()})";
         }
 
         protected override void OnPreviewKeyDown(KeyEventArgs e) => Close();

mpv.net/WPF/CommandPaletteWindow.xaml

@@ -3,21 +3,41 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Command Palette" Height="295" Width="400" ResizeMode="NoResize"
-        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+        
+        Title="Command Palette"
+        Height="295"
+        Width="400"
+        FontSize="13"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        Loaded="Window_Loaded">
+    
     <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">
+
+        <TextBox Name="FilterTextBox"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 Background="{x:Static UI:Theme.Background}"
+                 PreviewKeyDown="FilterTextBox_PreviewKeyDown"
+                 TextChanged="FilterTextBox_TextChanged"/>
+        
+        <ListView Name="ListView"
+                  Grid.Row="1"
+                  Foreground="{x:Static UI:Theme.Foreground}"
+                  Background="{x:Static UI:Theme.Background}"
+                  MouseUp="ListView_MouseUp">
+            
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
                 </Style>
             </ListView.ItemContainerStyle>
+            
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <Grid>
@@ -25,8 +45,12 @@
                             <ColumnDefinition />
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
+                        
                         <TextBlock Text="{Binding Path}"></TextBlock>
-                        <TextBlock Grid.Column="1" Text="{Binding Input}" HorizontalAlignment="Right"></TextBlock>
+                        
+                        <TextBlock Grid.Column="1"
+                                   Text="{Binding Input}"
+                                   HorizontalAlignment="Right"></TextBlock>
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>

mpv.net/WPF/CommandPaletteWindow.xaml.cs

@@ -23,14 +23,6 @@ namespace mpvnet
             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)

mpv.net/WPF/ConfWindow.xaml

@@ -3,35 +3,63 @@
         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"
+        xmlns:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Height="530" Width="700" Loaded="ConfWindow1_Loaded" ShowInTaskbar="False"
-        WindowStartupLocation="CenterScreen" Title="Config Editor">
+        
+        Title="Config Editor"
+        Height="530"
+        Width="700"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        ShowInTaskbar="False"
+        WindowStartupLocation="CenterScreen"
+        Loaded="ConfWindow1_Loaded">
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
+        
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="100" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Controls:SearchTextBoxUserControl HintText="Find a setting" x:Name="SearchControl" Width="250" Margin="0,20,0,0" Grid.ColumnSpan="2"/>
-        <ScrollViewer x:Name="MainScrollViewer" VerticalScrollBarVisibility="Auto" Grid.Row="1" Grid.Column="2" Margin="0,0,0,10">
+        
+        <Controls:SearchTextBoxUserControl HintText="Find a setting"
+                                           x:Name="SearchControl"
+                                           Width="250"
+                                           Margin="0,20,0,0"
+                                           Grid.ColumnSpan="2"/>
+        
+        <ScrollViewer x:Name="MainScrollViewer"
+                      VerticalScrollBarVisibility="Auto"
+                      Grid.Row="1"
+                      Grid.Column="2" 
+                      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="FilterListBox_SelectionChanged" Foreground="{x:Static WPF:WPF.ThemeBrush}" Background="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}">
+            <ListBox x:Name="FilterListBox"
+                     ItemsSource="{Binding FilterStrings}"
+                     BorderThickness="0"
+                     SelectionChanged="FilterListBox_SelectionChanged"
+                     Foreground="{x:Static UI:Theme.Heading}"
+                     Background="{x:Static UI:Theme.Background}">
+                
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <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 WPF:WPF.ThemeBrush}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
-            <TextBlock x:Name="PreviewTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="PreviewTextBlock_MouseUp">Preview mpv.conf</TextBlock>
-            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
-            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static WPF:WPF.ThemeBrush}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
+
+            <TextBlock x:Name="OpenSettingsTextBlock" Margin="0,30,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="OpenSettingsTextBlock_MouseUp">Open config folder</TextBlock>
+            <TextBlock x:Name="PreviewTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="PreviewTextBlock_MouseUp">Preview mpv.conf</TextBlock>
+            <TextBlock x:Name="ShowManualTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="ShowManualTextBlock_MouseUp">Show mpv manual</TextBlock>
+            <TextBlock x:Name="SupportTextBlock" Margin="0,15,0,0" Cursor="Hand" TextWrapping="WrapWithOverflow" Foreground="{x:Static UI:Theme.Heading}" MouseUp="SupportTextBlock_MouseUp">Show support forum</TextBlock>
         </StackPanel>
     </Grid>
 </Window>

mpv.net/WPF/ConfWindow.xaml.cs

@@ -1,13 +1,14 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Linq;
 
 using DynamicGUI;
 
@@ -15,8 +16,8 @@ namespace mpvnet
 {
     public partial class ConfWindow : Window
     {
-        private List<SettingBase> SettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvConfToml);
-        private List<SettingBase> NetSettingsDefinitions = Settings.LoadSettings(Properties.Resources.mpvNetConfToml);
+        List<SettingBase> SettingsDefinitions = Settings.LoadSettings(Properties.Resources.confToml);
+        List<ConfItem> ConfItems = new List<ConfItem>();
         public ObservableCollection<string> FilterStrings { get; } = new ObservableCollection<string>();
         string InitialContent;
 
@@ -25,41 +26,27 @@ namespace mpvnet
             InitializeComponent();
             DataContext = this;
             SearchControl.SearchTextBox.TextChanged += SearchTextBox_TextChanged;
-            LoadSettings(SettingsDefinitions, Conf);
-            LoadSettings(NetSettingsDefinitions, NetConf);
-            InitialContent = GetContent(mp.ConfPath, Conf, SettingsDefinitions) +
-                             GetContent(App.ConfPath, NetConf, NetSettingsDefinitions);
+            LoadConf(mp.ConfPath);
+            LoadConf(App.ConfPath);
+            LoadSettings();
+            InitialContent = GetCompareString();
             SearchControl.Text = RegHelp.GetString(App.RegPath, "ConfigEditorSearch");
+        }
 
-            if (App.IsDarkMode)
+        private void LoadSettings()
         {
-                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(ConfWindow), new PropertyMetadata(Brushes.DarkSlateGray));
-
-        private void LoadSettings(List<SettingBase> settingsDefinitions,
-                                  Dictionary<string, string> confSettings)
-        {
-            foreach (SettingBase setting in settingsDefinitions)
+            foreach (SettingBase setting in SettingsDefinitions)
             {
                 if (!FilterStrings.Contains(setting.Filter))
                     FilterStrings.Add(setting.Filter);
 
-                foreach (var pair in confSettings)
+                foreach (ConfItem confItem in ConfItems)
                 {
-                    if (setting.Name == pair.Key)
+                    if (setting.Name == confItem.Name && confItem.Section == "" && !confItem.IsSectionItem)
                     {
-                        setting.Value = pair.Value.Trim('\'', '"');
+                        setting.Value = confItem.Value.Trim('\'', '"');
+                        setting.ConfItem = confItem;
+                        confItem.SettingBase = setting;
                         continue;
                     }
                 }
@@ -68,97 +55,196 @@ namespace mpvnet
                 {
                     case StringSetting s:
                         var sc = new StringSettingControl(s);
-                        sc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
                         MainStackPanel.Children.Add(sc);
                         break;
                     case OptionSetting s:
                         var oc = new OptionSettingControl(s);
-                        oc.TitleTextBox.Foreground = WPF.WPF.ThemeBrush;
                         MainStackPanel.Children.Add(oc);
                         break;
                 }
             }
         }
 
-        private Dictionary<string, string> _Conf;
-
-        public Dictionary<string, string> Conf {
-            get {
-                if (_Conf == null) _Conf = LoadConf(mp.ConfPath);
-                return _Conf;
-            }
-        }
-
-        private Dictionary<string, string> _NetConf;
-
-        public Dictionary<string, string> NetConf {
-            get {
-                if (_NetConf == null) _NetConf = LoadConf(App.ConfPath);
-                return _NetConf;
-            }
-        }
-
-        private Dictionary<string, string> LoadConf(string filePath)
-        {
-            Dictionary<string, string> conf = new Dictionary<string, string>();
-
-            if (File.Exists(filePath))
-            {
-                foreach (string i in File.ReadAllLines(filePath))
-                {
-                    if (i.Contains("="))
-                    {
-                        int pos = i.IndexOf("=");
-                        string left = i.Substring(0, pos).Trim().ToLower();
-                        string right = i.Substring(pos + 1).Trim();
-                        if (left.StartsWith("#")) continue;
-                        if (left == "fs") left = "fullscreen";
-                        if (left == "loop") left = "loop-file";
-                        conf[left] = right;
-                    }
-                }
-            }
-            return conf;
-        }
-
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
             RegHelp.SetObject(App.RegPath, "ConfigEditorSearch", SearchControl.Text);
-            string content = GetContent(mp.ConfPath, Conf, SettingsDefinitions);
-            string netContent = GetContent(App.ConfPath, NetConf, NetSettingsDefinitions);
-            if (InitialContent == content + netContent) return;
-            File.WriteAllText(mp.ConfPath, content);
-            File.WriteAllText(App.ConfPath, netContent);
+            
+            if (InitialContent == GetCompareString())
+                return;
+            
+            File.WriteAllText(mp.ConfPath, GetContent("mpv"));
+            File.WriteAllText(App.ConfPath, GetContent("mpvnet"));
             Msg.Show("Changes will be available on next mpv.net startup.");            
         }
 
-        string GetContent(string filePath, Dictionary<string, string> confSettings, List<SettingBase> settings)
+        string GetCompareString()
         {
-            string content = "";
+            return string.Join("", SettingsDefinitions.Select(item => item.Name + item.Value).ToArray());
+        }
 
-            foreach (SettingBase setting in settings)
+        void LoadConf(string file)
         {
+            if (!File.Exists(file))
+                return;
+
+            string comment = "";
+            string section = "";
+            bool isSectionItem = false;
+
+            foreach (string currentLine in File.ReadAllLines(file))
+            {
+                string line = currentLine.Trim();
+
+                if (line == "")
+                {
+                    comment += "\r\n";
+                }
+                else if (line.StartsWith("#"))
+                {
+                    comment += line.Trim() + "\r\n";
+                }
+                else if (line.StartsWith("[") && line.Contains("]"))
+                {
+                    if (!isSectionItem && comment != "" && comment != "\r\n")
+                        ConfItems.Add(new ConfItem() {
+                            Comment = comment, File = Path.GetFileNameWithoutExtension(file)});
+
+                    section = line.Substring(0, line.IndexOf("]") + 1);
+                    comment = "";
+                    isSectionItem = true;
+                }
+                else if (line.Contains("="))
+                {
+                    ConfItem item = new ConfItem();
+                    item.File = Path.GetFileNameWithoutExtension(file);
+                    item.IsSectionItem = isSectionItem;
+                    item.Comment = comment;
+                    comment = "";
+                    item.Section = section;
+                    section = "";
+
+                    if (line.Contains("#") && !line.Contains("'") && !line.Contains("\""))
+                    {
+                        item.LineComment = line.Substring(line.IndexOf("#")).Trim();
+                        line = line.Substring(0, line.IndexOf("#")).Trim();
+                    }
+
+                    int pos = line.IndexOf("=");
+                    string left = line.Substring(0, pos).Trim().ToLower();
+                    string right = line.Substring(pos + 1).Trim();
+
+                    if (left == "fs")
+                        left = "fullscreen";
+
+                    if (left == "loop")
+                        left = "loop-file";
+
+                    item.Name = left;
+                    item.Value = right;
+                    ConfItems.Add(item);
+                }
+            }
+        }
+
+        string GetContent(string filename)
+        {
+            StringBuilder sb = new StringBuilder();
+            List<string> namesWritten = new List<string>();
+
+            foreach (ConfItem item in ConfItems)
+            {
+                if (filename != item.File || item.Section != "" || item.IsSectionItem)
+                    continue;
+
+                if (item.Comment != "")
+                    sb.Append(item.Comment);
+
+                if (item.SettingBase == null)
+                {
+                    if (item.Name != "")
+                    {
+                        sb.Append(item.Name + " = " + item.Value);
+
+                        if (item.LineComment != "")
+                            sb.Append(" " + item.LineComment);
+
+                        sb.AppendLine();
+                        namesWritten.Add(item.Name);
+                    }
+                }
+                else if ((item.SettingBase.Value ?? "") != item.SettingBase.Default)
+                {
+                    string value = "";
+
+                    if (item.SettingBase.Type == "string" ||
+                        item.SettingBase.Type == "folder" ||
+                        item.SettingBase.Type == "color")
+
+                        value = "'" + item.SettingBase.Value + "'";
+                    else
+                        value = item.SettingBase.Value;
+
+                    sb.Append(item.Name + " = " + value);
+
+                    if (item.LineComment != "")
+                        sb.Append(" " + item.LineComment);
+
+                    sb.AppendLine();
+                    namesWritten.Add(item.Name);
+                }
+            }
+
+            if (!sb.ToString().Contains("# Editor"))
+                sb.AppendLine("# Editor");
+
+            foreach (SettingBase setting in SettingsDefinitions)
+            {
+                if (filename != setting.File || namesWritten.Contains(setting.Name))
+                    continue;
+
                 if ((setting.Value ?? "") != setting.Default)
+                {
+                    string value = "";
+
                     if (setting.Type == "string" ||
                         setting.Type == "folder" ||
                         setting.Type == "color")
 
-                        confSettings[setting.Name] = "'" + setting.Value + "'";
+                        value = "'" + setting.Value + "'";
                     else
-                        confSettings[setting.Name] = setting.Value;
+                        value = setting.Value;
 
-                if (confSettings.ContainsKey(setting.Name) &&
-                    (setting.Value ?? "") == setting.Default ||
-                    (setting.Value ?? "") == "")
-
-                    confSettings.Remove(setting.Name);
+                    sb.AppendLine(setting.Name + " = " + value);
+                }
             }
 
-            foreach (var i in confSettings)
-                content = content + $"{i.Key} = {i.Value}\r\n";
+            foreach (ConfItem item in ConfItems)
+            {
+                if (filename != item.File || (item.Section == "" && !item.IsSectionItem))
+                    continue;
 
-            return content;
+                if (item.Section != "")
+                {
+                    if (!sb.ToString().EndsWith("\r\n\r\n"))
+                        sb.AppendLine();
+
+                    sb.AppendLine(item.Section);
+                }
+
+                if (item.Comment != "")
+                    sb.Append(item.Comment);
+
+                sb.Append(item.Name + " = " + item.Value);
+
+                if (item.LineComment != "")
+                    sb.Append(" " + item.LineComment);
+
+                sb.AppendLine();
+                namesWritten.Add(item.Name);
+            }
+
+            return "\r\n" + sb.ToString().Trim() + "\r\n";
         }
 
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
@@ -200,8 +286,7 @@ namespace mpvnet
 
         private void FilterListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (e.AddedItems.Count > 0)
-                SearchControl.Text = e.AddedItems[0].ToString() + ":";
+            if (e.AddedItems.Count > 0) SearchControl.Text = e.AddedItems[0] + ":";
         }
 
         private void OpenSettingsTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
@@ -211,7 +296,7 @@ namespace mpvnet
 
         private void PreviewTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            Msg.Show("mpv.conf Preview", GetContent(mp.ConfPath, Conf, SettingsDefinitions));
+            Msg.Show("mpv.conf Preview", GetContent("mpv"));
         }
 
         private void ShowManualTextBlock_MouseUp(object sender, MouseButtonEventArgs e)
@@ -227,6 +312,7 @@ namespace mpvnet
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
+
             if (e.Key == Key.Escape)
                 Close();
         }

mpv.net/WPF/EverythingWindow.xaml

@@ -3,21 +3,42 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Media File Search" Height="300" Width="600" ResizeMode="NoResize"
-        WindowStartupLocation="CenterOwner" Loaded="Window_Loaded" FontSize="13">
+        
+        Title="Media File Search"
+        FontSize="13"
+        Height="300"
+        Width="600"
+        ResizeMode="NoResize"
+        WindowStartupLocation="CenterOwner"
+        Loaded="Window_Loaded">
+    
     <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">
+
+        <TextBox Name="FilterTextBox"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 Background="{x:Static UI:Theme.Background}"
+                 PreviewKeyDown="FilterTextBox_PreviewKeyDown"
+                 TextChanged="FilterTextBox_TextChanged"/>
+
+        <ListView Name="ListView"
+                  Foreground="{x:Static UI:Theme.Foreground}"
+                  Background="{x:Static UI:Theme.Background}"
+                  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/WPF/EverythingWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -8,7 +9,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows.Media;
 
 namespace mpvnet
 {
@@ -17,19 +17,10 @@ namespace mpvnet
         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);
@@ -69,6 +60,7 @@ namespace mpvnet
         {
             if (msg == 0x200 /*WM_MOUSEMOVE*/ && Mouse.LeftButton != MouseButtonState.Pressed)
                 handled = true;
+
             return IntPtr.Zero;
         }
 
@@ -101,14 +93,18 @@ namespace mpvnet
 
         private void ListView_PreviewKeyDown(object sender, KeyEventArgs e)
         {
-            if (e.Key == Key.Escape) Close();
-            if (e.Key == Key.Enter) Execute();
+            if (e.Key == Key.Escape)
+                Close();
+
+            if (e.Key == Key.Enter)
+                Execute();
         }
 
         void Execute()
         {
             if (ListView.SelectedItem != null)
                 mp.Load(new[] { ListView.SelectedItem as string }, true, Keyboard.Modifiers == ModifierKeys.Control);
+
             Keyboard.Focus(FilterTextBox);
         }
 
@@ -134,7 +130,6 @@ namespace mpvnet
                     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++)

mpv.net/WPF/InputWindow.xaml

@@ -3,9 +3,19 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Input Editor" Height="500" Width="750" FontSize="13"
-        Loaded="Window_Loaded" Closed="Window_Closed" ShowInTaskbar="False">
+        
+        Title="Input Editor"
+        Height="500"
+        Width="750"
+        FontSize="13"
+        ShowInTaskbar="False"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        Loaded="Window_Loaded"
+        Closed="Window_Closed">
+    
     <Window.Resources>
         <Style x:Key="DataGrid_Font_Centering" TargetType="{x:Type DataGridCell}">
             <Setter Property="Template">
@@ -19,15 +29,29 @@
             </Setter>
         </Style>
     </Window.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Controls:SearchTextBoxUserControl HintText="Type ? to get help." x:Name="SearchControl" Width="300" Margin="0,20,0,20" Grid.ColumnSpan="2" />
-        <DataGrid Grid.Row="1" x:Name="DataGrid" CommandManager.PreviewCanExecute="DataGrid_PreviewCanExecute" AutoGenerateColumns="False" CellStyle="{StaticResource DataGrid_Font_Centering}">
+        
+        <Controls:SearchTextBoxUserControl
+            HintText="Type ? to get help."
+            x:Name="SearchControl"
+            Width="300"
+            Margin="0,20,0,20"
+            Grid.ColumnSpan="2" />
+
+        <DataGrid x:Name="DataGrid"
+                  Grid.Row="1"
+                  CommandManager.PreviewCanExecute="DataGrid_PreviewCanExecute"
+                  AutoGenerateColumns="False"
+                  CellStyle="{StaticResource DataGrid_Font_Centering}" >
+            
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Menu"  Binding="{Binding Path}"/>
+                
                 <DataGridTemplateColumn Header="Input">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
@@ -37,7 +61,9 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
+                
                 <DataGridTextColumn Header="Command" Binding="{Binding Command}" MaxWidth="330" />
+                
             </DataGrid.Columns>
         </DataGrid>
     </Grid>

mpv.net/WPF/InputWindow.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
@@ -6,7 +7,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-using System.Windows.Media;
 
 namespace mpvnet
 {
@@ -26,22 +26,7 @@ namespace mpvnet
             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)
         {

mpv.net/WPF/LearnWindow.xaml

@@ -3,21 +3,47 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="Learn Input" Height="200" Width="400" WindowStartupLocation="CenterOwner"
-        ResizeMode="NoResize" Loaded="Window_Loaded" Background="Black" MouseWheel="Window_MouseWheel" MouseUp="Window_MouseUp" MouseDoubleClick="Window_MouseDoubleClick" TextInput="Window_TextInput">
+        
+        Title="Learn Input"
+        Height="200"
+        Width="400"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="NoResize"
+        Loaded="Window_Loaded"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        MouseWheel="Window_MouseWheel"
+        MouseUp="Window_MouseUp"
+        MouseDoubleClick="Window_MouseDoubleClick"
+        TextInput="Window_TextInput">
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="*" />
             <RowDefinition Height="40" />
         </Grid.RowDefinitions>
+        
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <TextBlock x:Name="MenuTextBlock" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"></TextBlock>
-        <TextBlock x:Name="KeyTextBlock" Grid.Row="1" Grid.ColumnSpan="2" Foreground="White" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16"></TextBlock>
+        
+        <TextBlock x:Name="MenuTextBlock"
+                   Grid.ColumnSpan="2"
+                   VerticalAlignment="Center"
+                   HorizontalAlignment="Center"
+                   FontSize="16"></TextBlock>
+
+        <TextBlock x:Name="KeyTextBlock"
+                   Grid.Row="1"
+                   Grid.ColumnSpan="2"
+                   VerticalAlignment="Top"
+                   HorizontalAlignment="Center"
+                   FontSize="16" />
+        
         <Button x:Name="ConfirmButton" Grid.Row="2" Click="ConfirmButton_Click">Confirm</Button>
         <Button x:Name="ClearButton" Grid.Row="2" Click="ClearButton_Click" Grid.Column="1">Clear</Button>
     </Grid>

mpv.net/WPF/LearnWindow.xaml.cs

@@ -1,9 +1,11 @@
-using System;
+
+using System;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using WF = System.Windows.Forms;
+
+using WinForms = System.Windows.Forms;
 
 namespace mpvnet
 {
@@ -17,7 +19,7 @@ namespace mpvnet
 
         private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
-            WF.Message m = new WF.Message();
+            WinForms.Message m = new WinForms.Message();
             m.HWnd = hwnd;
             m.Msg = msg;
             m.WParam = wParam;
@@ -26,10 +28,10 @@ namespace mpvnet
             return m.Result;
         }
 
-        void OnKeyUp(WF.KeyEventArgs e)
+        void OnKeyUp(WinForms.KeyEventArgs e)
         {
-            if (e.KeyCode == WF.Keys.ControlKey || e.KeyCode == WF.Keys.ShiftKey ||
-                e.KeyCode == WF.Keys.Menu || e.KeyCode == WF.Keys.None)
+            if (e.KeyCode == WinForms.Keys.ControlKey || e.KeyCode == WinForms.Keys.ShiftKey ||
+                e.KeyCode == WinForms.Keys.Menu || e.KeyCode == WinForms.Keys.None)
 
                 return;
 
@@ -44,75 +46,75 @@ namespace mpvnet
                 } catch {}
 
             for (int i = 0; i < 13; i++)
-                if ("D" + i.ToString() == text)
+                if ("D" + i == text)
                     text = text.Substring(1);
 
             switch (e.KeyCode)
             {
-                case WF.Keys.NumPad0:
-                case WF.Keys.NumPad1:
-                case WF.Keys.NumPad2:
-                case WF.Keys.NumPad3:
-                case WF.Keys.NumPad4:
-                case WF.Keys.NumPad5:
-                case WF.Keys.NumPad6:
-                case WF.Keys.NumPad7:
-                case WF.Keys.NumPad8:
-                case WF.Keys.NumPad9:
-                    text = "KP" + e.KeyCode.ToString()[6].ToString(); break;
-                case WF.Keys.Space:
+                case WinForms.Keys.NumPad0:
+                case WinForms.Keys.NumPad1:
+                case WinForms.Keys.NumPad2:
+                case WinForms.Keys.NumPad3:
+                case WinForms.Keys.NumPad4:
+                case WinForms.Keys.NumPad5:
+                case WinForms.Keys.NumPad6:
+                case WinForms.Keys.NumPad7:
+                case WinForms.Keys.NumPad8:
+                case WinForms.Keys.NumPad9:
+                    text = "KP" + e.KeyCode.ToString()[6]; break;
+                case WinForms.Keys.Space:
                     text = "Space"; break;
-                case WF.Keys.Enter:
+                case WinForms.Keys.Enter:
                     text = "Enter"; break;
-                case WF.Keys.Tab:
+                case WinForms.Keys.Tab:
                     text = "TAB"; break;
-                case WF.Keys.Back:
+                case WinForms.Keys.Back:
                     text = "BS"; break;
-                case WF.Keys.Delete:
+                case WinForms.Keys.Delete:
                     text = "DEL"; break;
-                case WF.Keys.Insert:
+                case WinForms.Keys.Insert:
                     text = "INS"; break;
-                case WF.Keys.Home:
+                case WinForms.Keys.Home:
                     text = "Home"; break;
-                case WF.Keys.End:
+                case WinForms.Keys.End:
                     text = "END"; break;
-                case WF.Keys.PageUp:
+                case WinForms.Keys.PageUp:
                     text = "PGUP"; break;
-                case WF.Keys.PageDown:
+                case WinForms.Keys.PageDown:
                     text = "PGDWN"; break;
-                case WF.Keys.Escape:
+                case WinForms.Keys.Escape:
                     text = "ESC"; break;
-                case WF.Keys.PrintScreen:
+                case WinForms.Keys.PrintScreen:
                     text = "Print"; break;
-                case WF.Keys.Play:
+                case WinForms.Keys.Play:
                     text = "Play"; break;
-                case WF.Keys.Pause:
+                case WinForms.Keys.Pause:
                     text = "Pause"; break;
-                case WF.Keys.MediaPlayPause:
+                case WinForms.Keys.MediaPlayPause:
                     text = "PlayPause"; break;
-                case WF.Keys.MediaStop:
+                case WinForms.Keys.MediaStop:
                     text = "Stop"; break;
-                case WF.Keys.MediaNextTrack:
+                case WinForms.Keys.MediaNextTrack:
                     text = "Next"; break;
-                case WF.Keys.MediaPreviousTrack:
+                case WinForms.Keys.MediaPreviousTrack:
                     text = "Prev"; break;
-                case WF.Keys.VolumeUp:
+                case WinForms.Keys.VolumeUp:
                     text = "Volume_Up"; break;
-                case WF.Keys.VolumeDown:
+                case WinForms.Keys.VolumeDown:
                     text = "Volume_Down"; break;
-                case WF.Keys.VolumeMute:
+                case WinForms.Keys.VolumeMute:
                     text = "Mute"; break;
-                case WF.Keys.BrowserHome:
+                case WinForms.Keys.BrowserHome:
                     text = "Homepage"; break;
-                case WF.Keys.LaunchMail:
+                case WinForms.Keys.LaunchMail:
                     text = "Mail"; break;
-                case WF.Keys.BrowserFavorites:
+                case WinForms.Keys.BrowserFavorites:
                     text = "Favorites"; break;
-                case WF.Keys.BrowserSearch:
+                case WinForms.Keys.BrowserSearch:
                     text = "Search"; break;
-                case WF.Keys.Sleep:
+                case WinForms.Keys.Sleep:
                     text = "Sleep"; break;
-                case WF.Keys.Cancel:
+                case WinForms.Keys.Cancel:
                     text = "Cancel"; break;
             }
 
@@ -130,9 +132,14 @@ namespace mpvnet
 
             if (text == "#") text = "SHARP";
 
-            if (isAlt   && !wasModified) text = "ALT+" + text;
-            if (isShift && !wasModified) text = "SHIFT+" + text;
-            if (isCtrl  && !wasModified) text = "CTRL+" + text;
+            if (isAlt   && !wasModified)
+                text = "ALT+" + text;
+
+            if (isShift && !wasModified)
+                text = "SHIFT+" + text;
+
+            if (isCtrl  && !wasModified)
+                text = "CTRL+" + text;
 
             if (!string.IsNullOrEmpty(text))
                 SetKey(text);
@@ -151,25 +158,29 @@ namespace mpvnet
         [DllImport("user32.dll")]
         static extern uint MapVirtualKey(uint uCode, uint uMapType);
 
-        public static WF.Keys ModifierKeys {
+        public static WinForms.Keys ModifierKeys {
             get {
-                WF.Keys keys = WF.Keys.None;
+                WinForms.Keys keys = WinForms.Keys.None;
+
                 if (GetKeyState(17) < (short)0)
-                    keys |= WF.Keys.Control;
+                    keys |= WinForms.Keys.Control;
+
                 if (GetKeyState(16) < (short)0)
-                    keys |= WF.Keys.Shift;
+                    keys |= WinForms.Keys.Shift;
+
                 if (GetKeyState(18) < (short)0)
-                    keys |= WF.Keys.Alt;
+                    keys |= WinForms.Keys.Alt;
+
                 return keys;
             }
         }
 
-        void ProcessKeyEventArgs(ref WF.Message m)
+        void ProcessKeyEventArgs(ref WinForms.Message m)
         {
             int WM_KEYUP = 0x0101, WM_SYSKEYUP = 0x0105, WM_APPCOMMAND = 0x0319;
 
             if (m.Msg == WM_KEYUP || m.Msg == WM_SYSKEYUP)
-                OnKeyUp(new WF.KeyEventArgs((WF.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
+                OnKeyUp(new WinForms.KeyEventArgs((WinForms.Keys)(unchecked((int)(long)m.WParam)) | ModifierKeys));
             else if (m.Msg == WM_APPCOMMAND)
             {
                 var value = (AppCommand)(m.LParam.ToInt64() >> 16 & ~0xf000);

mpv.net/WPF/Resources.xaml

@@ -1,14 +1,23 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:WPF="clr-namespace:WPF">
+                    xmlns:UI="clr-namespace:UI">
     
     <Style TargetType="TextBox">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <Border x:Name="border"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="{TemplateBinding Background}"
+                            SnapsToDevicePixels="True">
+                        
+                        <ScrollViewer x:Name="PART_ContentHost"
+                                      Focusable="false"
+                                      HorizontalScrollBarVisibility="Hidden"
+                                      VerticalScrollBarVisibility="Hidden"/>
                     </Border>
+                    
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Opacity" TargetName="border" Value="0.56"/>
@@ -17,7 +26,7 @@
                             <Setter Property="BorderBrush" TargetName="border" Value="#FF7EB4EA"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{x:Static WPF:WPF.ThemeBrush}"/>
+                            <Setter Property="BorderBrush" TargetName="border" Value="{x:Static UI:Theme.Heading}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -34,13 +43,14 @@
                             <ColumnDefinition x:Name="LeftCol" Width="18" />
                             <ColumnDefinition x:Name="RightCol" Width="*" />
                         </Grid.ColumnDefinitions>
+                        
                         <Grid x:Name="PART_CHECKBOX">
                             <Ellipse
                                 x:Name="normal"
                                 Width="18"
                                 Height="18"
-                                Fill="{Binding Path=Background, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                                Stroke="{x:Static WPF:WPF.ThemeBrush}"
+                                Fill="{x:Static UI:Theme.Background}"
+                                Stroke="{x:Static UI:Theme.Heading}"
                                 StrokeThickness="2" />
                             <Ellipse
                                 x:Name="Checked1"
@@ -56,6 +66,7 @@
                                 Opacity="0"
                                 StrokeThickness="{TemplateBinding BorderThickness}" />
                         </Grid>
+                        
                         <ContentPresenter
                             x:Name="contentPresenter"
                             Grid.Column="1"
@@ -67,6 +78,7 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
                             RecognizesAccessKey="True" />
+                        
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />

mpv.net/WPF/SearchTextBoxUserControl.xaml

@@ -0,0 +1,68 @@
+<UserControl x:Class="Controls.SearchTextBoxUserControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:UI="clr-namespace:UI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450"
+             d:DesignWidth="800">
+    
+    <Grid Name="SearchTextBoxUserControl1"
+          Background="{x:Static UI:Theme.Background}">
+        
+        <TextBlock Name="HintTextBlock"
+                   Margin="5,2"
+                   Text="Find a setting"
+                   VerticalAlignment="Center"
+                   Foreground="{x:Static UI:Theme.Foreground2}"
+                   Background="{x:Static UI:Theme.Background}" />
+        
+        <TextBox Name="SearchTextBox"
+                 Height="25"
+                 Padding="1,2,0,0"
+                 BorderThickness="2"
+                 Background="Transparent"
+                 TextChanged="SearchTextBox_TextChanged"
+                 Foreground="{x:Static UI:Theme.Foreground}"
+                 CaretBrush="{x:Static UI:Theme.Foreground}" />
+        
+        <Button Name="SearchClearButton"
+                Background="Transparent"
+                HorizontalAlignment="Right"
+                FontFamily="Marlett"
+                FontSize="10"
+                Width="17"
+                Height="17"
+                Margin="2,0,4,0"
+                Visibility="Hidden"
+                Click="SearchClearButton_Click" >r
+
+            <Button.Style>
+                <Style TargetType="Button">
+                    <Setter Property="Background" Value="{x:Static UI:Theme.Background}"/>
+                    <Setter Property="Foreground" Value="{x:Static UI:Theme.Foreground2}"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Button">
+                                <Border BorderThickness="1"
+                                        BorderBrush="{TemplateBinding Foreground}"
+                                        SnapsToDevicePixels="True">
+                                    
+                                    <ContentPresenter HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center" />
+                                </Border>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="{x:Static UI:Theme.Heading}"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </Button.Style>
+        </Button>
+    </Grid>
+</UserControl>

mpv.net/WPF/SetupWindow.xaml

@@ -3,17 +3,31 @@
         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:UI="clr-namespace:UI"
         mc:Ignorable="d"
-        Title="mpv.net OS Setup" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterOwner">
+        
+        Title="mpv.net OS Setup"
+        FontSize="13"
+        Foreground="{x:Static UI:Theme.Foreground}"
+        Background="{x:Static UI:Theme.Background}"
+        SizeToContent="WidthAndHeight"
+        WindowStartupLocation="CenterOwner" >
+
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="Padding" Value="10"></Setter>
+            <Setter Property="Margin" Value="5"></Setter>
+        </Style>
+    </Window.Resources>
+    
     <Grid>
-        <StackPanel>
-            <Button Name="RegisterVideo" Margin="5" Click="RegisterVideo_Click">Register video file extensions (requires elevated privileges)</Button>
-            <Button Name="RegisterAudio" Margin="5" Click="RegisterAudio_Click">Register audio file extensions (requires elevated privileges)</Button>
-            <Button Name="RegisterImage" Margin="5" Click="RegisterImage_Click">Register image file extensions (requires elevated privileges)</Button>
-            <Button Name="AddToPathEnvVar" Margin="5" Click="AddToPathEnvVar_Click">Add mpv.net to Path environment variable</Button>
-            <Button Name="ManageDefaultApps" Margin="5" Click="ManageDefaultApps_Click">Manage Default Apps (Win 10 or higher)</Button>
-            <Button Name="UnregisterFileAssociations" Margin="5,20,5,5" Click="UnregisterFileAssociations_Click">Unregister file extensions (requires elevated privileges)</Button>
-            <Button Name="RemoveFromPathEnvVar" Margin="5" Click="RemoveFromPathEnvVar_Click">Remove mpv.net from Path environment variable</Button>
+        <StackPanel Margin="10">
+            <Button Name="RegisterVideo" Click="RegisterVideo_Click">Register video file extensions (requires elevated privileges)</Button>
+            <Button Name="RegisterAudio" Click="RegisterAudio_Click">Register audio file extensions (requires elevated privileges)</Button>
+            <Button Name="RegisterImage" Click="RegisterImage_Click">Register image file extensions (requires elevated privileges)</Button>
+            <Button Name="UnregisterFileAssociations" Click="UnregisterFileAssociations_Click">Unregister file extensions (requires elevated privileges)</Button>
+            <Button Name="AddToPathEnvVar" Click="AddToPathEnvVar_Click">Add mpv.net to Path environment variable</Button>
+            <Button Name="RemoveFromPathEnvVar" Click="RemoveFromPathEnvVar_Click">Remove mpv.net from Path environment variable</Button>
         </StackPanel>
     </Grid>
 </Window>

mpv.net/WPF/SetupWindow.xaml.cs

@@ -1,7 +1,9 @@
-using System;
+
+using System;
 using System.Diagnostics;
 using System.Windows;
-using WF = System.Windows.Forms;
+
+using WinForms = System.Windows.Forms;
 
 namespace mpvnet
 {
@@ -10,25 +12,30 @@ namespace mpvnet
         public SetupWindow() => InitializeComponent();
 
         void RegisterFileAssociations(string value)
+        {
+            try
             {
                 using (var proc = new Process())
                 {
-                proc.StartInfo.FileName = System.Windows.Forms.Application.ExecutablePath;
+                    proc.StartInfo.FileName = WinForms.Application.ExecutablePath;
                     proc.StartInfo.Arguments = "--reg-file-assoc " + value;
                     proc.StartInfo.Verb = "runas";
-                try { proc.Start(); } catch { }
+                    proc.Start();
                 }
+
+                Process.Start("ms-settings:defaultapps");
+            } catch {}
         }
 
         private void RegisterVideo_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("video");
         private void RegisterAudio_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("audio");
         private void RegisterImage_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("image");
+
         private void UnregisterFileAssociations_Click(object sender, RoutedEventArgs e) => RegisterFileAssociations("unreg");
-        private void ManageDefaultApps_Click(object sender, RoutedEventArgs e) => Process.Start("ms-settings:defaultapps");
 
         private void AddToPathEnvVar_Click(object sender, RoutedEventArgs e)
         {
-            string var = WF.Application.StartupPath + ";";
+            string var = WinForms.Application.StartupPath + ";";
             string path = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
 
             if (path.Contains(var))
@@ -42,7 +49,7 @@ namespace mpvnet
 
         private void RemoveFromPathEnvVar_Click(object sender, RoutedEventArgs e)
         {
-            string var = WF.Application.StartupPath + ";";
+            string var = WinForms.Application.StartupPath + ";";
             string path = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.User);
 
             if (path.Contains(var))

mpv.net/WPF/WPF.cs

@@ -1,69 +1,20 @@
 using System;
-using System.Globalization;
 using System.Windows;
-using System.Windows.Media;
-
-using Microsoft.Win32;
-using mpvnet;
 
 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; } = new SolidColorBrush(ThemeColor);
-
-        static bool WasThemeColorSet;
-
-        static Color _ThemeColor;
-
-        public static Color ThemeColor {
-            get {
-                if (!WasThemeColorSet)
-                {
-                    Color? color = null;
-
-                    try {
-                        if (App.IsDarkMode && !string.IsNullOrEmpty(App.DarkColor))
-                            color = (Color)ColorConverter.ConvertFromString(App.DarkColor);
-                        else if (!App.IsDarkMode && !string.IsNullOrEmpty(App.LightColor))
-                            color = (Color)ColorConverter.ConvertFromString(App.LightColor);
-                    } catch { }
-
-                    if (!color.HasValue)
-                    {
-                        if (Environment.OSVersion.Version.Major < 10)
-                        {
-                            int argb = Convert.ToInt32(Registry.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM", "ColorizationColor", 0));
-                            var wfc = System.Drawing.Color.FromArgb(argb);
-                            color = Color.FromArgb(wfc.A, wfc.R, wfc.G, wfc.B);
-                        }
-                        else
-                            color = SystemParameters.WindowGlassColor;
-                    }
-
-                    if (App.IsDarkMode && color == Colors.Black) color = Colors.Orange;
-                    if (!App.IsDarkMode && color == Colors.White) color = Colors.Orange;
-                    _ThemeColor = color.Value;
-                    WasThemeColorSet = true;
-                }
-                return _ThemeColor;
-            }
-        }
     }
 }

mpv.net/WinForms/MainForm.Designer.cs

@@ -30,14 +30,19 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-            this.Timer = new System.Windows.Forms.Timer(this.components);
+            this.CursorTimer = new System.Windows.Forms.Timer(this.components);
+            this.ProgressTimer = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
-            // Timer
+            // CursorTimer
             // 
-            this.Timer.Enabled = true;
-            this.Timer.Interval = 1000;
-            this.Timer.Tick += new System.EventHandler(this.Timer_Tick);
+            this.CursorTimer.Enabled = true;
+            this.CursorTimer.Interval = 1000;
+            this.CursorTimer.Tick += new System.EventHandler(this.CursorTimer_Tick);
+            // 
+            // ProgressTimer
+            // 
+            this.ProgressTimer.Tick += new System.EventHandler(this.ProgressTimer_Tick);
             // 
             // MainForm
             // 
@@ -45,7 +50,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(288F, 288F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(668, 345);
+            this.ClientSize = new System.Drawing.Size(348, 0);
             this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
@@ -57,6 +62,7 @@
 
         #endregion
 
-        private System.Windows.Forms.Timer Timer;
+        private System.Windows.Forms.Timer CursorTimer;
+        private System.Windows.Forms.Timer ProgressTimer;
     }
 }

mpv.net/WinForms/MainForm.cs

@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Drawing;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -9,6 +10,7 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using UI;
 
 namespace mpvnet
 {
@@ -16,12 +18,12 @@ namespace mpvnet
     {
         public static MainForm Instance { get; set; }
         public static IntPtr Hwnd { get; set; }
-
         public new ContextMenuStripEx ContextMenu { get; set; }
-
         Point  LastCursorPosChanged;
         int    LastCursorChangedTickCount;
+        int    TaskbarButtonCreatedMessage;
         bool   WasShown;
+        Taskbar Taskbar;
         List<string> RecentFiles;
 
         public MainForm()
@@ -30,6 +32,13 @@ namespace mpvnet
 
             try
             {
+                object recent = RegHelp.GetObject(App.RegPath, "Recent");
+
+                if (recent is string[] r)
+                    RecentFiles = new List<string>(r);
+                else
+                    RecentFiles = new List<string>();
+
                 Instance = this;
                 Hwnd = Handle;
                 mp.Init();
@@ -38,7 +47,9 @@ namespace mpvnet
                 mp.VideoSizeChanged += VideoSizeChanged;
                 mp.FileLoaded += FileLoaded;
                 mp.Idle += Idle;
+                mp.Seek += () => UpdateProgressBar();
 
+                mp.observe_property_bool("pause", PropChangePause);
                 mp.observe_property_bool("fullscreen", PropChangeFullscreen);
                 mp.observe_property_bool("ontop", PropChangeOnTop);
                 mp.observe_property_bool("border", PropChangeBorder);
@@ -46,30 +57,33 @@ namespace mpvnet
                 mp.observe_property_string("aid", PropChangeAid);
                 mp.observe_property_string("vid", PropChangeVid);
                 mp.observe_property_int("edition", PropChangeEdition);
+                mp.observe_property_double("window-scale", PropChangeWindowScale);
                 
-                if (mp.GPUAPI != "vulkan") mp.ProcessCommandLine(false);
+                if (mp.GPUAPI != "vulkan")
+                    mp.ProcessCommandLine(false);
 
                 AppDomain.CurrentDomain.UnhandledException += (sender, e) => Msg.ShowError(e.ExceptionObject.ToString());
                 Application.ThreadException += (sender, e) => Msg.ShowException(e.Exception);
                 Msg.SupportURL = "https://github.com/stax76/mpv.net#support";
                 Text = "mpv.net " + Application.ProductVersion;
-
-                object recent = RegHelp.GetObject(App.RegPath, "Recent");
-
-                if (recent is string[] r)
-                    RecentFiles = new List<string>(r);
-                else
-                    RecentFiles = new List<string>();
+                TaskbarButtonCreatedMessage = Native.RegisterWindowMessage("TaskbarButtonCreated");
                 
                 ContextMenu = new ContextMenuStripEx(components);
                 ContextMenu.Opened += ContextMenu_Opened;
                 ContextMenu.Opening += ContextMenu_Opening;
 
-                if (mp.Screen == -1) mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
+                if (mp.Screen == -1)
+                    mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen);
+
                 int targetIndex = mp.Screen;
                 Screen[] screens = Screen.AllScreens;
-                if (targetIndex < 0) targetIndex = 0;
-                if (targetIndex > screens.Length - 1) targetIndex = screens.Length - 1;
+
+                if (targetIndex < 0)
+                    targetIndex = 0;
+
+                if (targetIndex > screens.Length - 1)
+                    targetIndex = screens.Length - 1;
+
                 Screen screen = screens[Array.IndexOf(screens, screens[targetIndex])];
                 Rectangle target = screen.Bounds;
                 Left = target.X + (target.Width - Width) / 2;
@@ -83,6 +97,12 @@ namespace mpvnet
                     Left = posX - Width / 2;
                     Top = posY - Height / 2;
                 }
+
+                if (App.Maximized)
+                {
+                    SetFormPosAndSize(1, true);
+                    WindowState = FormWindowState.Maximized;
+                }
             }
             catch (Exception ex)
             {
@@ -92,19 +112,22 @@ namespace mpvnet
 
         public MenuItem FindMenuItem(string text) => FindMenuItem(text, ContextMenu.Items);
 
-        void Idle() => BeginInvoke(new Action(() => Text = "mpv.net " + Application.ProductVersion));
+        void Shutdown() => BeginInvoke(new Action(() => Close()));
+
+        void Idle()
+        {
+            BeginInvoke(new Action(() => Text = "mpv.net " + Application.ProductVersion));
+        }
 
         void CM_Popup(object sender, EventArgs e) => CursorHelp.Show();
 
         void VideoSizeChanged() => BeginInvoke(new Action(() => SetFormPosAndSize()));
 
-        void Shutdown() => BeginInvoke(new Action(() => Close()));
-
         void PropChangeFullscreen(bool value) => BeginInvoke(new Action(() => CycleFullscreen(value)));
 
         void ContextMenu_Opened(object sender, EventArgs e) => CursorHelp.Show();
 
-        bool IsFullscreen => WindowState == FormWindowState.Maximized;
+        bool IsFullscreen => WindowState == FormWindowState.Maximized && FormBorderStyle == FormBorderStyle.None;
 
         bool IsMouseInOSC() => PointToClient(Control.MousePosition).Y > ClientSize.Height * 0.9;
 
@@ -197,8 +220,10 @@ namespace mpvnet
             if (recent != null)
             {
                 recent.DropDownItems.Clear();
+
                 foreach (string path in RecentFiles)
                     MenuItem.Add(recent.DropDownItems, path, () => mp.Load(new[] { path }, true, Control.ModifierKeys.HasFlag(Keys.Control)));
+               
                 recent.DropDownItems.Add(new ToolStripSeparator());
                 MenuItem mi = new MenuItem("Clear List");
                 mi.Action = () => RecentFiles.Clear();
@@ -214,6 +239,7 @@ namespace mpvnet
                 {
                     if (mi.Text.StartsWith(text) && mi.Text.Trim() == text)
                         return mi;
+
                     if (mi.DropDownItems.Count > 0)
                     {
                         MenuItem val = FindMenuItem(text, mi.DropDownItems);
@@ -226,13 +252,19 @@ namespace mpvnet
 
         bool WasInitialSizeSet;
 
-        void SetFormPosAndSize()
+        void SetFormPosAndSize(double scale = 1, bool force = false)
         {
+            if (!force)
+            {
+                if (WindowState == FormWindowState.Maximized)
+                    return;
+
                 if (mp.Fullscreen)
                 {
                     CycleFullscreen(true);
                     return;
                 }
+            }
             
             Screen screen = Screen.FromControl(this);
             int autoFitHeight = Convert.ToInt32(screen.WorkingArea.Height * mp.Autofit);
@@ -243,7 +275,6 @@ namespace mpvnet
                 mp.VideoSize = new Size((int)(autoFitHeight * (16 / 9.0)), autoFitHeight);
 
             Size size = mp.VideoSize;
-
             int height = size.Height;
 
             if (App.RememberHeight)
@@ -257,6 +288,7 @@ namespace mpvnet
                 }
             }
 
+            height = Convert.ToInt32(height * scale);
             int width = Convert.ToInt32(height * size.Width / (double)size.Height);
 
             if (height > screen.WorkingArea.Height * 0.9)
@@ -295,10 +327,17 @@ namespace mpvnet
             int minTop = screens.Select(val => val.WorkingArea.Y).Min();
             int maxBottom = screens.Select(val => val.WorkingArea.Bottom).Max();
 
-            if (left < minLeft) left = minLeft;
-            if (left + rect.Width > maxRight) left = maxRight - rect.Width;
-            if (top < minTop) top = minTop;
-            if (top + rect.Height > maxBottom) top = maxBottom - rect.Height;
+            if (left < minLeft)
+                left = minLeft;
+
+            if (left + rect.Width > maxRight)
+                left = maxRight - rect.Width;
+
+            if (top < minTop)
+                top = minTop;
+
+            if (top + rect.Height > maxBottom)
+                top = maxBottom - rect.Height;
 
             Native.SetWindowPos(Handle, IntPtr.Zero /* HWND_TOP */, left, top, rect.Width, rect.Height, 4 /* SWP_NOZORDER */);
         }
@@ -320,7 +359,7 @@ namespace mpvnet
             }
             else
             {
-                if (WindowState == FormWindowState.Maximized)
+                if (WindowState == FormWindowState.Maximized && FormBorderStyle == FormBorderStyle.None)
                 {
                     WindowState = FormWindowState.Normal;
 
@@ -342,17 +381,22 @@ namespace mpvnet
             if (!content.Contains("#menu:"))
             {
                 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 (CommandItem item in items)
             {
-                if (string.IsNullOrEmpty(item.Path)) continue;
+                if (string.IsNullOrEmpty(item.Path))
+                    continue;
+
                 string path = item.Path.Replace("&", "&&");
+
                 MenuItem menuItem = ContextMenu.Add(path, () => {
                     try {
                         mp.command(item.Command);
@@ -360,24 +404,38 @@ namespace mpvnet
                         Msg.ShowException(ex);
                     }
                 });
-                if (menuItem != null) menuItem.ShortcutKeyDisplayString = item.Input + "    ";
+
+                if (menuItem != null)
+                    menuItem.ShortcutKeyDisplayString = item.Input + "    ";
             }
         }
 
         private void FileLoaded()
         {
             string path = mp.get_property_string("path");
+
             BeginInvoke(new Action(() => {
                 if (path.Contains("://"))
-                    Text = path + " - mpv.net " + Application.ProductVersion;
-                else if (File.Exists(path))
+                    Text = mp.get_property_string("media-title") + " - mpv.net " + Application.ProductVersion;
+                else if (path.Contains(":\\") || path.StartsWith("\\\\"))
                     Text = path.FileName() + " - mpv.net " + Application.ProductVersion;
                 else
                     Text = "mpv.net " + Application.ProductVersion;
+
+                int interval = (int)(mp.Duration.TotalMilliseconds / 100);
+                if (interval < 100) interval = 100;
+                if (interval > 1000) interval = 1000;
+                ProgressTimer.Interval = interval;
+                UpdateProgressBar();
             }));
-            if (RecentFiles.Contains(path)) RecentFiles.Remove(path);
+
+            if (RecentFiles.Contains(path))
+                RecentFiles.Remove(path);
+
             RecentFiles.Insert(0, path);
-            while (RecentFiles.Count > App.RecentCount) RecentFiles.RemoveAt(App.RecentCount);
+
+            while (RecentFiles.Count > App.RecentCount)
+                RecentFiles.RemoveAt(App.RecentCount);
         }
 
         protected override CreateParams CreateParams {
@@ -426,7 +484,8 @@ namespace mpvnet
                     }
                     break;
                 case 0x02E0: // WM_DPICHANGED
-                    if (!WasShown) break;
+                    if (!WasShown)
+                        break;
                     var r2 = Marshal.PtrToStructure<Native.RECT>(m.LParam);
                     Native.SetWindowPos(Handle, IntPtr.Zero, r2.Left, r2.Top, r2.Width, r2.Height, 0);
                     break;
@@ -436,14 +495,20 @@ namespace mpvnet
                     NativeHelp.SubtractWindowBorders(Handle, ref r);
                     int c_w = r.Right - r.Left, c_h = r.Bottom - r.Top;
                     Size s = mp.VideoSize;
-                    if (s == Size.Empty) s = new Size(16, 9);
+
+                    if (s == Size.Empty)
+                        s = new Size(16, 9);
+
                     float aspect = s.Width / (float)s.Height;
                     int d_w = Convert.ToInt32(c_h * aspect - c_w);
                     int d_h = Convert.ToInt32(c_w / aspect - c_h);
                     int[] d_corners = { d_w, d_h, -d_w, -d_h };
                     int[] corners = { rc.Left, rc.Top, rc.Right, rc.Bottom };
                     int corner = NativeHelp.GetResizeBorder(m.WParam.ToInt32());
-                    if (corner >= 0) corners[corner] -= d_corners[corner];
+
+                    if (corner >= 0)
+                        corners[corner] -= d_corners[corner];
+
                     Marshal.StructureToPtr<Native.RECT>(new Native.RECT(corners[0], corners[1], corners[2], corners[3]), m.LParam, false);
                     m.Result = new IntPtr(1);
                     return;
@@ -468,10 +533,16 @@ namespace mpvnet
                     return;
             }
 
+            if (m.Msg == TaskbarButtonCreatedMessage && mp.TaskbarProgress)
+            {
+                Taskbar = new Taskbar(Handle);
+                ProgressTimer.Start();
+            }
+
             base.WndProc(ref m);
         }
 
-        void Timer_Tick(object sender, EventArgs e)
+        void CursorTimer_Tick(object sender, EventArgs e)
         {
             if (CursorHelp.IsPosDifferent(LastCursorPosChanged))
             {
@@ -485,6 +556,14 @@ namespace mpvnet
                 CursorHelp.Hide();
         }
 
+        private void ProgressTimer_Tick(object sender, EventArgs e) => UpdateProgressBar();
+
+        void UpdateProgressBar()
+        {
+            if (mp.TaskbarProgress && Taskbar != null)
+                Taskbar.SetValue(mp.get_property_number("time-pos"), mp.Duration.TotalSeconds);
+        }
+
         void PropChangeOnTop(bool value) => BeginInvoke(new Action(() => TopMost = value));
 
         void PropChangeAid(string value) => mp.Aid = value;
@@ -495,6 +574,15 @@ namespace mpvnet
 
         void PropChangeEdition(int value) => mp.Edition = value;
         
+        void PropChangeWindowScale(double value)
+        {
+            if (value != 1)
+            {
+                BeginInvoke(new Action(() => SetFormPosAndSize(value)));
+                mp.command("no-osd set window-scale 1");
+            }
+        }
+
         void PropChangeBorder(bool enabled) {
             mp.Border = enabled;
 
@@ -503,49 +591,63 @@ namespace mpvnet
                 {
                     if (mp.Border && FormBorderStyle == FormBorderStyle.None)
                         FormBorderStyle = FormBorderStyle.Sizable;
+
                     if (!mp.Border && FormBorderStyle == FormBorderStyle.Sizable)
                         FormBorderStyle = FormBorderStyle.None;
                 }
             }));
         }
 
+        void PropChangePause(bool enabled)
+        {
+            if (Taskbar != null && mp.TaskbarProgress)
+            {
+                if (enabled)
+                    Taskbar.SetState(TaskbarStates.Paused);
+                else
+                    Taskbar.SetState(TaskbarStates.Normal);
+            }
+        }
+
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
-            if (mp.GPUAPI != "vulkan") mp.VideoSizeAutoResetEvent.WaitOne(App.StartThreshold);
+
+            if (mp.GPUAPI != "vulkan")
+                mp.VideoSizeAutoResetEvent.WaitOne(App.StartThreshold);
+
             SetFormPosAndSize();
         }
 
         protected override void OnShown(EventArgs e)
         {
             base.OnShown(e);
-            if (mp.GPUAPI == "vulkan") mp.ProcessCommandLine(false);
-            var wpfColor = WPF.WPF.ThemeColor;
-            Color color = Color.FromArgb(wpfColor.A, wpfColor.R, wpfColor.G, wpfColor.B);
-            ToolStripRendererEx.InitColors(color, App.IsDarkMode, App.ThemedMenu);
+
+            if (mp.GPUAPI == "vulkan")
+                mp.ProcessCommandLine(false);
+
+            ToolStripRendererEx.ForegroundColor = Theme.Current.GetWinFormsColor("menu-foreground");
+            ToolStripRendererEx.BackgroundColor = Theme.Current.GetWinFormsColor("menu-background");
+            ToolStripRendererEx.SelectionColor = Theme.Current.GetWinFormsColor("menu-highlight");
+            ToolStripRendererEx.BorderColor = Theme.Current.GetWinFormsColor("menu-border");
+            ToolStripRendererEx.CheckedColor = Theme.Current.GetWinFormsColor("menu-checked");
+
             BuildMenu();
             ContextMenuStrip = ContextMenu;
             WPF.WPF.Init();
             System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
-            CheckClipboardForURL();
             Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y);
             WasShown = true;
-            Task.Run(() => mp.LoadScripts());
-            Task.Run(() => mp.Extension = new Extension());
-        }
-
-        protected override void OnActivated(EventArgs e)
-        {
-            base.OnActivated(e);
-            CheckClipboardForURL();
-            Message m = new Message() { Msg = 0x0202 }; // WM_LBUTTONUP
-            Native.SendMessage(Handle, m.Msg, m.WParam, m.LParam);
+            mp.LoadScripts();
+            Task.Run(() => App.Extension = new Extension());
         }
 
         protected override void OnResize(EventArgs e)
         {
             base.OnResize(e);
-            if (mp.IsLogoVisible) mp.ShowLogo();
+
+            if (mp.IsLogoVisible)
+                mp.ShowLogo();
         }
 
         protected override void OnFormClosing(FormClosingEventArgs e)
@@ -587,6 +689,7 @@ namespace mpvnet
         protected override void OnDragEnter(DragEventArgs e)
         {
             base.OnDragEnter(e);
+
             if (e.Data.GetDataPresent(DataFormats.FileDrop) || e.Data.GetDataPresent(DataFormats.Text))
                 e.Effect = DragDropEffects.Copy;
         }
@@ -594,8 +697,10 @@ namespace mpvnet
         protected override void OnDragDrop(DragEventArgs e)
         {
             base.OnDragDrop(e);
+
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
                 mp.Load(e.Data.GetData(DataFormats.FileDrop) as String[], true, Control.ModifierKeys.HasFlag(Keys.Control));
+          
             if (e.Data.GetDataPresent(DataFormats.Text))
                 mp.Load(new[] { e.Data.GetData(DataFormats.Text).ToString() }, true, Control.ModifierKeys.HasFlag(Keys.Control));
         }
@@ -606,22 +711,10 @@ namespace mpvnet
             CursorHelp.Show();
         }
 
-        void CheckClipboardForURL()
+        protected override void OnKeyDown(KeyEventArgs e)
         {
-            string clipboard = Clipboard.GetText();
-
-            foreach (string url in App.UrlWhitelist)
-            {
-                if (clipboard.Contains("://") && !clipboard.Contains("\n") &&
-                    !clipboard.Contains(" ") && clipboard.Contains(url.ToLower().Trim()) &&
-                    RegHelp.GetString(App.RegPath, "LastURL") != clipboard && Visible)
-                {
-                    RegHelp.SetObject(App.RegPath, "LastURL", clipboard);
-
-                    if (Msg.ShowQuestion("Play URL?", clipboard) == MsgResult.OK)
-                        mp.Load(new[] { clipboard }, true, Control.ModifierKeys.HasFlag(Keys.Control));
-                }
-            }
+            e.SuppressKeyPress = true; // prevent beep using alt key
+            base.OnKeyDown(e);
         }
     }
 }

mpv.net/WinForms/MainForm.resx

@@ -117,9 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Timer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="CursorTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>30, 12</value>
   </metadata>
+  <metadata name="ProgressTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>321, 12</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

mpv.net/WinForms/Menu.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.ComponentModel;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
-using Microsoft.Win32;
 using System.Windows.Forms;
 using System.Drawing;
 
@@ -131,49 +130,29 @@ public class MenuItem : ToolStripMenuItem
 
 public class ToolStripRendererEx : ToolStripSystemRenderer
 {
-    public static Color ColorForeground { get; set; } = Color.Black;
-    public static Color ColorTheme { get; set; }
-    public static Color ColorChecked { get; set; }
-    public static Color ColorBorder { get; set; }
-    public static Color ColorTop { get; set; }
-    public static Color ColorSelection { get; set; }
-    public static Color ColorBackground { get; set; }
+    public static Color ForegroundColor { get; set; }
+    public static Color BackgroundColor { get; set; }
+    public static Color SelectionColor { get; set; }
+    public static Color CheckedColor { get; set; }
+    public static Color BorderColor { get; set; }
 
     int TextOffset;
 
-    public static void InitColors(Color themeColor, bool darkMode, bool themed)
+    public static void SetDefaultColors()
     {
-        if (darkMode)
-        {
-            ColorBorder = Color.White;
-            ColorBackground = Color.FromArgb(50, 50, 50);
-            ColorSelection = Color.FromArgb(80, 80, 80);
-
-            if (themed)
-                ColorForeground = themeColor;
-            else
-                ColorForeground = Color.White;
-
-            ColorChecked = Color.FromArgb(90, 90, 90);
-        }
-        else
-        {
-            if (!themed) themeColor = Color.FromArgb(238, 238, 238);
-
-            ColorBorder = HSLColor.Convert(themeColor).ToColorSetLuminosity(100);
-            ColorChecked = HSLColor.Convert(themeColor).ToColorSetLuminosity(160);
-            ColorSelection = HSLColor.Convert(themeColor).ToColorSetLuminosity(180);
-            ColorBackground = HSLColor.Convert(themeColor).ToColorSetLuminosity(210);
-            ColorTop = HSLColor.Convert(themeColor).ToColorSetLuminosity(240);
-        }
+        ForegroundColor = Color.FromArgb(unchecked((int)0xFF000000));
+        BackgroundColor = Color.FromArgb(unchecked((int)0xFFDFDFDF));
+        SelectionColor = Color.FromArgb(unchecked((int)0xFFBFBFBF));
+        CheckedColor = Color.FromArgb(unchecked((int)0xFFAAAAAA));
+        BorderColor = Color.FromArgb(unchecked((int)0xFF6A6A6A));
     }
 
     protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
     {
         Rectangle r = e.AffectedBounds;
         r.Inflate(-1, -1);
-        ControlPaint.DrawBorder(e.Graphics, r, ColorBackground, ButtonBorderStyle.Solid);
-        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, ColorBorder, ButtonBorderStyle.Solid);
+        ControlPaint.DrawBorder(e.Graphics, r, BackgroundColor, ButtonBorderStyle.Solid);
+        ControlPaint.DrawBorder(e.Graphics, e.AffectedBounds, BorderColor, ButtonBorderStyle.Solid);
     }
 
     protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
@@ -190,7 +169,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
             else
                 TextOffset = Convert.ToInt32(e.Item.Height * 0.2);
 
-            e.TextColor = ColorForeground;
+            e.TextColor = ForegroundColor;
             e.TextRectangle = new Rectangle(TextOffset, Convert.ToInt32((e.Item.Height - rect.Height) / 2.0), rect.Width, rect.Height);
         }
 
@@ -202,14 +181,14 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
         Rectangle rect = new Rectangle(Point.Empty, e.Item.Size);
 
         if (!(e.Item.Owner is MenuStrip))
-            e.Graphics.Clear(ColorBackground);
+            e.Graphics.Clear(BackgroundColor);
 
         if (e.Item.Selected && e.Item.Enabled)
         {
             e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
             rect = new Rectangle(rect.X + 2, rect.Y, rect.Width - 4, rect.Height - 1);
             rect.Inflate(-1, -1);
-            using (SolidBrush b = new SolidBrush(ColorSelection))
+            using (SolidBrush b = new SolidBrush(SelectionColor))
                 e.Graphics.FillRectangle(b, rect);
         }
     }
@@ -225,7 +204,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
         float y3 = e.Item.Height * 0.75f;
         e.Graphics.SmoothingMode = SmoothingMode.HighQuality;
 
-        using (Brush b = new SolidBrush(ColorForeground))
+        using (Brush b = new SolidBrush(ForegroundColor))
         {
             using (Pen p = new Pen(b, Control.DefaultFont.Height / 20f))
             {
@@ -251,7 +230,7 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
         rect = new Rectangle(rect.X + 2, rect.Y, rect.Height - 1, rect.Height - 1);
         rect.Inflate(-1, -1);
 
-        using (Brush brush = new SolidBrush(ColorChecked))
+        using (Brush brush = new SolidBrush(CheckedColor))
             e.Graphics.FillRectangle(brush, rect);
 
         float ellipseWidth = rect.Height / 3f;
@@ -261,17 +240,17 @@ public class ToolStripRendererEx : ToolStripSystemRenderer
                                           ellipseWidth,
                                           ellipseWidth);
 
-        using (Brush brush = new SolidBrush(ColorForeground))
+        using (Brush brush = new SolidBrush(ForegroundColor))
             e.Graphics.FillEllipse(brush, rectF);
     }
 
     protected override void OnRenderSeparator(ToolStripSeparatorRenderEventArgs e)
     {
-        e.Graphics.Clear(ColorBackground);
+        e.Graphics.Clear(BackgroundColor);
         int top = e.Item.Height / 2;
         top -= 1;
         int offset = Convert.ToInt32(e.Item.Font.Height * 0.7);
-        using (Pen p = new Pen(ColorBorder))
+        using (Pen p = new Pen(BorderColor))
             e.Graphics.DrawLine(p,
                 new Point(offset, top),
                 new Point(e.Item.Width - offset, top));

mpv.net/mpv.net.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>mpvnet</RootNamespace>
     <AssemblyName>mpvnet</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -116,7 +116,8 @@
   <ItemGroup>
     <Compile Include="Misc\App.cs" />
     <Compile Include="Misc\Extension.cs" />
-    <Page Include="Controls\SearchTextBoxUserControl.xaml">
+    <Content Include="Resources\theme.txt" />
+    <Page Include="WPF\SearchTextBoxUserControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -140,7 +141,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Compile Include="Controls\SearchTextBoxUserControl.xaml.cs">
+    <Compile Include="Misc\Help.cs" />
+    <Compile Include="Misc\Theme.cs" />
+    <Compile Include="WPF\SearchTextBoxUserControl.xaml.cs">
       <DependentUpon>SearchTextBoxUserControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="DynamicGUI\DynamicGUI.cs" />
@@ -153,6 +156,7 @@
     <Compile Include="DynamicGUI\Tommy.cs" />
     <Compile Include="Misc\ExtensionMethods.cs" />
     <Compile Include="Native\MediaInfo.cs" />
+    <Compile Include="Native\Taskbar.cs" />
     <Compile Include="WinForms\Menu.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -238,11 +242,9 @@
     </Content>
     <Content Include="mpvnet.ico" />
     <Content Include="Resources\mpvConf.txt" />
-    <Content Include="Resources\mpvConfToml.txt" />
+    <Content Include="Resources\confToml.txt" />
     <None Include="Resources\mpvnet.ico" />
     <None Include="Resources\mpvnet.png" />
-    <None Include="Resources\mpvNetConf.txt" />
-    <Content Include="Resources\mpvNetConfToml.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

mpv.net/mpv/mp.cs

@@ -16,7 +16,7 @@ using System.Windows.Forms;
 using WinForms = System.Windows.Forms;
 
 using static mpvnet.libmpv;
-using static mpvnet.Native;
+using static Native;
 
 namespace mpvnet
 {
@@ -58,15 +58,15 @@ namespace mpvnet
 
         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<double>>> DoublePropChangeActions { get; set; } = new List<KeyValuePair<string, Action<double>>>();
         public static List<KeyValuePair<string, Action<string>>> StringPropChangeActions { get; set; } = new List<KeyValuePair<string, Action<string>>>();
         public static List<MediaTrack> MediaTracks { get; set; } = new List<MediaTrack>();
         public static List<KeyValuePair<string, double>> Chapters { get; set; } = new List<KeyValuePair<string, double>>();
-
         public static IntPtr Handle { get; set; }
         public static IntPtr WindowHandle { get; set; }
-        public static Extension Extension { get; set; }
         public static List<PythonScript> PythonScripts { get; set; } = new List<PythonScript>();
         public static Size VideoSize { get; set; }
+        public static TimeSpan Duration;
         public static AutoResetEvent ShutdownAutoResetEvent { get; set; } = new AutoResetEvent(false);
         public static AutoResetEvent VideoSizeAutoResetEvent { get; set; } = new AutoResetEvent(false);
 
@@ -81,6 +81,7 @@ namespace mpvnet
         public static bool IsQuitNeeded { set; get; } = true;
         public static bool Fullscreen { get; set; }
         public static bool Border { get; set; } = true;
+        public static bool TaskbarProgress { get; set; } = true;
 
         public static int Screen { get; set; } = -1;
         public static int Edition { get; set; }
@@ -104,8 +105,8 @@ namespace mpvnet
 
             set_property_string("wid", MainForm.Hwnd.ToString());
             set_property_string("osc", "yes");
-            set_property_string("force-window", "yes");
             set_property_string("input-media-keys", "yes");
+            set_property_string("force-window", "yes");
             set_property_string("config-dir", ConfigFolder);
             set_property_string("config", "yes");
 
@@ -117,7 +118,9 @@ namespace mpvnet
 
         public static void ProcessProperty(string name, string value)
         {
-            if (name.Any(char.IsUpper)) Msg.ShowError("Uppercase char detected: " + name, "mpv properties using the command line and the mpv.conf config file are required to be lowercase.");
+            if (name.Any(char.IsUpper))
+                Msg.ShowError("Uppercase char detected: " + name,
+                    "mpv properties using the command line and the mpv.conf config file are required to be lowercase.");
 
             switch (name)
             {
@@ -136,6 +139,7 @@ namespace mpvnet
                 case "fs":
                 case "fullscreen": Fullscreen = value == "yes"; break;
                 case "border": Border = value == "yes"; break;
+                case "taskbar-progress": TaskbarProgress = value == "yes"; break;
                 case "screen": Screen = Convert.ToInt32(value); break;
                 case "gpu-api": GPUAPI = value; break;
             }
@@ -147,7 +151,7 @@ namespace mpvnet
             get {
                 if (_ConfigFolder == null)
                 {
-                    string portableFolder = PathHelp.StartupPath + "portable_config\\";
+                    string portableFolder = Folder.Startup + "portable_config\\";
                     _ConfigFolder = portableFolder;
 
                     if (!Directory.Exists(_ConfigFolder))
@@ -188,7 +192,7 @@ namespace mpvnet
                         }
                     }
 
-                    if (PathHelp.StartupPath == _ConfigFolder)
+                    if (Folder.Startup == _ConfigFolder)
                     {
                         Msg.ShowError("Startup folder and config folder cannot be identical, using portable_config instead.");
                         _ConfigFolder = portableFolder;
@@ -205,10 +209,8 @@ namespace mpvnet
 
                     if (!File.Exists(_ConfigFolder + "mpv.conf"))
                         File.WriteAllText(_ConfigFolder + "mpv.conf", Properties.Resources.mpvConf);
-
-                    if (!File.Exists(_ConfigFolder + "mpvnet.conf"))
-                        File.WriteAllText(_ConfigFolder + "mpvnet.conf", Properties.Resources.mpvNetConf);
                 }
+
                 return _ConfigFolder;
             }
         }
@@ -235,9 +237,9 @@ namespace mpvnet
 
         public static void LoadMpvScripts()
         {
-            if (Directory.Exists(PathHelp.StartupPath + "Scripts"))
+            if (Directory.Exists(Folder.Startup + "Scripts"))
             {
-                string[] startupScripts = Directory.GetFiles(PathHelp.StartupPath + "Scripts");
+                string[] startupScripts = Directory.GetFiles(Folder.Startup + "Scripts");
 
                 foreach (string path in startupScripts)
                     if ((path.EndsWith(".lua") || path.EndsWith(".js")) && KnownScripts.Contains(Path.GetFileName(path)))
@@ -249,28 +251,28 @@ namespace mpvnet
 
         public static void LoadScripts()
         {
-            if (Directory.Exists(PathHelp.StartupPath + "Scripts"))
+            if (Directory.Exists(Folder.Startup + "Scripts"))
             {
-                foreach (string path in Directory.GetFiles(PathHelp.StartupPath + "Scripts"))
+                foreach (string scriptPath in Directory.GetFiles(Folder.Startup + "Scripts"))
                 {
-                    if (KnownScripts.Contains(Path.GetFileName(path)))
+                    if (KnownScripts.Contains(Path.GetFileName(scriptPath)))
                     {
-                        if (path.EndsWith(".py"))
-                            PythonScripts.Add(new PythonScript(File.ReadAllText(path)));
-                        else if (path.EndsWith(".ps1"))
-                            PowerShellScript.Init(path);
+                        if (scriptPath.EndsWith(".py"))
+                            Task.Run(() => PythonScripts.Add(new PythonScript(scriptPath)));
+                        else if (scriptPath.EndsWith(".ps1"))
+                            Task.Run(() => PowerShellScript.Init(scriptPath));
                     }
                     else
-                        Msg.ShowError("Failed to load script", path + "\n\nOnly scripts that ship with mpv.net are allowed in <startup>\\scripts\n\nUser scripts have to use <config folder>\\scripts\n\nNever copy or install a new mpv.net version over a old mpv.net version.");
+                        Msg.ShowError("Failed to load script", scriptPath + "\n\nOnly scripts that ship with mpv.net are allowed in <startup>\\scripts\n\nUser scripts have to use <config folder>\\scripts\n\nNever copy or install a new mpv.net version over a old mpv.net version.");
                 }
             }
 
             if (Directory.Exists(ConfigFolder + "scripts"))
                 foreach (string scriptPath in Directory.GetFiles(ConfigFolder + "scripts"))
                     if (scriptPath.EndsWith(".py"))
-                        PythonScripts.Add(new PythonScript(File.ReadAllText(scriptPath)));
+                        Task.Run(() => PythonScripts.Add(new PythonScript(scriptPath)));
                     else if (scriptPath.EndsWith(".ps1"))
-                        PowerShellScript.Init(scriptPath);
+                        Task.Run(() => PowerShellScript.Init(scriptPath));
         }
 
         public static void EventLoop()
@@ -317,7 +319,7 @@ namespace mpvnet
                             break;
                         case mpv_event_id.MPV_EVENT_FILE_LOADED:
                             HideLogo();
-                            FileLoaded?.Invoke();
+                            Duration = TimeSpan.FromSeconds(get_property_number("duration"));
                             Size vidSize = new Size(get_property_int("width"), get_property_int("height"));
                             if (vidSize.Width == 0 || vidSize.Height == 0)
                                 vidSize = new Size(1, 1);
@@ -328,7 +330,11 @@ namespace mpvnet
                             }
                             VideoSizeAutoResetEvent.Set();
                             Task.Run(new Action(() => ReadMetaData()));
-                            WriteHistory(get_property_string("path"));
+                            string path = mp.get_property_string("path");
+                            if (path.Contains("://"))
+                                path = mp.get_property_string("media-title");
+                            WriteHistory(path);
+                            FileLoaded?.Invoke();
                             break;
                         case mpv_event_id.MPV_EVENT_TRACKS_CHANGED:
                             TracksChanged?.Invoke();
@@ -376,22 +382,33 @@ namespace mpvnet
                             var propData = (mpv_event_property)Marshal.PtrToStructure(evt.data, typeof(mpv_event_property));
 
                             if (propData.format == mpv_format.MPV_FORMAT_FLAG)
+                            {
                                 lock (BoolPropChangeActions)
                                     foreach (var i in BoolPropChangeActions)
                                         if (i.Key== propData.name)
                                             i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data) == 1);
-
-                            if (propData.format == mpv_format.MPV_FORMAT_STRING)
+                            }
+                            else if (propData.format == mpv_format.MPV_FORMAT_STRING)
+                            {
                                 lock (StringPropChangeActions)
                                     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)
+                            }
+                            else if(propData.format == mpv_format.MPV_FORMAT_INT64)
+                            {
                                 lock (IntPropChangeActions)
                                     foreach (var i in IntPropChangeActions)
                                         if (i.Key == propData.name)
                                             i.Value.Invoke(Marshal.PtrToStructure<int>(propData.data));
+                            }
+                            else if (propData.format == mpv_format.MPV_FORMAT_DOUBLE)
+                            {
+                                lock (DoublePropChangeActions)
+                                    foreach (var i in DoublePropChangeActions)
+                                        if (i.Key == propData.name)
+                                            i.Value.Invoke(Marshal.PtrToStructure<double>(propData.data));
+                            }
                             break;
                         case mpv_event_id.MPV_EVENT_PLAYBACK_RESTART:
                             PlaybackRestart?.Invoke();
@@ -416,12 +433,9 @@ namespace mpvnet
 
         static void HideLogo()
         {
-            if (IsLogoVisible)
-            {
-                commandv("overlay-remove", "0");
+            command("overlay-remove 0");
             IsLogoVisible = false;
         }
-        }
 
         static List<PythonEventObject> PythonEventObjects = new List<PythonEventObject>();
 
@@ -554,6 +568,17 @@ namespace mpvnet
                     IntPropChangeActions.Add(new KeyValuePair<string, Action<int>>(name, action));
         }
 
+        public static void observe_property_double(string name, Action<double> action)
+        {
+            int err = mpv_observe_property(Handle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_DOUBLE);
+
+            if (err < 0)
+                throw new Exception($"{name}: {(mpv_error)err}");
+            else
+                lock (DoublePropChangeActions)
+                    DoublePropChangeActions.Add(new KeyValuePair<string, Action<double>>(name, action));
+        }
+
         public static void observe_property_bool(string name, Action<bool> action)
         {
             int err = mpv_observe_property(Handle, (ulong)action.GetHashCode(), name, mpv_format.MPV_FORMAT_FLAG);
@@ -606,12 +631,15 @@ namespace mpvnet
                                 set_property_string(left, right, true);
                         }
                         else if (!preInit && !preInitProperties.Contains(left))
+                        {
+                            if (!PrintCommandLineArgument(arg))
                             {
                                 mp.ProcessProperty(left, right);
                                 if (!App.ProcessProperty(left, right))
                                     set_property_string(left, right, true);
                             }
                         }
+                    }
                     catch (Exception e)
                     {
                         Msg.ShowException(e);
@@ -625,14 +653,14 @@ namespace mpvnet
 
                 foreach (string i in args)
                 {
-                    if (!i.StartsWith("--") && (i == "-" || i.Contains("://") || File.Exists(i)))
+                    if (!i.StartsWith("--") && (i == "-" || i.Contains("://") ||
+                        i.Contains(":\\") || i.StartsWith("\\\\") || File.Exists(i)))
                     {
                         files.Add(i);
-                        if (i.Contains("://")) RegHelp.SetObject(App.RegPath, "LastURL", i);
                     }
                 }
 
-                Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control));
+                Load(files.ToArray(), !App.Queue, Control.ModifierKeys.HasFlag(Keys.Control) || App.Queue);
 
                 if (files.Count == 0 || files[0].Contains("://"))
                 {
@@ -642,14 +670,30 @@ namespace mpvnet
             }
         }
 
+        static bool PrintCommandLineArgument(string argument)
+        {
+            switch (argument)
+            {
+                case "--list-properties=yes":
+                    var list = get_property_string("property-list").Split(',').ToList();
+                    list.Sort();
+                    Console.WriteLine(string.Join("\r\n", list.ToArray()));
+                    return true;
+            }
+
+            return false;
+        }
+
         public static DateTime LastLoad;
 
         public static void Load(string[] files, bool loadFolder, bool append)
         {
-            if (files is null || files.Length == 0) return;
+            if (files is null || files.Length == 0)
+                return;
+
             HideLogo();
 
-            if ((DateTime.Now - LastLoad).TotalMilliseconds < 500)
+            if ((DateTime.Now - LastLoad).TotalMilliseconds < 1000)
                 append = true;
 
             LastLoad = DateTime.Now;
@@ -666,26 +710,37 @@ namespace mpvnet
             if (string.IsNullOrEmpty(get_property_string("path")))
                 set_property_int("playlist-pos", 0);
 
-            if (loadFolder && !append) Task.Run(() => LoadFolder()); // user reported race condition
+            if (loadFolder && !append)
+                Task.Run(() => LoadFolder());
         }
 
         public static void LoadFolder()
         {
-            if (!App.AutoLoadFolder) return;
-            Thread.Sleep(200); // user reported race condition
+            if (!App.AutoLoadFolder || Control.ModifierKeys.HasFlag(Keys.Shift))
+                return;
+
+            Thread.Sleep(1000);
             string path = get_property_string("path");
-            if (!File.Exists(path) || get_property_int("playlist-count") != 1) return;
+
+            if (!File.Exists(path) || get_property_int("playlist-count") != 1)
+                return;
+
             List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
+
             files = files.Where(file =>
                 App.VideoTypes.Contains(file.ShortExt()) ||
                 App.AudioTypes.Contains(file.ShortExt()) ||
                 App.ImageTypes.Contains(file.ShortExt())).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());
+
+            if (index > 0)
+                commandv("playlist-move", "0", (index + 1).ToString());
         }
 
         public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)
@@ -734,14 +789,14 @@ namespace mpvnet
 
         static void WriteHistory(string path)
         {
-            if (!File.Exists(path)) return;
+            if (!File.Exists(ConfigFolder + "history.txt"))
+                return;
+
             int totalMinutes = Convert.ToInt32((DateTime.Now - LastHistoryStartDateTime).TotalMinutes);
 
-            if (File.Exists(LastHistoryPath) && totalMinutes > 1)
-            {
+            if (PathHelp.GetBaseName(LastHistoryPath) != "" && totalMinutes > 1)
                 File.AppendAllText(ConfigFolder + "history.txt", DateTime.Now.ToString().Substring(0, 16) +
-                    " " + totalMinutes.ToString().PadLeft(3) + " " + Path.GetFileNameWithoutExtension(LastHistoryPath) + "\r\n");
-            }
+                    " " + totalMinutes.ToString().PadLeft(3) + " " + PathHelp.GetBaseName(LastHistoryPath) + "\r\n");
 
             LastHistoryPath = path;
             LastHistoryStartDateTime = DateTime.Now;