This commit is contained in:
Anastasia Yazykova 2024-07-04 02:40:41 +04:00
parent 0ac84cd6c7
commit a7254b9c40
3 changed files with 53 additions and 13 deletions

View File

@ -36,8 +36,9 @@ namespace Final
button1 = new Button(); button1 = new Button();
listBox1 = new ListBox(); listBox1 = new ListBox();
tabPage2 = new TabPage(); tabPage2 = new TabPage();
l = new Label();
button6 = new Button();
button5 = new Button(); button5 = new Button();
textBox1 = new TextBox();
textBoxH = new TextBox(); textBoxH = new TextBox();
textBoxW = new TextBox(); textBoxW = new TextBox();
button4 = new Button(); button4 = new Button();
@ -45,6 +46,8 @@ namespace Final
listBox2 = new ListBox(); listBox2 = new ListBox();
pictureBox1 = new PictureBox(); pictureBox1 = new PictureBox();
tabPage3 = new TabPage(); tabPage3 = new TabPage();
colorDialog = new ColorDialog();
colorDialog1 = new ColorDialog();
tabControl1.SuspendLayout(); tabControl1.SuspendLayout();
tabPage1.SuspendLayout(); tabPage1.SuspendLayout();
tabPage2.SuspendLayout(); tabPage2.SuspendLayout();
@ -106,8 +109,9 @@ namespace Final
// //
// tabPage2 // tabPage2
// //
tabPage2.Controls.Add(l);
tabPage2.Controls.Add(button6);
tabPage2.Controls.Add(button5); tabPage2.Controls.Add(button5);
tabPage2.Controls.Add(textBox1);
tabPage2.Controls.Add(textBoxH); tabPage2.Controls.Add(textBoxH);
tabPage2.Controls.Add(textBoxW); tabPage2.Controls.Add(textBoxW);
tabPage2.Controls.Add(button4); tabPage2.Controls.Add(button4);
@ -122,23 +126,37 @@ namespace Final
tabPage2.Text = "1 задание"; tabPage2.Text = "1 задание";
tabPage2.UseVisualStyleBackColor = true; tabPage2.UseVisualStyleBackColor = true;
// //
// l
//
l.AutoSize = true;
l.BackColor = Color.White;
l.Location = new Point(40, 167);
l.MaximumSize = new Size(100, 100);
l.Name = "l";
l.Size = new Size(97, 50);
l.TabIndex = 11;
l.Text = " ";
//
// button6
//
button6.Location = new Point(168, 167);
button6.Name = "button6";
button6.Size = new Size(176, 34);
button6.TabIndex = 10;
button6.Text = "Выбор цвета";
button6.UseVisualStyleBackColor = true;
button6.Click += button6_Click;
//
// button5 // button5
// //
button5.Location = new Point(918, 470); button5.Location = new Point(918, 470);
button5.Name = "button5"; button5.Name = "button5";
button5.Size = new Size(138, 62); button5.Size = new Size(138, 62);
button5.TabIndex = 9; button5.TabIndex = 9;
button5.Text = "Квадрат с овалом"; button5.Text = "Загрузить";
button5.UseVisualStyleBackColor = true; button5.UseVisualStyleBackColor = true;
button5.Click += button5_Click; button5.Click += button5_Click;
// //
// textBox1
//
textBox1.Location = new Point(168, 172);
textBox1.Name = "textBox1";
textBox1.Size = new Size(299, 31);
textBox1.TabIndex = 8;
//
// textBoxH // textBoxH
// //
textBoxH.Location = new Point(168, 101); textBoxH.Location = new Point(168, 101);
@ -177,9 +195,9 @@ namespace Final
// //
listBox2.FormattingEnabled = true; listBox2.FormattingEnabled = true;
listBox2.ItemHeight = 25; listBox2.ItemHeight = 25;
listBox2.Location = new Point(9, 470); listBox2.Location = new Point(6, 257);
listBox2.Name = "listBox2"; listBox2.Name = "listBox2";
listBox2.Size = new Size(519, 129); listBox2.Size = new Size(461, 304);
listBox2.TabIndex = 1; listBox2.TabIndex = 1;
// //
// pictureBox1 // pictureBox1
@ -205,6 +223,7 @@ namespace Final
// //
AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
BackColor = SystemColors.ControlDarkDark;
ClientSize = new Size(1158, 667); ClientSize = new Size(1158, 667);
Controls.Add(tabControl1); Controls.Add(tabControl1);
Name = "Form1"; Name = "Form1";
@ -232,7 +251,10 @@ namespace Final
private Button button4; private Button button4;
private TextBox textBoxH; private TextBox textBoxH;
private TextBox textBoxW; private TextBox textBoxW;
private TextBox textBox1;
private Button button5; private Button button5;
private ColorDialog colorDialog;
private Button button6;
private Label l;
private ColorDialog colorDialog1;
} }
} }

View File

@ -106,6 +106,18 @@ namespace Final
MessageBox.Show("Пожалуйста, выберите объект для прорисовки."); MessageBox.Show("Пожалуйста, выберите объект для прорисовки.");
} }
} }
private void button6_Click(object sender, EventArgs e)
{
using (ColorDialog colorDialog = new ColorDialog())
{
if (colorDialog.ShowDialog() == DialogResult.OK)
{
selectedColor = colorDialog.Color;
l.BackColor = selectedColor;
}
}
}
} }

View File

@ -117,4 +117,10 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>176, 17</value>
</metadata>
</root> </root>