From d5b2923c68a48f69962e2b2eb8f4cbafea7b9138 Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Sun, 14 Jul 2019 02:06:23 +0200 Subject: [PATCH] reorganize code for easier scripting --- Changelog.md | 2 +- mpv.net/Properties/AssemblyInfo.cs | 4 ++-- mpv.net/WinForms/MainForm.cs | 12 +++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Changelog.md b/Changelog.md index e1c2779..d4ea5ab 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,4 @@ -### 4.7.2 +### 4.7.3 - fix cursor showing load activity on startup diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index 51987f4..4bf5e90 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("4.7.2.0")] -[assembly: AssemblyFileVersion("4.7.2.0")] +[assembly: AssemblyVersion("4.7.3.0")] +[assembly: AssemblyFileVersion("4.7.3.0")] diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 1ea6f92..cb4969c 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Globalization; using System.Threading.Tasks; +using System.Diagnostics; namespace mpvnet { @@ -46,6 +47,11 @@ namespace mpvnet else RecentFiles = new List(); + if (App.IsDarkMode) ToolStripRendererEx.ColorTheme = Color.Black; + ContextMenu = new ContextMenuStripEx(components); + ContextMenu.Opened += ContextMenu_Opened; + ContextMenu.Opening += ContextMenu_Opening; + App.ProcessCommandLineEarly(); if (mp.Screen == -1) mp.Screen = Array.IndexOf(Screen.AllScreens, Screen.PrimaryScreen); @@ -511,16 +517,12 @@ namespace mpvnet protected override void OnShown(EventArgs e) { - if (App.IsDarkMode) ToolStripRendererEx.ColorTheme = Color.Black; - ContextMenu = new ContextMenuStripEx(components); - ContextMenu.Opened += ContextMenu_Opened; - ContextMenu.Opening += ContextMenu_Opening; + base.OnShown(e); BuildMenu(); ContextMenuStrip = ContextMenu; IgnoreDpiChanged = false; CheckClipboardForURL(); Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y); - base.OnShown(e); } protected override void OnActivated(EventArgs e)