From c2c0a8f19097cd1aa0b4b290e9575c25575bd3f8 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Fri, 1 Nov 2019 16:38:54 +0100 Subject: [PATCH] 5.4.3.0 --- Changelog.md | 7 ++++++- Manual.md | 8 ++++---- mpv.net/Misc/Command.cs | 3 +-- mpv.net/Misc/Misc.cs | 22 ++++++++++++++++++---- mpv.net/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/Changelog.md b/Changelog.md index e255fd5..83d811e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,11 @@ -### + +### 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 diff --git a/Manual.md b/Manual.md index bc16ff2..3ccf34b 100644 --- a/Manual.md +++ b/Manual.md @@ -91,7 +91,7 @@ * [External Tools](#external-tools) + [Play with mpv](#play-with-mpv) + [External Application Button](#external-application-button) - + [Open with++](#openwith++) + + [Open with++](#openwith) + [MediaInfo.NET](#mediainfonet) * [Command Line Interface](#command-line-interface) * [Color Theme](#color-theme) @@ -133,11 +133,11 @@ File Associations can be created using the setup or with the context menu under 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. +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 @@ -887,4 +887,4 @@ Selecting multiple files in File Explorer and pressing enter will open the files 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. \ No newline at end of file +Pressing the shift key while opening a single file will suppress loading all files in the folder. diff --git a/mpv.net/Misc/Command.cs b/mpv.net/Misc/Command.cs index ff3ba20..c66dd6e 100644 --- a/mpv.net/Misc/Command.cs +++ b/mpv.net/Misc/Command.cs @@ -1,5 +1,4 @@ - -using System; +using System; using System.Diagnostics; using System.IO; using System.Linq; diff --git a/mpv.net/Misc/Misc.cs b/mpv.net/Misc/Misc.cs index e876d92..9975514 100644 --- a/mpv.net/Misc/Misc.cs +++ b/mpv.net/Misc/Misc.cs @@ -1,4 +1,5 @@ -using System; + +using System; using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -213,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); } @@ -246,6 +259,7 @@ namespace mpvnet get { if (_Items is null) _Items = GetItems(File.ReadAllText(mp.InputConfPath)); + return _Items; } } diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index b532256..e93fb9a 100644 --- a/mpv.net/Properties/AssemblyInfo.cs +++ b/mpv.net/Properties/AssemblyInfo.cs @@ -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.4.2.2")] -[assembly: AssemblyFileVersion("5.4.2.2")] +[assembly: AssemblyVersion("5.4.3.0")] +[assembly: AssemblyFileVersion("5.4.3.0")]