diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs
index 028d3de..58ece84 100644
--- a/Mk0.Software.ImageSorter/Main.Designer.cs
+++ b/Mk0.Software.ImageSorter/Main.Designer.cs
@@ -43,6 +43,7 @@
this.labelZielPath = new System.Windows.Forms.Label();
this.buttonQuellPfad = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.buttonLastImage = new System.Windows.Forms.Button();
this.buttonInfo = new System.Windows.Forms.Button();
this.buttonJumpBack = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
@@ -66,7 +67,7 @@
this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.comboBoxZoom = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
- this.buttonLastImage = new System.Windows.Forms.Button();
+ this.buttonDuplicate = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
this.contextMenuStrip.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -222,6 +223,19 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Ziele";
//
+ // buttonLastImage
+ //
+ 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 = 9;
+ 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);
+ //
// buttonInfo
//
this.buttonInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -298,7 +312,7 @@
this.buttonDeleteImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonDeleteImage.Location = new System.Drawing.Point(6, 538);
this.buttonDeleteImage.Name = "buttonDeleteImage";
- this.buttonDeleteImage.Size = new System.Drawing.Size(100, 23);
+ this.buttonDeleteImage.Size = new System.Drawing.Size(95, 23);
this.buttonDeleteImage.TabIndex = 5;
this.buttonDeleteImage.Text = "Löschen";
this.buttonDeleteImage.UseVisualStyleBackColor = true;
@@ -307,9 +321,9 @@
// buttonRotate90
//
this.buttonRotate90.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonRotate90.Location = new System.Drawing.Point(121, 538);
+ this.buttonRotate90.Location = new System.Drawing.Point(112, 538);
this.buttonRotate90.Name = "buttonRotate90";
- this.buttonRotate90.Size = new System.Drawing.Size(100, 23);
+ this.buttonRotate90.Size = new System.Drawing.Size(95, 23);
this.buttonRotate90.TabIndex = 6;
this.buttonRotate90.Tag = "90";
this.buttonRotate90.Text = "Drehen 90°";
@@ -319,9 +333,9 @@
// buttonRotate180
//
this.buttonRotate180.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonRotate180.Location = new System.Drawing.Point(227, 538);
+ this.buttonRotate180.Location = new System.Drawing.Point(213, 538);
this.buttonRotate180.Name = "buttonRotate180";
- this.buttonRotate180.Size = new System.Drawing.Size(100, 23);
+ this.buttonRotate180.Size = new System.Drawing.Size(95, 23);
this.buttonRotate180.TabIndex = 7;
this.buttonRotate180.Tag = "180";
this.buttonRotate180.Text = "Drehen 180°";
@@ -331,9 +345,9 @@
// buttonRotate270
//
this.buttonRotate270.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonRotate270.Location = new System.Drawing.Point(333, 538);
+ this.buttonRotate270.Location = new System.Drawing.Point(314, 538);
this.buttonRotate270.Name = "buttonRotate270";
- this.buttonRotate270.Size = new System.Drawing.Size(100, 23);
+ this.buttonRotate270.Size = new System.Drawing.Size(95, 23);
this.buttonRotate270.TabIndex = 8;
this.buttonRotate270.Tag = "270";
this.buttonRotate270.Text = "Drehen 270°";
@@ -343,9 +357,9 @@
// buttonMirrorHorizontal
//
this.buttonMirrorHorizontal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonMirrorHorizontal.Location = new System.Drawing.Point(448, 538);
+ this.buttonMirrorHorizontal.Location = new System.Drawing.Point(420, 538);
this.buttonMirrorHorizontal.Name = "buttonMirrorHorizontal";
- this.buttonMirrorHorizontal.Size = new System.Drawing.Size(100, 23);
+ this.buttonMirrorHorizontal.Size = new System.Drawing.Size(95, 23);
this.buttonMirrorHorizontal.TabIndex = 9;
this.buttonMirrorHorizontal.Tag = "y";
this.buttonMirrorHorizontal.Text = "Spiegeln horiz.";
@@ -355,9 +369,9 @@
// buttonMirrorVertikal
//
this.buttonMirrorVertikal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonMirrorVertikal.Location = new System.Drawing.Point(554, 538);
+ this.buttonMirrorVertikal.Location = new System.Drawing.Point(521, 538);
this.buttonMirrorVertikal.Name = "buttonMirrorVertikal";
- this.buttonMirrorVertikal.Size = new System.Drawing.Size(100, 23);
+ this.buttonMirrorVertikal.Size = new System.Drawing.Size(95, 23);
this.buttonMirrorVertikal.TabIndex = 10;
this.buttonMirrorVertikal.Tag = "x";
this.buttonMirrorVertikal.Text = "Spiegeln vertikal";
@@ -481,24 +495,24 @@
this.label3.TabIndex = 15;
this.label3.Text = "Zoom";
//
- // buttonLastImage
+ // buttonDuplicate
//
- this.buttonLastImage.Enabled = false;
- 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 = 9;
- this.buttonLastImage.Text = "I";
- this.buttonLastImage.UseVisualStyleBackColor = true;
- this.buttonLastImage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ButtonLastImage_MouseDown);
- this.buttonLastImage.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ButtonLastImage_MouseUp);
+ this.buttonDuplicate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonDuplicate.Location = new System.Drawing.Point(627, 538);
+ this.buttonDuplicate.Name = "buttonDuplicate";
+ this.buttonDuplicate.Size = new System.Drawing.Size(95, 23);
+ this.buttonDuplicate.TabIndex = 16;
+ this.buttonDuplicate.Tag = "x";
+ this.buttonDuplicate.Text = "Duplizieren";
+ this.buttonDuplicate.UseVisualStyleBackColor = true;
+ this.buttonDuplicate.Click += new System.EventHandler(this.ButtonDuplicate_Click);
//
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(967, 566);
+ this.Controls.Add(this.buttonDuplicate);
this.Controls.Add(this.label3);
this.Controls.Add(this.comboBoxZoom);
this.Controls.Add(this.panel3);
@@ -517,7 +531,7 @@
this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "Image Sorter v1.37 | © 2015-2019 by manuelkamper.com";
+ this.Text = "Image Sorter v1.39 | © 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);
@@ -579,5 +593,6 @@
private System.Windows.Forms.Button buttonJumpBack;
private System.Windows.Forms.Button buttonInfo;
private System.Windows.Forms.Button buttonLastImage;
+ private System.Windows.Forms.Button buttonDuplicate;
}
}
diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs
index 4e0b153..be5552c 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -1198,6 +1198,17 @@ namespace Mk0.Software.ImageSorter
banner.ShowMessages();
}
+ ///
+ /// Anzeige eines Banners bei erstelltem Duplikat
+ ///
+ ///
+ ///
+ private void ShowDuplicatedMessage(Image bild, string bildpfad)
+ {
+ banner.Enqueue("Das Duplikat \"" + Path.GetFileName(bildpfad) + "\" wurde", "erstellt.", bild, Properties.Resources.duplicate);
+ banner.ShowMessages();
+ }
+
///
/// Bild wieder neu zentrieren und skalieren nach Größenänderung des Fensters
///
@@ -1360,14 +1371,44 @@ 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
}
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ private void ButtonDuplicate_Click(object sender, EventArgs e)
+ {
+ //aktuelles bild kopieren
+ string targetPath = Path.Combine(Path.GetDirectoryName(pictureBox.ImageLocation), Path.GetFileNameWithoutExtension(pictureBox.ImageLocation) + Randomize.NumberAndDigits(5, "_") + Path.GetExtension(pictureBox.ImageLocation));
+ File.Copy(pictureBox.ImageLocation, targetPath, true);
+
+ //duplikat als nächstes bild in liste aufnehmen
+ images.Insert(imageIndex + 1, targetPath);
+ CountPicsInPath();
+
+ //duplikat-message anzeigen
+ Image myImg = CopyImage.GetCopyImage(targetPath);
+ ShowDuplicatedMessage(myImg, targetPath);
+ }
}
}
\ 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 a3ad4cb..5360955 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.38.0.0
+ 1.39.0.0
true
true
true
@@ -175,6 +175,7 @@
+
diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
index 8aaa151..67c68fb 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.38.*")]
+[assembly: AssemblyVersion("1.39.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs b/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs
index 9f8c8cb..4547995 100644
--- a/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs
+++ b/Mk0.Software.ImageSorter/Properties/Resources.Designer.cs
@@ -90,6 +90,16 @@ namespace Mk0.Software.ImageSorter.Properties {
}
}
+ ///
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap duplicate {
+ get {
+ object obj = ResourceManager.GetObject("duplicate", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
///
diff --git a/Mk0.Software.ImageSorter/Properties/Resources.resx b/Mk0.Software.ImageSorter/Properties/Resources.resx
index 99f7c4a..9531aa3 100644
--- a/Mk0.Software.ImageSorter/Properties/Resources.resx
+++ b/Mk0.Software.ImageSorter/Properties/Resources.resx
@@ -127,6 +127,9 @@
..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\duplicate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\gif.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/Mk0.Software.ImageSorter/Resources/crop.jpg b/Mk0.Software.ImageSorter/Resources/crop.jpg
deleted file mode 100644
index 9e561e9..0000000
Binary files a/Mk0.Software.ImageSorter/Resources/crop.jpg and /dev/null differ
diff --git a/Mk0.Software.ImageSorter/Resources/duplicate.png b/Mk0.Software.ImageSorter/Resources/duplicate.png
new file mode 100644
index 0000000..07d6888
Binary files /dev/null and b/Mk0.Software.ImageSorter/Resources/duplicate.png differ