From 223e3bd5f7cddb0dad58ba604869511e0fc8375b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Thu, 27 Oct 2022 21:51:44 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D0=B1=D1=83=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccordionBus/FormBusConfig.Designer.cs | 400 ++++++++++++++++++ AccordionBus/AccordionBus/FormBusConfig.cs | 136 ++++++ AccordionBus/AccordionBus/FormBusConfig.resx | 60 +++ 3 files changed, 596 insertions(+) create mode 100644 AccordionBus/AccordionBus/FormBusConfig.Designer.cs create mode 100644 AccordionBus/AccordionBus/FormBusConfig.cs create mode 100644 AccordionBus/AccordionBus/FormBusConfig.resx diff --git a/AccordionBus/AccordionBus/FormBusConfig.Designer.cs b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs new file mode 100644 index 0000000..4ba9663 --- /dev/null +++ b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs @@ -0,0 +1,400 @@ +namespace AccordionBus +{ + partial class FormBusConfig + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.groupBoxConfig = new System.Windows.Forms.GroupBox(); + this.labelModifiedObject = new System.Windows.Forms.Label(); + this.labelSimpleObject = new System.Windows.Forms.Label(); + this.groupBoxColors = new System.Windows.Forms.GroupBox(); + this.panelPurple = new System.Windows.Forms.Panel(); + this.panelBlack = new System.Windows.Forms.Panel(); + this.panelGray = new System.Windows.Forms.Panel(); + this.panelWhite = new System.Windows.Forms.Panel(); + this.panelYellow = new System.Windows.Forms.Panel(); + this.panelBlue = new System.Windows.Forms.Panel(); + this.panelGreen = new System.Windows.Forms.Panel(); + this.panelRed = new System.Windows.Forms.Panel(); + this.checkBoxBusNumber = new System.Windows.Forms.CheckBox(); + this.checkBoxRearviewMirror = new System.Windows.Forms.CheckBox(); + this.checkBoxCompartment = new System.Windows.Forms.CheckBox(); + this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown(); + this.labelWeight = new System.Windows.Forms.Label(); + this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown(); + this.labelSpeed = new System.Windows.Forms.Label(); + this.pictureBoxObject = new System.Windows.Forms.PictureBox(); + this.panelObject = new System.Windows.Forms.Panel(); + this.labelDopColor = new System.Windows.Forms.Label(); + this.labelBaseColor = new System.Windows.Forms.Label(); + this.buttonOk = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.groupBoxConfig.SuspendLayout(); + this.groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit(); + this.panelObject.SuspendLayout(); + this.SuspendLayout(); + // + // groupBoxConfig + // + this.groupBoxConfig.Controls.Add(this.labelModifiedObject); + this.groupBoxConfig.Controls.Add(this.labelSimpleObject); + this.groupBoxConfig.Controls.Add(this.groupBoxColors); + this.groupBoxConfig.Controls.Add(this.checkBoxBusNumber); + this.groupBoxConfig.Controls.Add(this.checkBoxRearviewMirror); + this.groupBoxConfig.Controls.Add(this.checkBoxCompartment); + this.groupBoxConfig.Controls.Add(this.numericUpDownWeight); + this.groupBoxConfig.Controls.Add(this.labelWeight); + this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed); + this.groupBoxConfig.Controls.Add(this.labelSpeed); + this.groupBoxConfig.Location = new System.Drawing.Point(12, 12); + this.groupBoxConfig.Name = "groupBoxConfig"; + this.groupBoxConfig.Size = new System.Drawing.Size(619, 242); + this.groupBoxConfig.TabIndex = 0; + this.groupBoxConfig.TabStop = false; + this.groupBoxConfig.Text = "Параметры"; + // + // labelModifiedObject + // + this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelModifiedObject.Location = new System.Drawing.Point(476, 184); + this.labelModifiedObject.Name = "labelModifiedObject"; + this.labelModifiedObject.Size = new System.Drawing.Size(121, 37); + this.labelModifiedObject.TabIndex = 9; + this.labelModifiedObject.Text = "Продвинутый"; + this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // labelSimpleObject + // + this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelSimpleObject.Location = new System.Drawing.Point(347, 184); + this.labelSimpleObject.Name = "labelSimpleObject"; + this.labelSimpleObject.Size = new System.Drawing.Size(112, 37); + this.labelSimpleObject.TabIndex = 8; + this.labelSimpleObject.Text = "Простой"; + this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown); + // + // groupBoxColors + // + this.groupBoxColors.Controls.Add(this.panelPurple); + this.groupBoxColors.Controls.Add(this.panelBlack); + this.groupBoxColors.Controls.Add(this.panelGray); + this.groupBoxColors.Controls.Add(this.panelWhite); + this.groupBoxColors.Controls.Add(this.panelYellow); + this.groupBoxColors.Controls.Add(this.panelBlue); + this.groupBoxColors.Controls.Add(this.panelGreen); + this.groupBoxColors.Controls.Add(this.panelRed); + this.groupBoxColors.Location = new System.Drawing.Point(347, 26); + this.groupBoxColors.Name = "groupBoxColors"; + this.groupBoxColors.Size = new System.Drawing.Size(250, 143); + this.groupBoxColors.TabIndex = 7; + this.groupBoxColors.TabStop = false; + this.groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + this.panelPurple.BackColor = System.Drawing.Color.Purple; + this.panelPurple.Location = new System.Drawing.Point(184, 82); + this.panelPurple.Name = "panelPurple"; + this.panelPurple.Size = new System.Drawing.Size(40, 40); + this.panelPurple.TabIndex = 7; + this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlack + // + this.panelBlack.BackColor = System.Drawing.Color.Black; + this.panelBlack.Location = new System.Drawing.Point(129, 82); + this.panelBlack.Name = "panelBlack"; + this.panelBlack.Size = new System.Drawing.Size(40, 40); + this.panelBlack.TabIndex = 6; + this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGray + // + this.panelGray.BackColor = System.Drawing.Color.Gray; + this.panelGray.Location = new System.Drawing.Point(72, 82); + this.panelGray.Name = "panelGray"; + this.panelGray.Size = new System.Drawing.Size(40, 40); + this.panelGray.TabIndex = 5; + this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelWhite + // + this.panelWhite.BackColor = System.Drawing.Color.White; + this.panelWhite.Location = new System.Drawing.Point(16, 82); + this.panelWhite.Name = "panelWhite"; + this.panelWhite.Size = new System.Drawing.Size(40, 40); + this.panelWhite.TabIndex = 4; + this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelYellow + // + this.panelYellow.BackColor = System.Drawing.Color.Yellow; + this.panelYellow.Location = new System.Drawing.Point(184, 26); + this.panelYellow.Name = "panelYellow"; + this.panelYellow.Size = new System.Drawing.Size(40, 40); + this.panelYellow.TabIndex = 3; + this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelBlue + // + this.panelBlue.BackColor = System.Drawing.Color.Blue; + this.panelBlue.Location = new System.Drawing.Point(129, 26); + this.panelBlue.Name = "panelBlue"; + this.panelBlue.Size = new System.Drawing.Size(40, 40); + this.panelBlue.TabIndex = 2; + this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelGreen + // + this.panelGreen.BackColor = System.Drawing.Color.Green; + this.panelGreen.Location = new System.Drawing.Point(72, 26); + this.panelGreen.Name = "panelGreen"; + this.panelGreen.Size = new System.Drawing.Size(40, 40); + this.panelGreen.TabIndex = 1; + this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // panelRed + // + this.panelRed.BackColor = System.Drawing.Color.Red; + this.panelRed.Location = new System.Drawing.Point(16, 26); + this.panelRed.Name = "panelRed"; + this.panelRed.Size = new System.Drawing.Size(40, 40); + this.panelRed.TabIndex = 0; + this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); + // + // checkBoxBusNumber + // + this.checkBoxBusNumber.AutoSize = true; + this.checkBoxBusNumber.Location = new System.Drawing.Point(23, 197); + this.checkBoxBusNumber.Name = "checkBoxBusNumber"; + this.checkBoxBusNumber.Size = new System.Drawing.Size(278, 24); + this.checkBoxBusNumber.TabIndex = 6; + this.checkBoxBusNumber.Text = "Признак наличия номера автобуса"; + this.checkBoxBusNumber.UseVisualStyleBackColor = true; + // + // checkBoxRearviewMirror + // + this.checkBoxRearviewMirror.AutoSize = true; + this.checkBoxRearviewMirror.Location = new System.Drawing.Point(23, 167); + this.checkBoxRearviewMirror.Name = "checkBoxRearviewMirror"; + this.checkBoxRearviewMirror.Size = new System.Drawing.Size(309, 24); + this.checkBoxRearviewMirror.TabIndex = 5; + this.checkBoxRearviewMirror.Text = "Признак наличия зеркала заднего вида"; + this.checkBoxRearviewMirror.UseVisualStyleBackColor = true; + // + // checkBoxCompartment + // + this.checkBoxCompartment.AutoSize = true; + this.checkBoxCompartment.Location = new System.Drawing.Point(23, 137); + this.checkBoxCompartment.Name = "checkBoxCompartment"; + this.checkBoxCompartment.Size = new System.Drawing.Size(203, 24); + this.checkBoxCompartment.TabIndex = 4; + this.checkBoxCompartment.Text = "Признак наличия отсека"; + this.checkBoxCompartment.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + this.numericUpDownWeight.Location = new System.Drawing.Point(114, 88); + this.numericUpDownWeight.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownWeight.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownWeight.Name = "numericUpDownWeight"; + this.numericUpDownWeight.Size = new System.Drawing.Size(92, 27); + this.numericUpDownWeight.TabIndex = 3; + this.numericUpDownWeight.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelWeight + // + this.labelWeight.AutoSize = true; + this.labelWeight.Location = new System.Drawing.Point(23, 90); + this.labelWeight.Name = "labelWeight"; + this.labelWeight.Size = new System.Drawing.Size(36, 20); + this.labelWeight.TabIndex = 2; + this.labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + this.numericUpDownSpeed.Location = new System.Drawing.Point(114, 38); + this.numericUpDownSpeed.Maximum = new decimal(new int[] { + 1000, + 0, + 0, + 0}); + this.numericUpDownSpeed.Minimum = new decimal(new int[] { + 100, + 0, + 0, + 0}); + this.numericUpDownSpeed.Name = "numericUpDownSpeed"; + this.numericUpDownSpeed.Size = new System.Drawing.Size(92, 27); + this.numericUpDownSpeed.TabIndex = 1; + this.numericUpDownSpeed.Value = new decimal(new int[] { + 100, + 0, + 0, + 0}); + // + // labelSpeed + // + this.labelSpeed.AutoSize = true; + this.labelSpeed.Location = new System.Drawing.Point(23, 40); + this.labelSpeed.Name = "labelSpeed"; + this.labelSpeed.Size = new System.Drawing.Size(76, 20); + this.labelSpeed.TabIndex = 0; + this.labelSpeed.Text = "Скорость:"; + // + // pictureBoxObject + // + this.pictureBoxObject.Location = new System.Drawing.Point(17, 52); + this.pictureBoxObject.Name = "pictureBoxObject"; + this.pictureBoxObject.Size = new System.Drawing.Size(240, 128); + this.pictureBoxObject.TabIndex = 1; + this.pictureBoxObject.TabStop = false; + // + // panelObject + // + this.panelObject.AllowDrop = true; + this.panelObject.Controls.Add(this.labelDopColor); + this.panelObject.Controls.Add(this.labelBaseColor); + this.panelObject.Controls.Add(this.pictureBoxObject); + this.panelObject.Location = new System.Drawing.Point(637, 23); + this.panelObject.Name = "panelObject"; + this.panelObject.Size = new System.Drawing.Size(276, 197); + this.panelObject.TabIndex = 2; + this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); + this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); + // + // labelDopColor + // + this.labelDopColor.AllowDrop = true; + this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDopColor.Location = new System.Drawing.Point(145, 12); + this.labelDopColor.Name = "labelDopColor"; + this.labelDopColor.Size = new System.Drawing.Size(112, 37); + this.labelDopColor.TabIndex = 10; + this.labelDopColor.Text = "Доп. цвет"; + this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + // + // labelBaseColor + // + this.labelBaseColor.AllowDrop = true; + this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelBaseColor.Location = new System.Drawing.Point(17, 12); + this.labelBaseColor.Name = "labelBaseColor"; + this.labelBaseColor.Size = new System.Drawing.Size(112, 37); + this.labelBaseColor.TabIndex = 9; + this.labelBaseColor.Text = "Цвет"; + this.labelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.labelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop); + this.labelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter); + // + // buttonOk + // + this.buttonOk.Location = new System.Drawing.Point(654, 233); + this.buttonOk.Name = "buttonOk"; + this.buttonOk.Size = new System.Drawing.Size(112, 29); + this.buttonOk.TabIndex = 3; + this.buttonOk.Text = "Добавить"; + this.buttonOk.UseVisualStyleBackColor = true; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(782, 233); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(112, 29); + this.buttonCancel.TabIndex = 4; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // FormBusConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(927, 274); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonOk); + this.Controls.Add(this.panelObject); + this.Controls.Add(this.groupBoxConfig); + this.Name = "FormBusConfig"; + this.Text = "Создание объекта"; + this.groupBoxConfig.ResumeLayout(false); + this.groupBoxConfig.PerformLayout(); + this.groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit(); + this.panelObject.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private GroupBox groupBoxConfig; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private CheckBox checkBoxCompartment; + private NumericUpDown numericUpDownWeight; + private Label labelWeight; + private CheckBox checkBoxRearviewMirror; + private CheckBox checkBoxBusNumber; + private Label labelModifiedObject; + private Label labelSimpleObject; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Panel panelObject; + private Label labelDopColor; + private Label labelBaseColor; + private Button buttonOk; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/AccordionBus/AccordionBus/FormBusConfig.cs b/AccordionBus/AccordionBus/FormBusConfig.cs new file mode 100644 index 0000000..008a249 --- /dev/null +++ b/AccordionBus/AccordionBus/FormBusConfig.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace AccordionBus +{ + /// + /// Форма создания объекта + /// + public partial class FormBusConfig : Form + { + /// + /// Переменная-выбранный автобус + /// + DrawningBus _bus = null; + /// + /// Конструктор + /// + public FormBusConfig() + { + InitializeComponent(); + panelBlack.MouseDown += PanelColor_MouseDown; + panelPurple.MouseDown += PanelColor_MouseDown; + panelGray.MouseDown += PanelColor_MouseDown; + panelGreen.MouseDown += PanelColor_MouseDown; + panelRed.MouseDown += PanelColor_MouseDown; + panelWhite.MouseDown += PanelColor_MouseDown; + panelYellow.MouseDown += PanelColor_MouseDown; + panelBlue.MouseDown += PanelColor_MouseDown; + } + /// + /// Отрисовать автобус + /// + private void DrawBus() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _bus?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height); + _bus?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + /// + /// Передаем информацию при нажатии на Label + /// + /// + /// + private void LabelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(DataFormats.Text)) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data.GetData(DataFormats.Text).ToString()) + { + case "labelSimpleObject": + _bus = new DrawningBus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _bus = new DrawningAccordionBus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, + checkBoxCompartment.Checked, checkBoxRearviewMirror.Checked, checkBoxBusNumber.Checked); + break; + } + DrawBus(); + } + /// + /// Отправляем цвет с панели + /// + /// + /// + private void PanelColor_MouseDown(object sender, MouseEventArgs e) + { + (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + /// + /// Принимаем основной цвет + /// + /// + /// + private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car and set color + } + /// + /// Принимаем дополнительный цвет + /// + /// + /// + private void LabelDopColor_DragDrop(object sender, DragEventArgs e) + { + // TODO Call method from object _car if _car is DrawningSportCar and set dop color + } + } +} diff --git a/AccordionBus/AccordionBus/FormBusConfig.resx b/AccordionBus/AccordionBus/FormBusConfig.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/AccordionBus/AccordionBus/FormBusConfig.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file From 1a1ea1e996ea23a5278bf66b86dedfb95c71ded8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Thu, 27 Oct 2022 22:33:44 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccordionBus/AccordionBus/BusDelegate.cs | 14 +++++++ .../AccordionBus/FormBusConfig.Designer.cs | 15 +++---- AccordionBus/AccordionBus/FormBusConfig.cs | 29 ++++++++++++++ .../AccordionBus/FormMapWithSetBuses.cs | 39 ++++++++++--------- 4 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 AccordionBus/AccordionBus/BusDelegate.cs diff --git a/AccordionBus/AccordionBus/BusDelegate.cs b/AccordionBus/AccordionBus/BusDelegate.cs new file mode 100644 index 0000000..9214b6f --- /dev/null +++ b/AccordionBus/AccordionBus/BusDelegate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AccordionBus +{ + /// + /// Делегат для передачи объекта-автобуса + /// + /// + public delegate void BusDelegate(DrawningBus bus); +} diff --git a/AccordionBus/AccordionBus/FormBusConfig.Designer.cs b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs index 4ba9663..6e169ec 100644 --- a/AccordionBus/AccordionBus/FormBusConfig.Designer.cs +++ b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs @@ -287,7 +287,7 @@ // this.pictureBoxObject.Location = new System.Drawing.Point(17, 52); this.pictureBoxObject.Name = "pictureBoxObject"; - this.pictureBoxObject.Size = new System.Drawing.Size(240, 128); + this.pictureBoxObject.Size = new System.Drawing.Size(308, 128); this.pictureBoxObject.TabIndex = 1; this.pictureBoxObject.TabStop = false; // @@ -299,7 +299,7 @@ this.panelObject.Controls.Add(this.pictureBoxObject); this.panelObject.Location = new System.Drawing.Point(637, 23); this.panelObject.Name = "panelObject"; - this.panelObject.Size = new System.Drawing.Size(276, 197); + this.panelObject.Size = new System.Drawing.Size(342, 197); this.panelObject.TabIndex = 2; this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop); this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter); @@ -308,7 +308,7 @@ // this.labelDopColor.AllowDrop = true; this.labelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelDopColor.Location = new System.Drawing.Point(145, 12); + this.labelDopColor.Location = new System.Drawing.Point(183, 12); this.labelDopColor.Name = "labelDopColor"; this.labelDopColor.Size = new System.Drawing.Size(112, 37); this.labelDopColor.TabIndex = 10; @@ -320,7 +320,7 @@ // this.labelBaseColor.AllowDrop = true; this.labelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.labelBaseColor.Location = new System.Drawing.Point(17, 12); + this.labelBaseColor.Location = new System.Drawing.Point(44, 12); this.labelBaseColor.Name = "labelBaseColor"; this.labelBaseColor.Size = new System.Drawing.Size(112, 37); this.labelBaseColor.TabIndex = 9; @@ -331,16 +331,17 @@ // // buttonOk // - this.buttonOk.Location = new System.Drawing.Point(654, 233); + this.buttonOk.Location = new System.Drawing.Point(681, 233); this.buttonOk.Name = "buttonOk"; this.buttonOk.Size = new System.Drawing.Size(112, 29); this.buttonOk.TabIndex = 3; this.buttonOk.Text = "Добавить"; this.buttonOk.UseVisualStyleBackColor = true; + this.buttonOk.Click += new System.EventHandler(this.ButtonOk_Click); // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(782, 233); + this.buttonCancel.Location = new System.Drawing.Point(820, 233); this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.Size = new System.Drawing.Size(112, 29); this.buttonCancel.TabIndex = 4; @@ -351,7 +352,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(927, 274); + this.ClientSize = new System.Drawing.Size(991, 274); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonOk); this.Controls.Add(this.panelObject); diff --git a/AccordionBus/AccordionBus/FormBusConfig.cs b/AccordionBus/AccordionBus/FormBusConfig.cs index 008a249..90e8f71 100644 --- a/AccordionBus/AccordionBus/FormBusConfig.cs +++ b/AccordionBus/AccordionBus/FormBusConfig.cs @@ -20,6 +20,10 @@ namespace AccordionBus /// DrawningBus _bus = null; /// + /// Событие + /// + private event BusDelegate EventAddBus; + /// /// Конструктор /// public FormBusConfig() @@ -46,6 +50,21 @@ namespace AccordionBus pictureBoxObject.Image = bmp; } /// + /// Добавление события + /// + /// + public void AddEvent(BusDelegate ev) + { + if (EventAddBus == null) + { + EventAddBus = new BusDelegate(ev); + } + else + { + EventAddBus += ev; + } + } + /// /// Передаем информацию при нажатии на Label /// /// @@ -132,5 +151,15 @@ namespace AccordionBus { // TODO Call method from object _car if _car is DrawningSportCar and set dop color } + /// + /// Добавление автобуса + /// + /// + /// + private void ButtonOk_Click(object sender, EventArgs e) + { + EventAddBus?.Invoke(_bus); + Close(); + } } } diff --git a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs index 13d1fc3..fafe204 100644 --- a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs +++ b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs @@ -112,24 +112,27 @@ namespace AccordionBus /// private void ButtonAddBus_Click(object sender, EventArgs e) { - if (listBoxMaps.SelectedIndex == -1) - { - return; - } - FormBus form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - DrawningObjectBus bus = new(form.SelectedBus); - if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1) - { - MessageBox.Show("Объект добавлен"); - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - } - else - { - MessageBox.Show("Не удалось добавить объект"); - } - } + var formBusConfig = new FormBusConfig(); + // TODO Call method AddEvent from formCarConfig + formBusConfig.Show(); + //if (listBoxMaps.SelectedIndex == -1) + //{ + // return; + //} + //FormBus form = new(); + //if (form.ShowDialog() == DialogResult.OK) + //{ + // DrawningObjectBus bus = new(form.SelectedBus); + // if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1) + // { + // MessageBox.Show("Объект добавлен"); + // pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + // } + // else + // { + // MessageBox.Show("Не удалось добавить объект"); + // } + //} } /// /// Удаление объекта From f62db7d97c6558f82b13881d121394842192e8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Fri, 28 Oct 2022 18:39:34 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0=D1=85=20DragDrop=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=B8=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=86=D0=B2?= =?UTF-8?q?=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccordionBus/AccordionBus/FormBusConfig.cs | 43 +++++++++++++---- .../AccordionBus/FormMapWithSetBuses.cs | 46 ++++++++++--------- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/AccordionBus/AccordionBus/FormBusConfig.cs b/AccordionBus/AccordionBus/FormBusConfig.cs index 90e8f71..2578a4c 100644 --- a/AccordionBus/AccordionBus/FormBusConfig.cs +++ b/AccordionBus/AccordionBus/FormBusConfig.cs @@ -22,7 +22,7 @@ namespace AccordionBus /// /// Событие /// - private event BusDelegate EventAddBus; + private event Action EventAddBus; /// /// Конструктор /// @@ -37,6 +37,7 @@ namespace AccordionBus panelWhite.MouseDown += PanelColor_MouseDown; panelYellow.MouseDown += PanelColor_MouseDown; panelBlue.MouseDown += PanelColor_MouseDown; + buttonCancel.Click += (s, e) => Close(); } /// /// Отрисовать автобус @@ -53,11 +54,11 @@ namespace AccordionBus /// Добавление события /// /// - public void AddEvent(BusDelegate ev) + public void AddEvent(Action ev) { if (EventAddBus == null) { - EventAddBus = new BusDelegate(ev); + EventAddBus = new(ev); } else { @@ -118,13 +119,14 @@ namespace AccordionBus (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); } /// - /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// Устанавливает статус перемещаемых данных /// - /// /// - private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) + /// Тип которого должны соответствовать перемещаемые данные + /// Условие на возможность копирования данных + private void SetDragEffect(DragEventArgs e, Type needTypeData, bool condition) { - if (e.Data.GetDataPresent(typeof(Color))) + if (e.Data.GetDataPresent(needTypeData) && condition) { e.Effect = DragDropEffects.Copy; } @@ -134,13 +136,30 @@ namespace AccordionBus } } /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void LabelBaseColor_DragEnter(object sender, DragEventArgs e) => SetDragEffect(e, typeof(Color), _bus != null); + private void LabelDopColor_DragEnter(object sender, DragEventArgs e) => SetDragEffect(e, typeof(Color), _bus != null && _bus is DrawningAccordionBus); + /// /// Принимаем основной цвет /// /// /// private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car and set color + var color = (Color)e.Data.GetData(typeof(Color)); + if (_bus is DrawningAccordionBus) + { + var a = (EntityAccordionBus)_bus.Bus; + _bus = new DrawningAccordionBus(a.Speed, a.Weight, color, a.DopColor, a.Compartment, a.RearviewMirror, a.BusNumber); + } + else if (_bus is DrawningBus) + { + _bus = new DrawningBus(_bus.Bus.Speed, _bus.Bus.Weight, color); + } + DrawBus(); } /// /// Принимаем дополнительный цвет @@ -149,7 +168,13 @@ namespace AccordionBus /// private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { - // TODO Call method from object _car if _car is DrawningSportCar and set dop color + var color = (Color)e.Data.GetData(typeof(Color)); + if (_bus is DrawningAccordionBus) + { + var a = (EntityAccordionBus)_bus.Bus; + _bus = new DrawningAccordionBus(a.Speed, a.Weight, a.BodyColor, color, a.Compartment, a.RearviewMirror, a.BusNumber); + } + DrawBus(); } /// /// Добавление автобуса diff --git a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs index fafe204..6812f8f 100644 --- a/AccordionBus/AccordionBus/FormMapWithSetBuses.cs +++ b/AccordionBus/AccordionBus/FormMapWithSetBuses.cs @@ -106,33 +106,35 @@ namespace AccordionBus } } /// - /// Добавление объекта + /// Вызов формы для создания автобуса /// /// /// private void ButtonAddBus_Click(object sender, EventArgs e) { - var formBusConfig = new FormBusConfig(); - // TODO Call method AddEvent from formCarConfig - formBusConfig.Show(); - //if (listBoxMaps.SelectedIndex == -1) - //{ - // return; - //} - //FormBus form = new(); - //if (form.ShowDialog() == DialogResult.OK) - //{ - // DrawningObjectBus bus = new(form.SelectedBus); - // if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1) - // { - // MessageBox.Show("Объект добавлен"); - // pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); - // } - // else - // { - // MessageBox.Show("Не удалось добавить объект"); - // } - //} + FormBusConfig formBus = new(); + formBus.AddEvent(new(AddBus)); + formBus.Show(); + } + /// + /// Добавление объекта + /// + /// + private void AddBus(DrawningBus bus) + { + if (listBoxMaps.SelectedIndex == -1) + { + MessageBox.Show("Перед добавлением объекта необходимо создать карту"); + } + else if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectBus(bus) != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } } /// /// Удаление объекта From adfe468a8258797219578724ac9559bc01276ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Fri, 28 Oct 2022 18:53:36 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=91=D1=8B=D0=BB=D0=B0=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D1=83=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81?= =?UTF-8?q?=D1=82=D0=B2=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B1=D1=83=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccordionBus/AccordionBus/DrawningAccordionBus.cs | 12 ++++++++++++ AccordionBus/AccordionBus/DrawningBus.cs | 11 +++++++++++ AccordionBus/AccordionBus/FormBusConfig.cs | 11 +++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/AccordionBus/AccordionBus/DrawningAccordionBus.cs b/AccordionBus/AccordionBus/DrawningAccordionBus.cs index 9a8f8aa..2974694 100644 --- a/AccordionBus/AccordionBus/DrawningAccordionBus.cs +++ b/AccordionBus/AccordionBus/DrawningAccordionBus.cs @@ -26,6 +26,18 @@ namespace AccordionBus { Bus = new EntityAccordionBus(speed, weight, bodyColor, dopColor, compartment, rearviewMirror, busNumber); } + /// + /// Получение копии текущего объекта. Для изменения свойств поменять необязательные аргументы необходимым значением + /// + /// Скорость + /// Вес автобуса + /// Цвет кузова + /// Копия или измененная копия текущего объекта + public DrawningAccordionBus Copy(int? speed = null, float? weight = null, Color? bodyColor = null, Color? dopColor = null, bool? compartment = null, bool? rearviewMirror = null, bool? busNumber = null) + { + var e = (EntityAccordionBus)Bus; + return new DrawningAccordionBus(speed ?? e.Speed, weight ?? e.Weight, bodyColor ?? e.BodyColor, dopColor ?? e.DopColor, compartment ?? e.Compartment, rearviewMirror ?? e.RearviewMirror, busNumber ?? e.BusNumber); + } public override void DrawTransport(Graphics g) { if (Bus is not EntityAccordionBus accordionBus) diff --git a/AccordionBus/AccordionBus/DrawningBus.cs b/AccordionBus/AccordionBus/DrawningBus.cs index c048251..47b9abb 100644 --- a/AccordionBus/AccordionBus/DrawningBus.cs +++ b/AccordionBus/AccordionBus/DrawningBus.cs @@ -52,6 +52,17 @@ namespace AccordionBus Bus = new EntityBus(speed, weight, bodyColor); } /// + /// Получение копии текущего объекта. Для изменения свойств поменять необязательные аргументы необходимым значением + /// + /// Скорость + /// Вес автобуса + /// Цвет кузова + /// Копия или измененная копия текущего объекта + public DrawningBus Copy(int? speed = null, float? weight = null, Color? bodyColor = null) + { + return new DrawningBus(speed ?? Bus.Speed, weight ?? Bus.Weight, bodyColor ?? Bus.BodyColor); + } + /// /// Инициализация свойств /// /// Скорость diff --git a/AccordionBus/AccordionBus/FormBusConfig.cs b/AccordionBus/AccordionBus/FormBusConfig.cs index 2578a4c..9728c4f 100644 --- a/AccordionBus/AccordionBus/FormBusConfig.cs +++ b/AccordionBus/AccordionBus/FormBusConfig.cs @@ -152,12 +152,11 @@ namespace AccordionBus var color = (Color)e.Data.GetData(typeof(Color)); if (_bus is DrawningAccordionBus) { - var a = (EntityAccordionBus)_bus.Bus; - _bus = new DrawningAccordionBus(a.Speed, a.Weight, color, a.DopColor, a.Compartment, a.RearviewMirror, a.BusNumber); + _bus = ((DrawningAccordionBus)_bus).Copy(bodyColor: color); } else if (_bus is DrawningBus) { - _bus = new DrawningBus(_bus.Bus.Speed, _bus.Bus.Weight, color); + _bus = _bus.Copy(bodyColor: color); } DrawBus(); } @@ -169,10 +168,10 @@ namespace AccordionBus private void LabelDopColor_DragDrop(object sender, DragEventArgs e) { var color = (Color)e.Data.GetData(typeof(Color)); - if (_bus is DrawningAccordionBus) + var bus = _bus as DrawningAccordionBus; + if (bus != null) { - var a = (EntityAccordionBus)_bus.Bus; - _bus = new DrawningAccordionBus(a.Speed, a.Weight, a.BodyColor, color, a.Compartment, a.RearviewMirror, a.BusNumber); + _bus = bus.Copy(dopColor: color); } DrawBus(); } From f76c9a2d4781cfe31c96e7720dc97a27e9b7e60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Fri, 28 Oct 2022 18:56:17 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=91=D1=8B=D0=BB=20=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=81=D0=BE=D0=B1=D1=81=D1=82=D0=B2=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B4=D0=B5=D0=BB=D0=B5=D0=B3=D0=B0?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccordionBus/AccordionBus/BusDelegate.cs | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 AccordionBus/AccordionBus/BusDelegate.cs diff --git a/AccordionBus/AccordionBus/BusDelegate.cs b/AccordionBus/AccordionBus/BusDelegate.cs deleted file mode 100644 index 9214b6f..0000000 --- a/AccordionBus/AccordionBus/BusDelegate.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AccordionBus -{ - /// - /// Делегат для передачи объекта-автобуса - /// - /// - public delegate void BusDelegate(DrawningBus bus); -} From ba8006d2d14ac6e41a89416965cc86ef14587960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D0=BB=D0=B5=D1=80=D0=B8=D1=8F=20=D0=9D=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=D1=84=D0=BE=D1=80=D0=BE=D0=B2=D0=B0?= Date: Fri, 28 Oct 2022 20:00:17 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8?= =?UTF-8?q?=D0=B8=20DragEnter=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=BE=D0=BF.?= =?UTF-8?q?=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AccordionBus/AccordionBus/FormBusConfig.Designer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/AccordionBus/AccordionBus/FormBusConfig.Designer.cs b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs index 6e169ec..4a50a63 100644 --- a/AccordionBus/AccordionBus/FormBusConfig.Designer.cs +++ b/AccordionBus/AccordionBus/FormBusConfig.Designer.cs @@ -315,6 +315,7 @@ this.labelDopColor.Text = "Доп. цвет"; this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop); + this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter); // // labelBaseColor //