Removed disable auto-load option - v1.6.1

Alex4SSB · Sep 3, 2021 · e913210 · e913210
1 parent 913a577
commit e913210
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 31 deletions.
diff --git a/EU4-PCP.Packaging/Package.appxmanifest b/EU4-PCP.Packaging/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="57163AlexSSB.EU4-PCP"
     Publisher="CN=23CA18F3-0DFA-4F77-B8D7-9EF595185D27"
-    Version="1.6.0.0" />
+    Version="1.6.1.0" />
 
   <Properties>
     <DisplayName>EU4-PCP</DisplayName>

diff --git a/EU4-PCP/Models/AutoLoad.cs b/EU4-PCP/Models/AutoLoad.cs
@@ -2,7 +2,7 @@
 {
     public enum AutoLoad
     {
-        Disable,
+        ListMods,
         Remember,
         Fully
     }

diff --git a/EU4-PCP/Models/PCP_Implementations.cs b/EU4-PCP/Models/PCP_Implementations.cs
@@ -943,8 +943,7 @@ public static bool ValGame()
         {
             string tempGamePath = Storage.RetrieveValue(General.GamePath);
 
-            if (Storage.RetrieveBoolEnum(AutoLoad.Disable) ||
-                string.IsNullOrEmpty(tempGamePath) ||
+            if (string.IsNullOrEmpty(tempGamePath) ||
                 !PathHandler(Scope.Game)) return false;
             GamePath = tempGamePath;
 

diff --git a/EU4-PCP/Models/PCP_Logic.cs b/EU4-PCP/Models/PCP_Logic.cs
@@ -212,10 +212,7 @@ public static void ChangeMod()
         /// </summary>
         public static void UpdateProperties()
         {
-            if (Storage.RetrieveEnumGroup(typeof(AutoLoad)) is AutoLoad value
-                && LoadValue == AutoLoad.Disable && value != AutoLoad.Disable)
-                LaunchSequence();
-            else if (Naming != (ProvinceNames)Storage.RetrieveEnumGroup(typeof(ProvinceNames)))
+            if (Naming != (ProvinceNames)Storage.RetrieveEnumGroup(typeof(ProvinceNames)))
                 MainSequence();
             else if (Storage.RetrieveBool(General.ShowIllegalProv) != ShowIllegal)
                 MainSequence();

diff --git a/EU4-PCP/Properties/Resources.Designer.cs b/EU4-PCP/Properties/Resources.Designer.cs
diff --git a/EU4-PCP/Properties/Resources.resx b/EU4-PCP/Properties/Resources.resx
@@ -121,7 +121,7 @@
     <value>EU4 Province Color Picker</value>
   </data>
   <data name="AppVersion" xml:space="preserve">
-    <value>1.6.0</value>
+    <value>1.6.1</value>
   </data>
   <data name="AutoLoad" xml:space="preserve">
     <value>Auto-Load</value>
@@ -162,9 +162,6 @@
   <data name="Definition" xml:space="preserve">
     <value>From Definition</value>
   </data>
-  <data name="DisableLoad" xml:space="preserve">
-    <value>Disabled</value>
-  </data>
   <data name="Dynamic" xml:space="preserve">
     <value>Dynamic</value>
   </data>
@@ -228,6 +225,9 @@
   <data name="SettingsDateFormat" xml:space="preserve">
     <value>Date Format</value>
   </data>
+  <data name="SettingsListMods" xml:space="preserve">
+    <value>List Available Mods</value>
+  </data>
   <data name="SettingsPageAboutText" xml:space="preserve">
     <value>Settings page placeholder text.  Your app description goes here.</value>
   </data>

diff --git a/EU4-PCP/Views/SettingsPage.xaml b/EU4-PCP/Views/SettingsPage.xaml
@@ -120,26 +120,29 @@
                     <StackPanel Margin="{StaticResource SmallTopMargin}">
                         <TextBlock Style="{StaticResource BodyTextStyle}" Text="{x:Static properties:Resources.AutoLoad}" />
                         <StackPanel Margin="{StaticResource XSmallTopMargin}">
-                            <RadioButton
+                            <CheckBox
                                 x:Name="DisableLoadRadio"
-                                Checked="Box_Checked"
-                                Content="{x:Static properties:Resources.DisableLoad}"
+                                Content="{x:Static properties:Resources.SettingsListMods}"
                                 FontSize="{StaticResource MediumFontSize}"
-                                Tag="AutoLoad|Disable" />
-                            <RadioButton
+                                IsChecked="True"
+                                IsEnabled="False"
+                                Tag="AutoLoad|ListMods" />
+                            <CheckBox
                                 x:Name="RememberLoadRadio"
                                 Margin="{StaticResource XSmallTopMargin}"
                                 Checked="Box_Checked"
                                 Content="{x:Static properties:Resources.RememberLoad}"
                                 FontSize="{StaticResource MediumFontSize}"
-                                Tag="AutoLoad|Remember" />
-                            <RadioButton
+                                Tag="AutoLoad|Remember"
+                                Unchecked="Box_Checked" />
+                            <CheckBox
                                 x:Name="FullyLoadRadio"
                                 Margin="{StaticResource XSmallTopMargin}"
                                 Checked="Box_Checked"
                                 Content="{x:Static properties:Resources.FullyLoad}"
                                 FontSize="{StaticResource MediumFontSize}"
-                                Tag="AutoLoad|Fully" />
+                                Tag="AutoLoad|Fully"
+                                Unchecked="Box_Checked" />
                         </StackPanel>
                     </StackPanel>
                     <StackPanel Margin="{StaticResource SmallTopMargin}">

diff --git a/EU4-PCP/Views/SettingsPage.xaml.cs b/EU4-PCP/Views/SettingsPage.xaml.cs
@@ -209,7 +209,7 @@ private void ChangeGroup(string group, long index)
             foreach (ToggleButton item in boxes)
             {
                 var i = item.GetIndex();
-                item.IsChecked = (item is RadioButton ? i == index : i <= index);
+                item.IsChecked = i <= index; // (item is RadioButton ? i == index : i <= index)
             }
         }