kamp
/
Mk0.Software.ImageSorter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

implemented #8

This commit is contained in:
Manuel Kamper 2023-08-13 13:03:55 +02:00
parent 861174edcd
commit 4776764b46
6 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mk0.Software.ImageSorter/Main.Designer.cs generated
View File

@ -871,7 +871,7 @@
this.KeyPreview = true; this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(983, 605); this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main"; 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.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing);
this.Load += new System.EventHandler(this.Main_Load); this.Load += new System.EventHandler(this.Main_Load);
this.Shown += new System.EventHandler(this.Main_Shown); this.Shown += new System.EventHandler(this.Main_Shown);

8
Mk0.Software.ImageSorter/Main.cs
View File

@ -17,7 +17,6 @@ using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using Mk0.Software.OnlineUpdater; using Mk0.Software.OnlineUpdater;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Reflection;
namespace Mk0.Software.ImageSorter namespace Mk0.Software.ImageSorter
{ {
@ -845,6 +844,11 @@ namespace Mk0.Software.ImageSorter
CheckUndo(); CheckUndo();
return; return;
} }
else if (result == DialogResult.Cancel)
{
ImageDelete(null, null);
return;
}
else else
{ {
return; return;
@ -2070,7 +2074,7 @@ namespace Mk0.Software.ImageSorter
} }
//rechts neue pb erstellen //rechts neue pb erstellen
int pIndex = imageIndex; int pIndex = imageIndex;
pIndex += previewNumber; pIndex += previewNumber + 1;
if (pIndex >= images.Count() || pIndex < 0) if (pIndex >= images.Count() || pIndex < 0)
{ {
pIndex = 0; pIndex = 0;

2
Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
View File

@ -33,7 +33,7 @@
<PublisherName>manuelkamper.com</PublisherName> <PublisherName>manuelkamper.com</PublisherName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish> <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>2.6.0.0</ApplicationVersion> <ApplicationVersion>2.7.0.0</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust> <UseApplicationTrust>true</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<ExcludeDeploymentUrl>true</ExcludeDeploymentUrl> <ExcludeDeploymentUrl>true</ExcludeDeploymentUrl>

2
Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben: // übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.6.*")] [assembly: AssemblyVersion("2.7.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")] //[assembly: AssemblyFileVersion("1.6.0.0")]

25
Mk0.Software.ImageSorter/Vergleicher.Designer.cs generated
View File

@ -39,6 +39,7 @@
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.labelquellinfo = new System.Windows.Forms.Label(); this.labelquellinfo = new System.Windows.Forms.Label();
this.labelzielinfo = 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.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.SuspendLayout(); this.SuspendLayout();
@ -61,7 +62,7 @@
this.button1.DialogResult = System.Windows.Forms.DialogResult.Yes; this.button1.DialogResult = System.Windows.Forms.DialogResult.Yes;
this.button1.Location = new System.Drawing.Point(15, 325); this.button1.Location = new System.Drawing.Point(15, 325);
this.button1.Name = "button1"; 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.TabIndex = 1;
this.button1.Text = "Ja, Kopie erstellen"; this.button1.Text = "Ja, Kopie erstellen";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
@ -71,9 +72,9 @@
// //
this.button2.Anchor = System.Windows.Forms.AnchorStyles.Bottom; this.button2.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.button2.DialogResult = System.Windows.Forms.DialogResult.No; 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.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.TabIndex = 2;
this.button2.Text = "Nein, überschreiben"; this.button2.Text = "Nein, überschreiben";
this.button2.UseVisualStyleBackColor = true; 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.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.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.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.TabIndex = 3;
this.button3.Text = "Abbrechen"; this.button3.Text = "Abbrechen";
this.button3.UseVisualStyleBackColor = true; this.button3.UseVisualStyleBackColor = true;
@ -155,11 +156,24 @@
this.labelzielinfo.TabIndex = 9; this.labelzielinfo.TabIndex = 9;
this.labelzielinfo.Text = "1024 KB; 31.12.2015, 15:30"; 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 // Vergleicher
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(620, 360); this.ClientSize = new System.Drawing.Size(620, 360);
this.Controls.Add(this.button4);
this.Controls.Add(this.labelzielinfo); this.Controls.Add(this.labelzielinfo);
this.Controls.Add(this.labelquellinfo); this.Controls.Add(this.labelquellinfo);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
@ -199,5 +213,6 @@
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label labelquellinfo; private System.Windows.Forms.Label labelquellinfo;
private System.Windows.Forms.Label labelzielinfo; private System.Windows.Forms.Label labelzielinfo;
private System.Windows.Forms.Button button4;
} }
} }

5
Mk0.Software.ImageSorter/Vergleicher.cs
View File

@ -33,5 +33,10 @@ namespace Mk0.Software.ImageSorter
{ {
Close(); Close();
} }
private void Button4_Click(object sender, EventArgs e)
{
Close();
}
} }
} }