From b1c1dca4954df11cc76a0703a397dff02c75b533 Mon Sep 17 00:00:00 2001 From: Manuel Kamper Date: Sat, 17 Aug 2024 08:18:32 +0200 Subject: [PATCH] implemented #10 --- Mk0.Software.ImageSorter/Main.Designer.cs | 2 +- Mk0.Software.ImageSorter/Main.cs | 23 ++++++++++++------- .../Mk0.Software.ImageSorter.csproj | 4 ++-- .../Properties/AssemblyInfo.cs | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index 05f6038..b6dba9e 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -888,7 +888,7 @@ this.KeyPreview = true; this.MinimumSize = new System.Drawing.Size(983, 605); this.Name = "Main"; - this.Text = "Image Sorter v2.8 | © 2015-2024 by kmpr.at"; + this.Text = "Image Sorter v2.9 | © 2015-2024 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 de526bf..10ca0cc 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -2206,15 +2206,22 @@ namespace Mk0.Software.ImageSorter { if (CheckInpaint()) { - Inpaint ip = new Inpaint(Properties.Settings.Default.inpaintUrl, pictureBoxImage.ImageLocation); - ip.ShowDialog(); - string oldFileName = pictureBoxImage.ImageLocation; - string newFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inpaint-tmp", Path.GetFileNameWithoutExtension(pictureBoxImage.ImageLocation) + "_cleanup" + Path.GetExtension(pictureBoxImage.ImageLocation)); - if (File.Exists(newFileName)) + if (Path.GetExtension(pictureBoxImage.ImageLocation).ToLower() != "heic") { - File.Delete(oldFileName); - File.Move(newFileName, oldFileName); - LoadPicture(imageIndex); + Inpaint ip = new Inpaint(Properties.Settings.Default.inpaintUrl, pictureBoxImage.ImageLocation); + ip.ShowDialog(); + string oldFileName = pictureBoxImage.ImageLocation; + string newFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inpaint-tmp", Path.GetFileNameWithoutExtension(pictureBoxImage.ImageLocation) + "_cleanup" + Path.GetExtension(pictureBoxImage.ImageLocation)); + if (File.Exists(newFileName)) + { + File.Delete(oldFileName); + File.Move(newFileName, oldFileName); + LoadPicture(imageIndex); + } + } + else + { + MessageBox.Show("Das Dateiformat dieses Bildes wird von Inpaint nicht unterstützt.\n\nBitte konvertiere das Bild zuerst in ein unterstütztes Bildformat.", "Inpaint Dateityp", MessageBoxButtons.OK, MessageBoxIcon.Error); } } else diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj index 52f6857..40ba9fe 100644 --- a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj +++ b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj @@ -38,7 +38,7 @@ manuelkamper.com false 0 - 2.8.0.0 + 2.9.0.0 true true true @@ -62,7 +62,7 @@ bin\Release\ TRACE prompt - 0 + 5 image.ico diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs index a6e0237..7d5affc 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.8.*")] +[assembly: AssemblyVersion("2.9.*")] //[assembly: AssemblyFileVersion("1.6.0.0")]