diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs
index e017e72..ab94012 100644
--- a/Mk0.Software.ImageSorter/Main.Designer.cs
+++ b/Mk0.Software.ImageSorter/Main.Designer.cs
@@ -871,7 +871,7 @@
this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main";
- this.Text = "Image Sorter v2.6 | © 2015-2023 by kmpr.at";
+ this.Text = "Image Sorter v2.7 | © 2015-2023 by kmpr.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 a1cb4d9..3242ac2 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -17,7 +17,6 @@ using System.Threading;
using System.Windows.Forms;
using Mk0.Software.OnlineUpdater;
using System.Threading.Tasks;
-using System.Reflection;
namespace Mk0.Software.ImageSorter
{
@@ -845,6 +844,11 @@ namespace Mk0.Software.ImageSorter
CheckUndo();
return;
}
+ else if (result == DialogResult.Cancel)
+ {
+ ImageDelete(null, null);
+ return;
+ }
else
{
return;
@@ -2070,7 +2074,7 @@ namespace Mk0.Software.ImageSorter
}
//rechts neue pb erstellen
int pIndex = imageIndex;
- pIndex += previewNumber;
+ pIndex += previewNumber + 1;
if (pIndex >= images.Count() || pIndex < 0)
{
pIndex = 0;
diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
index f952875..daa107c 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
- 2.6.0.0
+ 2.7.0.0
true
true
true
diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
index 54fdd50..e4cb0fd 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("2.6.*")]
+[assembly: AssemblyVersion("2.7.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Mk0.Software.ImageSorter/Vergleicher.Designer.cs b/Mk0.Software.ImageSorter/Vergleicher.Designer.cs
index 5ac972b..b718553 100644
--- a/Mk0.Software.ImageSorter/Vergleicher.Designer.cs
+++ b/Mk0.Software.ImageSorter/Vergleicher.Designer.cs
@@ -39,6 +39,7 @@
this.label3 = new System.Windows.Forms.Label();
this.labelquellinfo = new System.Windows.Forms.Label();
this.labelzielinfo = new System.Windows.Forms.Label();
+ this.button4 = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout();
@@ -61,7 +62,7 @@
this.button1.DialogResult = System.Windows.Forms.DialogResult.Yes;
this.button1.Location = new System.Drawing.Point(15, 325);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(155, 23);
+ this.button1.Size = new System.Drawing.Size(140, 23);
this.button1.TabIndex = 1;
this.button1.Text = "Ja, Kopie erstellen";
this.button1.UseVisualStyleBackColor = true;
@@ -71,9 +72,9 @@
//
this.button2.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.button2.DialogResult = System.Windows.Forms.DialogResult.No;
- this.button2.Location = new System.Drawing.Point(233, 325);
+ this.button2.Location = new System.Drawing.Point(165, 325);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(155, 23);
+ this.button2.Size = new System.Drawing.Size(140, 23);
this.button2.TabIndex = 2;
this.button2.Text = "Nein, überschreiben";
this.button2.UseVisualStyleBackColor = true;
@@ -83,9 +84,9 @@
//
this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button3.DialogResult = System.Windows.Forms.DialogResult.Abort;
- this.button3.Location = new System.Drawing.Point(453, 325);
+ this.button3.Location = new System.Drawing.Point(467, 325);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(155, 23);
+ this.button3.Size = new System.Drawing.Size(140, 23);
this.button3.TabIndex = 3;
this.button3.Text = "Abbrechen";
this.button3.UseVisualStyleBackColor = true;
@@ -155,11 +156,24 @@
this.labelzielinfo.TabIndex = 9;
this.labelzielinfo.Text = "1024 KB; 31.12.2015, 15:30";
//
+ // button4
+ //
+ this.button4.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.button4.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.button4.Location = new System.Drawing.Point(315, 325);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(140, 23);
+ this.button4.TabIndex = 10;
+ this.button4.Text = "Quelldatei löschen";
+ this.button4.UseVisualStyleBackColor = true;
+ this.button4.Click += new System.EventHandler(this.Button4_Click);
+ //
// Vergleicher
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(620, 360);
+ this.Controls.Add(this.button4);
this.Controls.Add(this.labelzielinfo);
this.Controls.Add(this.labelquellinfo);
this.Controls.Add(this.label3);
@@ -199,5 +213,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label labelquellinfo;
private System.Windows.Forms.Label labelzielinfo;
+ private System.Windows.Forms.Button button4;
}
}
\ No newline at end of file
diff --git a/Mk0.Software.ImageSorter/Vergleicher.cs b/Mk0.Software.ImageSorter/Vergleicher.cs
index a37e97c..e0b940e 100644
--- a/Mk0.Software.ImageSorter/Vergleicher.cs
+++ b/Mk0.Software.ImageSorter/Vergleicher.cs
@@ -33,5 +33,10 @@ namespace Mk0.Software.ImageSorter
{
Close();
}
+
+ private void Button4_Click(object sender, EventArgs e)
+ {
+ Close();
+ }
}
}