Minor tweaks from #106

U-C-S · Mar 19, 2024 · 169b686 · 169b686
1 parent 7835382
commit 169b686
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/Source/Hurl.RulesetManager/SettingsState.cs b/Source/Hurl.RulesetManager/SettingsState.cs
@@ -18,7 +18,14 @@ private SettingsState()
 
     public static List<Ruleset> Rulesets
     {
-        get => Get.Rulesets;
+        get
+        {
+            if (Get.Rulesets == null)
+            {
+                Get.Rulesets = new();
+            }
+            return Get.Rulesets;
+        }
         set
         {
             _state._settings.Rulesets = value;

diff --git a/Source/Hurl.RulesetManager/Windows/EditRuleset.xaml b/Source/Hurl.RulesetManager/Windows/EditRuleset.xaml
@@ -115,8 +115,7 @@
                             <ui:TextBox
                                 x:Name="_Rule"
                                 Grid.Column="1"
-                                Margin="8"
-                                PlaceholderText="*.google.com" />
+                                Margin="8" />
                         </Grid>
 
                         <Grid Grid.Row="2">

diff --git a/Source/Hurl.RulesetManager/Windows/EditRuleset.xaml.cs b/Source/Hurl.RulesetManager/Windows/EditRuleset.xaml.cs
@@ -47,17 +47,19 @@ private void RuleAddButton_Click(object sender, RoutedEventArgs e)
         var rule = _Rule.Text;
         var mode = _RuleInputType.Text;
 
-        if(string.IsNullOrWhiteSpace(rule) || string.IsNullOrWhiteSpace(mode))
+        if (string.IsNullOrWhiteSpace(rule) || string.IsNullOrWhiteSpace(mode))
         {
             return;
         }
 
         var vm = (EditRulesetViewModel)DataContext;
-
         var ruleObj = new Rule(rule, mode);
-
         vm.Rules.Add(ruleObj);
+
         Refresh();
+
+        _Rule.Text = string.Empty;
+        _Rule.Focus();
     }
 
     private void SaveButton_Click(object sender, RoutedEventArgs e)

diff --git a/Source/Hurl.RulesetManager/Windows/RuleTestingWindow.xaml.cs b/Source/Hurl.RulesetManager/Windows/RuleTestingWindow.xaml.cs
@@ -58,7 +58,7 @@ private void TestExistingButton_Click(object sender, RoutedEventArgs e)
 
         if (matchingRuleset != null)
         {
-            PresentOutput($"Ruleset Match: {matchingRuleset.BrowserName}", Brushes.Green);
+            PresentOutput($"Ruleset Match: {matchingRuleset.BrowserName}\nRuleset Name: {matchingRuleset?.Name}", Brushes.Green);
         }
         else
         {
-Original file line number
+Diff line change
@@ Expand Up @@
             if (matchingRuleset != null)
             {
-                PresentOutput($"Ruleset Match: {matchingRuleset.BrowserName}", Brushes.Green);
+                PresentOutput($"Ruleset Match: {matchingRuleset.BrowserName}\nRuleset Name: {matchingRuleset?.Name}", Brushes.Green);
             }
             else
             {
@@ Expand Down @@