Merge lp:~elementary-pantheon/switchboard-plug-keyboard/signals-at-the-end into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Danielle Foré]

Behavior.vala: Connect signals at the end

[David Hewitt (davidmhewitt)]

review: Approve (code, function)

=== modified file 'src/Views/Behavior.vala'
--- src/Views/Behavior.vala	2017-02-15 02:39:25 +0000
+++ src/Views/Behavior.vala	2017-02-16 00:51:33 +0000
@@ -60,31 +60,6 @@
 			var spin_repeat_speed  = new Gtk.SpinButton.with_range (10, 100,  1);
             spin_repeat_speed.set_value (double_speed);
 
-			// connect signals
-			scale_repeat_delay.value_changed.connect (() => {
-				settings_repeat.delay = (uint) (spin_repeat_delay.adjustment.value = scale_repeat_delay.adjustment.value);
-			} );
-
-			scale_repeat_speed.value_changed.connect (() => {
-				settings_repeat.repeat_interval = (uint) (spin_repeat_speed.adjustment.value = scale_repeat_speed.adjustment.value);
-			} );
-
-			spin_repeat_delay.value_changed.connect (() => {
-				settings_repeat.delay = (uint) (scale_repeat_delay.adjustment.value = spin_repeat_delay.adjustment.value);
-			} );
-
-			spin_repeat_speed.value_changed.connect (() => {
-				settings_repeat.repeat_interval = (uint) (scale_repeat_speed.adjustment.value = spin_repeat_speed.adjustment.value);
-			} );
-
-			settings_repeat.changed["delay"].connect (() => {
-				scale_repeat_delay.adjustment.value = spin_repeat_delay.adjustment.value = (double) settings_repeat.delay;
-			} );
-
-			settings_repeat.changed["repeat-interval"].connect (() => {
-				scale_repeat_speed.adjustment.value = spin_repeat_speed.adjustment.value = (double) settings_repeat.repeat_interval;
-			} );
-
             var label_blink = new Gtk.Label (_("Cursor Blinking:"));
             label_blink.get_style_context ().add_class ("h4");
             label_blink.halign = Gtk.Align.END;
@@ -170,7 +145,22 @@
             switch_repeat.bind_property ("active", spin_repeat_delay, "sensitive", BindingFlags.DEFAULT);
             switch_repeat.bind_property ("active", spin_repeat_speed, "sensitive", BindingFlags.DEFAULT);
 
-			// connect signals
+            scale_repeat_delay.value_changed.connect (() => {
+                settings_repeat.delay = (uint) (spin_repeat_delay.adjustment.value = scale_repeat_delay.adjustment.value);
+            });
+
+            scale_repeat_speed.value_changed.connect (() => {
+                settings_repeat.repeat_interval = (uint) (spin_repeat_speed.adjustment.value = scale_repeat_speed.adjustment.value);
+            });
+
+            spin_repeat_delay.value_changed.connect (() => {
+                settings_repeat.delay = (uint) (scale_repeat_delay.adjustment.value = spin_repeat_delay.adjustment.value);
+            });
+
+            spin_repeat_speed.value_changed.connect (() => {
+                settings_repeat.repeat_interval = (uint) (scale_repeat_speed.adjustment.value = spin_repeat_speed.adjustment.value);
+            });
+
 			scale_blink_speed.value_changed.connect (() => {
 				settings_blink.cursor_blink_time = (int) (spin_blink_speed.adjustment.value = scale_blink_speed.adjustment.value);
 			} );
@@ -187,6 +177,14 @@
 				settings_blink.cursor_blink_timeout = (int) (scale_blink_time.adjustment.value = spin_blink_time.adjustment.value);
 			} );
 
+            settings_repeat.changed["delay"].connect (() => {
+                scale_repeat_delay.adjustment.value = spin_repeat_delay.adjustment.value = (double) settings_repeat.delay;
+            });
+
+            settings_repeat.changed["repeat-interval"].connect (() => {
+                scale_repeat_speed.adjustment.value = spin_repeat_speed.adjustment.value = (double) settings_repeat.repeat_interval;
+            });
+
 			settings_blink.changed["cursor-blink-time"].connect (() => {
 				scale_blink_speed.adjustment.value = spin_blink_speed.adjustment.value = (double) settings_blink.cursor_blink_time;
 			} );