From 29cd0d9cedecf45141a82cb8425115660e2a0792 Mon Sep 17 00:00:00 2001 From: Sharosh322 <132645197+Sharosh322@users.noreply.github.com> Date: Sat, 23 Dec 2023 11:05:38 +0400 Subject: [PATCH] Done --- ...esigner.cs => FormPlaneConfig.Designer.cs} | 2 +- .../{PlaneConfig.cs => FormPlaneConfig.cs} | 19 +++++++++++++++++-- ...{PlaneConfig.resx => FormPlaneConfig.resx} | 0 .../ProjStormtrooper/PlaneCollection.cs | 6 +++++- .../ProjStormtrooper/PlanesGenericStorage.cs | 2 +- 5 files changed, 24 insertions(+), 5 deletions(-) rename ProjStormtrooper/ProjStormtrooper/{PlaneConfig.Designer.cs => FormPlaneConfig.Designer.cs} (99%) rename ProjStormtrooper/ProjStormtrooper/{PlaneConfig.cs => FormPlaneConfig.cs} (92%) rename ProjStormtrooper/ProjStormtrooper/{PlaneConfig.resx => FormPlaneConfig.resx} (100%) diff --git a/ProjStormtrooper/ProjStormtrooper/PlaneConfig.Designer.cs b/ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.Designer.cs similarity index 99% rename from ProjStormtrooper/ProjStormtrooper/PlaneConfig.Designer.cs rename to ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.Designer.cs index 6ecfe56..8215bda 100644 --- a/ProjStormtrooper/ProjStormtrooper/PlaneConfig.Designer.cs +++ b/ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.Designer.cs @@ -1,6 +1,6 @@ namespace ProjStormtrooper { - partial class PlaneConfig + partial class FormPlaneConfig { /// /// Required designer variable. diff --git a/ProjStormtrooper/ProjStormtrooper/PlaneConfig.cs b/ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.cs similarity index 92% rename from ProjStormtrooper/ProjStormtrooper/PlaneConfig.cs rename to ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.cs index f06554a..5c5bf6e 100644 --- a/ProjStormtrooper/ProjStormtrooper/PlaneConfig.cs +++ b/ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; namespace ProjStormtrooper { - public partial class PlaneConfig : Form + public partial class FormPlaneConfig : Form { /// /// Переменная-выбранный самолет @@ -20,7 +20,7 @@ namespace ProjStormtrooper /// Событие /// private event Action? EventAddPlane; - public PlaneConfig() + public FormPlaneConfig() { InitializeComponent(); @@ -123,5 +123,20 @@ namespace ProjStormtrooper (_plane.EntityPlane as EntityStormtrooper).SetAdditionalColor((Color)e.Data.GetData(typeof(Color).ToString())); DrawPlane(); } + + private void labelStormtrooper_Click(object sender, EventArgs e) + { + + } + + private void panelColorRed_Paint(object sender, PaintEventArgs e) + { + + } + + private void panelColorYellow_Paint(object sender, PaintEventArgs e) + { + + } } } diff --git a/ProjStormtrooper/ProjStormtrooper/PlaneConfig.resx b/ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.resx similarity index 100% rename from ProjStormtrooper/ProjStormtrooper/PlaneConfig.resx rename to ProjStormtrooper/ProjStormtrooper/FormPlaneConfig.resx diff --git a/ProjStormtrooper/ProjStormtrooper/PlaneCollection.cs b/ProjStormtrooper/ProjStormtrooper/PlaneCollection.cs index 4d79d8d..7be6c64 100644 --- a/ProjStormtrooper/ProjStormtrooper/PlaneCollection.cs +++ b/ProjStormtrooper/ProjStormtrooper/PlaneCollection.cs @@ -95,7 +95,7 @@ namespace ProjStormtrooper /// private void buttonAddPlane_Click(object sender, EventArgs e) { - var formPlaneConfig = new PlaneConfig(); + var formPlaneConfig = new FormPlaneConfig(); formPlaneConfig.AddEvent(AddPlaneListener); formPlaneConfig.Show(); } @@ -207,5 +207,9 @@ namespace ProjStormtrooper } } } + private void openFileDialog_FileOk(object sender, CancelEventArgs e) + { + + } } } diff --git a/ProjStormtrooper/ProjStormtrooper/PlanesGenericStorage.cs b/ProjStormtrooper/ProjStormtrooper/PlanesGenericStorage.cs index d4a2f50..a95ec15 100644 --- a/ProjStormtrooper/ProjStormtrooper/PlanesGenericStorage.cs +++ b/ProjStormtrooper/ProjStormtrooper/PlanesGenericStorage.cs @@ -106,7 +106,7 @@ namespace ProjStormtrooper return true; } /// - /// Загрузка информации по самолету в хранилище из файла + /// Загрузка информации по автомобилям в хранилище из файла /// /// Путь и имя файла /// true - загрузка прошла успешно, false - ошибка при загрузке данных