Use Granite.SettingsSidebar (#165)

elementary · Jan 3, 2024 · 33dad1c · 33dad1c
1 parent 7d23400
commit 33dad1c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 224 deletions.
diff --git a/po/POTFILES b/po/POTFILES
@@ -12,5 +12,3 @@ src/Widgets/AppRow.vala
 src/Widgets/ClearUsagePopover.vala
 src/Widgets/ExcludeTreeView.vala
 src/Widgets/IncludeTreeView.vala
-src/Widgets/ServiceItem.vala
-src/Widgets/ServiceList.vala
diff --git a/src/Plug.vala b/src/Plug.vala
@@ -31,8 +31,6 @@ namespace SecurityPrivacy {
         Gtk.Grid main_grid;
         Gtk.Stack stack;
 
-        ServiceList service_list;
-
         private const string FIREWALL = "firewall";
         private const string HOUSEKEEPING = "housekeeping";
         private const string HISTORY = "tracking";
@@ -132,20 +130,15 @@ namespace SecurityPrivacy {
             stack.add_titled (housekeeping, HOUSEKEEPING, _("Housekeeping"));
             stack.add_titled (location, LOCATION, _("Location Services"));
 
-            service_list = new ServiceList ();
+            var settings_sidebar = new Granite.SettingsSidebar (stack);
 
             var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
             paned.position = 200;
-            paned.add1 (service_list);
+            paned.add1 (settings_sidebar);
             paned.add2 (grid);
 
             main_grid.add (paned);
             main_grid.show_all ();
-
-            service_list.row_selected.connect ((row) => {
-                var title = ((ServiceItem)row).title;
-                stack.visible_child_name = title;
-            });
         }
 
         public override void hidden () {
@@ -158,7 +151,6 @@ namespace SecurityPrivacy {
             }
 
             stack.set_visible_child_name (location);
-            service_list.select_service_name (location);
         }
 
         // 'search' returns results like ("Keyboard → Behavior → Duration", "keyboard<sep>behavior")

diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
@@ -55,20 +55,9 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
 
         status_switch.notify["active"].connect (() => {
             if (loading == false) {
-                view.sensitive = status_switch.active;
                 UFWHelpers.set_status (status_switch.active);
             }
-
-            if (status_switch.active) {
-                status_type = Granite.SettingsPage.StatusType.SUCCESS;
-                status = _("Enabled");
-            } else {
-                warning ("Trying to set offline");
-                status_type = Granite.SettingsPage.StatusType.OFFLINE;
-                status = _("Disabled");
-            }
-
-            show_rules ();
+            update_status ();
         });
 
         create_treeview ();
@@ -81,13 +70,9 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
             status_switch.active = UFWHelpers.get_status ();
             list_store.clear ();
             remove_button.sensitive = false;
-            if (status_switch.active == true) {
-                view.sensitive = true;
-                show_rules ();
-            } else {
-                view.sensitive = false;
-            }
+
             loading = false;
+            update_status ();
         });
     }
 
@@ -465,4 +450,17 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
 
         content_area.attach (frame, 0, 1, 3, 1);
     }
+
+    private void update_status () {
+        view.sensitive = status_switch.active;
+
+        if (status_switch.active) {
+            status_type = Granite.SettingsPage.StatusType.SUCCESS;
+            status = _("Enabled");
+            show_rules ();
+        } else {
+            status_type = Granite.SettingsPage.StatusType.OFFLINE;
+            status = _("Disabled");
+        }
+    }
 }
diff --git a/src/Views/HouseKeepingPanel.vala b/src/Views/HouseKeepingPanel.vala
@@ -153,10 +153,13 @@ public class SecurityPrivacy.HouseKeepingPanel : Granite.SimpleSettingsPage {
 
         if (all_active) {
             status_type = Granite.SettingsPage.StatusType.SUCCESS;
+            status = _("Enabled");
         } else if (any_active) {
             status_type = Granite.SettingsPage.StatusType.WARNING;
+            status = _("Partially Enabled");
         } else {
             status_type = Granite.SettingsPage.StatusType.OFFLINE;
+            status = _("Disabled");
         }
 
         file_age_label.sensitive = any_active;

diff --git a/src/Widgets/ServiceItem.vala b/src/Widgets/ServiceItem.vala
diff --git a/src/Widgets/ServiceList.vala b/src/Widgets/ServiceList.vala
diff --git a/src/meson.build b/src/meson.build
@@ -19,9 +19,7 @@ plug_files = files(
     'Widgets/AppRow.vala',
     'Widgets/ClearUsagePopover.vala',
     'Widgets/ExcludeTreeView.vala',
-    'Widgets/IncludeTreeView.vala',
-    'Widgets/ServiceItem.vala',
-    'Widgets/ServiceList.vala'
+    'Widgets/IncludeTreeView.vala'
 )
 
 plug_dependencies = [