Merge lp:~fabiozaramella/pantheon-photos/fix-1313440 into lp:~pantheon-photos/pantheon-photos/trunk

[Fabio Zaramella]

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2014-06-23 18:40:45 +0000
+++ src/Dialogs.vala	2014-08-08 17:33:00 +0000
@@ -2193,6 +2193,7 @@
     private static PreferencesDialog preferences_dialog;
     
     private Gtk.Dialog dialog;
+    private Gtk.HeaderBar header;
     private Gtk.Builder builder;
     private Gtk.Adjustment bg_color_adjustment;
     private Gtk.Scale bg_color_slider;
@@ -2217,9 +2218,7 @@
         builder = AppWindow.create_builder();
         
         // Preferences dialog window settings
-        dialog = new Gtk.Dialog();
-        dialog.border_width = 6;
-        dialog.title = _("Preferences");
+        dialog = new Gtk.Dialog ();
         dialog.width_request = 450;
         dialog.type_hint = Gdk.WindowTypeHint.DIALOG;
         dialog.resizable = false;
@@ -2227,6 +2226,13 @@
         dialog.map_event.connect(map_event_handler);
         dialog.set_parent_window(AppWindow.get_instance().get_parent_window());
         
+        header = new Gtk.HeaderBar ();
+        header.show_close_button = false;
+        header.title = _("Preferences");
+        header.get_style_context ().remove_class ("header-bar");
+        
+        dialog.set_titlebar (header);
+
         // Create our stack container and load in each preference container from shotwell.glade
         Gtk.Stack container = new Gtk.Stack ();
         container.expand = true;
@@ -2238,11 +2244,13 @@
         switcher.stack = container;
         switcher.expand = true;
         switcher.halign = Gtk.Align.CENTER;
-        switcher.margin_top = 6;
-        switcher.margin_bottom = 12;
+        switcher.margin_bottom = 6;
         
         // Add the switcher, stack container and button container to the window
         Gtk.Box content = dialog.get_content_area () as Gtk.Box;
+        content.margin_bottom = 6;
+        content.margin_start = 6;
+        content.margin_end = 6;
         content.add (switcher);
         content.add (container);
         
@@ -2701,4 +2709,4 @@
         progress.close();
     
     AppWindow.get_instance().set_normal_cursor();
-}
+}
\ No newline at end of file