From f1bec13c66e5e3d06d219a23838bfafca51df9c3 Mon Sep 17 00:00:00 2001 From: Manuel Kamper Date: Sun, 19 Jan 2020 08:40:43 +0100 Subject: [PATCH] implemented #3 --- Mk0.Software.ImageSorter/Main.Designer.cs | 2 +- Mk0.Software.ImageSorter/Main.cs | 5 +++++ .../Mk0.Software.ImageSorter.csproj | 14 +++++++------- .../Properties/AssemblyInfo.cs | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 7aa28f7..032fbd9 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -693,7 +693,7 @@ this.MinimumSize = new System.Drawing.Size(983, 605); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Image Sorter v1.50 | © 2015-2020 by mk0.at"; + this.Text = "Image Sorter v1.51 | © 2015-2020 by mk0.at"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); this.Load += new System.EventHandler(this.Main_Load); this.Shown += new System.EventHandler(this.Main_Shown); diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs index 8b66465..9234b1c 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -45,6 +45,7 @@ namespace Mk0.Software.ImageSorter public string[] Args; private System.Timers.Timer t1 = new System.Timers.Timer(1200); private FormWindowState lastState = FormWindowState.Minimized; + private string defaultWindowName; public Main() { @@ -81,6 +82,8 @@ namespace Mk0.Software.ImageSorter Args = null; } + defaultWindowName = Text; + AutoUpdater.ShowSkipButton = false; AutoUpdater.Start("https://software.mk0.at/update/imagesorter.xml"); } @@ -572,10 +575,12 @@ namespace Mk0.Software.ImageSorter imageIndex = 0; } pictureBoxImage.ImageLocation = CropImageBorders(images.ElementAt(imageIndex)); + Text = defaultWindowName + " - " + Path.GetFileName(pictureBoxImage.ImageLocation); } else { pictureBoxImage.Image = null; + Text = defaultWindowName; } } diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index c409443..3df8c3c 100644 --- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj +++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj @@ -33,7 +33,7 @@ manuelkamper.com false 0 - 1.50.0.0 + 1.51.0.0 true true true @@ -77,22 +77,22 @@ - ..\packages\mk0.gui.banner.1.0.0\lib\net461\Mk0.GUI.Banner.dll + ..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.gui.banner.1.0.0\lib\net461\Mk0.GUI.Banner.dll - ..\..\manuelkamp\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\Mk0.Software.OnlineUpdater.dll + ..\..\Mk0.Software.OnlineUpdater\Mk0.Software.OnlineUpdater\bin\Debug\Mk0.Software.OnlineUpdater.dll - ..\packages\mk0.tools.calculation.1.0.0\lib\net461\Mk0.Tools.Calculation.dll + ..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.calculation.1.0.0\lib\net461\Mk0.Tools.Calculation.dll - ..\packages\mk0.tools.imagecropper.1.0.0\lib\net461\Mk0.Tools.ImageCropper.dll + ..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.imagecropper.1.0.0\lib\net461\Mk0.Tools.ImageCropper.dll - ..\packages\mk0.tools.images.1.0.4\lib\net461\Mk0.Tools.Images.dll + ..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.images.1.0.4\lib\net461\Mk0.Tools.Images.dll - ..\packages\mk0.tools.randomization.1.0.0\lib\net461\Mk0.Tools.Randomization.dll + ..\..\..\Mk0.Tools.Password\Mk0.Tools.Password\Mk0.Tools.Password\mk0.tools.randomization.1.0.0\lib\net461\Mk0.Tools.Randomization.dll diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index 8c2d4d0..6c006f2 100644 --- a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs +++ b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.50.*")] +[assembly: AssemblyVersion("1.51.*")] //[assembly: AssemblyFileVersion("1.6.0.0")]