Switched LastGroup to a String variable and fixed implementation with…

… a try/catch block to default back to Shopping List if variable is lost
Rottenbeer · Aug 4, 2019 · 74cac98 · 74cac98
1 parent c137fb7
commit 74cac98
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/LarkatorGUI/MainWindow.xaml b/LarkatorGUI/MainWindow.xaml
@@ -317,7 +317,7 @@
                     <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
                         <StackPanel Margin="8" Orientation="Vertical" HorizontalAlignment="Stretch" DataContext="{Binding NewSearch}">
                             <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True" />
-                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}" IsEditable="True" />
+                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}" IsEditable="True" StaysOpenOnEdit="True"/>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
                                 <TextBlock Text="Min"/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>

diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
@@ -476,7 +476,7 @@ private void CreateSearch_Click(object sender, RoutedEventArgs e)
 
             speciesCombo.ItemsSource = arkReader.AllSpecies;
             groupsCombo.ItemsSource = ListSearches.Select(sc => sc.Group).Distinct().OrderBy(g => g).ToArray();
-            groupsCombo.SelectedIndex = Properties.Settings.Default.LastGroup;
+            groupsCombo.SelectedItem = Properties.Settings.Default.LastGroup;
         }
 
         private void Dev_Calibration_Click(object sender, MouseButtonEventArgs e)
@@ -532,7 +532,15 @@ private void SaveSearch_Click(object sender, RoutedEventArgs e)
             SearchCriteria tempSearch;
             int order = 100;
 
-            Properties.Settings.Default.LastGroup = groupsCombo.SelectedIndex;
+            //If we lose our selection default back to Shopping List
+            try
+            {
+                Properties.Settings.Default.LastGroup = groupsCombo.Text;
+            }
+            catch 
+            {
+                Properties.Settings.Default.LastGroup = "Shopping List";
+            }
             Properties.Settings.Default.Save();
 
 

diff --git a/LarkatorGUI/Properties/Settings.Designer.cs b/LarkatorGUI/Properties/Settings.Designer.cs
diff --git a/LarkatorGUI/Properties/Settings.settings b/LarkatorGUI/Properties/Settings.settings
@@ -71,8 +71,8 @@
     <Setting Name="ShowSpeed" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="LastGroup" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">0</Value>
+    <Setting Name="LastGroup" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="HideUntameable" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>

diff --git a/LarkatorGUI/app.config b/LarkatorGUI/app.config
@@ -77,7 +77,7 @@
                 <value>True</value>
             </setting>
             <setting name="LastGroup" serializeAs="String">
-                <value>0</value>
+                <value />
             </setting>
             <setting name="HideUntameable" serializeAs="String">
                 <value>False</value>