Merging
This commit is contained in:
parent
b775d4e193
commit
bda8a696f9
|
@ -77,8 +77,8 @@
|
||||||
//
|
//
|
||||||
// pictureBox
|
// pictureBox
|
||||||
//
|
//
|
||||||
this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.pictureBox.BackColor = System.Drawing.SystemColors.Control;
|
this.pictureBox.BackColor = System.Drawing.SystemColors.Control;
|
||||||
this.pictureBox.ContextMenuStrip = this.contextMenuStrip;
|
this.pictureBox.ContextMenuStrip = this.contextMenuStrip;
|
||||||
|
@ -191,7 +191,7 @@
|
||||||
//
|
//
|
||||||
// groupBox2
|
// groupBox2
|
||||||
//
|
//
|
||||||
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.groupBox2.Controls.Add(this.labelZielPath);
|
this.groupBox2.Controls.Add(this.labelZielPath);
|
||||||
this.groupBox2.Controls.Add(this.panel2);
|
this.groupBox2.Controls.Add(this.panel2);
|
||||||
|
@ -216,7 +216,7 @@
|
||||||
//
|
//
|
||||||
// panel2
|
// panel2
|
||||||
//
|
//
|
||||||
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)));
|
| System.Windows.Forms.AnchorStyles.Left)));
|
||||||
this.panel2.AutoScroll = true;
|
this.panel2.AutoScroll = true;
|
||||||
this.panel2.Controls.Add(this.labelNoTargets);
|
this.panel2.Controls.Add(this.labelNoTargets);
|
||||||
|
@ -335,8 +335,8 @@
|
||||||
//
|
//
|
||||||
// panel1
|
// panel1
|
||||||
//
|
//
|
||||||
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.panel1.BackColor = System.Drawing.SystemColors.Control;
|
this.panel1.BackColor = System.Drawing.SystemColors.Control;
|
||||||
this.panel1.Controls.Add(this.labelNoImages);
|
this.panel1.Controls.Add(this.labelNoImages);
|
||||||
|
@ -349,8 +349,8 @@
|
||||||
//
|
//
|
||||||
// labelNoImages
|
// labelNoImages
|
||||||
//
|
//
|
||||||
this.labelNoImages.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.labelNoImages.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)
|
| System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.labelNoImages.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
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.ForeColor = System.Drawing.Color.Maroon;
|
||||||
|
@ -374,7 +374,7 @@
|
||||||
//
|
//
|
||||||
// panel3
|
// panel3
|
||||||
//
|
//
|
||||||
this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||||
| System.Windows.Forms.AnchorStyles.Right)));
|
| System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.panel3.BackColor = System.Drawing.SystemColors.Highlight;
|
this.panel3.BackColor = System.Drawing.SystemColors.Highlight;
|
||||||
this.panel3.Controls.Add(this.pictureBox2);
|
this.panel3.Controls.Add(this.pictureBox2);
|
||||||
|
@ -472,9 +472,8 @@
|
||||||
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.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
|
|
||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||||
this.Text = "Image Sorter v1.29 | © 2015-2019 by manuelkamper.com";
|
this.Text = "Image Sorter v1.30 | © 2015-2019 by manuelkamper.com";
|
||||||
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);
|
||||||
|
@ -536,4 +535,3 @@
|
||||||
private System.Windows.Forms.Label label3;
|
private System.Windows.Forms.Label label3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue