diff --git a/WarmlyLocomotive/FormWarmlyLocomotiveConfig.Designer.cs b/WarmlyLocomotive/FormWarmlyLocomotiveConfig.Designer.cs index 015e475..d371f04 100644 --- a/WarmlyLocomotive/FormWarmlyLocomotiveConfig.Designer.cs +++ b/WarmlyLocomotive/FormWarmlyLocomotiveConfig.Designer.cs @@ -73,9 +73,11 @@ groupBoxOptions.Controls.Add(numericUpDownSpeed); groupBoxOptions.Controls.Add(label2); groupBoxOptions.Controls.Add(label1); - groupBoxOptions.Location = new Point(33, 12); + groupBoxOptions.Location = new Point(61, 26); + groupBoxOptions.Margin = new Padding(6, 6, 6, 6); groupBoxOptions.Name = "groupBoxOptions"; - groupBoxOptions.Size = new Size(755, 309); + groupBoxOptions.Padding = new Padding(6, 6, 6, 6); + groupBoxOptions.Size = new Size(1402, 659); groupBoxOptions.TabIndex = 0; groupBoxOptions.TabStop = false; groupBoxOptions.Text = "Параметры"; @@ -84,9 +86,10 @@ // // buttonCancel // - buttonCancel.Location = new Point(623, 242); + buttonCancel.Location = new Point(1157, 516); + buttonCancel.Margin = new Padding(6, 6, 6, 6); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(75, 23); + buttonCancel.Size = new Size(139, 49); buttonCancel.TabIndex = 5; buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; @@ -95,9 +98,10 @@ // labelBasic // labelBasic.BorderStyle = BorderStyle.FixedSingle; - labelBasic.Location = new Point(209, 172); + labelBasic.Location = new Point(388, 367); + labelBasic.Margin = new Padding(6, 0, 6, 0); labelBasic.Name = "labelBasic"; - labelBasic.Size = new Size(80, 30); + labelBasic.Size = new Size(147, 62); labelBasic.TabIndex = 2; labelBasic.Text = "Простой"; labelBasic.TextAlign = ContentAlignment.MiddleCenter; @@ -105,9 +109,10 @@ // // buttonOk // - buttonOk.Location = new Point(520, 242); + buttonOk.Location = new Point(966, 516); + buttonOk.Margin = new Padding(6, 6, 6, 6); buttonOk.Name = "buttonOk"; - buttonOk.Size = new Size(75, 23); + buttonOk.Size = new Size(139, 49); buttonOk.TabIndex = 4; buttonOk.Text = "Добавить"; buttonOk.UseVisualStyleBackColor = true; @@ -116,9 +121,10 @@ // labelAdvanced // labelAdvanced.BorderStyle = BorderStyle.FixedSingle; - labelAdvanced.Location = new Point(304, 172); + labelAdvanced.Location = new Point(565, 367); + labelAdvanced.Margin = new Padding(6, 0, 6, 0); labelAdvanced.Name = "labelAdvanced"; - labelAdvanced.Size = new Size(85, 30); + labelAdvanced.Size = new Size(205, 62); labelAdvanced.TabIndex = 3; labelAdvanced.Text = "Продвинутый"; labelAdvanced.TextAlign = ContentAlignment.MiddleCenter; @@ -134,9 +140,11 @@ groupBoxColor.Controls.Add(panelGreen); groupBoxColor.Controls.Add(panelWhite); groupBoxColor.Controls.Add(panelRed); - groupBoxColor.Location = new Point(203, 45); + groupBoxColor.Location = new Point(377, 96); + groupBoxColor.Margin = new Padding(6, 6, 6, 6); groupBoxColor.Name = "groupBoxColor"; - groupBoxColor.Size = new Size(189, 115); + groupBoxColor.Padding = new Padding(6, 6, 6, 6); + groupBoxColor.Size = new Size(351, 245); groupBoxColor.TabIndex = 6; groupBoxColor.TabStop = false; groupBoxColor.Text = "Цвета"; @@ -144,73 +152,82 @@ // panelYellow // panelYellow.BackColor = Color.Yellow; - panelYellow.Location = new Point(149, 22); + panelYellow.Location = new Point(277, 47); + panelYellow.Margin = new Padding(6, 6, 6, 6); panelYellow.Name = "panelYellow"; - panelYellow.Size = new Size(32, 31); + panelYellow.Size = new Size(59, 66); panelYellow.TabIndex = 1; // // panelPurple // panelPurple.BackColor = Color.Purple; - panelPurple.Location = new Point(149, 63); + panelPurple.Location = new Point(277, 134); + panelPurple.Margin = new Padding(6, 6, 6, 6); panelPurple.Name = "panelPurple"; - panelPurple.Size = new Size(32, 31); + panelPurple.Size = new Size(59, 66); panelPurple.TabIndex = 1; // // panelBlue // panelBlue.BackColor = Color.Blue; - panelBlue.Location = new Point(101, 22); + panelBlue.Location = new Point(188, 47); + panelBlue.Margin = new Padding(6, 6, 6, 6); panelBlue.Name = "panelBlue"; - panelBlue.Size = new Size(32, 31); + panelBlue.Size = new Size(59, 66); panelBlue.TabIndex = 1; // // panelBlack // panelBlack.BackColor = Color.Black; - panelBlack.Location = new Point(101, 63); + panelBlack.Location = new Point(188, 134); + panelBlack.Margin = new Padding(6, 6, 6, 6); panelBlack.Name = "panelBlack"; - panelBlack.Size = new Size(32, 31); + panelBlack.Size = new Size(59, 66); panelBlack.TabIndex = 1; // // panelGray // panelGray.BackColor = Color.Gray; - panelGray.Location = new Point(53, 63); + panelGray.Location = new Point(98, 134); + panelGray.Margin = new Padding(6, 6, 6, 6); panelGray.Name = "panelGray"; - panelGray.Size = new Size(32, 29); + panelGray.Size = new Size(59, 62); panelGray.TabIndex = 1; // // panelGreen // panelGreen.BackColor = Color.Green; - panelGreen.Location = new Point(53, 22); + panelGreen.Location = new Point(98, 47); + panelGreen.Margin = new Padding(6, 6, 6, 6); panelGreen.Name = "panelGreen"; - panelGreen.Size = new Size(32, 31); + panelGreen.Size = new Size(59, 66); panelGreen.TabIndex = 1; // // panelWhite // panelWhite.BackColor = Color.White; - panelWhite.Location = new Point(6, 61); + panelWhite.Location = new Point(11, 130); + panelWhite.Margin = new Padding(6, 6, 6, 6); panelWhite.Name = "panelWhite"; - panelWhite.Size = new Size(32, 31); + panelWhite.Size = new Size(59, 66); panelWhite.TabIndex = 1; // // panelRed // panelRed.BackColor = Color.Red; - panelRed.Location = new Point(6, 22); + panelRed.Location = new Point(11, 47); + panelRed.Margin = new Padding(6, 6, 6, 6); panelRed.Name = "panelRed"; - panelRed.Size = new Size(32, 31); + panelRed.Size = new Size(59, 66); panelRed.TabIndex = 0; // // checkBoxLuggage // checkBoxLuggage.AutoSize = true; - checkBoxLuggage.Location = new Point(15, 193); + checkBoxLuggage.Location = new Point(28, 412); + checkBoxLuggage.Margin = new Padding(6, 6, 6, 6); checkBoxLuggage.Name = "checkBoxLuggage"; - checkBoxLuggage.Size = new Size(173, 19); + checkBoxLuggage.Size = new Size(342, 36); checkBoxLuggage.TabIndex = 5; checkBoxLuggage.Text = "Признак наличия прицепа"; checkBoxLuggage.UseVisualStyleBackColor = true; @@ -218,56 +235,62 @@ // checkBoxTrumpet // checkBoxTrumpet.AutoSize = true; - checkBoxTrumpet.Location = new Point(15, 168); + checkBoxTrumpet.Location = new Point(28, 358); + checkBoxTrumpet.Margin = new Padding(6, 6, 6, 6); checkBoxTrumpet.Name = "checkBoxTrumpet"; - checkBoxTrumpet.Size = new Size(160, 19); + checkBoxTrumpet.Size = new Size(314, 36); checkBoxTrumpet.TabIndex = 4; checkBoxTrumpet.Text = "Признак наличия трубы"; checkBoxTrumpet.UseVisualStyleBackColor = true; // // numericUpDownWeight // - numericUpDownWeight.Location = new Point(82, 90); + numericUpDownWeight.Location = new Point(152, 192); + numericUpDownWeight.Margin = new Padding(6, 6, 6, 6); numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); numericUpDownWeight.Name = "numericUpDownWeight"; - numericUpDownWeight.Size = new Size(70, 23); + numericUpDownWeight.Size = new Size(130, 39); numericUpDownWeight.TabIndex = 3; numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); // // numericUpDownSpeed // - numericUpDownSpeed.Location = new Point(82, 45); + numericUpDownSpeed.Location = new Point(152, 96); + numericUpDownSpeed.Margin = new Padding(6, 6, 6, 6); numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); numericUpDownSpeed.Name = "numericUpDownSpeed"; - numericUpDownSpeed.Size = new Size(70, 23); + numericUpDownSpeed.Size = new Size(130, 39); numericUpDownSpeed.TabIndex = 2; numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); // // label2 // label2.AutoSize = true; - label2.Location = new Point(14, 47); + label2.Location = new Point(26, 100); + label2.Margin = new Padding(6, 0, 6, 0); label2.Name = "label2"; - label2.Size = new Size(62, 15); + label2.Size = new Size(121, 32); label2.TabIndex = 1; label2.Text = "Скорость:"; // // label1 // label1.AutoSize = true; - label1.Location = new Point(34, 90); + label1.Location = new Point(63, 192); + label1.Margin = new Padding(6, 0, 6, 0); label1.Name = "label1"; - label1.Size = new Size(29, 15); + label1.Size = new Size(57, 32); label1.TabIndex = 0; label1.Text = "Вес:"; // // pictureBoxObject // - pictureBoxObject.Location = new Point(17, 61); + pictureBoxObject.Location = new Point(32, 130); + pictureBoxObject.Margin = new Padding(6, 6, 6, 6); pictureBoxObject.Name = "pictureBoxObject"; - pictureBoxObject.Size = new Size(202, 123); + pictureBoxObject.Size = new Size(375, 262); pictureBoxObject.TabIndex = 1; pictureBoxObject.TabStop = false; // @@ -277,9 +300,10 @@ PanelColor.Controls.Add(labelAdditionalColor); PanelColor.Controls.Add(labelMainColor); PanelColor.Controls.Add(pictureBoxObject); - PanelColor.Location = new Point(522, 30); + PanelColor.Location = new Point(969, 64); + PanelColor.Margin = new Padding(6, 6, 6, 6); PanelColor.Name = "PanelColor"; - PanelColor.Size = new Size(238, 206); + PanelColor.Size = new Size(442, 439); PanelColor.TabIndex = 2; PanelColor.DragDrop += PanelObject_DragDrop; PanelColor.DragEnter += PanelObject_DragEnter; @@ -288,9 +312,10 @@ // labelAdditionalColor.AllowDrop = true; labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; - labelAdditionalColor.Location = new Point(129, 13); + labelAdditionalColor.Location = new Point(240, 28); + labelAdditionalColor.Margin = new Padding(6, 0, 6, 0); labelAdditionalColor.Name = "labelAdditionalColor"; - labelAdditionalColor.Size = new Size(80, 30); + labelAdditionalColor.Size = new Size(147, 62); labelAdditionalColor.TabIndex = 3; labelAdditionalColor.Text = "Доп. цвет"; labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; @@ -301,9 +326,10 @@ // labelMainColor.AllowDrop = true; labelMainColor.BorderStyle = BorderStyle.FixedSingle; - labelMainColor.Location = new Point(26, 13); + labelMainColor.Location = new Point(48, 28); + labelMainColor.Margin = new Padding(6, 0, 6, 0); labelMainColor.Name = "labelMainColor"; - labelMainColor.Size = new Size(80, 30); + labelMainColor.Size = new Size(147, 62); labelMainColor.TabIndex = 2; labelMainColor.Text = "Цвет"; labelMainColor.TextAlign = ContentAlignment.MiddleCenter; @@ -312,11 +338,12 @@ // // FormWarmlyLocomotiveConfig // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(13F, 32F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 345); + ClientSize = new Size(1486, 736); Controls.Add(PanelColor); Controls.Add(groupBoxOptions); + Margin = new Padding(6, 6, 6, 6); Name = "FormWarmlyLocomotiveConfig"; Text = "Создание объекта"; groupBoxOptions.ResumeLayout(false);