From 12ec39dd211b397d9824a100ef5de6f3937d5d8c Mon Sep 17 00:00:00 2001
From: Arklightning <voltlightning@mail.ru>
Date: Mon, 21 Nov 2022 22:53:50 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D1=86=D1=83=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Trolleybus/Trolleybus/FormTrolleybusConfig.cs | 22 +++++++++++++++++--
 Trolleybus/Trolleybus/Trolleybus.csproj       |  1 +
 Trolleybus/Trolleybus/TrolleybusDelegate.cs   | 10 +++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 Trolleybus/Trolleybus/TrolleybusDelegate.cs

diff --git a/Trolleybus/Trolleybus/FormTrolleybusConfig.cs b/Trolleybus/Trolleybus/FormTrolleybusConfig.cs
index 16bc0be..c7e5d26 100644
--- a/Trolleybus/Trolleybus/FormTrolleybusConfig.cs
+++ b/Trolleybus/Trolleybus/FormTrolleybusConfig.cs
@@ -13,6 +13,7 @@ namespace Trolleybus
     public partial class FormTrolleybusConfig : Form
     {
         DrawingTrolleybus _trolleybus = null;
+        private event TrolleybusDelegate EventAddTrolleybus;
         public FormTrolleybusConfig()
         {
             InitializeComponent();
@@ -27,6 +28,18 @@ namespace Trolleybus
             pictureBoxObject.Image = btm;
         }
 
+        public void AddEvent(TrolleybusDelegate ev)
+        {
+            if (EventAddTrolleybus == null)
+            {
+                EventAddTrolleybus = new TrolleybusDelegate(ev);
+            }
+            else
+            {
+                EventAddTrolleybus += ev;
+            }
+        }
+
         private void groupBox2_Enter(object sender, EventArgs e)
         {
 
@@ -37,7 +50,7 @@ namespace Trolleybus
             (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
         }
 
-        private void panelObject_DragDrop(object sender, DragEventArgs e)
+        private void panelObject_DragEnter(object sender, DragEventArgs e)
         {
             if (e.Data.GetDataPresent(DataFormats.Text))
             {
@@ -49,7 +62,7 @@ namespace Trolleybus
             }
         }
 
-        private void panelObject_DragEnter(object sender, DragEventArgs e)
+        private void panelObject_DragDrop(object sender, DragEventArgs e)
         {
             switch (e.Data.GetData(DataFormats.Text).ToString())
             {
@@ -63,5 +76,10 @@ namespace Trolleybus
             }
             DrawTrolleybus();
         }
+        private void ButtonOk_Click(object sender, EventArgs e)
+        {
+            EventAddTrolleybus?.Invoke(_trolleybus);
+            Close();
+        }
     }
 }
diff --git a/Trolleybus/Trolleybus/Trolleybus.csproj b/Trolleybus/Trolleybus/Trolleybus.csproj
index 389e2c0..9425bfb 100644
--- a/Trolleybus/Trolleybus/Trolleybus.csproj
+++ b/Trolleybus/Trolleybus/Trolleybus.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SetTrolleybusGeneric.cs" />
     <Compile Include="SimpleMap.cs" />
+    <Compile Include="TrolleybusDelegate.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/Trolleybus/Trolleybus/TrolleybusDelegate.cs b/Trolleybus/Trolleybus/TrolleybusDelegate.cs
new file mode 100644
index 0000000..295f631
--- /dev/null
+++ b/Trolleybus/Trolleybus/TrolleybusDelegate.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Trolleybus
+{
+    public delegate void TrolleybusDelegate(DrawingTrolleybus trolleybus);
+}