From 477475ba9d28464dd4c9bd69e40783dfde2dbaba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Mon, 27 Mar 2023 10:21:25 -0700
Subject: [PATCH] Simplify settings handling

---
 data/io.elementary.code.gschema.xml |  8 ++---
 src/Widgets/SearchBar.vala          | 49 +++--------------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
index 2ee1dfc293..1794882fa9 100644
--- a/data/io.elementary.code.gschema.xml
+++ b/data/io.elementary.code.gschema.xml
@@ -11,9 +11,9 @@
     <value nick="Always" value="2" />
   </enum>
   <enum id="io.elementary.code.case-sensitive-mode">
-    <value nick="Never" value="0" />
-    <value nick="Mixed Case" value="1" />
-    <value nick="Always" value="2" />
+    <value nick="never" value="0" />
+    <value nick="mixed" value="1" />
+    <value nick="always" value="2" />
   </enum>
 
   <schema path="/io/elementary/code/saved-state/" id="io.elementary.code.saved-state" gettext-domain="io.elementary.code">
@@ -171,7 +171,7 @@
       <description>Whether the search should use the search term as a regex expression for matching.</description>
     </key>
     <key name="case-sensitive-search" enum="io.elementary.code.case-sensitive-mode">
-      <default>"Mixed Case"</default>
+      <default>'mixed'</default>
       <summary>When text search is case sensitive</summary>
       <description>Whether the text search is case sensitive never, always or only when search term is mixed case</description>
     </key>
diff --git a/src/Widgets/SearchBar.vala b/src/Widgets/SearchBar.vala
index c54cf1b6c6..a986c99c9f 100644
--- a/src/Widgets/SearchBar.vala
+++ b/src/Widgets/SearchBar.vala
@@ -24,33 +24,7 @@ namespace Scratch.Widgets {
         enum CaseSensitiveMode {
             NEVER,
             MIXED,
-            ALWAYS;
-
-            public string to_string () {
-                switch (this) {
-                    case NEVER:
-                        return "Never";
-                    case MIXED:
-                        return "Mixed Case";
-                    case ALWAYS:
-                        return "Always";
-                    default:
-                        assert_not_reached ();
-                }
-            }
-
-            public static CaseSensitiveMode from_string (string s) {
-                switch (s) {
-                    case "Never":
-                        return NEVER;
-                    case "Mixed Case":
-                        return MIXED;
-                    case "Always":
-                        return ALWAYS;
-                    default:
-                        assert_not_reached ();
-                }
-            }
+            ALWAYS
         }
 
         public weak MainWindow window { get; construct; }
@@ -125,9 +99,9 @@ namespace Scratch.Widgets {
             cycle_search_button = new Granite.SwitchModelButton (_("Cyclic Search"));
 
             case_sensitive_search_button = new Gtk.ComboBoxText ();
-            case_sensitive_search_button.append (null, _("Never"));
-            case_sensitive_search_button.append (null, _("Mixed Case"));
-            case_sensitive_search_button.append (null, _("Always"));
+            case_sensitive_search_button.append ("never", _("Never"));
+            case_sensitive_search_button.append ("mixed", _("Mixed Case"));
+            case_sensitive_search_button.append ("always", _("Always"));
             case_sensitive_search_button.active = 1;
 
             var case_sensitive_search_label = new Gtk.Label (_("Case Sensitive"));
@@ -171,20 +145,7 @@ namespace Scratch.Widgets {
             Scratch.settings.bind ("cyclic-search", cycle_search_button, "active", SettingsBindFlags.DEFAULT);
             Scratch.settings.bind ("wholeword-search", whole_word_search_button, "active", SettingsBindFlags.DEFAULT);
             Scratch.settings.bind ("regex-search", regex_search_button, "active", SettingsBindFlags.DEFAULT);
-            Scratch.settings.bind_with_mapping (
-                "case-sensitive-search",
-                case_sensitive_search_button, "active",
-                SettingsBindFlags.DEFAULT,
-                (to_val, from_variant) => {
-                    to_val.set_int (CaseSensitiveMode.from_string (from_variant.get_string ()));
-                    return true;
-                },
-                (from_val, vartype) => {
-                    var mode_s = ((CaseSensitiveMode)(from_val.get_int ())).to_string ();
-                    return new Variant.string (mode_s);
-                },
-                null, null
-            );
+            Scratch.settings.bind ("case-sensitive-search", case_sensitive_search_button, "active-id", SettingsBindFlags.DEFAULT);
 
             var search_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
                 margin_top = 3,