diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 7c9f881..853d8b1 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -44,7 +44,7 @@ this.labelZielPath = new System.Windows.Forms.Label(); this.buttonQuellPfad = new System.Windows.Forms.Button(); this.groupBoxZiele = new System.Windows.Forms.GroupBox(); - this.buttonLastImage = new System.Windows.Forms.Button(); + this.buttonDateirenamer = new System.Windows.Forms.Button(); this.buttonInfo = new System.Windows.Forms.Button(); this.buttonJumpBack = new System.Windows.Forms.Button(); this.panelButtons = new System.Windows.Forms.Panel(); @@ -231,7 +231,7 @@ // this.groupBoxZiele.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBoxZiele.Controls.Add(this.buttonLastImage); + this.groupBoxZiele.Controls.Add(this.buttonDateirenamer); this.groupBoxZiele.Controls.Add(this.buttonInfo); this.groupBoxZiele.Controls.Add(this.buttonQuellPfad); this.groupBoxZiele.Controls.Add(this.buttonSettings); @@ -246,18 +246,17 @@ this.groupBoxZiele.TabStop = false; this.groupBoxZiele.Text = "Ziele"; // - // buttonLastImage + // buttonDateirenamer // - this.buttonLastImage.Font = new System.Drawing.Font("Wingdings", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonLastImage.Location = new System.Drawing.Point(105, 16); - this.buttonLastImage.Name = "buttonLastImage"; - this.buttonLastImage.Size = new System.Drawing.Size(23, 23); - this.buttonLastImage.TabIndex = 4; - this.buttonLastImage.Text = "I"; - this.buttonLastImage.UseVisualStyleBackColor = true; - this.buttonLastImage.Visible = false; - this.buttonLastImage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ButtonLastImage_MouseDown); - this.buttonLastImage.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ButtonLastImage_MouseUp); + this.buttonDateirenamer.Enabled = false; + this.buttonDateirenamer.Font = new System.Drawing.Font("Wingdings", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.buttonDateirenamer.Location = new System.Drawing.Point(105, 16); + this.buttonDateirenamer.Name = "buttonDateirenamer"; + this.buttonDateirenamer.Size = new System.Drawing.Size(23, 23); + this.buttonDateirenamer.TabIndex = 4; + this.buttonDateirenamer.Text = "4"; + this.buttonDateirenamer.UseVisualStyleBackColor = true; + this.buttonDateirenamer.Click += new System.EventHandler(this.ButtonDateirenamer_Click); // // buttonInfo // @@ -693,7 +692,7 @@ this.MinimumSize = new System.Drawing.Size(983, 605); this.Name = "Main"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Image Sorter v1.54 | © 2015-2020 by mk0.at"; + this.Text = "Image Sorter v1.56 | © 2015-2021 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); @@ -758,7 +757,7 @@ private System.Windows.Forms.Label labelZoom1; private System.Windows.Forms.Button buttonJumpBack; private System.Windows.Forms.Button buttonInfo; - private System.Windows.Forms.Button buttonLastImage; + private System.Windows.Forms.Button buttonDateirenamer; private System.Windows.Forms.Button buttonDuplicate; private System.Windows.Forms.GroupBox groupBoxTransformation; private System.Windows.Forms.Button buttonTransformation; diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs index f50941c..0e35373 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -220,7 +220,7 @@ namespace Mk0.Software.ImageSorter InitialDelay = 1000, ReshowDelay = 500 }; - t4.SetToolTip(buttonSettings, "Einstellungen öffnen"); + t4.SetToolTip(buttonSettings, "Einstellungen öffnen (F10)"); ToolTip t5 = new ToolTip { AutoPopDelay = 5000, @@ -241,7 +241,7 @@ namespace Mk0.Software.ImageSorter InitialDelay = 1000, ReshowDelay = 500 }; - t7.SetToolTip(buttonLastImage, "Letztes Bild anzeigen"); + t7.SetToolTip(buttonDateirenamer, "Dateirenamer öffnen (F12)"); } /// @@ -557,6 +557,7 @@ namespace Mk0.Software.ImageSorter comboBoxZoom.Enabled = enabled; buttonJumpForward.Enabled = enabled; labelNoImages.Visible = !enabled; + buttonDateirenamer.Enabled = enabled; } /// @@ -1347,6 +1348,18 @@ namespace Mk0.Software.ImageSorter e.Handled = true; } + if (e.KeyCode == Keys.F10) + { + buttonSettings.PerformClick(); + e.Handled = true; + } + + if (e.KeyCode == Keys.F12) + { + buttonDateirenamer.PerformClick(); + e.Handled = true; + } + if (e.KeyCode == Keys.Back) { buttonUndo.PerformClick(); @@ -1438,26 +1451,6 @@ namespace Mk0.Software.ImageSorter } } - /// - /// Blendet letztes Bild ein - /// - /// - /// - private void ButtonLastImage_MouseDown(object sender, MouseEventArgs e) - { - //todo vorheriges Bild anzeigen - } - - /// - /// Blendet letztes Bild aus - /// - /// - /// - private void ButtonLastImage_MouseUp(object sender, MouseEventArgs e) - { - //todo vorheriges Bild ausblenden - } - /// /// Duplikat von aktuellem Bild erzeugen /// @@ -1600,5 +1593,15 @@ namespace Mk0.Software.ImageSorter { labelRander.Text = trackBarRander.Value + " px."; } + + /// + /// Öffnet den Dateirenamer + /// + /// + /// + private void ButtonDateirenamer_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index b3602ba..b1e1ee2 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.54.0.0 + 1.56.0.0 true true true diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index 4a107d4..b6c5a31 100644 --- a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs +++ b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("mk0.at")] [assembly: AssemblyProduct("ImageSorter")] -[assembly: AssemblyCopyright("Copyright © 2015-2020 by mk0.at")] +[assembly: AssemblyCopyright("Copyright © 2015-2021 by mk0.at")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.54.*")] +[assembly: AssemblyVersion("1.56.*")] //[assembly: AssemblyFileVersion("1.6.0.0")]