правки

revert правки

AirBomber/ClassDelegate.cs

@@ -1,9 +0,0 @@
-using AirBomber.Drawnings;
-
-namespace AirBomber;
-
-/// <summary>
-/// Делегар передачи объекта класса прорисовки
-/// </summary>
-/// <param name="airplane"></param>
-public delegate void AirPlaneDelegate(DrawningAirPlane airplane);

AirBomber/FormAirPlaneConfig.Designer.cs

@@ -73,10 +73,8 @@
             groupBoxConfig.Controls.Add(labelSimpleObject);
             groupBoxConfig.Dock = DockStyle.Left;
             groupBoxConfig.Location = new Point(0, 0);
-            groupBoxConfig.Margin = new Padding(3, 4, 3, 4);
             groupBoxConfig.Name = "groupBoxConfig";
-            groupBoxConfig.Padding = new Padding(3, 4, 3, 4);
-            groupBoxConfig.Size = new Size(629, 346);
+            groupBoxConfig.Size = new Size(550, 260);
             groupBoxConfig.TabIndex = 0;
             groupBoxConfig.TabStop = false;
             groupBoxConfig.Text = "Параметры";
@@ -91,11 +89,9 @@
             groupBoxColors.Controls.Add(panelWhite);
             groupBoxColors.Controls.Add(panelGreen);
             groupBoxColors.Controls.Add(panelRed);
-            groupBoxColors.Location = new Point(360, 16);
-            groupBoxColors.Margin = new Padding(3, 4, 3, 4);
+            groupBoxColors.Location = new Point(315, 12);
             groupBoxColors.Name = "groupBoxColors";
-            groupBoxColors.Padding = new Padding(3, 4, 3, 4);
-            groupBoxColors.Size = new Size(259, 149);
+            groupBoxColors.Size = new Size(227, 112);
             groupBoxColors.TabIndex = 11;
             groupBoxColors.TabStop = false;
             groupBoxColors.Text = "Цвета";
@@ -103,83 +99,74 @@
             // panelPurple
             // 
             panelPurple.BackColor = Color.Purple;
-            panelPurple.Location = new Point(201, 88);
-            panelPurple.Margin = new Padding(3, 4, 3, 4);
+            panelPurple.Location = new Point(176, 66);
             panelPurple.Name = "panelPurple";
-            panelPurple.Size = new Size(39, 45);
+            panelPurple.Size = new Size(34, 34);
             panelPurple.TabIndex = 3;
             // 
             // panelYellow
             // 
             panelYellow.BackColor = Color.Yellow;
-            panelYellow.Location = new Point(201, 29);
-            panelYellow.Margin = new Padding(3, 4, 3, 4);
+            panelYellow.Location = new Point(176, 22);
             panelYellow.Name = "panelYellow";
-            panelYellow.Size = new Size(39, 45);
+            panelYellow.Size = new Size(34, 34);
             panelYellow.TabIndex = 1;
             // 
             // panelBlack
             // 
             panelBlack.BackColor = Color.Black;
-            panelBlack.Location = new Point(137, 88);
-            panelBlack.Margin = new Padding(3, 4, 3, 4);
+            panelBlack.Location = new Point(120, 66);
             panelBlack.Name = "panelBlack";
-            panelBlack.Size = new Size(39, 45);
+            panelBlack.Size = new Size(34, 34);
             panelBlack.TabIndex = 4;
             // 
             // panelGray
             // 
             panelGray.BackColor = Color.Gray;
-            panelGray.Location = new Point(77, 88);
-            panelGray.Margin = new Padding(3, 4, 3, 4);
+            panelGray.Location = new Point(67, 66);
             panelGray.Name = "panelGray";
-            panelGray.Size = new Size(39, 45);
+            panelGray.Size = new Size(34, 34);
             panelGray.TabIndex = 5;
             // 
             // panelBlue
             // 
             panelBlue.BackColor = Color.Blue;
-            panelBlue.Location = new Point(137, 29);
-            panelBlue.Margin = new Padding(3, 4, 3, 4);
+            panelBlue.Location = new Point(120, 22);
             panelBlue.Name = "panelBlue";
-            panelBlue.Size = new Size(39, 45);
+            panelBlue.Size = new Size(34, 34);
             panelBlue.TabIndex = 1;
             // 
             // panelWhite
             // 
             panelWhite.BackColor = Color.White;
-            panelWhite.Location = new Point(17, 88);
-            panelWhite.Margin = new Padding(3, 4, 3, 4);
+            panelWhite.Location = new Point(15, 66);
             panelWhite.Name = "panelWhite";
-            panelWhite.Size = new Size(39, 45);
+            panelWhite.Size = new Size(34, 34);
             panelWhite.TabIndex = 2;
             // 
             // panelGreen
             // 
             panelGreen.BackColor = Color.Green;
-            panelGreen.Location = new Point(77, 29);
-            panelGreen.Margin = new Padding(3, 4, 3, 4);
+            panelGreen.Location = new Point(67, 22);
             panelGreen.Name = "panelGreen";
-            panelGreen.Size = new Size(39, 45);
+            panelGreen.Size = new Size(34, 34);
             panelGreen.TabIndex = 1;
             // 
             // panelRed
             // 
             panelRed.BackColor = Color.Red;
-            panelRed.Location = new Point(17, 29);
-            panelRed.Margin = new Padding(3, 4, 3, 4);
+            panelRed.Location = new Point(15, 22);
             panelRed.Name = "panelRed";
-            panelRed.Size = new Size(39, 45);
+            panelRed.Size = new Size(34, 34);
             panelRed.TabIndex = 0;
             panelRed.MouseDown += Panel_MouseDown;
             // 
             // checkBoxFuelTanks
             // 
             checkBoxFuelTanks.AutoSize = true;
-            checkBoxFuelTanks.Location = new Point(14, 237);
-            checkBoxFuelTanks.Margin = new Padding(3, 4, 3, 4);
+            checkBoxFuelTanks.Location = new Point(12, 178);
             checkBoxFuelTanks.Name = "checkBoxFuelTanks";
-            checkBoxFuelTanks.Size = new Size(312, 24);
+            checkBoxFuelTanks.Size = new Size(248, 19);
             checkBoxFuelTanks.TabIndex = 7;
             checkBoxFuelTanks.Text = "Признак наличия доп. топливных баков";
             checkBoxFuelTanks.UseVisualStyleBackColor = true;
@@ -187,60 +174,57 @@
             // checkBoxBombs
             // 
             checkBoxBombs.AutoSize = true;
-            checkBoxBombs.Location = new Point(14, 176);
-            checkBoxBombs.Margin = new Padding(3, 4, 3, 4);
+            checkBoxBombs.Location = new Point(12, 132);
             checkBoxBombs.Name = "checkBoxBombs";
-            checkBoxBombs.Size = new Size(196, 24);
+            checkBoxBombs.Size = new Size(156, 19);
             checkBoxBombs.TabIndex = 6;
             checkBoxBombs.Text = "Признак наличия бомб";
             checkBoxBombs.UseVisualStyleBackColor = true;
             // 
             // numericUpDownWeight
             // 
-            numericUpDownWeight.Location = new Point(91, 109);
-            numericUpDownWeight.Margin = new Padding(3, 4, 3, 4);
+            numericUpDownWeight.Location = new Point(80, 82);
             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(101, 27);
+            numericUpDownWeight.Size = new Size(88, 23);
             numericUpDownWeight.TabIndex = 5;
             numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
             // 
             // labelWeight
             // 
             labelWeight.AutoSize = true;
-            labelWeight.Location = new Point(14, 112);
+            labelWeight.Location = new Point(12, 84);
             labelWeight.Name = "labelWeight";
-            labelWeight.Size = new Size(36, 20);
+            labelWeight.Size = new Size(29, 15);
             labelWeight.TabIndex = 4;
             labelWeight.Text = "Вес:";
             // 
             // numericUpDownSpeed
             // 
-            numericUpDownSpeed.Location = new Point(91, 51);
-            numericUpDownSpeed.Margin = new Padding(3, 4, 3, 4);
+            numericUpDownSpeed.Location = new Point(80, 38);
             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(101, 27);
+            numericUpDownSpeed.Size = new Size(88, 23);
             numericUpDownSpeed.TabIndex = 3;
             numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
             // 
             // labelSpeed
             // 
             labelSpeed.AutoSize = true;
-            labelSpeed.Location = new Point(14, 53);
+            labelSpeed.Location = new Point(12, 40);
             labelSpeed.Name = "labelSpeed";
-            labelSpeed.Size = new Size(76, 20);
+            labelSpeed.Size = new Size(62, 15);
             labelSpeed.TabIndex = 2;
             labelSpeed.Text = "Скорость:";
             // 
             // labelModifiedObject
             // 
             labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
-            labelModifiedObject.Location = new Point(466, 222);
+            labelModifiedObject.Location = new Point(408, 166);
             labelModifiedObject.Name = "labelModifiedObject";
-            labelModifiedObject.Size = new Size(117, 53);
+            labelModifiedObject.Size = new Size(103, 40);
             labelModifiedObject.TabIndex = 1;
             labelModifiedObject.Text = "Продвинутый";
             labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
@@ -249,9 +233,9 @@
             // labelSimpleObject
             // 
             labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
-            labelSimpleObject.Location = new Point(330, 222);
+            labelSimpleObject.Location = new Point(289, 166);
             labelSimpleObject.Name = "labelSimpleObject";
-            labelSimpleObject.Size = new Size(117, 53);
+            labelSimpleObject.Size = new Size(103, 40);
             labelSimpleObject.TabIndex = 0;
             labelSimpleObject.Text = "Простой";
             labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
@@ -259,19 +243,17 @@
             // 
             // pictureBoxObject
             // 
-            pictureBoxObject.Location = new Point(15, 69);
-            pictureBoxObject.Margin = new Padding(3, 4, 3, 4);
+            pictureBoxObject.Location = new Point(13, 45);
             pictureBoxObject.Name = "pictureBoxObject";
-            pictureBoxObject.Size = new Size(194, 161);
+            pictureBoxObject.Size = new Size(170, 136);
             pictureBoxObject.TabIndex = 1;
             pictureBoxObject.TabStop = false;
             // 
             // buttonAdd
             // 
-            buttonAdd.Location = new Point(672, 254);
-            buttonAdd.Margin = new Padding(3, 4, 3, 4);
+            buttonAdd.Location = new Point(588, 190);
             buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(101, 53);
+            buttonAdd.Size = new Size(88, 40);
             buttonAdd.TabIndex = 2;
             buttonAdd.Text = "Добавить";
             buttonAdd.UseVisualStyleBackColor = true;
@@ -279,10 +261,9 @@
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(786, 254);
-            buttonCancel.Margin = new Padding(3, 4, 3, 4);
+            buttonCancel.Location = new Point(688, 190);
             buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(102, 53);
+            buttonCancel.Size = new Size(89, 40);
             buttonCancel.TabIndex = 3;
             buttonCancel.Text = "Отмена";
             buttonCancel.UseVisualStyleBackColor = true;
@@ -293,10 +274,9 @@
             panelObject.Controls.Add(labelBodyColor);
             panelObject.Controls.Add(labelAdditionalColor);
             panelObject.Controls.Add(pictureBoxObject);
-            panelObject.Location = new Point(679, 0);
-            panelObject.Margin = new Padding(3, 4, 3, 4);
+            panelObject.Location = new Point(594, 0);
             panelObject.Name = "panelObject";
-            panelObject.Size = new Size(222, 246);
+            panelObject.Size = new Size(194, 184);
             panelObject.TabIndex = 4;
             panelObject.DragDrop += PanelObject_DragDrop;
             panelObject.DragEnter += PanelObject_DragEnter;
@@ -305,9 +285,9 @@
             // 
             labelBodyColor.AllowDrop = true;
             labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
-            labelBodyColor.Location = new Point(15, 12);
+            labelBodyColor.Location = new Point(13, 9);
             labelBodyColor.Name = "labelBodyColor";
-            labelBodyColor.Size = new Size(85, 43);
+            labelBodyColor.Size = new Size(75, 33);
             labelBodyColor.TabIndex = 2;
             labelBodyColor.Text = "Цвет";
             labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
@@ -318,9 +298,9 @@
             // 
             labelAdditionalColor.AllowDrop = true;
             labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
-            labelAdditionalColor.Location = new Point(123, 12);
+            labelAdditionalColor.Location = new Point(108, 9);
             labelAdditionalColor.Name = "labelAdditionalColor";
-            labelAdditionalColor.Size = new Size(85, 43);
+            labelAdditionalColor.Size = new Size(75, 33);
             labelAdditionalColor.TabIndex = 3;
             labelAdditionalColor.Text = "Доп. Цвет";
             labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
@@ -329,14 +309,13 @@
             // 
             // FormAirPlaneConfig
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(909, 346);
+            ClientSize = new Size(795, 260);
             Controls.Add(panelObject);
             Controls.Add(buttonCancel);
             Controls.Add(buttonAdd);
             Controls.Add(groupBoxConfig);
-            Margin = new Padding(3, 4, 3, 4);
             Name = "FormAirPlaneConfig";
             Text = "Создание объекта";
             groupBoxConfig.ResumeLayout(false);

AirBomber/FormAirPlaneConfig.resx

@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>