diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 7fa7c34..cb95c75 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.52 | © 2015-2020 by mk0.at"; + this.Text = "Image Sorter v1.53 | © 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 b4cf707..4173a29 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -470,8 +470,7 @@ namespace Mk0.Software.ImageSorter /// private int GetImageIndex(string image) { - int index = 0; - index = images.IndexOf(image); + int index = images.IndexOf(image); return index; } @@ -645,16 +644,16 @@ namespace Mk0.Software.ImageSorter try { - string fullTargetPath = Path.Combine(targetPath, Path.GetFileName(pictureBoxImage.ImageLocation)); + string fullTargetPath = Path.Combine(targetPath, CleanFileName(Path.GetFileName(pictureBoxImage.ImageLocation))); Image myImg = CopyImage.GetCopyImage(pictureBoxImage.ImageLocation); if (File.Exists(fullTargetPath)) { - using (var form = new Vergleicher("Das zu verschiebende Bild \"" + Path.GetFileName(pictureBoxImage.ImageLocation) + "\"" + "existiert im Zielverzeichnis \"" + btn.Text + "\" bereits." + Environment.NewLine + Environment.NewLine + "Soll eine Kopie angelegt werden? Nein überschreibt die Datei, Abbrechen bricht den Vorgang ab.", pictureBoxImage.ImageLocation, fullTargetPath)) + using (var form = new Vergleicher("Das zu verschiebende Bild \"" + CleanFileName(Path.GetFileName(pictureBoxImage.ImageLocation)) + "\"" + "existiert im Zielverzeichnis \"" + btn.Text + "\" bereits." + Environment.NewLine + Environment.NewLine + "Soll eine Kopie angelegt werden? Nein überschreibt die Datei, Abbrechen bricht den Vorgang ab.", pictureBoxImage.ImageLocation, fullTargetPath)) { var result = form.ShowDialog(); if (result == DialogResult.Yes) { - fullTargetPath = Path.Combine(targetPath, Path.GetFileNameWithoutExtension(pictureBoxImage.ImageLocation) + Randomize.NumbersAndDigits(5, "_") + Path.GetExtension(pictureBoxImage.ImageLocation)); + fullTargetPath = Path.Combine(targetPath, CleanFileName(Path.GetFileNameWithoutExtension(pictureBoxImage.ImageLocation)) + Randomize.NumbersAndDigits(5, "_") + Path.GetExtension(pictureBoxImage.ImageLocation)); } else if (result == DialogResult.No) { @@ -703,6 +702,14 @@ namespace Mk0.Software.ImageSorter } } + private string CleanFileName(string filename) + { + string fn = filename; + fn = fn.Replace("_crp", ""); + fn = fn.Replace("_cut", ""); + return fn; + } + /// /// Blinkender Button nach erfolgreichem Verschieben /// @@ -1288,8 +1295,6 @@ namespace Mk0.Software.ImageSorter /// private void Main_KeyDown(object sender, KeyEventArgs e) { - int x = e.KeyValue; - if (e.KeyCode == Keys.Delete) { buttonDeleteImage.PerformClick(); diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index d8b5f1d..4907a23 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.52.0.0 + 1.53.0.0 true true true @@ -177,6 +177,7 @@ + diff --git a/Mk0.Software.ImageSorter/Mk0.Software.OnlineUpdater.dll b/Mk0.Software.ImageSorter/Mk0.Software.OnlineUpdater.dll new file mode 100644 index 0000000..7bea14d Binary files /dev/null and b/Mk0.Software.ImageSorter/Mk0.Software.OnlineUpdater.dll differ diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index 2613e5c..7fd1540 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.52.*")] +[assembly: AssemblyVersion("1.53.*")] //[assembly: AssemblyFileVersion("1.6.0.0")]