From ec986c5a2ce7135ef8d715a45ebfe333fb919e5a Mon Sep 17 00:00:00 2001 From: AparyanLuiza Date: Fri, 29 Dec 2023 03:24:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D0=BA.=20=D0=A1=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormBulldozerCollections.Designer.cs | 26 ++++++++++++++++--- .../FormBulldozerCollections.resx | 13 +++++++--- .../Generics/TractorGenericStorage.cs | 2 +- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/ProjectBulldozer/FormBulldozerCollections.Designer.cs b/ProjectBulldozer/FormBulldozerCollections.Designer.cs index fc7a868..0b6c7d3 100644 --- a/ProjectBulldozer/FormBulldozerCollections.Designer.cs +++ b/ProjectBulldozer/FormBulldozerCollections.Designer.cs @@ -1,4 +1,6 @@ -namespace ProjectBulldozer +using System.ComponentModel; + +namespace ProjectBulldozer { partial class FormTractorCollections { @@ -23,7 +25,7 @@ сохранитьToolStripMenuItem = new ToolStripMenuItem(); загрузитьToolStripMenuItem = new ToolStripMenuItem(); toolStripMenuItem1 = new ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)pictureBoxCollections).BeginInit(); + ((ISupportInitialize)pictureBoxCollections).BeginInit(); groupBox1.SuspendLayout(); Instruments.SuspendLayout(); menuStrip1.SuspendLayout(); @@ -34,7 +36,7 @@ maskedTextBoxNumber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; maskedTextBoxNumber.Location = new Point(33, 356); maskedTextBoxNumber.Margin = new Padding(3, 2, 3, 2); - maskedTextBoxNumber.Mask = "0"; + maskedTextBoxNumber.Mask = "00"; maskedTextBoxNumber.Name = "maskedTextBoxNumber"; maskedTextBoxNumber.Size = new Size(131, 23); maskedTextBoxNumber.TabIndex = 4; @@ -217,7 +219,7 @@ Margin = new Padding(3, 2, 3, 2); Name = "FormTractorCollections"; Text = "Набор объектов"; - ((System.ComponentModel.ISupportInitialize)pictureBoxCollections).EndInit(); + ((ISupportInitialize)pictureBoxCollections).EndInit(); groupBox1.ResumeLayout(false); groupBox1.PerformLayout(); Instruments.ResumeLayout(false); @@ -227,6 +229,22 @@ ResumeLayout(false); PerformLayout(); } + + private void файлToolStripMenuItem_Click(object sender, EventArgs e) + { + throw new NotImplementedException(); + } + + private void saveFileDialog_FileOk(object sender, CancelEventArgs e) + { + throw new NotImplementedException(); + } + + private void openFileDialog_FileOk(object sender, CancelEventArgs e) + { + throw new NotImplementedException(); + } + private void pictureBoxCollections_Click(object sender, EventArgs e) { throw new NotImplementedException(); diff --git a/ProjectBulldozer/FormBulldozerCollections.resx b/ProjectBulldozer/FormBulldozerCollections.resx index 1c86d73..0a3f5bf 100644 --- a/ProjectBulldozer/FormBulldozerCollections.resx +++ b/ProjectBulldozer/FormBulldozerCollections.resx @@ -18,9 +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] @@ -119,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 153, 17 + + + 286, 17 + \ No newline at end of file diff --git a/ProjectBulldozer/Generics/TractorGenericStorage.cs b/ProjectBulldozer/Generics/TractorGenericStorage.cs index 82c1204..07a2f5d 100644 --- a/ProjectBulldozer/Generics/TractorGenericStorage.cs +++ b/ProjectBulldozer/Generics/TractorGenericStorage.cs @@ -112,7 +112,7 @@ namespace ProjectBulldozer.Generics _pictureWidth, _pictureHeight); if (tractor != null) { - if ((collection + tractor) == -1) + if ((collection + tractor)) { throw new ApplicationException("Ошибка добавления в коллекцию"); }