Правки №2.

ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.Designer.cs

@@ -29,13 +29,11 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormLocomotiveCollection));
-            panelLocomotiveCollection = new Panel();
             groupBoxSets = new GroupBox();
             textBoxSetName = new TextBox();
             buttonDeleteSet = new Button();
             listBoxStorages = new ListBox();
             buttonAddSet = new Button();
-            LabelOnPanel = new Label();
             maskedTextBoxNumber = new MaskedTextBox();
             ButtonRefreshCollection = new Button();
             ButtonRemoveLocomotive = new Button();
@@ -47,36 +45,21 @@
             SaveToolStripMenuItem = new ToolStripMenuItem();
             saveFileDialog = new SaveFileDialog();
             openFileDialog = new OpenFileDialog();
-            panelLocomotiveCollection.SuspendLayout();
+            groupBoxMenu = new GroupBox();
             groupBoxSets.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
             menuStrip.SuspendLayout();
+            groupBoxMenu.SuspendLayout();
             SuspendLayout();
             // 
-            // panelLocomotiveCollection
-            // 
-            panelLocomotiveCollection.AccessibleDescription = "";
-            panelLocomotiveCollection.AccessibleName = "";
-            panelLocomotiveCollection.Controls.Add(groupBoxSets);
-            panelLocomotiveCollection.Controls.Add(LabelOnPanel);
-            panelLocomotiveCollection.Controls.Add(maskedTextBoxNumber);
-            panelLocomotiveCollection.Controls.Add(ButtonRefreshCollection);
-            panelLocomotiveCollection.Controls.Add(ButtonRemoveLocomotive);
-            panelLocomotiveCollection.Controls.Add(ButtonAddLocomotive);
-            panelLocomotiveCollection.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point);
-            panelLocomotiveCollection.Location = new Point(660, 27);
-            panelLocomotiveCollection.Name = "panelLocomotiveCollection";
-            panelLocomotiveCollection.Size = new Size(248, 559);
-            panelLocomotiveCollection.TabIndex = 0;
-            panelLocomotiveCollection.Tag = "Инструменты";
-            // 
             // groupBoxSets
             // 
             groupBoxSets.Controls.Add(textBoxSetName);
             groupBoxSets.Controls.Add(buttonDeleteSet);
             groupBoxSets.Controls.Add(listBoxStorages);
+            groupBoxSets.Controls.Add(ButtonAddLocomotive);
             groupBoxSets.Controls.Add(buttonAddSet);
-            groupBoxSets.Location = new Point(3, 25);
+            groupBoxSets.Location = new Point(0, 22);
             groupBoxSets.Name = "groupBoxSets";
             groupBoxSets.Size = new Size(242, 314);
             groupBoxSets.TabIndex = 5;
@@ -120,27 +103,18 @@
             buttonAddSet.UseVisualStyleBackColor = true;
             buttonAddSet.Click += buttonAddSet_Click;
             // 
-            // LabelOnPanel
-            // 
-            LabelOnPanel.AutoSize = true;
-            LabelOnPanel.Location = new Point(3, -3);
-            LabelOnPanel.Name = "LabelOnPanel";
-            LabelOnPanel.Size = new Size(83, 15);
-            LabelOnPanel.TabIndex = 4;
-            LabelOnPanel.Text = "Инструменты";
-            // 
             // maskedTextBoxNumber
             // 
-            maskedTextBoxNumber.Location = new Point(35, 408);
+            maskedTextBoxNumber.Location = new Point(6, 342);
             maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            maskedTextBoxNumber.Size = new Size(176, 23);
+            maskedTextBoxNumber.Size = new Size(226, 23);
             maskedTextBoxNumber.TabIndex = 3;
             // 
             // ButtonRefreshCollection
             // 
-            ButtonRefreshCollection.Location = new Point(3, 505);
+            ButtonRefreshCollection.Location = new Point(6, 440);
             ButtonRefreshCollection.Name = "ButtonRefreshCollection";
-            ButtonRefreshCollection.Size = new Size(242, 43);
+            ButtonRefreshCollection.Size = new Size(230, 43);
             ButtonRefreshCollection.TabIndex = 2;
             ButtonRefreshCollection.Text = " Обновить коллекцию";
             ButtonRefreshCollection.UseVisualStyleBackColor = true;
@@ -148,9 +122,9 @@
             // 
             // ButtonRemoveLocomotive
             // 
-            ButtonRemoveLocomotive.Location = new Point(3, 460);
+            ButtonRemoveLocomotive.Location = new Point(6, 388);
             ButtonRemoveLocomotive.Name = "ButtonRemoveLocomotive";
-            ButtonRemoveLocomotive.Size = new Size(242, 39);
+            ButtonRemoveLocomotive.Size = new Size(230, 39);
             ButtonRemoveLocomotive.TabIndex = 1;
             ButtonRemoveLocomotive.Text = "Удалить локомотив";
             ButtonRemoveLocomotive.UseVisualStyleBackColor = true;
@@ -158,9 +132,9 @@
             // 
             // ButtonAddLocomotive
             // 
-            ButtonAddLocomotive.Location = new Point(3, 345);
+            ButtonAddLocomotive.Location = new Point(6, 269);
             ButtonAddLocomotive.Name = "ButtonAddLocomotive";
-            ButtonAddLocomotive.Size = new Size(242, 39);
+            ButtonAddLocomotive.Size = new Size(226, 39);
             ButtonAddLocomotive.TabIndex = 0;
             ButtonAddLocomotive.Text = "Добавить локомотив";
             ButtonAddLocomotive.UseVisualStyleBackColor = true;
@@ -168,7 +142,7 @@
             // 
             // pictureBoxCollection
             // 
-            pictureBoxCollection.Location = new Point(2, 27);
+            pictureBoxCollection.Location = new Point(6, 24);
             pictureBoxCollection.Name = "pictureBoxCollection";
             pictureBoxCollection.Size = new Size(655, 560);
             pictureBoxCollection.SizeMode = PictureBoxSizeMode.AutoSize;
@@ -197,7 +171,7 @@
             LoadToolStripMenuItem.Image = (Image)resources.GetObject("LoadToolStripMenuItem.Image");
             LoadToolStripMenuItem.ImageTransparentColor = Color.Magenta;
             LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            LoadToolStripMenuItem.Size = new Size(180, 22);
+            LoadToolStripMenuItem.Size = new Size(141, 22);
             LoadToolStripMenuItem.Text = "Загрузка";
             LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
             // 
@@ -206,7 +180,7 @@
             SaveToolStripMenuItem.Image = (Image)resources.GetObject("SaveToolStripMenuItem.Image");
             SaveToolStripMenuItem.ImageTransparentColor = Color.Magenta;
             SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            SaveToolStripMenuItem.Size = new Size(180, 22);
+            SaveToolStripMenuItem.Size = new Size(141, 22);
             SaveToolStripMenuItem.Text = "Сохранение";
             SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
             // 
@@ -218,36 +192,49 @@
             // 
             openFileDialog.FileName = "openFileDialog1";
             // 
+            // groupBoxMenu
+            // 
+            groupBoxMenu.AutoSize = true;
+            groupBoxMenu.Controls.Add(maskedTextBoxNumber);
+            groupBoxMenu.Controls.Add(groupBoxSets);
+            groupBoxMenu.Controls.Add(ButtonRemoveLocomotive);
+            groupBoxMenu.Controls.Add(ButtonRefreshCollection);
+            groupBoxMenu.Dock = DockStyle.Right;
+            groupBoxMenu.Location = new Point(661, 24);
+            groupBoxMenu.Name = "groupBoxMenu";
+            groupBoxMenu.Size = new Size(248, 563);
+            groupBoxMenu.TabIndex = 6;
+            groupBoxMenu.TabStop = false;
+            groupBoxMenu.Text = "Инструменты";
+            // 
             // FormLocomotiveCollection
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(909, 587);
+            Controls.Add(groupBoxMenu);
             Controls.Add(menuStrip);
-            Controls.Add(panelLocomotiveCollection);
             Controls.Add(pictureBoxCollection);
             MainMenuStrip = menuStrip;
             Name = "FormLocomotiveCollection";
             Text = "Набор локомотивов";
-            panelLocomotiveCollection.ResumeLayout(false);
-            panelLocomotiveCollection.PerformLayout();
             groupBoxSets.ResumeLayout(false);
             groupBoxSets.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
             menuStrip.ResumeLayout(false);
             menuStrip.PerformLayout();
+            groupBoxMenu.ResumeLayout(false);
+            groupBoxMenu.PerformLayout();
             ResumeLayout(false);
             PerformLayout();
         }
-        #endregion
 
-        private Panel panelLocomotiveCollection;
+        #endregion
         private Button ButtonAddLocomotive;
         private Button ButtonRemoveLocomotive;
         private Button ButtonRefreshCollection;
         private PictureBox pictureBoxCollection;
         private MaskedTextBox maskedTextBoxNumber;
-        private Label LabelOnPanel;
         private GroupBox groupBoxSets;
         private Button buttonDeleteSet;
         private ListBox listBoxStorages;
@@ -259,5 +246,6 @@
         private ToolStripMenuItem файлToolStripMenuItem;
         private ToolStripMenuItem LoadToolStripMenuItem;
         private ToolStripMenuItem SaveToolStripMenuItem;
+        private GroupBox groupBoxMenu;
     }
 }

ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.resx

@@ -148,6 +148,6 @@
     <value>269, 13</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>62</value>
+    <value>25</value>
   </metadata>
 </root>