Merge lp:~elementary-pantheon/switchboard-plug-keyboard/behavior-no-namespace into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

[Danielle Foré]

Behavior.vala:
* Don't use namespace with only one class
* Convert remaining tabs to spaces

No other changes were made besides indentation.

[Santiago (santileortiz)]

review: Approve

=== modified file 'src/Views/Behavior.vala'
--- src/Views/Behavior.vala	2017-02-16 00:50:35 +0000
+++ src/Views/Behavior.vala	2017-02-19 01:40:06 +0000
@@ -1,197 +1,195 @@
-namespace Pantheon.Keyboard.Behaviour {
-    class Page : Pantheon.Keyboard.AbstractPage {
-        Settings gsettings_blink;
-        Settings gsettings_repeat;
-
-        public override void reset () {
-            gsettings_blink.reset ("cursor-blink");
-            gsettings_blink.reset ("cursor-blink-time");
-            gsettings_blink.reset ("cursor-blink-timeout");
-
-            gsettings_repeat.reset ("delay");
-            gsettings_repeat.reset ("repeat");
-            gsettings_repeat.reset ("repeat-interval");
-
-            return;
-        }
-
-        public Page () {
-            var settings_repeat = new Behaviour.SettingsRepeat ();
-            var settings_blink  = new Behaviour.SettingsBlink  ();
-
-            var double_delay = (double) settings_repeat.delay;
-            var double_speed = (double) settings_repeat.repeat_interval;
-            var double_blink_speed = (double) settings_blink.cursor_blink_time;
-            var double_blink_time = (double) settings_blink.cursor_blink_timeout;
-
-            var label_repeat = new Gtk.Label (_("Repeat Keys:"));
-            label_repeat.halign = Gtk.Align.END;
-            label_repeat.get_style_context ().add_class ("h4");
-
-			var label_repeat_delay = new Gtk.Label (_("Delay:"));
-            label_repeat_delay.halign = Gtk.Align.END;
-
-			var label_repeat_speed = new Gtk.Label (_("Interval:"));
-            label_repeat_speed.halign = Gtk.Align.END;
-
-			var label_repeat_ms1   = new Gtk.Label (_("milliseconds"));
-            label_repeat_ms1.halign = Gtk.Align.START;
-
-			var label_repeat_ms2   = new Gtk.Label (_("milliseconds"));
-            label_repeat_ms2.halign = Gtk.Align.START;
-
-            var switch_repeat = new Gtk.Switch ();
-            switch_repeat.halign = Gtk.Align.START;
-            switch_repeat.valign = Gtk.Align.CENTER;
-
-			var scale_repeat_delay = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 1000, 1);
-            scale_repeat_delay.draw_value = false;
-            scale_repeat_delay.hexpand = true;
-            scale_repeat_delay.set_value (double_delay);
-
-			var scale_repeat_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 100,  1);
-            scale_repeat_speed.draw_value = false;
-            scale_repeat_speed.hexpand = true;
-            scale_repeat_speed.set_value (double_speed);
-
-			var spin_repeat_delay  = new Gtk.SpinButton.with_range (10, 1000, 1);
-            spin_repeat_delay.set_value (double_delay);
-
-			var spin_repeat_speed  = new Gtk.SpinButton.with_range (10, 100,  1);
-            spin_repeat_speed.set_value (double_speed);
-
-            var label_blink = new Gtk.Label (_("Cursor Blinking:"));
-            label_blink.get_style_context ().add_class ("h4");
-            label_blink.halign = Gtk.Align.END;
-            label_blink.margin_top = 24;
-
-			var label_blink_speed = new Gtk.Label (_("Speed:"));
-            label_blink_speed.halign = Gtk.Align.END;
-
-			var label_blink_time  = new Gtk.Label (_("Duration:"));
-            label_blink_time.halign = Gtk.Align.END;
-
-			var label_blink_ms    = new Gtk.Label (_("milliseconds"));
-            label_blink_ms.halign = Gtk.Align.START;
-
-			var label_blink_s     = new Gtk.Label (_("seconds"));
-            label_blink_s.halign = Gtk.Align.START;
-
-            var switch_blink = new Gtk.Switch ();
-            switch_blink.halign = Gtk.Align.START;
-            switch_blink.valign = Gtk.Align.CENTER;
-            switch_blink.margin_top = 24;
-
-			var scale_blink_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 100, 2500, 10);
-            scale_blink_speed.draw_value = false;
-            scale_blink_speed.hexpand = true;
-            scale_blink_speed.set_value (double_blink_speed);
-
-			var scale_blink_time  = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 100, 1);
-            scale_blink_time.draw_value = false;
-            scale_blink_time.hexpand = true;
-            scale_blink_time.set_value (double_blink_time);
-
-			var spin_blink_speed  = new Gtk.SpinButton.with_range (100, 2500, 10);
-            spin_blink_speed.set_value  (double_blink_speed);
-
-			var spin_blink_time   = new Gtk.SpinButton.with_range (1, 100, 1);
-            spin_blink_time.set_value (double_blink_time);
-
-            var entry_test = new Gtk.Entry ();
-            entry_test.margin_top = 24;
-            entry_test.placeholder_text = (_("Type to test your settings…"));
-            entry_test.hexpand = true;
-
-            attach (label_repeat, 0, 0, 1, 1);
-            attach (switch_repeat, 1, 0, 1, 1);
-            attach (label_repeat_delay, 0, 1, 1, 1);
-            attach (scale_repeat_delay, 1, 1, 1, 1);
-            attach (spin_repeat_delay, 2, 1, 1, 1);
-            attach (label_repeat_ms1, 3, 1, 1, 1);
-            attach (label_repeat_speed, 0, 2, 1, 1);
-            attach (scale_repeat_speed, 1, 2, 1, 1);
-            attach (spin_repeat_speed, 2, 2, 1, 1);
-            attach (label_repeat_ms2, 3, 2, 1, 1);
-            attach (label_blink, 0, 3, 1, 1);
-            attach (switch_blink, 1, 3, 1, 1);
-            attach (label_blink_speed, 0, 4, 1, 1);
-            attach (scale_blink_speed, 1, 4, 1, 1);
-            attach (spin_blink_speed, 2, 4, 1, 1);
-            attach (label_blink_ms, 3, 4, 1, 1);
-            attach (label_blink_time, 0, 5, 1, 1);
-            attach (scale_blink_time, 1, 5, 1, 1);
-            attach (spin_blink_time, 2, 5, 1, 1);
-            attach (label_blink_s, 3, 5, 1, 1);
-            attach (entry_test, 1, 6, 1, 1);
-
-            gsettings_blink = new Settings ("org.gnome.desktop.interface");
-            gsettings_blink.bind ("cursor-blink", switch_blink, "active", SettingsBindFlags.DEFAULT);
-
-            gsettings_repeat = new Settings ("org.gnome.desktop.peripherals.keyboard");
-            gsettings_repeat.bind ("repeat", switch_repeat, "active", SettingsBindFlags.DEFAULT);
-
-            switch_blink.bind_property ("active", label_blink_speed, "sensitive", BindingFlags.DEFAULT);
-            switch_blink.bind_property ("active", label_blink_time, "sensitive", BindingFlags.DEFAULT);
-            switch_blink.bind_property ("active", scale_blink_speed, "sensitive", BindingFlags.DEFAULT);
-            switch_blink.bind_property ("active", scale_blink_time, "sensitive", BindingFlags.DEFAULT);
-            switch_blink.bind_property ("active", spin_blink_speed, "sensitive", BindingFlags.DEFAULT);
-            switch_blink.bind_property ("active", spin_blink_time, "sensitive", BindingFlags.DEFAULT);
-
-            switch_repeat.bind_property ("active", label_repeat_delay, "sensitive", BindingFlags.DEFAULT);
-            switch_repeat.bind_property ("active", label_repeat_speed, "sensitive", BindingFlags.DEFAULT);
-            switch_repeat.bind_property ("active", scale_repeat_delay, "sensitive", BindingFlags.DEFAULT);
-            switch_repeat.bind_property ("active", scale_repeat_speed, "sensitive", BindingFlags.DEFAULT);
-            switch_repeat.bind_property ("active", spin_repeat_delay, "sensitive", BindingFlags.DEFAULT);
-            switch_repeat.bind_property ("active", spin_repeat_speed, "sensitive", BindingFlags.DEFAULT);
-
-            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);
-			} );
-
-			scale_blink_time.value_changed.connect (() => {
-				settings_blink.cursor_blink_timeout = (int) (spin_blink_time.adjustment.value = scale_blink_time.adjustment.value);
-			} );
-
-			spin_blink_speed.value_changed.connect (() => {
-				settings_blink.cursor_blink_time = (int) (scale_blink_speed.adjustment.value = spin_blink_speed.adjustment.value);
-			} );
-
-			spin_blink_time.value_changed.connect (() => {
-				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;
-			} );
-
-			settings_blink.changed["cursor-blink-timeout"].connect (() => {
-				scale_blink_time.adjustment.value = spin_blink_time.adjustment.value = (double) settings_blink.cursor_blink_timeout;
-			} );
-		}
-	}
+class Pantheon.Keyboard.Behaviour.Page : Pantheon.Keyboard.AbstractPage {
+    Settings gsettings_blink;
+    Settings gsettings_repeat;
+
+    public override void reset () {
+        gsettings_blink.reset ("cursor-blink");
+        gsettings_blink.reset ("cursor-blink-time");
+        gsettings_blink.reset ("cursor-blink-timeout");
+
+        gsettings_repeat.reset ("delay");
+        gsettings_repeat.reset ("repeat");
+        gsettings_repeat.reset ("repeat-interval");
+
+        return;
+    }
+
+    public Page () {
+        var settings_repeat = new Behaviour.SettingsRepeat ();
+        var settings_blink  = new Behaviour.SettingsBlink  ();
+
+        var double_delay = (double) settings_repeat.delay;
+        var double_speed = (double) settings_repeat.repeat_interval;
+        var double_blink_speed = (double) settings_blink.cursor_blink_time;
+        var double_blink_time = (double) settings_blink.cursor_blink_timeout;
+
+        var label_repeat = new Gtk.Label (_("Repeat Keys:"));
+        label_repeat.halign = Gtk.Align.END;
+        label_repeat.get_style_context ().add_class ("h4");
+
+        var label_repeat_delay = new Gtk.Label (_("Delay:"));
+        label_repeat_delay.halign = Gtk.Align.END;
+
+        var label_repeat_speed = new Gtk.Label (_("Interval:"));
+        label_repeat_speed.halign = Gtk.Align.END;
+
+        var label_repeat_ms1 = new Gtk.Label (_("milliseconds"));
+        label_repeat_ms1.halign = Gtk.Align.START;
+
+        var label_repeat_ms2 = new Gtk.Label (_("milliseconds"));
+        label_repeat_ms2.halign = Gtk.Align.START;
+
+        var switch_repeat = new Gtk.Switch ();
+        switch_repeat.halign = Gtk.Align.START;
+        switch_repeat.valign = Gtk.Align.CENTER;
+
+        var scale_repeat_delay = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 1000, 1);
+        scale_repeat_delay.draw_value = false;
+        scale_repeat_delay.hexpand = true;
+        scale_repeat_delay.set_value (double_delay);
+
+        var scale_repeat_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 100, 1);
+        scale_repeat_speed.draw_value = false;
+        scale_repeat_speed.hexpand = true;
+        scale_repeat_speed.set_value (double_speed);
+
+        var spin_repeat_delay = new Gtk.SpinButton.with_range (10, 1000, 1);
+        spin_repeat_delay.set_value (double_delay);
+
+        var spin_repeat_speed = new Gtk.SpinButton.with_range (10, 100, 1);
+        spin_repeat_speed.set_value (double_speed);
+
+        var label_blink = new Gtk.Label (_("Cursor Blinking:"));
+        label_blink.get_style_context ().add_class ("h4");
+        label_blink.halign = Gtk.Align.END;
+        label_blink.margin_top = 24;
+
+        var label_blink_speed = new Gtk.Label (_("Speed:"));
+        label_blink_speed.halign = Gtk.Align.END;
+
+        var label_blink_time = new Gtk.Label (_("Duration:"));
+        label_blink_time.halign = Gtk.Align.END;
+
+        var label_blink_ms = new Gtk.Label (_("milliseconds"));
+        label_blink_ms.halign = Gtk.Align.START;
+
+        var label_blink_s = new Gtk.Label (_("seconds"));
+        label_blink_s.halign = Gtk.Align.START;
+
+        var switch_blink = new Gtk.Switch ();
+        switch_blink.halign = Gtk.Align.START;
+        switch_blink.valign = Gtk.Align.CENTER;
+        switch_blink.margin_top = 24;
+
+        var scale_blink_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 100, 2500, 10);
+        scale_blink_speed.draw_value = false;
+        scale_blink_speed.hexpand = true;
+        scale_blink_speed.set_value (double_blink_speed);
+
+        var scale_blink_time = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 100, 1);
+        scale_blink_time.draw_value = false;
+        scale_blink_time.hexpand = true;
+        scale_blink_time.set_value (double_blink_time);
+
+        var spin_blink_speed = new Gtk.SpinButton.with_range (100, 2500, 10);
+        spin_blink_speed.set_value (double_blink_speed);
+
+        var spin_blink_time = new Gtk.SpinButton.with_range (1, 100, 1);
+        spin_blink_time.set_value (double_blink_time);
+
+        var entry_test = new Gtk.Entry ();
+        entry_test.margin_top = 24;
+        entry_test.placeholder_text = (_("Type to test your settings…"));
+        entry_test.hexpand = true;
+
+        attach (label_repeat, 0, 0, 1, 1);
+        attach (switch_repeat, 1, 0, 1, 1);
+        attach (label_repeat_delay, 0, 1, 1, 1);
+        attach (scale_repeat_delay, 1, 1, 1, 1);
+        attach (spin_repeat_delay, 2, 1, 1, 1);
+        attach (label_repeat_ms1, 3, 1, 1, 1);
+        attach (label_repeat_speed, 0, 2, 1, 1);
+        attach (scale_repeat_speed, 1, 2, 1, 1);
+        attach (spin_repeat_speed, 2, 2, 1, 1);
+        attach (label_repeat_ms2, 3, 2, 1, 1);
+        attach (label_blink, 0, 3, 1, 1);
+        attach (switch_blink, 1, 3, 1, 1);
+        attach (label_blink_speed, 0, 4, 1, 1);
+        attach (scale_blink_speed, 1, 4, 1, 1);
+        attach (spin_blink_speed, 2, 4, 1, 1);
+        attach (label_blink_ms, 3, 4, 1, 1);
+        attach (label_blink_time, 0, 5, 1, 1);
+        attach (scale_blink_time, 1, 5, 1, 1);
+        attach (spin_blink_time, 2, 5, 1, 1);
+        attach (label_blink_s, 3, 5, 1, 1);
+        attach (entry_test, 1, 6, 1, 1);
+
+        gsettings_blink = new Settings ("org.gnome.desktop.interface");
+        gsettings_blink.bind ("cursor-blink", switch_blink, "active", SettingsBindFlags.DEFAULT);
+
+        gsettings_repeat = new Settings ("org.gnome.desktop.peripherals.keyboard");
+        gsettings_repeat.bind ("repeat", switch_repeat, "active", SettingsBindFlags.DEFAULT);
+
+        switch_blink.bind_property ("active", label_blink_speed, "sensitive", BindingFlags.DEFAULT);
+        switch_blink.bind_property ("active", label_blink_time, "sensitive", BindingFlags.DEFAULT);
+        switch_blink.bind_property ("active", scale_blink_speed, "sensitive", BindingFlags.DEFAULT);
+        switch_blink.bind_property ("active", scale_blink_time, "sensitive", BindingFlags.DEFAULT);
+        switch_blink.bind_property ("active", spin_blink_speed, "sensitive", BindingFlags.DEFAULT);
+        switch_blink.bind_property ("active", spin_blink_time, "sensitive", BindingFlags.DEFAULT);
+
+        switch_repeat.bind_property ("active", label_repeat_delay, "sensitive", BindingFlags.DEFAULT);
+        switch_repeat.bind_property ("active", label_repeat_speed, "sensitive", BindingFlags.DEFAULT);
+        switch_repeat.bind_property ("active", scale_repeat_delay, "sensitive", BindingFlags.DEFAULT);
+        switch_repeat.bind_property ("active", scale_repeat_speed, "sensitive", BindingFlags.DEFAULT);
+        switch_repeat.bind_property ("active", spin_repeat_delay, "sensitive", BindingFlags.DEFAULT);
+        switch_repeat.bind_property ("active", spin_repeat_speed, "sensitive", BindingFlags.DEFAULT);
+
+        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);
+        });
+
+        scale_blink_time.value_changed.connect (() => {
+            settings_blink.cursor_blink_timeout = (int) (spin_blink_time.adjustment.value = scale_blink_time.adjustment.value);
+        });
+
+        spin_blink_speed.value_changed.connect (() => {
+            settings_blink.cursor_blink_time = (int) (scale_blink_speed.adjustment.value = spin_blink_speed.adjustment.value);
+        });
+
+        spin_blink_time.value_changed.connect (() => {
+            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;
+        });
+
+        settings_blink.changed["cursor-blink-timeout"].connect (() => {
+            scale_blink_time.adjustment.value = spin_blink_time.adjustment.value = (double) settings_blink.cursor_blink_timeout;
+        });
+    }
 }