Merge lp:~fabiozaramella/switchboard-plug-keyboard/fix-1349289 into lp:~elementary-pantheon/switchboard-plug-keyboard/trunk

Proposed by Fabio Zaramella
Status: Merged
Approved by: Danielle Foré
Approved revision: 289
Merged at revision: 288
Proposed branch: lp:~fabiozaramella/switchboard-plug-keyboard/fix-1349289
Merge into: lp:~elementary-pantheon/switchboard-plug-keyboard/trunk
Diff against target: 34 lines (+6/-4)
1 file modified
src/Pages/Layout/add_layout.vala (+6/-4)
To merge this branch: bzr merge lp:~fabiozaramella/switchboard-plug-keyboard/fix-1349289
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+246851@code.launchpad.net

Commit message

set deletable = false in add_layout and minor margin fixes

Description of the change

set deletable = false in add_layout and minor margin fixes

To post a comment you must log in.
289. By Fabio Zaramella

code aligned

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Pages/Layout/add_layout.vala'
--- src/Pages/Layout/add_layout.vala 2014-08-06 12:05:13 +0000
+++ src/Pages/Layout/add_layout.vala 2015-01-18 19:34:06 +0000
@@ -7,9 +7,12 @@
77
8 public AddLayout()8 public AddLayout()
9 {9 {
10 deletable = false;
11
10 var grid = new Gtk.Grid();12 var grid = new Gtk.Grid();
1113
12 grid.margin = 12;14 grid.margin_start = 12;
15 grid.margin_end = 12;
13 grid.column_spacing = 12;16 grid.column_spacing = 12;
14 grid.row_spacing = 12;17 grid.row_spacing = 12;
1518
@@ -57,8 +60,7 @@
57 // add buttons60 // add buttons
58 var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);61 var button_box = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
59 button_box.layout_style = Gtk.ButtonBoxStyle.END;62 button_box.layout_style = Gtk.ButtonBoxStyle.END;
60 button_box.spacing = 5;63 button_box.spacing = 6;
61 button_box.margin = 1;
6264
63 var button_add = new Gtk.Button.with_label (_("Add Layout"));65 var button_add = new Gtk.Button.with_label (_("Add Layout"));
64 var button_cancel = new Gtk.Button.with_label (_("Cancel"));66 var button_cancel = new Gtk.Button.with_label (_("Cancel"));
@@ -79,4 +81,4 @@
79 } );81 } );
80 }82 }
81 }83 }
82}
83\ No newline at end of file84\ No newline at end of file
85}

Subscribers

People subscribed via source and target branches

to all changes: