From 31bad4e1a705ad95d821536cd1e54af845be5d6e Mon Sep 17 00:00:00 2001 From: "yuliya.mavrina@internet.ru" Date: Mon, 27 Nov 2023 12:18:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=20=E2=84=96?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormBusCollection.Designer.cs | 30 ++++++++++++------- .../Generics/BusesGenericStorage.cs | 3 +- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormBusCollection.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormBusCollection.Designer.cs index c1a9038..654573f 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/FormBusCollection.Designer.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/FormBusCollection.Designer.cs @@ -39,8 +39,9 @@ ButtonDelObject = new Button(); ButtonAddObject = new Button(); menuStrip = new MenuStrip(); - SaveToolStripMenuItem = new ToolStripMenuItem(); + ToolStripMenuItem = new ToolStripMenuItem(); LoadToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); openFileDialog = new OpenFileDialog(); saveFileDialog = new SaveFileDialog(); ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit(); @@ -155,28 +156,34 @@ // // menuStrip // - menuStrip.Items.AddRange(new ToolStripItem[] { SaveToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { ToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(168, 24); menuStrip.TabIndex = 10; menuStrip.Text = "menuStrip1"; // - // SaveToolStripMenuItem + // ToolStripMenuItem // - SaveToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { LoadToolStripMenuItem }); - SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; - SaveToolStripMenuItem.Size = new Size(144, 20); - SaveToolStripMenuItem.Text = "SaveToolStripMenuItem"; - SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + ToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { LoadToolStripMenuItem, saveToolStripMenuItem }); + ToolStripMenuItem.Name = "ToolStripMenuItem"; + ToolStripMenuItem.Size = new Size(48, 20); + ToolStripMenuItem.Text = "файл"; // // LoadToolStripMenuItem // LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; - LoadToolStripMenuItem.Size = new Size(201, 22); - LoadToolStripMenuItem.Text = "LoadToolStripMenuItem"; + LoadToolStripMenuItem.Size = new Size(180, 22); + LoadToolStripMenuItem.Text = "Загрузить"; LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.Size = new Size(180, 22); + saveToolStripMenuItem.Text = "Сохранить"; + saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // // openFileDialog // openFileDialog.FileName = "openFileDialog"; @@ -219,7 +226,8 @@ private OpenFileDialog openFileDialog; private SaveFileDialog saveFileDialog; private MenuStrip menuStrip; - private ToolStripMenuItem SaveToolStripMenuItem; + private ToolStripMenuItem ToolStripMenuItem; private ToolStripMenuItem LoadToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/Generics/BusesGenericStorage.cs b/DoubleDeckerBus/DoubleDeckerBus/Generics/BusesGenericStorage.cs index 81800ad..d3b1c0d 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Generics/BusesGenericStorage.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Generics/BusesGenericStorage.cs @@ -87,8 +87,7 @@ namespace DoubleDeckerBus.Generics string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries); foreach (string elem in set) { - DrawningBus? bus = - elem?.CreateDrawningBus(_separatorForObject, _pictureWidth, _pictureHeight); + DrawningBus? bus = elem?.CreateDrawningBus(_separatorForObject, _pictureWidth, _pictureHeight); if (bus != null) { if (!(collection + bus))