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

[The Lemon Man]

Use a Popover instead of a Dialog for AddLayout

[lp:~lemonboy/switchboard-plug-keyboard/popover]

367. By The Lemon Man on 2015-10-26

Use a Popover instead of a Dialog for AddLayout.

[Danielle Foré (danrabbit)]

margins are a little fucky. Probably should change that grid.margin_start to just grid.margin so you get that 12px all the way around

review: Needs Fixing

[lp:~lemonboy/switchboard-plug-keyboard/popover]

368. By The Lemon Man on 2015-10-26

Fix the margin size for the popover.

369. By The Lemon Man on 2015-10-27

Restore the call to 'add_item'

=== modified file 'src/Pages/Layout/add_layout.vala'
--- src/Pages/Layout/add_layout.vala	2015-01-18 19:33:54 +0000
+++ src/Pages/Layout/add_layout.vala	2015-10-26 23:56:58 +0000
@@ -1,23 +1,19 @@
 namespace Pantheon.Keyboard.LayoutPage
 {
 	// pop over widget to add a new keyboard layout
-	class AddLayout : Gtk.Dialog
+	class AddLayout : Gtk.Popover
 	{
 		public signal void layout_added (int language, int layout = 0);
 
 		public AddLayout()
 		{
-			deletable = false;
-
 			var grid = new Gtk.Grid();
 
-			grid.margin_start   = 12;
-			grid.margin_end     = 12;
+			grid.margin         = 12;
 			grid.column_spacing = 12;
 			grid.row_spacing    = 12;
 
-			Gtk.Box content = this.get_content_area ();
-			content.pack_start (grid, false, true, 0);
+			this.add_with_properties (grid);
 
 			// add some labels
 			var label_language = new Gtk.Label (_("Language:"));
 
=== modified file 'src/Pages/Layout/display.vala'
--- src/Pages/Layout/display.vala	2014-10-04 22:26:16 +0000
+++ src/Pages/Layout/display.vala	2015-10-26 23:56:58 +0000
@@ -75,9 +75,7 @@
             var pop = new AddLayout ();
 
             add_button.clicked.connect( () => {
-                // uncomment when reverting to popover
-                //pop.move_to_widget (add_button);
-                // and remove this line
+                pop.set_relative_to (add_button);
                 pop.show_all ();
                 add_item (pop);
             });
@@ -205,4 +203,4 @@
             });
         }
     }
-}
 \ No newline at end of file
+}