diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs
index d3d7d72..6916c88 100644
--- a/Mk0.Software.ImageSorter/Main.Designer.cs
+++ b/Mk0.Software.ImageSorter/Main.Designer.cs
@@ -60,6 +60,9 @@
this.panelImageBackground = new System.Windows.Forms.Panel();
this.labelNoImages = new System.Windows.Forms.Label();
this.groupBoxRander = new System.Windows.Forms.GroupBox();
+ this.buttonRandAlle = new System.Windows.Forms.Button();
+ this.buttonRandObenUnten = new System.Windows.Forms.Button();
+ this.buttonRandLinksRechts = new System.Windows.Forms.Button();
this.labelRander = new System.Windows.Forms.Label();
this.trackBarRander = new System.Windows.Forms.TrackBar();
this.buttonRandLinks = new System.Windows.Forms.Button();
@@ -477,25 +480,73 @@
// groupBoxRander
//
this.groupBoxRander.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.groupBoxRander.Controls.Add(this.buttonRandAlle);
+ this.groupBoxRander.Controls.Add(this.buttonRandObenUnten);
+ this.groupBoxRander.Controls.Add(this.buttonRandLinksRechts);
this.groupBoxRander.Controls.Add(this.labelRander);
this.groupBoxRander.Controls.Add(this.trackBarRander);
this.groupBoxRander.Controls.Add(this.buttonRandLinks);
this.groupBoxRander.Controls.Add(this.buttonRandRechts);
this.groupBoxRander.Controls.Add(this.buttonRandUnten);
this.groupBoxRander.Controls.Add(this.buttonRandOben);
- this.groupBoxRander.Location = new System.Drawing.Point(161, 423);
+ this.groupBoxRander.Location = new System.Drawing.Point(161, 397);
this.groupBoxRander.Name = "groupBoxRander";
- this.groupBoxRander.Size = new System.Drawing.Size(125, 110);
+ this.groupBoxRander.Size = new System.Drawing.Size(125, 136);
this.groupBoxRander.TabIndex = 18;
this.groupBoxRander.TabStop = false;
this.groupBoxRander.Text = "Ränder schneiden";
this.groupBoxRander.Visible = false;
//
+ // buttonRandAlle
+ //
+ this.buttonRandAlle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonRandAlle.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon;
+ this.buttonRandAlle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRandAlle.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
+ this.buttonRandAlle.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonRandAlle.Location = new System.Drawing.Point(64, 102);
+ this.buttonRandAlle.Name = "buttonRandAlle";
+ this.buttonRandAlle.Size = new System.Drawing.Size(23, 23);
+ this.buttonRandAlle.TabIndex = 16;
+ this.buttonRandAlle.Tag = "alle";
+ this.buttonRandAlle.UseVisualStyleBackColor = true;
+ this.buttonRandAlle.Click += new System.EventHandler(this.RandSchneiden_Click);
+ //
+ // buttonRandObenUnten
+ //
+ this.buttonRandObenUnten.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonRandObenUnten.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon;
+ this.buttonRandObenUnten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRandObenUnten.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
+ this.buttonRandObenUnten.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonRandObenUnten.Location = new System.Drawing.Point(35, 102);
+ this.buttonRandObenUnten.Name = "buttonRandObenUnten";
+ this.buttonRandObenUnten.Size = new System.Drawing.Size(23, 23);
+ this.buttonRandObenUnten.TabIndex = 15;
+ this.buttonRandObenUnten.Tag = "obenunten";
+ this.buttonRandObenUnten.UseVisualStyleBackColor = true;
+ this.buttonRandObenUnten.Click += new System.EventHandler(this.RandSchneiden_Click);
+ //
+ // buttonRandLinksRechts
+ //
+ this.buttonRandLinksRechts.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonRandLinksRechts.BackgroundImage = global::Mk0.Software.ImageSorter.Properties.Resources.border_2_left_icon;
+ this.buttonRandLinksRechts.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.buttonRandLinksRechts.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
+ this.buttonRandLinksRechts.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonRandLinksRechts.Location = new System.Drawing.Point(6, 102);
+ this.buttonRandLinksRechts.Name = "buttonRandLinksRechts";
+ this.buttonRandLinksRechts.Size = new System.Drawing.Size(23, 23);
+ this.buttonRandLinksRechts.TabIndex = 14;
+ this.buttonRandLinksRechts.Tag = "linksrechts";
+ this.buttonRandLinksRechts.UseVisualStyleBackColor = true;
+ this.buttonRandLinksRechts.Click += new System.EventHandler(this.RandSchneiden_Click);
+ //
// labelRander
//
this.labelRander.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.labelRander.AutoSize = true;
- this.labelRander.Location = new System.Drawing.Point(6, 54);
+ this.labelRander.Location = new System.Drawing.Point(6, 52);
this.labelRander.Name = "labelRander";
this.labelRander.Size = new System.Drawing.Size(30, 13);
this.labelRander.TabIndex = 12;
@@ -505,7 +556,7 @@
//
this.trackBarRander.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.trackBarRander.LargeChange = 1;
- this.trackBarRander.Location = new System.Drawing.Point(6, 21);
+ this.trackBarRander.Location = new System.Drawing.Point(6, 19);
this.trackBarRander.Minimum = 1;
this.trackBarRander.Name = "trackBarRander";
this.trackBarRander.Size = new System.Drawing.Size(110, 45);
@@ -520,7 +571,7 @@
this.buttonRandLinks.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRandLinks.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonRandLinks.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonRandLinks.Location = new System.Drawing.Point(6, 75);
+ this.buttonRandLinks.Location = new System.Drawing.Point(6, 73);
this.buttonRandLinks.Name = "buttonRandLinks";
this.buttonRandLinks.Size = new System.Drawing.Size(23, 23);
this.buttonRandLinks.TabIndex = 7;
@@ -535,7 +586,7 @@
this.buttonRandRechts.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRandRechts.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonRandRechts.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonRandRechts.Location = new System.Drawing.Point(35, 75);
+ this.buttonRandRechts.Location = new System.Drawing.Point(35, 73);
this.buttonRandRechts.Name = "buttonRandRechts";
this.buttonRandRechts.Size = new System.Drawing.Size(23, 23);
this.buttonRandRechts.TabIndex = 8;
@@ -550,7 +601,7 @@
this.buttonRandUnten.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRandUnten.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonRandUnten.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonRandUnten.Location = new System.Drawing.Point(93, 75);
+ this.buttonRandUnten.Location = new System.Drawing.Point(93, 73);
this.buttonRandUnten.Name = "buttonRandUnten";
this.buttonRandUnten.Size = new System.Drawing.Size(23, 23);
this.buttonRandUnten.TabIndex = 10;
@@ -565,7 +616,7 @@
this.buttonRandOben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.buttonRandOben.FlatAppearance.BorderColor = System.Drawing.Color.Silver;
this.buttonRandOben.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonRandOben.Location = new System.Drawing.Point(64, 75);
+ this.buttonRandOben.Location = new System.Drawing.Point(64, 73);
this.buttonRandOben.Name = "buttonRandOben";
this.buttonRandOben.Size = new System.Drawing.Size(23, 23);
this.buttonRandOben.TabIndex = 9;
@@ -821,7 +872,7 @@
this.KeyPreview = true;
this.MinimumSize = new System.Drawing.Size(983, 605);
this.Name = "Main";
- this.Text = "Image Sorter v2.3 | © 2015-2023 by kmpr.at";
+ this.Text = "Image Sorter v2.4 | © 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);
@@ -904,5 +955,8 @@
private System.Windows.Forms.Panel panelPreview;
private System.Windows.Forms.Button buttonHeart;
private System.Windows.Forms.Button buttonChristmas;
+ private System.Windows.Forms.Button buttonRandAlle;
+ private System.Windows.Forms.Button buttonRandObenUnten;
+ private System.Windows.Forms.Button buttonRandLinksRechts;
}
}
diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs
index 6bd568a..c7c922f 100644
--- a/Mk0.Software.ImageSorter/Main.cs
+++ b/Mk0.Software.ImageSorter/Main.cs
@@ -1880,6 +1880,27 @@ namespace Mk0.Software.ImageSorter
{
height -= move;
}
+ else if (cutString == "linksrechts")
+ {
+ x += move;
+ width -= move;
+ width -= move;
+ }
+ else if (cutString == "obenunten")
+ {
+ y += move;
+ height -= move;
+ height -= move;
+ }
+ else if (cutString == "alle")
+ {
+ x += move;
+ width -= move;
+ width -= move;
+ y += move;
+ height -= move;
+ height -= move;
+ }
Rectangle r = new Rectangle(x, y, width, height);
Image res = CropImage(im, r);
diff --git a/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj b/Mk0.Software.ImageSorter/Mk0.Software.ImageSorter.csproj
index b802bbb..2ddc075 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.3.0.0
+ 2.4.0.0
true
true
true
diff --git a/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs b/Mk0.Software.ImageSorter/Properties/AssemblyInfo.cs
index 9566b65..6fb7a0b 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.3.*")]
+[assembly: AssemblyVersion("2.4.*")]
//[assembly: AssemblyFileVersion("1.6.0.0")]