diff --git a/Mk0.Software.ImageSorter/Main.Designer.cs b/Mk0.Software.ImageSorter/Main.Designer.cs index b6dba9e..9f262a7 100644 --- a/Mk0.Software.ImageSorter/Main.Designer.cs +++ b/Mk0.Software.ImageSorter/Main.Designer.cs @@ -104,15 +104,14 @@ // // pictureBoxImage // - this.pictureBoxImage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.pictureBoxImage.Anchor = System.Windows.Forms.AnchorStyles.None; this.pictureBoxImage.BackColor = System.Drawing.SystemColors.Control; this.pictureBoxImage.ContextMenuStrip = this.contextMenuStrip; this.pictureBoxImage.ImageLocation = ""; this.pictureBoxImage.Location = new System.Drawing.Point(0, 0); + this.pictureBoxImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBoxImage.Name = "pictureBoxImage"; - this.pictureBoxImage.Size = new System.Drawing.Size(682, 526); + this.pictureBoxImage.Size = new System.Drawing.Size(1023, 789); this.pictureBoxImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBoxImage.TabIndex = 0; this.pictureBoxImage.TabStop = false; @@ -133,40 +132,40 @@ this.toolStripMenuItemImageDetails, this.toolStripMenuItemShowEXIF}); this.contextMenuStrip.Name = "contextMenuStrip"; - this.contextMenuStrip.Size = new System.Drawing.Size(206, 114); + this.contextMenuStrip.Size = new System.Drawing.Size(282, 164); // // toolStripMenuItemCropImage // this.toolStripMenuItemCropImage.Name = "toolStripMenuItemCropImage"; - this.toolStripMenuItemCropImage.Size = new System.Drawing.Size(205, 22); + this.toolStripMenuItemCropImage.Size = new System.Drawing.Size(281, 32); this.toolStripMenuItemCropImage.Text = "Bild zuschneiden (F2)"; this.toolStripMenuItemCropImage.Click += new System.EventHandler(this.BildZuschneidenToolStripMenuItem_Click); // // toolStripMenuItemEditImage // this.toolStripMenuItemEditImage.Name = "toolStripMenuItemEditImage"; - this.toolStripMenuItemEditImage.Size = new System.Drawing.Size(205, 22); + this.toolStripMenuItemEditImage.Size = new System.Drawing.Size(281, 32); this.toolStripMenuItemEditImage.Text = "Bild bearbeiten (F3)"; this.toolStripMenuItemEditImage.Click += new System.EventHandler(this.ToolStripMenuItemEditImage_Click); // // toolStripMenuItemOpenExplorer // this.toolStripMenuItemOpenExplorer.Name = "toolStripMenuItemOpenExplorer"; - this.toolStripMenuItemOpenExplorer.Size = new System.Drawing.Size(205, 22); + this.toolStripMenuItemOpenExplorer.Size = new System.Drawing.Size(281, 32); this.toolStripMenuItemOpenExplorer.Text = "Speicherort öffnen (F4)"; this.toolStripMenuItemOpenExplorer.Click += new System.EventHandler(this.ToolStripMenuItemOpenExplorer_Click); // // toolStripMenuItemImageDetails // this.toolStripMenuItemImageDetails.Name = "toolStripMenuItemImageDetails"; - this.toolStripMenuItemImageDetails.Size = new System.Drawing.Size(205, 22); + this.toolStripMenuItemImageDetails.Size = new System.Drawing.Size(281, 32); this.toolStripMenuItemImageDetails.Text = "Bildeigenschaften (F5)"; this.toolStripMenuItemImageDetails.Click += new System.EventHandler(this.ToolStripMenuItemImageDetails_Click); // // toolStripMenuItemShowEXIF // this.toolStripMenuItemShowEXIF.Name = "toolStripMenuItemShowEXIF"; - this.toolStripMenuItemShowEXIF.Size = new System.Drawing.Size(205, 22); + this.toolStripMenuItemShowEXIF.Size = new System.Drawing.Size(281, 32); this.toolStripMenuItemShowEXIF.Text = "EXIF-Daten anzeigen (F6)"; this.toolStripMenuItemShowEXIF.Click += new System.EventHandler(this.ToolStripMenuItemShowEXIF_Click); // @@ -177,9 +176,10 @@ this.buttonSettings.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonSettings.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSettings.Font = new System.Drawing.Font("Webdings", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonSettings.Location = new System.Drawing.Point(233, 16); + this.buttonSettings.Location = new System.Drawing.Point(350, 24); + this.buttonSettings.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonSettings.Name = "buttonSettings"; - this.buttonSettings.Size = new System.Drawing.Size(23, 23); + this.buttonSettings.Size = new System.Drawing.Size(34, 34); this.buttonSettings.TabIndex = 7; this.buttonSettings.UseVisualStyleBackColor = true; this.buttonSettings.Click += new System.EventHandler(this.ButtonSettings_Click); @@ -188,9 +188,10 @@ // this.labelQuellPath.AutoSize = true; this.labelQuellPath.ForeColor = System.Drawing.Color.SteelBlue; - this.labelQuellPath.Location = new System.Drawing.Point(6, 45); + this.labelQuellPath.Location = new System.Drawing.Point(9, 68); + this.labelQuellPath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelQuellPath.Name = "labelQuellPath"; - this.labelQuellPath.Size = new System.Drawing.Size(76, 13); + this.labelQuellPath.Size = new System.Drawing.Size(111, 20); this.labelQuellPath.TabIndex = 2; this.labelQuellPath.Text = "C:/dummypfad"; // @@ -200,9 +201,11 @@ this.groupBoxInformationen.Controls.Add(this.labelCounter); this.groupBoxInformationen.Controls.Add(this.labelQuellPath); this.groupBoxInformationen.Controls.Add(this.labelZielPath); - this.groupBoxInformationen.Location = new System.Drawing.Point(694, 12); + this.groupBoxInformationen.Location = new System.Drawing.Point(1041, 18); + this.groupBoxInformationen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxInformationen.Name = "groupBoxInformationen"; - this.groupBoxInformationen.Size = new System.Drawing.Size(262, 81); + this.groupBoxInformationen.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxInformationen.Size = new System.Drawing.Size(393, 122); this.groupBoxInformationen.TabIndex = 3; this.groupBoxInformationen.TabStop = false; this.groupBoxInformationen.Text = "Informationen"; @@ -211,9 +214,10 @@ // this.labelCounter.AutoSize = true; this.labelCounter.ForeColor = System.Drawing.Color.Gray; - this.labelCounter.Location = new System.Drawing.Point(6, 16); + this.labelCounter.Location = new System.Drawing.Point(9, 24); + this.labelCounter.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelCounter.Name = "labelCounter"; - this.labelCounter.Size = new System.Drawing.Size(94, 13); + this.labelCounter.Size = new System.Drawing.Size(138, 20); this.labelCounter.TabIndex = 3; this.labelCounter.Text = "keine Bildaktionen"; // @@ -221,9 +225,10 @@ // this.labelZielPath.AutoSize = true; this.labelZielPath.ForeColor = System.Drawing.Color.SteelBlue; - this.labelZielPath.Location = new System.Drawing.Point(6, 60); + this.labelZielPath.Location = new System.Drawing.Point(9, 90); + this.labelZielPath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZielPath.Name = "labelZielPath"; - this.labelZielPath.Size = new System.Drawing.Size(168, 13); + this.labelZielPath.Size = new System.Drawing.Size(248, 20); this.labelZielPath.TabIndex = 6; this.labelZielPath.Text = "Zielpfad in Einstellungen wählen..."; // @@ -234,9 +239,10 @@ this.buttonQuellPfad.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonQuellPfad.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonQuellPfad.Font = new System.Drawing.Font("Wingdings", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonQuellPfad.Location = new System.Drawing.Point(204, 16); + this.buttonQuellPfad.Location = new System.Drawing.Point(306, 24); + this.buttonQuellPfad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonQuellPfad.Name = "buttonQuellPfad"; - this.buttonQuellPfad.Size = new System.Drawing.Size(23, 23); + this.buttonQuellPfad.Size = new System.Drawing.Size(34, 34); this.buttonQuellPfad.TabIndex = 6; this.buttonQuellPfad.UseVisualStyleBackColor = true; this.buttonQuellPfad.Click += new System.EventHandler(this.ButtonQuellPfad_Click); @@ -253,9 +259,11 @@ this.groupBoxZiele.Controls.Add(this.panelButtons); this.groupBoxZiele.Controls.Add(this.buttonJumpForward); this.groupBoxZiele.Controls.Add(this.buttonUndo); - this.groupBoxZiele.Location = new System.Drawing.Point(694, 99); + this.groupBoxZiele.Location = new System.Drawing.Point(1041, 148); + this.groupBoxZiele.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxZiele.Name = "groupBoxZiele"; - this.groupBoxZiele.Size = new System.Drawing.Size(262, 433); + this.groupBoxZiele.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxZiele.Size = new System.Drawing.Size(393, 650); this.groupBoxZiele.TabIndex = 4; this.groupBoxZiele.TabStop = false; this.groupBoxZiele.Text = "Ziele"; @@ -268,9 +276,10 @@ this.buttonDateirenamer.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonDateirenamer.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonDateirenamer.Font = new System.Drawing.Font("Wingdings", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonDateirenamer.Location = new System.Drawing.Point(105, 16); + this.buttonDateirenamer.Location = new System.Drawing.Point(158, 24); + this.buttonDateirenamer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonDateirenamer.Name = "buttonDateirenamer"; - this.buttonDateirenamer.Size = new System.Drawing.Size(23, 23); + this.buttonDateirenamer.Size = new System.Drawing.Size(34, 34); this.buttonDateirenamer.TabIndex = 4; this.buttonDateirenamer.UseVisualStyleBackColor = true; this.buttonDateirenamer.Click += new System.EventHandler(this.ButtonDateirenamer_Click); @@ -282,9 +291,10 @@ this.buttonInfo.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; 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))); - this.buttonInfo.Location = new System.Drawing.Point(175, 16); + this.buttonInfo.Location = new System.Drawing.Point(262, 24); + this.buttonInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonInfo.Name = "buttonInfo"; - this.buttonInfo.Size = new System.Drawing.Size(23, 23); + this.buttonInfo.Size = new System.Drawing.Size(34, 34); this.buttonInfo.TabIndex = 5; this.buttonInfo.UseVisualStyleBackColor = true; this.buttonInfo.Click += new System.EventHandler(this.ButtonInfo_Click); @@ -296,9 +306,10 @@ this.buttonJumpBack.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonJumpBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonJumpBack.Font = new System.Drawing.Font("Wingdings", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonJumpBack.Location = new System.Drawing.Point(6, 16); + this.buttonJumpBack.Location = new System.Drawing.Point(9, 24); + this.buttonJumpBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonJumpBack.Name = "buttonJumpBack"; - this.buttonJumpBack.Size = new System.Drawing.Size(23, 23); + this.buttonJumpBack.Size = new System.Drawing.Size(34, 34); this.buttonJumpBack.TabIndex = 1; this.buttonJumpBack.UseVisualStyleBackColor = true; this.buttonJumpBack.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ButtonJumpBack_Click); @@ -309,9 +320,10 @@ | System.Windows.Forms.AnchorStyles.Left))); this.panelButtons.AutoScroll = true; this.panelButtons.Controls.Add(this.labelNoTargets); - this.panelButtons.Location = new System.Drawing.Point(3, 45); + this.panelButtons.Location = new System.Drawing.Point(4, 68); + this.panelButtons.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelButtons.Name = "panelButtons"; - this.panelButtons.Size = new System.Drawing.Size(258, 382); + this.panelButtons.Size = new System.Drawing.Size(387, 573); this.panelButtons.TabIndex = 5; this.panelButtons.MouseEnter += new System.EventHandler(this.Panel2_MouseEnter); this.panelButtons.MouseLeave += new System.EventHandler(this.PictureBox_MouseLeave); @@ -320,9 +332,10 @@ // this.labelNoTargets.AutoSize = true; this.labelNoTargets.ForeColor = System.Drawing.Color.Maroon; - this.labelNoTargets.Location = new System.Drawing.Point(19, 10); + this.labelNoTargets.Location = new System.Drawing.Point(28, 15); + this.labelNoTargets.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNoTargets.Name = "labelNoTargets"; - this.labelNoTargets.Size = new System.Drawing.Size(198, 91); + this.labelNoTargets.Size = new System.Drawing.Size(296, 140); this.labelNoTargets.TabIndex = 0; this.labelNoTargets.Text = "Keine Unterordner im Zielpfad gefunden.\r\n\r\nBilder können nur in Unterordner des\r\n" + "Zielpfades verschoben werden.\r\n\r\nWählen Sie einen anderen Zielpfad\r\nin den Einst" + @@ -336,9 +349,10 @@ this.buttonJumpForward.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonJumpForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonJumpForward.Font = new System.Drawing.Font("Wingdings", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonJumpForward.Location = new System.Drawing.Point(35, 16); + this.buttonJumpForward.Location = new System.Drawing.Point(52, 24); + this.buttonJumpForward.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonJumpForward.Name = "buttonJumpForward"; - this.buttonJumpForward.Size = new System.Drawing.Size(23, 23); + this.buttonJumpForward.Size = new System.Drawing.Size(34, 34); this.buttonJumpForward.TabIndex = 2; this.buttonJumpForward.UseVisualStyleBackColor = true; this.buttonJumpForward.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ButtonJumpForward_Click); @@ -351,9 +365,10 @@ this.buttonUndo.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonUndo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonUndo.Font = new System.Drawing.Font("Wingdings", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonUndo.Location = new System.Drawing.Point(64, 16); + this.buttonUndo.Location = new System.Drawing.Point(96, 24); + this.buttonUndo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonUndo.Name = "buttonUndo"; - this.buttonUndo.Size = new System.Drawing.Size(23, 23); + this.buttonUndo.Size = new System.Drawing.Size(34, 34); this.buttonUndo.TabIndex = 3; this.buttonUndo.UseVisualStyleBackColor = true; this.buttonUndo.Click += new System.EventHandler(this.ButtonUndo_Click); @@ -365,9 +380,10 @@ this.buttonDeleteImage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonDeleteImage.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonDeleteImage.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonDeleteImage.Location = new System.Drawing.Point(6, 538); + this.buttonDeleteImage.Location = new System.Drawing.Point(9, 807); + this.buttonDeleteImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonDeleteImage.Name = "buttonDeleteImage"; - this.buttonDeleteImage.Size = new System.Drawing.Size(23, 23); + this.buttonDeleteImage.Size = new System.Drawing.Size(34, 34); this.buttonDeleteImage.TabIndex = 10; this.buttonDeleteImage.UseVisualStyleBackColor = true; this.buttonDeleteImage.Click += new System.EventHandler(this.ImageDelete); @@ -379,9 +395,10 @@ this.buttonRotate90.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRotate90.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRotate90.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonRotate90.Location = new System.Drawing.Point(6, 19); + this.buttonRotate90.Location = new System.Drawing.Point(9, 28); + this.buttonRotate90.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRotate90.Name = "buttonRotate90"; - this.buttonRotate90.Size = new System.Drawing.Size(23, 23); + this.buttonRotate90.Size = new System.Drawing.Size(34, 34); this.buttonRotate90.TabIndex = 6; this.buttonRotate90.Tag = "90"; this.buttonRotate90.UseVisualStyleBackColor = true; @@ -394,9 +411,10 @@ this.buttonRotate180.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRotate180.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRotate180.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonRotate180.Location = new System.Drawing.Point(35, 19); + this.buttonRotate180.Location = new System.Drawing.Point(52, 28); + this.buttonRotate180.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRotate180.Name = "buttonRotate180"; - this.buttonRotate180.Size = new System.Drawing.Size(23, 23); + this.buttonRotate180.Size = new System.Drawing.Size(34, 34); this.buttonRotate180.TabIndex = 7; this.buttonRotate180.Tag = "180"; this.buttonRotate180.UseVisualStyleBackColor = true; @@ -409,9 +427,10 @@ this.buttonRotate270.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonRotate270.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRotate270.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonRotate270.Location = new System.Drawing.Point(64, 19); + this.buttonRotate270.Location = new System.Drawing.Point(96, 28); + this.buttonRotate270.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRotate270.Name = "buttonRotate270"; - this.buttonRotate270.Size = new System.Drawing.Size(23, 23); + this.buttonRotate270.Size = new System.Drawing.Size(34, 34); this.buttonRotate270.TabIndex = 8; this.buttonRotate270.Tag = "270"; this.buttonRotate270.UseVisualStyleBackColor = true; @@ -424,9 +443,10 @@ this.buttonMirrorHorizontal.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonMirrorHorizontal.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonMirrorHorizontal.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonMirrorHorizontal.Location = new System.Drawing.Point(6, 53); + this.buttonMirrorHorizontal.Location = new System.Drawing.Point(9, 80); + this.buttonMirrorHorizontal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonMirrorHorizontal.Name = "buttonMirrorHorizontal"; - this.buttonMirrorHorizontal.Size = new System.Drawing.Size(23, 23); + this.buttonMirrorHorizontal.Size = new System.Drawing.Size(34, 34); this.buttonMirrorHorizontal.TabIndex = 9; this.buttonMirrorHorizontal.Tag = "x"; this.buttonMirrorHorizontal.UseVisualStyleBackColor = true; @@ -439,9 +459,10 @@ this.buttonMirrorVertikal.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonMirrorVertikal.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonMirrorVertikal.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonMirrorVertikal.Location = new System.Drawing.Point(35, 53); + this.buttonMirrorVertikal.Location = new System.Drawing.Point(52, 80); + this.buttonMirrorVertikal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonMirrorVertikal.Name = "buttonMirrorVertikal"; - this.buttonMirrorVertikal.Size = new System.Drawing.Size(23, 23); + this.buttonMirrorVertikal.Size = new System.Drawing.Size(34, 34); this.buttonMirrorVertikal.TabIndex = 10; this.buttonMirrorVertikal.Tag = "y"; this.buttonMirrorVertikal.UseVisualStyleBackColor = true; @@ -455,9 +476,10 @@ this.panelImageBackground.BackColor = System.Drawing.SystemColors.Control; this.panelImageBackground.Controls.Add(this.labelNoImages); this.panelImageBackground.Controls.Add(this.pictureBoxImage); - this.panelImageBackground.Location = new System.Drawing.Point(6, 6); + this.panelImageBackground.Location = new System.Drawing.Point(9, 9); + this.panelImageBackground.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelImageBackground.Name = "panelImageBackground"; - this.panelImageBackground.Size = new System.Drawing.Size(682, 526); + this.panelImageBackground.Size = new System.Drawing.Size(1023, 789); this.panelImageBackground.TabIndex = 3; this.panelImageBackground.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.ZoomInOut); // @@ -470,8 +492,9 @@ this.labelNoImages.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelNoImages.ForeColor = System.Drawing.Color.Maroon; this.labelNoImages.Location = new System.Drawing.Point(0, 0); + this.labelNoImages.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNoImages.Name = "labelNoImages"; - this.labelNoImages.Size = new System.Drawing.Size(682, 526); + this.labelNoImages.Size = new System.Drawing.Size(1023, 789); this.labelNoImages.TabIndex = 1; this.labelNoImages.Text = "Keine Bilder im aktuellen Pfad vorhanden.\r\nBitte den Quellpfad ändern, um Bilder " + "zu sortieren.\r\nErlaubte Dateiformate sind:\r\nJP(E)G, PNG, GIF, BMP, TIF(F), WEBP," + @@ -490,9 +513,11 @@ 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, 397); + this.groupBoxRander.Location = new System.Drawing.Point(242, 596); + this.groupBoxRander.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxRander.Name = "groupBoxRander"; - this.groupBoxRander.Size = new System.Drawing.Size(123, 136); + this.groupBoxRander.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxRander.Size = new System.Drawing.Size(184, 204); this.groupBoxRander.TabIndex = 18; this.groupBoxRander.TabStop = false; this.groupBoxRander.Text = "Ränder schneiden"; @@ -505,9 +530,10 @@ 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(76, 102); + this.buttonRandAlle.Location = new System.Drawing.Point(114, 153); + this.buttonRandAlle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandAlle.Name = "buttonRandAlle"; - this.buttonRandAlle.Size = new System.Drawing.Size(23, 23); + this.buttonRandAlle.Size = new System.Drawing.Size(34, 34); this.buttonRandAlle.TabIndex = 16; this.buttonRandAlle.Tag = "alle"; this.buttonRandAlle.UseVisualStyleBackColor = true; @@ -520,9 +546,10 @@ 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(47, 102); + this.buttonRandObenUnten.Location = new System.Drawing.Point(70, 153); + this.buttonRandObenUnten.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandObenUnten.Name = "buttonRandObenUnten"; - this.buttonRandObenUnten.Size = new System.Drawing.Size(23, 23); + this.buttonRandObenUnten.Size = new System.Drawing.Size(34, 34); this.buttonRandObenUnten.TabIndex = 15; this.buttonRandObenUnten.Tag = "obenunten"; this.buttonRandObenUnten.UseVisualStyleBackColor = true; @@ -535,9 +562,10 @@ 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(18, 102); + this.buttonRandLinksRechts.Location = new System.Drawing.Point(27, 153); + this.buttonRandLinksRechts.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandLinksRechts.Name = "buttonRandLinksRechts"; - this.buttonRandLinksRechts.Size = new System.Drawing.Size(23, 23); + this.buttonRandLinksRechts.Size = new System.Drawing.Size(34, 34); this.buttonRandLinksRechts.TabIndex = 14; this.buttonRandLinksRechts.Tag = "linksrechts"; this.buttonRandLinksRechts.UseVisualStyleBackColor = true; @@ -547,9 +575,10 @@ // 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, 52); + this.labelRander.Location = new System.Drawing.Point(9, 78); + this.labelRander.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelRander.Name = "labelRander"; - this.labelRander.Size = new System.Drawing.Size(30, 13); + this.labelRander.Size = new System.Drawing.Size(42, 20); this.labelRander.TabIndex = 12; this.labelRander.Text = "1 px."; // @@ -557,10 +586,11 @@ // 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, 19); + this.trackBarRander.Location = new System.Drawing.Point(9, 28); + this.trackBarRander.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.trackBarRander.Minimum = 1; this.trackBarRander.Name = "trackBarRander"; - this.trackBarRander.Size = new System.Drawing.Size(110, 45); + this.trackBarRander.Size = new System.Drawing.Size(165, 69); this.trackBarRander.TabIndex = 13; this.trackBarRander.Value = 1; this.trackBarRander.Scroll += new System.EventHandler(this.TrackBarRander_Scroll); @@ -572,9 +602,10 @@ 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, 73); + this.buttonRandLinks.Location = new System.Drawing.Point(9, 110); + this.buttonRandLinks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandLinks.Name = "buttonRandLinks"; - this.buttonRandLinks.Size = new System.Drawing.Size(23, 23); + this.buttonRandLinks.Size = new System.Drawing.Size(34, 34); this.buttonRandLinks.TabIndex = 7; this.buttonRandLinks.Tag = "links"; this.buttonRandLinks.UseVisualStyleBackColor = true; @@ -587,9 +618,10 @@ 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, 73); + this.buttonRandRechts.Location = new System.Drawing.Point(52, 110); + this.buttonRandRechts.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandRechts.Name = "buttonRandRechts"; - this.buttonRandRechts.Size = new System.Drawing.Size(23, 23); + this.buttonRandRechts.Size = new System.Drawing.Size(34, 34); this.buttonRandRechts.TabIndex = 8; this.buttonRandRechts.Tag = "rechts"; this.buttonRandRechts.UseVisualStyleBackColor = true; @@ -602,9 +634,10 @@ 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, 73); + this.buttonRandUnten.Location = new System.Drawing.Point(140, 110); + this.buttonRandUnten.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandUnten.Name = "buttonRandUnten"; - this.buttonRandUnten.Size = new System.Drawing.Size(23, 23); + this.buttonRandUnten.Size = new System.Drawing.Size(34, 34); this.buttonRandUnten.TabIndex = 10; this.buttonRandUnten.Tag = "unten"; this.buttonRandUnten.UseVisualStyleBackColor = true; @@ -617,9 +650,10 @@ 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, 73); + this.buttonRandOben.Location = new System.Drawing.Point(96, 110); + this.buttonRandOben.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRandOben.Name = "buttonRandOben"; - this.buttonRandOben.Size = new System.Drawing.Size(23, 23); + this.buttonRandOben.Size = new System.Drawing.Size(34, 34); this.buttonRandOben.TabIndex = 9; this.buttonRandOben.Tag = "oben"; this.buttonRandOben.UseVisualStyleBackColor = true; @@ -629,9 +663,10 @@ // this.labelZoom2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelZoom2.AutoSize = true; - this.labelZoom2.Location = new System.Drawing.Point(924, 543); + this.labelZoom2.Location = new System.Drawing.Point(1386, 814); + this.labelZoom2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZoom2.Name = "labelZoom2"; - this.labelZoom2.Size = new System.Drawing.Size(18, 13); + this.labelZoom2.Size = new System.Drawing.Size(25, 20); this.labelZoom2.TabIndex = 13; this.labelZoom2.Text = "x1"; // @@ -644,17 +679,19 @@ this.panelBanner.Controls.Add(this.labelBanner2); this.panelBanner.Controls.Add(this.labelBanner1); this.panelBanner.Controls.Add(this.pictureBoxBanner1); - this.panelBanner.Location = new System.Drawing.Point(0, -52); + this.panelBanner.Location = new System.Drawing.Point(0, -78); + this.panelBanner.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelBanner.Name = "panelBanner"; - this.panelBanner.Size = new System.Drawing.Size(688, 52); + this.panelBanner.Size = new System.Drawing.Size(1032, 78); this.panelBanner.TabIndex = 2; // // pictureBoxBanner2 // this.pictureBoxBanner2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBoxBanner2.Location = new System.Drawing.Point(634, 3); + this.pictureBoxBanner2.Location = new System.Drawing.Point(951, 4); + this.pictureBoxBanner2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBoxBanner2.Name = "pictureBoxBanner2"; - this.pictureBoxBanner2.Size = new System.Drawing.Size(51, 47); + this.pictureBoxBanner2.Size = new System.Drawing.Size(76, 70); this.pictureBoxBanner2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBoxBanner2.TabIndex = 3; this.pictureBoxBanner2.TabStop = false; @@ -663,9 +700,10 @@ // this.labelBanner2.AutoSize = true; this.labelBanner2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelBanner2.Location = new System.Drawing.Point(56, 27); + this.labelBanner2.Location = new System.Drawing.Point(84, 40); + this.labelBanner2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelBanner2.Name = "labelBanner2"; - this.labelBanner2.Size = new System.Drawing.Size(193, 16); + this.labelBanner2.Size = new System.Drawing.Size(268, 25); this.labelBanner2.TabIndex = 2; this.labelBanner2.Text = "\"Pfadangabe\" verschoben."; // @@ -673,17 +711,19 @@ // this.labelBanner1.AutoSize = true; this.labelBanner1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelBanner1.Location = new System.Drawing.Point(57, 7); + this.labelBanner1.Location = new System.Drawing.Point(86, 10); + this.labelBanner1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelBanner1.Name = "labelBanner1"; - this.labelBanner1.Size = new System.Drawing.Size(240, 16); + this.labelBanner1.Size = new System.Drawing.Size(333, 25); this.labelBanner1.TabIndex = 1; this.labelBanner1.Text = "Bild \"Dateiname\" erfolgreich nach"; // // pictureBoxBanner1 // - this.pictureBoxBanner1.Location = new System.Drawing.Point(3, 3); + this.pictureBoxBanner1.Location = new System.Drawing.Point(4, 4); + this.pictureBoxBanner1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBoxBanner1.Name = "pictureBoxBanner1"; - this.pictureBoxBanner1.Size = new System.Drawing.Size(48, 46); + this.pictureBoxBanner1.Size = new System.Drawing.Size(72, 69); this.pictureBoxBanner1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBoxBanner1.TabIndex = 0; this.pictureBoxBanner1.TabStop = false; @@ -697,9 +737,10 @@ "Auto", "Vollbild", "Original"}); - this.comboBoxZoom.Location = new System.Drawing.Point(799, 538); + this.comboBoxZoom.Location = new System.Drawing.Point(1198, 807); + this.comboBoxZoom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.comboBoxZoom.Name = "comboBoxZoom"; - this.comboBoxZoom.Size = new System.Drawing.Size(121, 21); + this.comboBoxZoom.Size = new System.Drawing.Size(180, 28); this.comboBoxZoom.TabIndex = 14; this.comboBoxZoom.SelectedIndexChanged += new System.EventHandler(this.ComboBoxZoom_SelectedIndexChanged); // @@ -707,9 +748,10 @@ // this.labelZoom1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelZoom1.AutoSize = true; - this.labelZoom1.Location = new System.Drawing.Point(759, 543); + this.labelZoom1.Location = new System.Drawing.Point(1138, 814); + this.labelZoom1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZoom1.Name = "labelZoom1"; - this.labelZoom1.Size = new System.Drawing.Size(34, 13); + this.labelZoom1.Size = new System.Drawing.Size(50, 20); this.labelZoom1.TabIndex = 15; this.labelZoom1.Text = "Zoom"; // @@ -721,9 +763,10 @@ this.buttonDuplicate.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonDuplicate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonDuplicate.Font = new System.Drawing.Font("Webdings", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.buttonDuplicate.Location = new System.Drawing.Point(83, 538); + this.buttonDuplicate.Location = new System.Drawing.Point(124, 807); + this.buttonDuplicate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonDuplicate.Name = "buttonDuplicate"; - this.buttonDuplicate.Size = new System.Drawing.Size(23, 23); + this.buttonDuplicate.Size = new System.Drawing.Size(34, 34); this.buttonDuplicate.TabIndex = 12; this.buttonDuplicate.Tag = ""; this.buttonDuplicate.UseVisualStyleBackColor = true; @@ -737,9 +780,11 @@ this.groupBoxTransformation.Controls.Add(this.buttonRotate270); this.groupBoxTransformation.Controls.Add(this.buttonMirrorVertikal); this.groupBoxTransformation.Controls.Add(this.buttonMirrorHorizontal); - this.groupBoxTransformation.Location = new System.Drawing.Point(46, 445); + this.groupBoxTransformation.Location = new System.Drawing.Point(69, 668); + this.groupBoxTransformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBoxTransformation.Name = "groupBoxTransformation"; - this.groupBoxTransformation.Size = new System.Drawing.Size(99, 88); + this.groupBoxTransformation.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.groupBoxTransformation.Size = new System.Drawing.Size(148, 132); this.groupBoxTransformation.TabIndex = 17; this.groupBoxTransformation.TabStop = false; this.groupBoxTransformation.Text = "Transformation"; @@ -752,9 +797,10 @@ this.buttonTransformation.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonTransformation.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonTransformation.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonTransformation.Location = new System.Drawing.Point(45, 538); + this.buttonTransformation.Location = new System.Drawing.Point(68, 807); + this.buttonTransformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonTransformation.Name = "buttonTransformation"; - this.buttonTransformation.Size = new System.Drawing.Size(23, 23); + this.buttonTransformation.Size = new System.Drawing.Size(34, 34); this.buttonTransformation.TabIndex = 11; this.buttonTransformation.Tag = ""; this.buttonTransformation.UseVisualStyleBackColor = true; @@ -767,9 +813,10 @@ this.buttonHintergrund.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonHintergrund.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonHintergrund.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonHintergrund.Location = new System.Drawing.Point(122, 538); + this.buttonHintergrund.Location = new System.Drawing.Point(183, 807); + this.buttonHintergrund.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonHintergrund.Name = "buttonHintergrund"; - this.buttonHintergrund.Size = new System.Drawing.Size(23, 23); + this.buttonHintergrund.Size = new System.Drawing.Size(34, 34); this.buttonHintergrund.TabIndex = 13; this.buttonHintergrund.Tag = ""; this.buttonHintergrund.UseVisualStyleBackColor = true; @@ -783,9 +830,10 @@ this.buttonRander.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonRander.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonRander.Font = new System.Drawing.Font("Webdings", 9.5F); - this.buttonRander.Location = new System.Drawing.Point(161, 538); + this.buttonRander.Location = new System.Drawing.Point(242, 807); + this.buttonRander.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonRander.Name = "buttonRander"; - this.buttonRander.Size = new System.Drawing.Size(23, 23); + this.buttonRander.Size = new System.Drawing.Size(34, 34); this.buttonRander.TabIndex = 14; this.buttonRander.Tag = ""; this.buttonRander.UseVisualStyleBackColor = true; @@ -798,9 +846,10 @@ this.buttonPreview.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonPreview.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonPreview.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonPreview.Location = new System.Drawing.Point(200, 537); + this.buttonPreview.Location = new System.Drawing.Point(300, 806); + this.buttonPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonPreview.Name = "buttonPreview"; - this.buttonPreview.Size = new System.Drawing.Size(23, 23); + this.buttonPreview.Size = new System.Drawing.Size(34, 34); this.buttonPreview.TabIndex = 19; this.buttonPreview.UseVisualStyleBackColor = true; this.buttonPreview.Click += new System.EventHandler(this.ButtonPreview_Click); @@ -810,9 +859,10 @@ this.panelPreview.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.panelPreview.BackColor = System.Drawing.Color.Gainsboro; - this.panelPreview.Location = new System.Drawing.Point(6, 433); + this.panelPreview.Location = new System.Drawing.Point(9, 650); + this.panelPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panelPreview.Name = "panelPreview"; - this.panelPreview.Size = new System.Drawing.Size(682, 100); + this.panelPreview.Size = new System.Drawing.Size(1023, 150); this.panelPreview.TabIndex = 20; this.panelPreview.Visible = false; // @@ -823,9 +873,10 @@ this.buttonHeart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonHeart.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonHeart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonHeart.Location = new System.Drawing.Point(665, 537); + this.buttonHeart.Location = new System.Drawing.Point(998, 806); + this.buttonHeart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonHeart.Name = "buttonHeart"; - this.buttonHeart.Size = new System.Drawing.Size(23, 23); + this.buttonHeart.Size = new System.Drawing.Size(34, 34); this.buttonHeart.TabIndex = 21; this.buttonHeart.UseVisualStyleBackColor = true; this.buttonHeart.Click += new System.EventHandler(this.ButtonHeart_Click); @@ -837,9 +888,10 @@ this.buttonChristmas.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonChristmas.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonChristmas.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonChristmas.Location = new System.Drawing.Point(626, 537); + this.buttonChristmas.Location = new System.Drawing.Point(939, 806); + this.buttonChristmas.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonChristmas.Name = "buttonChristmas"; - this.buttonChristmas.Size = new System.Drawing.Size(23, 23); + this.buttonChristmas.Size = new System.Drawing.Size(34, 34); this.buttonChristmas.TabIndex = 22; this.buttonChristmas.UseVisualStyleBackColor = true; this.buttonChristmas.Visible = false; @@ -852,9 +904,10 @@ this.buttonWebRemove.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.buttonWebRemove.FlatAppearance.BorderColor = System.Drawing.Color.Silver; this.buttonWebRemove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonWebRemove.Location = new System.Drawing.Point(239, 536); + this.buttonWebRemove.Location = new System.Drawing.Point(358, 804); + this.buttonWebRemove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.buttonWebRemove.Name = "buttonWebRemove"; - this.buttonWebRemove.Size = new System.Drawing.Size(23, 23); + this.buttonWebRemove.Size = new System.Drawing.Size(34, 34); this.buttonWebRemove.TabIndex = 23; this.buttonWebRemove.Tag = ""; this.buttonWebRemove.UseVisualStyleBackColor = true; @@ -862,9 +915,9 @@ // // Main // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(967, 566); + this.ClientSize = new System.Drawing.Size(1450, 849); this.Controls.Add(this.buttonWebRemove); this.Controls.Add(this.groupBoxTransformation); this.Controls.Add(this.groupBoxRander); @@ -886,7 +939,8 @@ this.Controls.Add(this.buttonRander); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.KeyPreview = true; - this.MinimumSize = new System.Drawing.Size(983, 605); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.MinimumSize = new System.Drawing.Size(1464, 880); this.Name = "Main"; this.Text = "Image Sorter v2.9 | © 2015-2024 by kmpr.at"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); diff --git a/Mk0.Software.ImageSorter/Main.cs b/Mk0.Software.ImageSorter/Main.cs index c815989..2d17cf9 100644 --- a/Mk0.Software.ImageSorter/Main.cs +++ b/Mk0.Software.ImageSorter/Main.cs @@ -1106,10 +1106,9 @@ namespace Mk0.Software.ImageSorter if (zoom == "Original") { - pictureBoxImage.SizeMode = PictureBoxSizeMode.Zoom; + pictureBoxImage.SizeMode = PictureBoxSizeMode.AutoSize; pictureBoxImage.Size = new Size(pictureBoxImage.Image.Width, pictureBoxImage.Image.Height); - if (pictureBoxImage.Image.Width > panelImageBackground.Width) { pictureBoxImage.Left = (panelImageBackground.Width / 2) - (pictureBoxImage.Width / 2); } else { pictureBoxImage.Left = (panelImageBackground.Width / 2) - (pictureBoxImage.Image.Width / 2); } - if (pictureBoxImage.Image.Height > panelImageBackground.Height) { pictureBoxImage.Top = (panelImageBackground.Height / 2) - (pictureBoxImage.Height / 2); } else { pictureBoxImage.Top = (panelImageBackground.Height / 2) - (pictureBoxImage.Image.Height / 2); } + pictureBoxImage.Location = new Point(((pictureBoxImage.Width - panelImageBackground.Width) / 2) * -1, ((pictureBoxImage.Height - panelImageBackground.Height) / 2) * -1); moveable = true; } else if (zoom == "Vollbild") @@ -1126,8 +1125,6 @@ namespace Mk0.Software.ImageSorter if (pictureBoxImage.Image.Width > panelImageBackground.Width || pictureBoxImage.Image.Height > panelImageBackground.Height) { pictureBoxImage.Size = new Size(panelImageBackground.Width, panelImageBackground.Height); - if (pictureBoxImage.Width != panelImageBackground.Width) { pictureBoxImage.Width = panelImageBackground.Width; } - if (pictureBoxImage.Height != panelImageBackground.Height) { pictureBoxImage.Height = panelImageBackground.Height; } pictureBoxImage.Top = 0; pictureBoxImage.Left = 0; moveable = false;