diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AbstractCompany.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AbstractCompany.cs index 62d766b..0a01510 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/AbstractCompany.cs @@ -41,7 +41,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// /// Перегрузка оператора сложения для класса @@ -53,6 +53,7 @@ public abstract class AbstractCompany { return company._collection?.Insert(truck) ?? -1; } + /// /// Перегрузка оператора удаления для класса /// diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ICollectionGenericObjects.cs index da9ba28..50a775a 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -9,8 +9,12 @@ namespace ProjectCleaningCar.CollectionGenericObjects; /// Интерфейс описания действий для набора хранимых объектов /// /// Параметр: ограничение - ссылочный тип +/// +/// Интерфейс описания действий для набора хранимых объектов +/// +/// Параметр: ограничение - ссылочный тип public interface ICollectionGenericObjects - where T : class +where T : class { /// /// Количество объектов в коллекции @@ -19,13 +23,14 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась int Insert(T obj); + /// /// Добавление объекта в коллекцию на конкретную позицию /// @@ -33,16 +38,28 @@ public interface ICollectionGenericObjects /// Позиция /// true - вставка прошла удачно, false - вставка не удалась int Insert(T obj, int position); + /// /// Удаление объекта из коллекции с конкретной позиции /// /// Позиция /// true - удаление прошло удачно, false - удаление не удалось T Remove(int position); + /// /// Получение объекта по позиции /// /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ListGenericObjects.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ListGenericObjects.cs index 1b7056f..a1184fa 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/ListGenericObjects.cs @@ -22,7 +22,19 @@ public class ListGenericObjects : ICollectionGenericObjects private int _maxCount; public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount + { + get => _maxCount; + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + public CollectionType GetCollectionType => CollectionType.List; /// /// Конструктор @@ -70,4 +82,12 @@ public class ListGenericObjects : ICollectionGenericObjects _collection.RemoveAt(position); return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Count; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs index 7a1f83d..15ca193 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectCleaningCar.CollectionGenericObjects; +namespace ProjectCleaningCar.CollectionGenericObjects; /// /// Параметризованный набор объектов /// @@ -17,8 +11,13 @@ internal class MassiveGenericObjects : ICollectionGenericObjects /// private T?[] _collection; public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } + set { if (value > 0) @@ -34,6 +33,9 @@ internal class MassiveGenericObjects : ICollectionGenericObjects } } } + + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -107,5 +109,12 @@ internal class MassiveGenericObjects : ICollectionGenericObjects return obj; } + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs index 53cc3bc..0f828cc 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/CollectionGenericObjects/StorageCollection.cs @@ -1,4 +1,5 @@ -using System; +using ProjectCleaningCar.Drawnings; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -10,7 +11,7 @@ namespace ProjectCleaningCar.CollectionGenericObjects; /// /// public class StorageCollection - where T : class + where T : DrawningTruck { /// /// Словарь (хранилище) с коллекциями @@ -20,6 +21,20 @@ public class StorageCollection /// Возвращение списка названий коллекций /// public List Keys => _storages.Keys.ToList(); + + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -87,4 +102,114 @@ public class StorageCollection return null; } } + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранении данных + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + StringBuilder sb = new(); + + using (StreamWriter sw = new StreamWriter(filename)) + { + sw.WriteLine(_collectionKey.ToString()); + foreach (KeyValuePair> kvpair in _storages) + { + // не сохраняем пустые коллекции + if (kvpair.Value.Count == 0) + continue; + sb.Append(kvpair.Key); + sb.Append(_separatorForKeyValue); + sb.Append(kvpair.Value.GetCollectionType); + sb.Append(_separatorForKeyValue); + sb.Append(kvpair.Value.MaxCount); + sb.Append(_separatorForKeyValue); + foreach (T? item in kvpair.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + continue; + sb.Append(data); + sb.Append(_separatorItems); + } + sw.WriteLine(sb.ToString()); + sb.Clear(); + } + } + return true; + } + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + using (StreamReader sr = new StreamReader(filename)) + { + string? str; + str = sr.ReadLine(); + if (str != _collectionKey.ToString()) + return false; + _storages.Clear(); + while ((str = sr.ReadLine()) != null) + { + string[] record = str.Split(_separatorForKeyValue); + if (record.Length != 4) + { + continue; + } + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + + collection.MaxCount = Convert.ToInt32(record[2]); + + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningTruck() is T ship) + { + if (collection.Insert(ship) == -1) + return false; + } + } + _storages.Add(record[0], collection); + } + } + return true; + } + /// + /// Создание коллекции по типу + /// + /// + /// + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null, + }; + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCleaningCar.cs b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCleaningCar.cs index 7988397..f357c19 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCleaningCar.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCleaningCar.cs @@ -27,6 +27,15 @@ public class DrawningCleaningCar : DrawningTruck EntityTruck = new EntityCleaningCar(speed, weight, bodyColor, additionalColor, waterTank, sweepingBrush); } + /// + /// Конструктор через сущность + /// + /// Объект класса-сущность + public DrawningCleaningCar(EntityTruck entityTruck) : base() + { + EntityTruck = entityTruck; + } + public override void DrawTransport(Graphics g) { if (EntityTruck == null || EntityTruck is not EntityCleaningCar cleaningCar || !_startPosX.HasValue || !_startPosY.HasValue) diff --git a/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCar.cs b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningTruck.cs similarity index 96% rename from ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCar.cs rename to ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningTruck.cs index 2ff89dd..4a15ecd 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningCar.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/DrawningTruck.cs @@ -58,7 +58,7 @@ public class DrawningTruck /// /// Пустой конструктор /// - private DrawningTruck() + public DrawningTruck() { _pictureWidth = null; _pictureHeight = null; @@ -85,6 +85,16 @@ public class DrawningTruck _drawningTruckWidth = drawningTruckWidth; _pictureHeight = drawningTruckHeight; } + + /// + /// Конструктор через сущность + /// + /// объект класса-сущность + public DrawningTruck(EntityTruck entityTruck) : this() + { + EntityTruck = entityTruck; + } + /// /// Установка границ поля /// diff --git a/ProjectCleaningCar/ProjectCleaningCar/Drawnings/ExtentionDrawningTruck.cs b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/ExtentionDrawningTruck.cs new file mode 100644 index 0000000..6225767 --- /dev/null +++ b/ProjectCleaningCar/ProjectCleaningCar/Drawnings/ExtentionDrawningTruck.cs @@ -0,0 +1,53 @@ +using ProjectCleaningCar.Entites; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCleaningCar.Drawnings; +/// +/// Расширение для класса EntityTruck +/// +public static class ExtentionDrawningTruck +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningTruck? CreateDrawningTruck(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityTruck? truck = EntityCleaningCar.CreateEntityCleaningCar(strs); + if (truck != null) + { + return new DrawningCleaningCar(truck); + } + truck = EntityTruck.CreateEntityTruck(strs); + if (truck != null) + { + return new DrawningTruck(truck); + } + return null; + } + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningTruck drawningTruck) + { + string[]? array = drawningTruck?.EntityTruck?.GetStringRepresentation(); + if (array == null) + { + return string.Empty; + } + return string.Join(_separatorForObject, array); + } + +} diff --git a/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCleaningCar.cs b/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCleaningCar.cs index c7ed579..c330f98 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCleaningCar.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCleaningCar.cs @@ -40,4 +40,26 @@ public class EntityCleaningCar : EntityTruck WaterTank = waterTank; SweepingBrush = sweepingBrush; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityCleaningCar), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, WaterTank.ToString(), SweepingBrush.ToString() }; + } + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityCleaningCar? CreateEntityCleaningCar(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityCleaningCar)) + { + return null; + } + return new EntityCleaningCar(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCar.cs b/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityTruck.cs similarity index 57% rename from ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCar.cs rename to ProjectCleaningCar/ProjectCleaningCar/Entites/EntityTruck.cs index c1a1384..692d45d 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityCar.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/Entites/EntityTruck.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace ProjectCleaningCar.Entites; /// -/// Класс-сущность "Машина" +/// Класс-сущность "Грузовик" /// public class EntityTruck { @@ -41,5 +41,27 @@ public class EntityTruck BodyColor = bodyColor; } + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityTruck), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityTruck? CreateEntityTruck(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityTruck)) + { + return null; + } + return new EntityTruck(Convert.ToInt32(strs[1]), + Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.Designer.cs b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.Designer.cs index af10dac..6dfcde1 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.Designer.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.Designer.cs @@ -47,10 +47,17 @@ namespace ProjectCleaningCar 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 @@ -60,9 +67,9 @@ namespace ProjectCleaningCar groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(933, 0); + groupBoxTools.Location = new Point(927, 28); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(250, 636); + groupBoxTools.Size = new Size(250, 641); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -76,7 +83,7 @@ namespace ProjectCleaningCar panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 388); + panelCompanyTools.Location = new Point(3, 393); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(244, 245); panelCompanyTools.TabIndex = 8; @@ -241,19 +248,62 @@ namespace ProjectCleaningCar // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 28); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(933, 636); + pictureBox.Size = new Size(927, 641); 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.Size = new Size(1177, 28); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip1"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(59, 24); + файлToolStripMenuItem.Text = "Файл"; + // + // 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"; + // // FormTruckCollection // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1183, 636); + ClientSize = new Size(1177, 669); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormTruckCollection"; Text = "Коллекция автомобилей"; groupBoxTools.ResumeLayout(false); @@ -262,7 +312,10 @@ namespace ProjectCleaningCar panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -285,5 +338,11 @@ namespace ProjectCleaningCar private Button buttonCreateCompany; private Button buttonCollectionDel; 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/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.cs b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.cs index bcecfd8..fdb3580 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.cs +++ b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.cs @@ -241,4 +241,47 @@ public partial class FormTruckCollection : Form panelCompanyTools.Enabled = true; RerfreshListBoxItems(); } + /// + /// Обработка нажания "Сохранение" + /// + /// + /// + 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)) + { + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + } } diff --git a/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.resx b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.resx index af32865..ee1748a 100644 --- a/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.resx +++ b/ProjectCleaningCar/ProjectCleaningCar/FormTruckCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 145, 17 + + + 310, 17 + \ No newline at end of file