diff --git a/AirBomber/FormAirPlaneCollection.Designer.cs b/AirBomber/FormAirPlaneCollection.Designer.cs index 4a35aed..97259d8 100644 --- a/AirBomber/FormAirPlaneCollection.Designer.cs +++ b/AirBomber/FormAirPlaneCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); + loadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -59,9 +66,11 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(752, 0); + groupBoxTools.Location = new Point(859, 0); + groupBoxTools.Margin = new Padding(3, 4, 3, 4); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(208, 644); + groupBoxTools.Padding = new Padding(3, 4, 3, 4); + groupBoxTools.Size = new Size(238, 859); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструманты"; @@ -73,18 +82,18 @@ panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(buttonDelAirPlane); panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Location = new Point(14, 342); - panelCompanyTools.Margin = new Padding(3, 2, 3, 2); + panelCompanyTools.Location = new Point(16, 456); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(184, 214); + panelCompanyTools.Size = new Size(210, 285); panelCompanyTools.TabIndex = 8; // // buttonAddAirPlane // buttonAddAirPlane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddAirPlane.Location = new Point(6, 3); + buttonAddAirPlane.Location = new Point(7, 4); + buttonAddAirPlane.Margin = new Padding(3, 4, 3, 4); buttonAddAirPlane.Name = "buttonAddAirPlane"; - buttonAddAirPlane.Size = new Size(175, 41); + buttonAddAirPlane.Size = new Size(200, 55); buttonAddAirPlane.TabIndex = 1; buttonAddAirPlane.Text = "Добавление самолета"; buttonAddAirPlane.UseVisualStyleBackColor = true; @@ -92,18 +101,20 @@ // // maskedTextBox // - maskedTextBox.Location = new Point(6, 98); + maskedTextBox.Location = new Point(7, 131); + maskedTextBox.Margin = new Padding(3, 4, 3, 4); maskedTextBox.Mask = "00"; maskedTextBox.Name = "maskedTextBox"; - maskedTextBox.Size = new Size(176, 23); + maskedTextBox.Size = new Size(201, 27); maskedTextBox.TabIndex = 3; maskedTextBox.ValidatingType = typeof(int); // // buttonRefresh // - buttonRefresh.Location = new Point(6, 182); + buttonRefresh.Location = new Point(7, 243); + buttonRefresh.Margin = new Padding(3, 4, 3, 4); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(175, 22); + buttonRefresh.Size = new Size(200, 29); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить"; buttonRefresh.UseVisualStyleBackColor = true; @@ -112,9 +123,10 @@ // buttonDelAirPlane // buttonDelAirPlane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelAirPlane.Location = new Point(6, 124); + buttonDelAirPlane.Location = new Point(7, 165); + buttonDelAirPlane.Margin = new Padding(3, 4, 3, 4); buttonDelAirPlane.Name = "buttonDelAirPlane"; - buttonDelAirPlane.Size = new Size(175, 23); + buttonDelAirPlane.Size = new Size(200, 31); buttonDelAirPlane.TabIndex = 4; buttonDelAirPlane.Text = "Удалить Самолет"; buttonDelAirPlane.UseVisualStyleBackColor = true; @@ -122,9 +134,10 @@ // // buttonGoToCheck // - buttonGoToCheck.Location = new Point(6, 154); + buttonGoToCheck.Location = new Point(7, 205); + buttonGoToCheck.Margin = new Padding(3, 4, 3, 4); buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(175, 22); + buttonGoToCheck.Size = new Size(200, 29); buttonGoToCheck.TabIndex = 5; buttonGoToCheck.Text = "Передать на тесты"; buttonGoToCheck.UseVisualStyleBackColor = true; @@ -132,10 +145,9 @@ // // buttonCreateCompany // - buttonCreateCompany.Location = new Point(14, 274); - buttonCreateCompany.Margin = new Padding(3, 2, 3, 2); + buttonCreateCompany.Location = new Point(16, 365); buttonCreateCompany.Name = "buttonCreateCompany"; - buttonCreateCompany.Size = new Size(181, 37); + buttonCreateCompany.Size = new Size(207, 49); buttonCreateCompany.TabIndex = 7; buttonCreateCompany.Text = "Создать компанию"; buttonCreateCompany.UseVisualStyleBackColor = true; @@ -151,18 +163,16 @@ panelStorage.Controls.Add(textBoxCollectionName); panelStorage.Controls.Add(labelCollectionName); panelStorage.Dock = DockStyle.Top; - panelStorage.Location = new Point(3, 19); - panelStorage.Margin = new Padding(3, 2, 3, 2); + panelStorage.Location = new Point(3, 24); panelStorage.Name = "panelStorage"; - panelStorage.Size = new Size(202, 228); + panelStorage.Size = new Size(232, 304); panelStorage.TabIndex = 7; // // buttonCollectionDel // - buttonCollectionDel.Location = new Point(11, 203); - buttonCollectionDel.Margin = new Padding(3, 2, 3, 2); + buttonCollectionDel.Location = new Point(13, 271); buttonCollectionDel.Name = "buttonCollectionDel"; - buttonCollectionDel.Size = new Size(184, 22); + buttonCollectionDel.Size = new Size(210, 29); buttonCollectionDel.TabIndex = 6; buttonCollectionDel.Text = "Удалить коллецию"; buttonCollectionDel.UseVisualStyleBackColor = true; @@ -171,19 +181,17 @@ // listBoxCollection // listBoxCollection.FormattingEnabled = true; - listBoxCollection.ItemHeight = 15; - listBoxCollection.Location = new Point(3, 121); - listBoxCollection.Margin = new Padding(3, 2, 3, 2); + listBoxCollection.ItemHeight = 20; + listBoxCollection.Location = new Point(3, 161); listBoxCollection.Name = "listBoxCollection"; - listBoxCollection.Size = new Size(193, 79); + listBoxCollection.Size = new Size(220, 104); listBoxCollection.TabIndex = 5; // // buttonCollectionAdd // - buttonCollectionAdd.Location = new Point(11, 94); - buttonCollectionAdd.Margin = new Padding(3, 2, 3, 2); + buttonCollectionAdd.Location = new Point(13, 125); buttonCollectionAdd.Name = "buttonCollectionAdd"; - buttonCollectionAdd.Size = new Size(189, 22); + buttonCollectionAdd.Size = new Size(216, 29); buttonCollectionAdd.TabIndex = 4; buttonCollectionAdd.Text = "Добавить коллецию"; buttonCollectionAdd.UseVisualStyleBackColor = true; @@ -192,10 +200,9 @@ // radioButtonList // radioButtonList.AutoSize = true; - radioButtonList.Location = new Point(88, 72); - radioButtonList.Margin = new Padding(3, 2, 3, 2); + radioButtonList.Location = new Point(101, 96); radioButtonList.Name = "radioButtonList"; - radioButtonList.Size = new Size(66, 19); + radioButtonList.Size = new Size(80, 24); radioButtonList.TabIndex = 3; radioButtonList.TabStop = true; radioButtonList.Text = "Список"; @@ -204,10 +211,9 @@ // radioButtonMassive // radioButtonMassive.AutoSize = true; - radioButtonMassive.Location = new Point(11, 72); - radioButtonMassive.Margin = new Padding(3, 2, 3, 2); + radioButtonMassive.Location = new Point(13, 96); radioButtonMassive.Name = "radioButtonMassive"; - radioButtonMassive.Size = new Size(67, 19); + radioButtonMassive.Size = new Size(82, 24); radioButtonMassive.TabIndex = 2; radioButtonMassive.TabStop = true; radioButtonMassive.Text = "Массив"; @@ -215,18 +221,17 @@ // // textBoxCollectionName // - textBoxCollectionName.Location = new Point(3, 40); - textBoxCollectionName.Margin = new Padding(3, 2, 3, 2); + textBoxCollectionName.Location = new Point(3, 53); textBoxCollectionName.Name = "textBoxCollectionName"; - textBoxCollectionName.Size = new Size(198, 23); + textBoxCollectionName.Size = new Size(226, 27); textBoxCollectionName.TabIndex = 1; // // labelCollectionName // labelCollectionName.AutoSize = true; - labelCollectionName.Location = new Point(11, 9); + labelCollectionName.Location = new Point(13, 12); labelCollectionName.Name = "labelCollectionName"; - labelCollectionName.Size = new Size(119, 15); + labelCollectionName.Size = new Size(151, 20); labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллеции:"; // @@ -236,9 +241,10 @@ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(14, 248); + comboBoxSelectorCompany.Location = new Point(16, 331); + comboBoxSelectorCompany.Margin = new Padding(3, 4, 3, 4); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; - comboBoxSelectorCompany.Size = new Size(184, 23); + comboBoxSelectorCompany.Size = new Size(210, 28); comboBoxSelectorCompany.TabIndex = 0; comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; // @@ -246,18 +252,64 @@ // pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 0); + pictureBox.Margin = new Padding(3, 4, 3, 4); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(752, 644); + pictureBox.Size = new Size(859, 859); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Padding = new Padding(7, 3, 0, 3); + menuStrip.Size = new Size(859, 30); + menuStrip.TabIndex = 3; + menuStrip.Text = "menuStrip1"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(59, 24); + файлToolStripMenuItem.Text = "Файл"; + файлToolStripMenuItem.Click += saveToolStripMenuItem_Click; + // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + saveToolStripMenuItem.Size = new Size(227, 26); + saveToolStripMenuItem.Text = "Сохранение"; + saveToolStripMenuItem.Click += saveToolStripMenuItem_Click; + // + // loadToolStripMenuItem + // + loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + loadToolStripMenuItem.Size = new Size(227, 26); + loadToolStripMenuItem.Text = "Загрузка"; + loadToolStripMenuItem.Click += loadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file | *.txt"; + // // FormAirPlaneCollection // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(960, 644); + ClientSize = new Size(1097, 859); + Controls.Add(menuStrip); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Margin = new Padding(3, 4, 3, 4); Name = "FormAirPlaneCollection"; Text = "FormAirPlaneCollection"; Load += FormAirPlaneCollection_Load; @@ -267,7 +319,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -290,5 +345,11 @@ private ListBox listBoxCollection; private Button buttonCreateCompany; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; + private ToolStripMenuItem loadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/AirBomber/FormAirPlaneCollection.cs b/AirBomber/FormAirPlaneCollection.cs index 805f200..873daa6 100644 --- a/AirBomber/FormAirPlaneCollection.cs +++ b/AirBomber/FormAirPlaneCollection.cs @@ -47,7 +47,7 @@ namespace AirBomber /// Создание объекта класса-перемещения /// /// Тип создаваемого объекта - + /// /// Добавление самолета @@ -72,7 +72,7 @@ namespace AirBomber { return; } - + if (_company + airplane != -1) { MessageBox.Show("Объект добавлен"); @@ -263,5 +263,46 @@ namespace AirBomber panelCompanyTools.Enabled = true; RefreshListBoxItems(); } + + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.SaveData(saveFileDialog.FileName)) + { + MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + /// + /// Обработка кнопки загрузки + /// + /// + /// + private void loadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.LoadData(openFileDialog.FileName)) + { + RefreshListBoxItems(); + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } } diff --git a/AirBomber/FormAirPlaneCollection.resx b/AirBomber/FormAirPlaneCollection.resx index a395bff..8b1dfa1 100644 --- a/AirBomber/FormAirPlaneCollection.resx +++ b/AirBomber/FormAirPlaneCollection.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 126, 17 + + + 261, 17 + \ No newline at end of file