diff --git a/docs/Changelog.md b/docs/Changelog.md index dc07e32..563194b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,4 +1,5 @@ +- New show-santa-logo (green and grumpy) option. - New quick bookmark feature, see manual. - Fix crash choosing Matroska edition in the menu. - Fix auto-play not working with user scripts. diff --git a/docs/Manual.md b/docs/Manual.md index 7c0e27a..885a821 100644 --- a/docs/Manual.md +++ b/docs/Manual.md @@ -521,9 +521,12 @@ Color theme used in light mode. Default: light #### --show-logo=\ -Draws the blue mpv.net logo ontop of the native OSC logo. -Changes take effect after application restart. Default: yes +Draws the blue mpv.net logo ontop of the native OSC logo. Default: yes +#### --show-santa-logo=\ + +Draws the blue mpv.net logo with a santa hat in december, +the option is called green and grumpy in mpv. Default: yes External Tools -------------- diff --git a/src/Misc/App.cs b/src/Misc/App.cs index d710d84..f4b3005 100644 --- a/src/Misc/App.cs +++ b/src/Misc/App.cs @@ -31,6 +31,7 @@ namespace mpvnet public static bool RememberVolume { get; set; } = true; public static bool RememberWindowPosition { get; set; } public static bool ShowLogo { get; set; } = true; + public static bool ShowSantaLogo { get; set; } = true; public static int StartThreshold { get; set; } = 1500; public static int RecentCount { get; set; } = 15; @@ -252,6 +253,7 @@ namespace mpvnet case "remember-volume": RememberVolume = value == "yes"; return true; case "remember-window-position": RememberWindowPosition = value == "yes"; return true; case "show-logo": ShowLogo = value == "yes"; return true; + case "show-santa-logo": ShowSantaLogo = value == "yes"; return true; case "start-size": StartSize = value; return true; case "start-threshold": StartThreshold = value.ToInt(); return true; case "video-file-extensions": CorePlayer.VideoTypes = value.Split(" ,;".ToCharArray(), StringSplitOptions.RemoveEmptyEntries); return true; diff --git a/src/Misc/Player.cs b/src/Misc/Player.cs index e2dcc67..ee9fdc6 100644 --- a/src/Misc/Player.cs +++ b/src/Misc/Player.cs @@ -1301,7 +1301,6 @@ namespace mpvnet return; bool december = DateTime.Now.Month == 12; - Rectangle cr = MainForm.Instance.ClientRectangle; int len = Convert.ToInt32(cr.Height / (december ? 4.5 : 5)); @@ -1315,7 +1314,7 @@ namespace mpvnet gx.InterpolationMode = InterpolationMode.HighQualityBicubic; gx.Clear(Color.Black); Rectangle rect = new Rectangle(0, 0, len, len); - Bitmap bmp2 = december ? Properties.Resources.mpvnet_santa : Properties.Resources.mpvnet; + Bitmap bmp2 = (december && App.ShowSantaLogo) ? Properties.Resources.mpvnet_santa : Properties.Resources.mpvnet; gx.DrawImage(bmp2, rect); BitmapData bd = bmp.LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppPArgb); int x = Convert.ToInt32((cr.Width - len) / (december ? 1.95 : 2)); diff --git a/src/Resources/editor_conf.txt b/src/Resources/editor_conf.txt index c1c8a05..72c271b 100644 --- a/src/Resources/editor_conf.txt +++ b/src/Resources/editor_conf.txt @@ -702,3 +702,13 @@ help = Draws the blue mpv.net logo ontop of the native OSC logo. option = yes option = no + +[setting] +name = show-santa-logo +file = mpvnet +default = yes +filter = UI +help = Draws the blue mpv.net logo with a santa hat in december, the option is called green and grumpy in mpv. + +option = yes +option = no