Merge lp:~elementary-pantheon/switchboard-plug-parental-controls/bind-active into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk

[Danielle Foré]

UserItem.vala:
* Bind properties instead of set methods

ControlPage.vala:
* Set page.stack sensitivity instead of page sensitivity

[Adam Bieńkowski (donadigo)]

Nice improvements here! Approve.

review: Approve (code / testing)

=== modified file 'src/Widgets/ControlPage.vala'
--- src/Widgets/ControlPage.vala	2016-03-06 11:20:50 +0000
+++ src/Widgets/ControlPage.vala	2016-05-20 03:33:34 +0000
@@ -23,6 +23,7 @@
 namespace PC.Widgets {
     public class ControlPage : Gtk.Box {
         public Act.User user;
+        public Gtk.Stack stack;
         private GeneralBox general_box;
         private AppsBox apps_box;
         private InternetBox internet_box;
@@ -50,7 +51,7 @@
             internet_box.expand = true;
             internet_box.update_key_file.connect (on_update_key_file);
 
-            var stack = new Gtk.Stack ();
+            stack = new Gtk.Stack ();
             stack.add_titled (general_box, "general", _("General"));
             stack.add_titled (internet_box, "internet", _("Internet"));
             stack.add_titled (apps_box, "apps", _("Applications"));
@@ -64,23 +65,23 @@
             show_all ();
         }
 
-        public bool get_active () {
-            return apps_box.get_active ();
-        }
-
-        public void set_active (bool active) {
-            apps_box.set_active (active);
-
-            if (Utils.get_permission ().get_allowed ()) {
-                if (active) {
-                    general_box.refresh ();
-                    Utils.call_cli ({"--user", user.get_user_name (), "--enable-restrict"});
-                } else {
-                    general_box.set_lock_dock_active (false);
-                    general_box.set_printer_active (true);                    
-                    Utils.call_cli ({"--user", user.get_user_name (), "--disable-restrict"});
-                }
-            }            
+        public bool active {
+            get {
+                return apps_box.get_active ();
+            }
+            set {
+                apps_box.set_active (value);
+                if (Utils.get_permission ().get_allowed ()) {
+                    if (value) {
+                        general_box.refresh ();
+                        Utils.call_cli ({"--user", user.get_user_name (), "--enable-restrict"});
+                    } else {
+                        general_box.set_lock_dock_active (false);
+                        general_box.set_printer_active (true);                    
+                        Utils.call_cli ({"--user", user.get_user_name (), "--disable-restrict"});
+                    }
+                }            
+            }
         }
 
         private void on_update_key_file () {
@@ -96,4 +97,4 @@
             Utils.call_cli ({ "--set-contents", key_file.to_data (), "--file", Utils.build_daemon_conf_path (user) });
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Widgets/UserItem.vala'
--- src/Widgets/UserItem.vala	2016-05-19 19:08:11 +0000
+++ src/Widgets/UserItem.vala	2016-05-20 03:33:34 +0000
@@ -62,13 +62,10 @@
             grid.attach (avatar, 0, 0, 1, 2);
             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);       
+            grid.attach (master_switch, 2, 0, 1, 2);  
 
-            master_switch.notify["active"].connect (() => {
-                bool active = master_switch.get_active ();
-                page.sensitive = active;
-                page.set_active (active);
-            });
+            master_switch.bind_property ("active", page, "active", BindingFlags.SYNC_CREATE);
+            master_switch.bind_property ("active", page.stack, "sensitive", BindingFlags.SYNC_CREATE);
 
             update_ui ();
 
@@ -77,10 +74,6 @@
         }
 
         public void update_ui () {
-            bool active = page.get_active ();
-            master_switch.active = active;
-            page.sensitive = active;
-
             try {
                 var avatar_pixbuf = new Gdk.Pixbuf.from_file_at_scale (user.get_icon_file (), 32, 32, true);
                 avatar.pixbuf = avatar_pixbuf;