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

Proposed by Danielle Foré
Status: Merged
Approved by: David Hewitt
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 Approve
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 Danielle Foré

group properties

Revision history for this message
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
=== modified file 'src/Widgets/Layout/AddLayoutPopover.vala'
--- src/Widgets/Layout/AddLayoutPopover.vala 2017-02-12 04:00:41 +0000
+++ src/Widgets/Layout/AddLayoutPopover.vala 2017-02-19 02:03:45 +0000
@@ -9,23 +9,20 @@
99
10 label_language.halign = label_layout.halign = Gtk.Align.END;10 label_language.halign = label_layout.halign = Gtk.Align.END;
1111
12 // list stores
13 var lang_list = create_list_store (handler.languages);12 var lang_list = create_list_store (handler.languages);
13
14 var renderer = new Gtk.CellRendererText ();
15
14 var language_box = new Gtk.ComboBox.with_model (lang_list);16 var language_box = new Gtk.ComboBox.with_model (lang_list);
15 language_box.id_column = 0;
16 language_box.active = 0;
17
18 var layout_list = create_list_store (handler.get_variants_for_language (language_box.active_id));
19 var layout_box = new Gtk.ComboBox.with_model (layout_list);
20 layout_box.id_column = 0;
21 layout_box.active = 0;
22
23 var renderer = new Gtk.CellRendererText ();
24
25 language_box.pack_start (renderer, true);17 language_box.pack_start (renderer, true);
26 language_box.add_attribute (renderer, "text", 1);18 language_box.add_attribute (renderer, "text", 1);
27 language_box.active = 0;19 language_box.active = 0;
2820 language_box.id_column = 0;
21
22 var layout_list = create_list_store (handler.get_variants_for_language (language_box.active_id));
23
24 var layout_box = new Gtk.ComboBox.with_model (layout_list);
25 layout_box.id_column = 0;
29 layout_box.pack_start (renderer, true);26 layout_box.pack_start (renderer, true);
30 layout_box.add_attribute (renderer, "text", 1);27 layout_box.add_attribute (renderer, "text", 1);
31 layout_box.active = 0;28 layout_box.active = 0;

Subscribers

People subscribed via source and target branches