diff --git a/Mk0.Software.ImageSorter/App.config b/Mk0.Software.ImageSorter/App.config index 12e7981..701f878 100644 --- a/Mk0.Software.ImageSorter/App.config +++ b/Mk0.Software.ImageSorter/App.config @@ -64,6 +64,9 @@ 0 + + True + diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 58dd997..88ace99 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -502,7 +502,7 @@ this.MinimumSize = new System.Drawing.Size(983, 605); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Image Sorter v1.33 | © 2015-2019 by manuelkamper.com"; + this.Text = "Image Sorter v1.34 | © 2015-2019 by manuelkamper.com"; 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 99ad57b..e93fc0a 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -42,6 +42,7 @@ namespace Mk0.Software.ImageSorter private string startuppath; private string startupimage; public string[] Args; + private System.Timers.Timer t = new System.Timers.Timer(700); public Main() { @@ -121,11 +122,11 @@ namespace Mk0.Software.ImageSorter /// private void Main_Shown(object sender, EventArgs e) { - if (Properties.Settings.Default.lastHeight >= this.MinimumSize.Height) + if (Properties.Settings.Default.lastHeight >= MinimumSize.Height) { Height = Properties.Settings.Default.lastHeight; } - if (Properties.Settings.Default.lastWidth >= this.MinimumSize.Width) + if (Properties.Settings.Default.lastWidth >= MinimumSize.Width) { Width = Properties.Settings.Default.lastWidth; } @@ -137,6 +138,12 @@ namespace Mk0.Software.ImageSorter { Left = Properties.Settings.Default.lastLeft; } + groupBox1.Visible = Properties.Settings.Default.showInfo; + if (!groupBox1.Visible) + { + groupBox2.Location = new Point(groupBox2.Location.X, 12); + groupBox2.Height = groupBox2.Height + 87; + } CheckSubfolders(); SearchImages(); CountPicsInPath(); @@ -632,6 +639,27 @@ namespace Mk0.Software.ImageSorter CountPicsInPath(); LoadPicture(imageIndex); CheckUndo(); + btn.ForeColor = Color.MediumSeaGreen; + btn.Font = new Font(btn.Font, FontStyle.Bold); + + t.Elapsed += new System.Timers.ElapsedEventHandler((sender1, e1) => ButtonBlink(sender, e, btn)); + t.Enabled = true; + } + + /// + /// Blinkender Button nach erfolgreichem Verschieben + /// + /// + /// + /// + private void ButtonBlink(object sender, EventArgs e, Button btn) + { + btn.BeginInvoke(new MethodInvoker(() => + { + btn.ForeColor = SystemColors.ControlText; + btn.Font = new Font(btn.Font, FontStyle.Regular); + })); + t.Stop(); } /// @@ -1075,6 +1103,7 @@ namespace Mk0.Software.ImageSorter Properties.Settings.Default.lastHeight = Height; Properties.Settings.Default.lastTop = Top; Properties.Settings.Default.lastLeft = Left; + Properties.Settings.Default.showInfo = groupBox1.Visible; Properties.Settings.Default.Save(); } diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index 53b9b58..53c2821 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.33.*")] +[assembly: AssemblyVersion("1.34.*")] //[assembly: AssemblyFileVersion("1.6.0.0")] diff --git a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs index 4ed8230..55a4846 100644 --- a/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs +++ b/Mk0.Software.ImageSorter/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Mk0.Software.ImageSorter.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -130,5 +130,17 @@ namespace Mk0.Software.ImageSorter.Properties { this["zoom"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool showInfo { + get { + return ((bool)(this["showInfo"])); + } + set { + this["showInfo"] = value; + } + } } } diff --git a/Mk0.Software.ImageSorter/Properties/Settings.settings b/Mk0.Software.ImageSorter/Properties/Settings.settings index 941d310..b87a4ac 100644 --- a/Mk0.Software.ImageSorter/Properties/Settings.settings +++ b/Mk0.Software.ImageSorter/Properties/Settings.settings @@ -29,5 +29,8 @@ 0 + + True + \ No newline at end of file