Merge lp:~elementary-pantheon/switchboard-plug-keyboard/popover-group-properties into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

Proposed by Daniel Fore on 2017-02-19
Status: Merged
Approved by: David Hewitt on 2017-02-26
Approved revision: 518
Merged at revision: 522
Proposed branch: lp:~elementary-pantheon/switchboard-plug-keyboard/popover-group-properties
Merge into: lp:~elementary-pantheon/switchboard-plug-keyboard/trunk
Diff against target: 36 lines (+9/-12)
1 file modified
src/Widgets/Layout/AddLayoutPopover.vala (+9/-12)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-keyboard/popover-group-properties
Reviewer Review Type Date Requested Status
David Hewitt code, function 2017-02-19 Approve on 2017-02-26
Review via email: mp+317718@code.launchpad.net

Commit message

AddLayoutPopover.vala:
* Remove unnecessary comments
* Group widget properties
* Remove duplicate properties

To post a comment you must log in.
518. By Daniel Fore on 2017-02-19

group properties

David Hewitt (davidmhewitt) wrote :

LGTM :)

review: Approve (code, function)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/Layout/AddLayoutPopover.vala'
2--- src/Widgets/Layout/AddLayoutPopover.vala 2017-02-12 04:00:41 +0000
3+++ src/Widgets/Layout/AddLayoutPopover.vala 2017-02-19 02:03:45 +0000
4@@ -9,23 +9,20 @@
5
6 label_language.halign = label_layout.halign = Gtk.Align.END;
7
8- // list stores
9 var lang_list = create_list_store (handler.languages);
10+
11+ var renderer = new Gtk.CellRendererText ();
12+
13 var language_box = new Gtk.ComboBox.with_model (lang_list);
14- language_box.id_column = 0;
15- language_box.active = 0;
16-
17- var layout_list = create_list_store (handler.get_variants_for_language (language_box.active_id));
18- var layout_box = new Gtk.ComboBox.with_model (layout_list);
19- layout_box.id_column = 0;
20- layout_box.active = 0;
21-
22- var renderer = new Gtk.CellRendererText ();
23-
24 language_box.pack_start (renderer, true);
25 language_box.add_attribute (renderer, "text", 1);
26 language_box.active = 0;
27-
28+ language_box.id_column = 0;
29+
30+ var layout_list = create_list_store (handler.get_variants_for_language (language_box.active_id));
31+
32+ var layout_box = new Gtk.ComboBox.with_model (layout_list);
33+ layout_box.id_column = 0;
34 layout_box.pack_start (renderer, true);
35 layout_box.add_attribute (renderer, "text", 1);
36 layout_box.active = 0;

Subscribers

People subscribed via source and target branches