From 3a33fde10abdf68ba62ab96b4550f570b8307eb8 Mon Sep 17 00:00:00 2001
From: Alex Z <Aleks-Z@users.noreply.github.com>
Date: Sat, 7 Mar 2020 01:43:10 +0300
Subject: [PATCH] fixed EpicMorg/UniversalValveToolbox#8

---
 .../Model/VIewModel/FormAddonViewModel.cs     |  9 ++++-
 .../translations/VarStrings.Designer.cs       | 11 +++++-
 .../Properties/translations/VarStrings.resx   |  5 ++-
 .../translations/VarStrings.ru.resx           |  5 ++-
 src/UniversalValveToolbox/UI/FormAddons.cs    | 37 ++++++++++++++-----
 5 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/UniversalValveToolbox/Model/VIewModel/FormAddonViewModel.cs b/src/UniversalValveToolbox/Model/VIewModel/FormAddonViewModel.cs
index 3d83562..0a0fab9 100644
--- a/src/UniversalValveToolbox/Model/VIewModel/FormAddonViewModel.cs
+++ b/src/UniversalValveToolbox/Model/VIewModel/FormAddonViewModel.cs
@@ -57,7 +57,14 @@ namespace UniversalValveToolbox.Model.ViewModel {
             }
         }
 
-        public AddonDtoModel SelectAddon => addons[selectAddonIndex];
+        public AddonDtoModel SelectAddon {
+            get {
+                if (addons == null || addons.Length == 0)
+                    return null;
+                
+                return addons[selectAddonIndex]; 
+            }
+        }
 
         public DictionaryEntry SelectCategory {
             get { return categories[selectCategoryIndex]; }
diff --git a/src/UniversalValveToolbox/Properties/translations/VarStrings.Designer.cs b/src/UniversalValveToolbox/Properties/translations/VarStrings.Designer.cs
index 07f3b2b..dbd3363 100644
--- a/src/UniversalValveToolbox/Properties/translations/VarStrings.Designer.cs
+++ b/src/UniversalValveToolbox/Properties/translations/VarStrings.Designer.cs
@@ -61,7 +61,16 @@ namespace UniversalValveToolbox.Properties.translations {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;new project&gt;.
+        ///   Looks up a localized string similar to &lt;New Addon&gt;.
+        /// </summary>
+        internal static string strNewAddon {
+            get {
+                return ResourceManager.GetString("strNewAddon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;New Project&gt;.
         /// </summary>
         internal static string strNewProject {
             get {
diff --git a/src/UniversalValveToolbox/Properties/translations/VarStrings.resx b/src/UniversalValveToolbox/Properties/translations/VarStrings.resx
index 46a5b9d..c7a6433 100644
--- a/src/UniversalValveToolbox/Properties/translations/VarStrings.resx
+++ b/src/UniversalValveToolbox/Properties/translations/VarStrings.resx
@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="strNewAddon" xml:space="preserve">
+    <value>&lt;New Addon&gt;</value>
+  </data>
   <data name="strNewProject" xml:space="preserve">
-    <value>&lt;new project&gt;</value>
+    <value>&lt;New Project&gt;</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/UniversalValveToolbox/Properties/translations/VarStrings.ru.resx b/src/UniversalValveToolbox/Properties/translations/VarStrings.ru.resx
index 972559d..7e479a7 100644
--- a/src/UniversalValveToolbox/Properties/translations/VarStrings.ru.resx
+++ b/src/UniversalValveToolbox/Properties/translations/VarStrings.ru.resx
@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="strNewAddon" xml:space="preserve">
+    <value>&lt;Новое Дополнение&gt;</value>
+  </data>
   <data name="strNewProject" xml:space="preserve">
-    <value>&lt;новый проект&gt;</value>
+    <value>&lt;Новый Проект&gt;</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/UniversalValveToolbox/UI/FormAddons.cs b/src/UniversalValveToolbox/UI/FormAddons.cs
index e3b185c..31c30af 100644
--- a/src/UniversalValveToolbox/UI/FormAddons.cs
+++ b/src/UniversalValveToolbox/UI/FormAddons.cs
@@ -75,11 +75,18 @@ namespace UniversalValveToolbox {
             engineCheckedListBox.Items.Clear();
             engineCheckedListBox.Items.AddRange(model.Engines);
 
-            for (var i = 0; i < model.Engines.Length; i++) {
-                var engine = model.Engines[i];
+            if (model.SelectAddon != null) {
+                for (var i = 0; i < model.Engines.Length; i++) {
+                    var engine = model.Engines[i];
 
-                if (model.SelectAddon.Engines.Contains(engine.Appid)) {
-                    engineCheckedListBox.SetItemChecked(i, true);
+                    if (model.SelectAddon.Engines.Contains(engine.Appid)) {
+                        engineCheckedListBox.SetItemChecked(i, true);
+                    }
+                }
+            }
+            else {
+                for (var i = 0; i < model.Engines.Length; i++) {
+                    engineCheckedListBox.SetItemChecked(i, false);
                 }
             }
 
@@ -87,9 +94,15 @@ namespace UniversalValveToolbox {
         }
 
         private void UpdateAddonsComboBox() {
-            comboBox_Addon.Items.Clear();
-            comboBox_Addon.Items.AddRange(model.Addons);
-            comboBox_Addon.SelectedIndex = 0;
+            if (model.Addons.Length == 0) {
+                New();
+            }
+            else {
+                comboBox_Addon.Items.Clear();
+                comboBox_Addon.Items.AddRange(model.Addons);
+
+                comboBox_Addon.SelectedIndex = 0;
+            }
         }
 
         private void UpdateAddonCategoryComboBox() {
@@ -136,8 +149,7 @@ namespace UniversalValveToolbox {
         }
 
         private void New() {
-            var newAddon = new AddonDtoModel();
-            newAddon.Name = "<new addon>";
+            var newAddon = CreateNewEmptyAddon();
 
             var newAddonList = new List<AddonDtoModel>(model.Addons);
             newAddonList.Insert(0, newAddon);
@@ -147,6 +159,13 @@ namespace UniversalValveToolbox {
             UpdateAddonsComboBox();
         }
 
+        private AddonDtoModel CreateNewEmptyAddon() {
+            var newAddon = new AddonDtoModel();
+            newAddon.Name = Properties.translations.VarStrings.strNewAddon;
+
+            return newAddon;
+        }
+
         private void Save() {
             JsonFileUtil.SaveValues(DataProvider.AddonsPath, "json", model.Addons.ToList());
         }