Merge lp:~elementary-pantheon/switchboard-plug-parental-controls/ui-cleanups into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Danielle Foré]

Plug.vala:
* Remove extra box

AppsBox.vala:
* Use Grid instead of Box
* Use View class to style frame instead of hardcoding colors
* Use ActionBar instead of ToolBar with expander
* Make header consistent with InternetBox

GeneralBox.vala:
* Use Grid instead of Box
* Use Property bindings instead of methods
* Use Construct method
* Use View class to style frame instead of hardcoding colors
* Don't hardcode magic number margins

InternetBox.vala:
* Use Grid instead of Box
* Use View class to style frame instead of hardcoding colors
* Make header consistent with AppsBox

UserItem.vala:
* Ellipsize name
* Use Grid instead of Box

[lp:~elementary-pantheon/switchboard-plug-parental-controls/ui-cleanups]

153. By Danielle Foré on 2016-05-19

expand so switch is always at end of the user list

[Adam Bieńkowski (donadigo)]

Good job on cleaning the UI, looks much more consistent & clean.

review: Approve (code / testing)

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-05-18 15:47:51 +0000
+++ src/Plug.vala	2016-05-19 19:08:23 +0000
@@ -44,7 +44,6 @@
             content = new Gtk.Stack ();
             content.hexpand = true;
 
-            var sidebar = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
             list = new Widgets.UserListBox ();
             list.row_activated.connect ((row) => {
                 if (content.get_children ().find (((Widgets.UserItem) row).page) == null) {
@@ -59,9 +58,7 @@
             scrolled_window.add (list);
             scrolled_window.vexpand = true;
 
-            sidebar.pack_start (scrolled_window, true, true);
-
-            paned.pack1 (sidebar, false, false);
+            paned.pack1 (scrolled_window, true, true);
             paned.pack2 (content, true, false);
             paned.set_position (240);
 

=== modified file 'src/Widgets/AppsBox.vala'
--- src/Widgets/AppsBox.vala	2016-05-18 15:39:48 +0000
+++ src/Widgets/AppsBox.vala	2016-05-19 19:08:23 +0000
@@ -21,7 +21,7 @@
  */
 
 namespace PC.Widgets {
-    public class AppsBox : Gtk.Box {
+    public class AppsBox : Gtk.Grid {
         public signal void update_key_file ();
 
         public string[] targets = {};
@@ -34,8 +34,8 @@
         private Gtk.ListBox list_box;
         private AppChooser apps_popover;
         private Gtk.Switch admin_switch_btn;
-        private Gtk.ToolButton remove_button;
-        private Gtk.ToolButton clear_button;
+        private Gtk.Button remove_button;
+        private Gtk.Button clear_button;
 
 
         protected class AppEntry : Gtk.ListBoxRow {
@@ -52,6 +52,7 @@
                 main_grid.orientation = Gtk.Orientation.HORIZONTAL;
 
                 main_grid.margin = 6;
+                main_grid.margin_start = 12;
                 main_grid.column_spacing = 12;
 
                 var image = new Gtk.Image.from_gicon (info.get_icon (), Gtk.IconSize.LARGE_TOOLBAR);
@@ -87,75 +88,65 @@
             this.user = user;
             entries = new List<AppEntry> ();
 
-            orientation = Gtk.Orientation.VERTICAL;
-            spacing = 12;
-
-            var admin_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-
-            var admin_label = new Gtk.Label (_("Allow access to these apps with admin permission:"));
-            admin_box.add (admin_label);
-
-            admin_switch_btn = new Gtk.Switch ();
-            admin_switch_btn.notify["active"].connect (on_changed);
-            admin_box.add (admin_switch_btn);
-
-            var frame = new Gtk.Frame (null);
-            frame.hexpand = frame.vexpand = true;
-
-            Gdk.RGBA bg = { 1, 1, 1, 1 };
-            frame.override_background_color (0, bg);
-
-            var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-            frame.add (main_box);
+            column_spacing = 12;
+            row_spacing = 12;
 
             var scrolled = new Gtk.ScrolledWindow (null, null);
             scrolled.hexpand = scrolled.vexpand = true;
 
-            var header_label = new Gtk.Label (_("Add apps to prevent %s from using them:").printf (user.get_real_name ()));
-            header_label.margin_start = 6;
+            var header_label = new Gtk.Label (_("Prevent %s from using these apps:").printf (user.get_real_name ()));
+            header_label.margin_start = 12;
+            header_label.margin_top = 6;
             header_label.halign = Gtk.Align.START;
             header_label.get_style_context ().add_class ("h4");
 
-            main_box.add (header_label);
-
             list_box = new Gtk.ListBox ();
             list_box.row_selected.connect (on_changed);
             scrolled.add (list_box);
 
-            var toolbar = new Gtk.Toolbar ();
-            toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-            toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR;
-
-            var add_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.BUTTON), null);
+            var add_button = new Gtk.Button.from_icon_name ("list-add-symbolic", Gtk.IconSize.MENU);
             add_button.tooltip_text = _("Add Prevented Apps…");
             add_button.clicked.connect (on_add_button_clicked);
 
-            remove_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-remove-symbolic", Gtk.IconSize.BUTTON), null);
+            remove_button = new Gtk.Button.from_icon_name ("list-remove-symbolic", Gtk.IconSize.MENU);
             remove_button.tooltip_text = _("Remove Selected App");
             remove_button.sensitive = false;
             remove_button.clicked.connect (on_remove_button_clicked);
 
-            var expander = new Gtk.ToolItem ();
-            expander.set_expand (true);
-            expander.visible_vertical = false;
-
-            clear_button = new Gtk.ToolButton (null, _("Clear"));
+            clear_button = new Gtk.Button.from_icon_name ("edit-clear-all-symbolic", Gtk.IconSize.MENU);
+            clear_button.tooltip_text = _("Clear All");
             clear_button.sensitive = false;
             clear_button.clicked.connect (on_clear_button_clicked);
 
             apps_popover = new AppChooser (add_button);
             apps_popover.app_chosen.connect (load_info);
 
+            var toolbar = new Gtk.ActionBar ();
+            toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
             toolbar.add (add_button);
             toolbar.add (remove_button);
-            toolbar.add (expander);
-            toolbar.add (clear_button);
+            toolbar.pack_end (clear_button);
 
+            var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+            main_box.add (header_label);
+            main_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
             main_box.add (scrolled);
             main_box.add (toolbar);
 
-            add (frame);
-            add (admin_box);
+            var frame = new Gtk.Frame (null);
+            frame.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
+            frame.add (main_box);
+
+            var admin_label = new Gtk.Label (_("Allow access to these apps with admin permission:"));
+            admin_label.halign = Gtk.Align.END;
+
+            admin_switch_btn = new Gtk.Switch ();
+            admin_switch_btn.halign = Gtk.Align.START;
+            admin_switch_btn.notify["active"].connect (on_changed);
+
+            attach (frame, 0, 0, 2, 1);
+            attach (admin_label, 0, 1, 1, 1);
+            attach (admin_switch_btn, 1, 1, 1, 1);
 
             load_existing ();
             show_all ();

=== modified file 'src/Widgets/GeneralBox.vala'
--- src/Widgets/GeneralBox.vala	2016-05-18 15:29:00 +0000
+++ src/Widgets/GeneralBox.vala	2016-05-19 19:08:23 +0000
@@ -21,7 +21,7 @@
  */
 
 namespace PC.Widgets {
-    public class GeneralBox : Gtk.Box {
+    public class GeneralBox : Gtk.Grid {
         private string plank_conf_file_path = "";
         private Act.User user;
         private Gtk.CheckButton dock_btn;
@@ -38,54 +38,53 @@
             this.user = user;
             plank_conf_file_path = Path.build_filename (user.get_home_dir (), Vars.PLANK_CONF_DIR);
 
-            margin_start = margin_end = 12;
-            spacing = 12;
-            orientation = Gtk.Orientation.VERTICAL;
-
-            var allow_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            allow_box.halign = Gtk.Align.CENTER;
+            dock_btn.notify["active"].connect (on_dock_btn_activate);
+
+            print_btn.notify["active"].connect (on_print_conf_activate);
+
+            limit_switch.notify["active"].connect (on_limit_switch_changed);
+            limit_switch.bind_property ("active", limit_combobox, "sensitive", GLib.BindingFlags.SYNC_CREATE);
+            limit_switch.bind_property ("active", frame, "sensitive", GLib.BindingFlags.SYNC_CREATE);
+
+            limit_combobox.changed.connect (on_limit_combobox_changed);
+
+            weekday_box.changed.connect (update_pam);
+            weekend_box.changed.connect (update_pam);
+
+            monitor_updates ();
+            update ();
+            load_restrictions ();
+        }
+
+        construct {
+            column_spacing = 12;
+            row_spacing = 6;
 
             var main_label = new Gtk.Label (_("Allow this user to:"));
-            main_label.valign = Gtk.Align.START;
-            main_label.margin_end = 12;
-            allow_box.add (main_label);
-
-            var checkbutton_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-            allow_box.add (checkbutton_box);
+            main_label.halign = Gtk.Align.END;
 
             dock_btn = new Gtk.CheckButton.with_label (_("Modify the dock"));
-            dock_btn.notify["active"].connect (on_dock_btn_activate);
-            dock_btn.margin_end = 82;
-            checkbutton_box.add (dock_btn);
+            dock_btn.halign = Gtk.Align.START;
 
             print_btn = new Gtk.CheckButton.with_label (_("Configure printing"));
-            print_btn.notify["active"].connect (on_print_conf_activate);
-            checkbutton_box.add (print_btn);
-
-            var limit_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 12);
-
-            var limit_method_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            limit_method_box.add (new Gtk.Label (_("Limit computer use:")));
+            print_btn.halign = Gtk.Align.START;
+            print_btn.margin_bottom = 18;
+
+            var limit_method_label = new Gtk.Label (_("Limit computer use:"));
+            limit_method_label.halign = Gtk.Align.END;
+
+            limit_switch = new Gtk.Switch ();
+            limit_switch.valign = Gtk.Align.CENTER;
 
             limit_combobox = new Gtk.ComboBoxText ();
             limit_combobox.hexpand = true;
-            limit_combobox.margin_end = 64;
             limit_combobox.append (Vars.ALL_ID, _("On weekdays and weekends"));
             limit_combobox.append (Vars.WEEKDAYS_ID, _("Only on weekdays"));
             limit_combobox.append (Vars.WEEKENDS_ID, _("Only on weekends"));
             limit_combobox.active_id = "all";
-            limit_combobox.changed.connect (on_limit_combobox_changed);
-
-            limit_switch = new Gtk.Switch ();
-            limit_switch.valign = Gtk.Align.CENTER;
-            limit_switch.active = false;
-            limit_switch.notify["active"].connect (on_limit_switch_changed);
-            limit_method_box.add (limit_switch);
-            limit_method_box.add (limit_combobox);
-            limit_box.add (limit_method_box);
 
             frame = new Gtk.Frame (null);
-            frame.override_background_color (0, { 1, 1, 1, 1 });
+            frame.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
 
             var frame_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
 
@@ -97,22 +96,19 @@
             weekend_box.margin = 12;
             weekend_box.halign = Gtk.Align.CENTER;
 
-            weekday_box.changed.connect (update_pam);
-            weekend_box.changed.connect (update_pam);
-
             frame_box.add (weekday_box);
             frame_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
             frame_box.add (weekend_box);
             frame.add (frame_box);
 
-            monitor_updates ();
-            update ();
-            load_restrictions ();
-
-            this.add (allow_box);
-            this.add (limit_box);
-            this.add (frame);
-            this.show_all ();
+            attach (main_label, 0, 0, 1, 1);
+            attach (dock_btn, 1, 0, 2, 1);
+            attach (print_btn, 1, 1, 2, 1);
+            attach (limit_method_label, 0, 2, 1, 1);
+            attach (limit_switch, 1, 2, 1, 1);
+            attach (limit_combobox, 2, 2, 1, 1);
+            attach (frame, 0, 3, 3, 1);
+            show_all ();
         }
 
         public void refresh () {
@@ -221,19 +217,12 @@
                 warning ("%s\n", e.message);
             }
 
-            update_sensitivity ();
             /* TODO: Get denied users for printing configuration */
 
             /* For now, we assume that printing is enabled */
             print_btn.active = true;
         }
 
-        private void update_sensitivity () {
-            bool active = limit_switch.get_active ();
-            limit_combobox.sensitive = active;
-            frame.sensitive = active;            
-        }
-
         private void on_dock_btn_activate () {
             set_lock_dock_active (!dock_btn.get_active ());
         }
@@ -279,8 +268,6 @@
             } else {
                 PAMControl.try_remove_user_restrict (user.get_user_name ());
             }
-
-            update_sensitivity ();
         }
 
         private void on_limit_combobox_changed () {

=== modified file 'src/Widgets/InternetBox.vala'
--- src/Widgets/InternetBox.vala	2016-05-18 15:33:30 +0000
+++ src/Widgets/InternetBox.vala	2016-05-19 19:08:23 +0000
@@ -21,7 +21,7 @@
  */
 
 namespace PC.Widgets {
-    public class InternetBox : Gtk.Box {
+    public class InternetBox : Gtk.Grid {
         public signal void update_key_file ();
         public string[] urls;
 
@@ -75,21 +75,7 @@
 
             url_list = new List<UrlEntry> ();
 
-            orientation = Gtk.Orientation.VERTICAL;
-            margin_start = margin_end = 12;
-            margin_bottom = 32;
-
-            Gdk.RGBA bg = { 1, 1, 1, 1 };
-
-            var frame = new Gtk.Frame (null);
-            frame.hexpand = frame.vexpand = true;
-            frame.override_background_color (0, bg);
-
-            var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-            main_box.hexpand = main_box.vexpand = true;
-            main_box.margin_top = main_box.margin_bottom = 6;
-
-            var info_label = new Gtk.Label (_("Blacklist the following sites:"));
+            var info_label = new Gtk.Label (_("Prevent %s from visiting these websites:").printf (user.get_real_name ()));
             info_label.halign = Gtk.Align.START;
             info_label.margin_start = 12;
             info_label.get_style_context ().add_class ("h4");
@@ -102,30 +88,33 @@
 
             scrolled.add (list_box);
 
-            var bottom_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            bottom_box.margin_start = bottom_box.margin_end = 6;
-
             add_button = new Gtk.Button.with_label (_("Add URL"));
             add_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+            add_button.margin_end = 6;
             add_button.sensitive = false;
             add_button.clicked.connect (on_entry_activate);
 
             entry = new Gtk.Entry ();
             entry.hexpand = true;
+            entry.margin_start = 6;
             entry.set_placeholder_text (_("Add a new URL, for example: google.com"));
             entry.set_icon_tooltip_text (Gtk.EntryIconPosition.SECONDARY, _("Invalid URL"));
             entry.changed.connect (on_entry_changed);
             entry.activate.connect (on_entry_activate);
 
-            bottom_box.add (entry);
-            bottom_box.pack_end (add_button, false, false, 0);
-
-            main_box.add (info_label);
-            main_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-            main_box.add (scrolled);
-            main_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-            main_box.add (bottom_box);
-
+            var main_box = new Gtk.Grid ();
+            main_box.column_spacing = 6;
+            main_box.row_spacing = 6;
+            main_box.margin_top = main_box.margin_bottom = 6;
+            main_box.attach (info_label, 0, 0, 2, 1);
+            main_box.attach (new Gtk.Separator (Gtk.Orientation.HORIZONTAL), 0, 1, 2, 1);
+            main_box.attach (scrolled, 0, 2, 2, 1);
+            main_box.attach (new Gtk.Separator (Gtk.Orientation.HORIZONTAL), 0, 3, 2, 1);
+            main_box.attach (entry, 0, 4, 1, 1);
+            main_box.attach (add_button, 1, 4, 1, 1);
+
+            var frame = new Gtk.Frame (null);
+            frame.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
             frame.add (main_box);
 
             add (frame);
@@ -200,4 +189,4 @@
             update ();
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/UserItem.vala'
--- src/Widgets/UserItem.vala	2016-03-06 18:26:44 +0000
+++ src/Widgets/UserItem.vala	2016-05-19 19:08:23 +0000
@@ -41,11 +41,14 @@
 
             grid = new Gtk.Grid ();
             grid.margin = 6;
-            grid.margin_left = 12;
             grid.column_spacing = 6;
 
+            avatar = new Granite.Widgets.Avatar ();
+
             full_name_label = new Gtk.Label ("");
             full_name_label.halign = Gtk.Align.START;
+            full_name_label.hexpand = true;
+            full_name_label.ellipsize = Pango.EllipsizeMode.END;
             full_name_label.get_style_context ().add_class ("h3");
 
             username_label = new Gtk.Label ("");
@@ -53,23 +56,13 @@
             username_label.use_markup = true;
             username_label.ellipsize = Pango.EllipsizeMode.END;
 
-            var switch_grid = new Gtk.Grid ();
-            switch_grid.margin_end = 6;
-            switch_grid.valign = Gtk.Align.CENTER;
-
             master_switch = new Gtk.Switch ();
-            switch_grid.add (master_switch);
-
-            var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-
-            avatar = new Granite.Widgets.Avatar ();
+            master_switch.valign = Gtk.Align.CENTER;
 
             grid.attach (avatar, 0, 0, 1, 2);
-            grid.attach (full_name_label, 1, 0, 2, 1);
-            grid.attach (username_label, 1, 1, 1, 1);        
-
-            main_box.add (grid);
-            main_box.pack_end (switch_grid, false, false, 0);
+            grid.attach (full_name_label, 1, 0, 1, 1);
+            grid.attach (username_label, 1, 1, 1, 1); 
+            grid.attach (master_switch, 2, 0, 1, 2);       
 
             master_switch.notify["active"].connect (() => {
                 bool active = master_switch.get_active ();
@@ -79,7 +72,7 @@
 
             update_ui ();
 
-            add (main_box);
+            add (grid);
             show_all ();
         }
 
@@ -100,4 +93,4 @@
             grid.show_all ();
         }
     }
-}
\ No newline at end of file
+}