Switchboard Keyboard Plug

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

  1. behavior-style
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 500
Merged at revision: 502
Proposed branch: lp:~elementary-pantheon/switchboard-plug-keyboard/behavior-style
Merge into: lp:~elementary-pantheon/switchboard-plug-keyboard/trunk
Diff against target: 71 lines (+13/-13)
1 file modified
src/Pages/behaviour.vala (+13/-13)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-keyboard/behavior-style
Reviewer Review Type Date Requested Status
David Hewitt Approve
elementary Pantheon team Pending
Review via email: mp+316650@code.launchpad.net

Commit message

behaviour.vala:
* use CSS to style section headers instead of pango
* Increase white space between sections
* Remove unnecessary comments

To post a comment you must log in.
Revision history for this message
David Hewitt (davidmhewitt) wrote :

Added whitespace definitely helps to group the sections and all works/looks good on my computer.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Pages/behaviour.vala'
2--- src/Pages/behaviour.vala 2015-10-22 15:32:43 +0000
3+++ src/Pages/behaviour.vala 2017-02-07 22:53:42 +0000
4@@ -17,20 +17,21 @@
5 settings_repeat = new Behaviour.SettingsRepeat ();
6 settings_blink = new Behaviour.SettingsBlink ();
7
8- // create widgets
9- var label_repeat = new Gtk.Label (_("<b>Repeat Keys:</b>"));
10+ var label_repeat = new Gtk.Label (_("Repeat Keys:"));
11+ label_repeat.get_style_context ().add_class ("h4");
12+
13 var label_repeat_delay = new Gtk.Label (_("Delay:"));
14 var label_repeat_speed = new Gtk.Label (_("Interval:"));
15 var label_repeat_ms1 = new Gtk.Label (_("milliseconds"));
16 var label_repeat_ms2 = new Gtk.Label (_("milliseconds"));
17 var switch_repeat = new Gtk.Switch ();
18+ switch_repeat.valign = Gtk.Align.CENTER;
19+
20 var scale_repeat_delay = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 1000, 1);
21 var scale_repeat_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 10, 100, 1);
22 var spin_repeat_delay = new Gtk.SpinButton.with_range (10, 1000, 1);
23 var spin_repeat_speed = new Gtk.SpinButton.with_range (10, 100, 1);
24
25- // align labels vertically to CENTER and horizontally to END
26- label_repeat.use_markup = true;
27 label_repeat.halign = Gtk.Align.END;
28 label_repeat_delay.halign = Gtk.Align.END;
29 label_repeat_speed.halign = Gtk.Align.END;
30@@ -125,24 +126,23 @@
31 switch_repeat.active = active;
32 } );
33
34-
35-
36- /** Cursor Blinking **/
37-
38- // setup gui
39- var label_blink = new Gtk.Label (_("<b>Cursor Blinking:</b>"));
40+ var label_blink = new Gtk.Label (_("Cursor Blinking:"));
41+ label_blink.get_style_context ().add_class ("h4");
42+ label_blink.margin_top = 24;
43+
44 var label_blink_speed = new Gtk.Label (_("Speed:"));
45 var label_blink_time = new Gtk.Label (_("Duration:"));
46 var label_blink_ms = new Gtk.Label (_("milliseconds"));
47 var label_blink_s = new Gtk.Label (_("seconds"));
48 var switch_blink = new Gtk.Switch ();
49+ switch_blink.valign = Gtk.Align.CENTER;
50+ switch_blink.margin_top = 24;
51+
52 var scale_blink_speed = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 100, 2500, 10);
53 var scale_blink_time = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 1, 100, 1);
54 var spin_blink_speed = new Gtk.SpinButton.with_range (100, 2500, 10);
55 var spin_blink_time = new Gtk.SpinButton.with_range (1, 100, 1);
56
57- // align labels vertically to CENTER and hoizontally to END
58- label_blink.use_markup = true;
59 label_blink.halign = Gtk.Align.END;
60 label_blink_time.halign = Gtk.Align.END;
61 label_blink_speed.halign = Gtk.Align.END;
62@@ -241,8 +241,8 @@
63 /** Test Settings **/
64
65 var entry_test = new Gtk.Entry ();
66+ entry_test.margin_top = 24;
67 entry_test.placeholder_text = (_("Type to test your settings…"));
68-
69 entry_test.hexpand = true;
70
71 this.attach (entry_test, 1, 6, 1, 1);

Subscribers

People subscribed via source and target branches