Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/sidebar-nav into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

Add ServiceItem and ServiceList widgets

Plug.vala: Add ServiceList instead of StackSwitcher

FirewallPanel.vala,
TrackPanel.vala:
* Fix frame issues
* Margin on top

This is mainly to facilitate the fact that we're going to have lots of new pages for the various agents, but it will also allow us to communicate status of various services

[lp:~elementary-pantheon/switchboard-plug-security-privacy/sidebar-nav]

298. By Danielle Foré on 2017-02-27

use network-firewall icon

[David Hewitt (davidmhewitt)]

Looks good, but navigating the plug with the tab key on the keyboard got much harder. It's not too bad with the arrow keys but I feel like the tab focus order isn't what I'd expect it to be. Would you agree?

review: Needs Information

[Danielle Foré (danrabbit)]

afaik tab focus is set totally by Gtk+ automatically. It seems to work the same way across all the plugs

[David Hewitt (davidmhewitt)]

It is possible to set the tab focus order with set_focus_chain but I see that the other plugs with a sidebar like the network plug and the language & region plug have what I'd consider a slightly strange focus order. So beyond the scope of this merge request.

Everything else looked good, so I'm approving.

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-26 17:34:10 +0000
+++ src/CMakeLists.txt	2017-02-27 01:30:54 +0000
@@ -25,6 +25,8 @@
     Widgets/AppChooser.vala
     Widgets/AppRow.vala
     Widgets/ClearUsagePopover.vala
+    Widgets/ServiceItem.vala
+    Widgets/ServiceList.vala
 
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2017-02-26 18:17:34 +0000
+++ src/Plug.vala	2017-02-27 01:30:54 +0000
@@ -78,16 +78,25 @@
             stack.add_titled (locking, "locking", _("Locking"));
             stack.add_titled (firewall, "firewall", _("Firewall"));
 
-            var stack_switcher = new Gtk.StackSwitcher ();
-            stack_switcher.set_stack (stack);
-            stack_switcher.halign = Gtk.Align.CENTER;
-            stack_switcher.margin = 12;
-
-            main_grid.attach (infobar, 0, 0, 1, 1);
-            main_grid.attach (stack_switcher, 0, 1, 1, 1);
-            main_grid.attach (stack, 0, 2, 1, 1);
+            var grid = new Gtk.Grid ();
+            grid.attach (infobar, 0, 0, 1, 1);
+            grid.attach (stack, 0, 3, 1, 1);
+
+            var service_list = new ServiceList ();
+
+            var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
+            paned.position = 200;
+            paned.add1 (service_list);
+            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;
+            });
+
             try {
                 var permission = new Polkit.Permission.sync ("org.pantheon.security-privacy", Polkit.UnixProcess.new (Posix.getpid ()));
 

=== modified file 'src/Views/FirewallPanel.vala'
--- src/Views/FirewallPanel.vala	2017-02-19 21:27:25 +0000
+++ src/Views/FirewallPanel.vala	2017-02-27 01:30:54 +0000
@@ -42,7 +42,6 @@
         column_spacing = 12;
         row_spacing = 6;
         margin = 12;
-        margin_top = 0;
         orientation = Gtk.Orientation.VERTICAL;
 
         var status_grid = new Gtk.Grid ();
@@ -254,12 +253,15 @@
         var view_grid = new Gtk.Grid ();
 
         var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.shadow_type = Gtk.ShadowType.IN;
         scrolled.expand = true;
         scrolled.add (view);
 
         view_grid.attach (scrolled, 0, 0, 1, 1);
         view_grid.attach (list_toolbar, 0, 1, 1, 1);
-        add (view_grid);
+
+        var frame = new Gtk.Frame (null);
+        frame.add (view_grid);
+
+        add (frame);
     }
 }

=== modified file 'src/Views/LockPanel.vala'
--- src/Views/LockPanel.vala	2017-02-19 21:27:25 +0000
+++ src/Views/LockPanel.vala	2017-02-27 01:30:54 +0000
@@ -27,6 +27,7 @@
     public LockPanel () {
         column_spacing = 12;
         row_spacing = 6;
+        margin = 12;
 
         locker = new Settings ("apps.light-locker");
 

=== modified file 'src/Views/TrackPanel.vala'
--- src/Views/TrackPanel.vala	2017-02-25 23:38:34 +0000
+++ src/Views/TrackPanel.vala	2017-02-27 01:30:54 +0000
@@ -102,7 +102,6 @@
         column_spacing = 12;
         row_spacing = 12;
         margin = 12;
-        margin_top = 0;
 
         create_include_treeview ();
         create_exclude_treeview ();
@@ -231,7 +230,6 @@
         view.insert_column_with_attributes (-1, "", cell, "markup", NotColumns.NAME);
 
         var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.shadow_type = Gtk.ShadowType.IN;
         scrolled.expand = true;
         scrolled.add (view);
 
@@ -301,6 +299,9 @@
         frame_grid.add (scrolled);
         frame_grid.add (list_toolbar);
 
+        var frame = new Gtk.Frame (null);
+        frame.add (frame_grid);
+
         var record_label = new Gtk.Label (_("Do not collect data from the following:"));
         record_label.xalign = 0;
 
@@ -308,7 +309,7 @@
         exclude_grid.row_spacing = 6;
         exclude_grid.orientation = Gtk.Orientation.VERTICAL;
         exclude_grid.add (record_label);
-        exclude_grid.add (frame_grid);
+        exclude_grid.add (frame);
         attach (exclude_grid, 1, 0, 1, 1);
 
         view.cursor_changed.connect (() => {

=== added file 'src/Widgets/ServiceItem.vala'
--- src/Widgets/ServiceItem.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/ServiceItem.vala	2017-02-27 01:30:54 +0000
@@ -0,0 +1,69 @@
+public class ServiceItem: Gtk.ListBoxRow {
+    public enum Status {
+        ENABLED,
+        DISABLED
+    }
+
+    public Status status {
+        set {
+            switch (value) {
+                case Status.ENABLED:
+                    status_icon.icon_name = "user-available";
+                    status_label.label = _("Enabled");
+                    break;
+                case Status.DISABLED:
+                    status_icon.icon_name = "user-offline";
+                    status_label.label = _("Disabled");
+                    break;
+            }
+            status_label.no_show_all = false;
+            status_label.label = "<span font_size='small'>" + status_label.label + "</span>";
+        }
+    }
+
+    private Gtk.Image status_icon;
+    private Gtk.Label status_label;
+
+    public string icon_name { get; construct; }
+    public string label { get; construct; }
+    public string title { get; construct; }
+
+    public ServiceItem (string icon_name, string title, string label) {
+        Object (icon_name: icon_name,
+                label: label,
+                title: title);
+    }
+
+    construct {
+        var icon = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DND);
+
+        var title_label = new Gtk.Label (label);
+        title_label.get_style_context ().add_class ("h3");
+        title_label.ellipsize = Pango.EllipsizeMode.END;
+        title_label.xalign = 0;
+
+        status_icon = new Gtk.Image ();
+        status_icon.halign = Gtk.Align.END;
+        status_icon.valign = Gtk.Align.END;
+
+        status_label = new Gtk.Label (null);
+        status_label.no_show_all = true;
+        status_label.use_markup = true;
+        status_label.ellipsize = Pango.EllipsizeMode.END;
+        status_label.xalign = 0;
+
+        var overlay = new Gtk.Overlay ();
+        overlay.width_request = 38;
+        overlay.add (icon);
+        overlay.add_overlay (status_icon);
+
+        var grid = new Gtk.Grid ();
+        grid.margin = 6;
+        grid.column_spacing = 6;
+        grid.attach (overlay, 0, 0, 1, 2);
+        grid.attach (title_label, 1, 0, 1, 1);
+        grid.attach (status_label, 1, 1, 1, 1);
+
+        add (grid);
+    }
+}

=== added file 'src/Widgets/ServiceList.vala'
--- src/Widgets/ServiceList.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/ServiceList.vala	2017-02-27 01:30:54 +0000
@@ -0,0 +1,16 @@
+public class ServiceList : Gtk.ListBox {
+    public ServiceList () {
+        Object (activate_on_single_click: true,
+                selection_mode: Gtk.SelectionMode.SINGLE);
+    }
+
+    construct {
+        var privacy_item = new ServiceItem ("document-open-recent", "tracking", _("Privacy"));
+        var lock_item = new ServiceItem ("system-lock-screen", "locking", _("Locking"));
+        var firewall_item = new ServiceItem ("network-firewall", "firewall", _("Firewall"));
+
+        add (privacy_item);
+        add (lock_item);
+        add (firewall_item);
+    }
+}