Merge lp:~fabiozaramella/noise/dont-use-headerbar into lp:~elementary-apps/noise/trunk

[Fabio Zaramella]

Don't use Gtk.Header Bar for preferences window in order to keep a consistent style with other apps, for example Scratch.

[lp:~fabiozaramella/noise/dont-use-headerbar]

1614. By Fabio on 2014-05-31

1615. By Fabio on 2014-05-31

ready for merge

[Cody Garver (codygarver)]

Gtk.Box is/is going to be deprecated, use Grid instead https://developer.gnome.org/gtk3/3.7/gtk-migrating-GtkGrid.html

review: Needs Fixing

[lp:~fabiozaramella/noise/dont-use-headerbar]

1616. By Fabio on 2014-06-01

use grid intead of box

1617. By Fabio on 2014-06-01

window made draggable

1618. By Fabio on 2014-07-03

uses headerbar but hides the close button

1619. By Fabio on 2014-07-06

need to hide the close button

1620. By Fabio on 2014-07-14

show_close_button (false)

1621. By Fabio on 2014-07-27

transient_for removed

Unmerged revisions

=== modified file 'src/Dialogs/PreferencesWindow.vala'
--- src/Dialogs/PreferencesWindow.vala	2014-03-16 20:34:25 +0000
+++ src/Dialogs/PreferencesWindow.vala	2014-06-01 08:24:24 +0000
@@ -39,7 +39,6 @@
     private int index = 0;
 
     public PreferencesWindow (LibraryWindow lw) {
-        Object (use_header_bar: 1);
         build_ui (lw);
 
         lw.add_preference_page.connect ((page) => {add_page (page);});
@@ -56,6 +55,16 @@
 
         Plugins.Manager.get_default ().hook_preferences_window (this);
 
+        /*
+         *  Allow moving the window
+         */
+        this.button_press_event.connect ( (e) => {
+            if (e.button == 1) {
+                this.begin_move_drag ((int) e.button, (int) e.x_root, (int) e.y_root, e.time);
+                return true;
+            }
+            return false;
+        });
     }
 
 
@@ -90,6 +99,7 @@
         main_stack = new Gtk.Stack ();
         main_stackswitcher = new Gtk.StackSwitcher ();
         main_stackswitcher.set_stack (main_stack);
+        main_stackswitcher.halign = Gtk.Align.CENTER;
 
         var close_button = new Gtk.Button.with_label (_("Close"));
         close_button.clicked.connect (() => {this.destroy ();});
@@ -99,11 +109,12 @@
         button_box.pack_end (close_button);
         button_box.margin_right = 12;
 
-        var main_grid = new Gtk.Grid ();
-        main_grid.attach (main_stack, 0, 0, 1, 1);
-        main_grid.attach (button_box, 0, 1, 1, 1);
+        // Pack everything into the dialog
+        Gtk.Grid main_grid = new Gtk.Grid ();
+        main_grid.attach (main_stackswitcher, 0, 0, 1, 1);
+        main_grid.attach (main_stack, 0, 1, 1, 1);
+        main_grid.attach (button_box, 0, 2, 1, 1);
 
-        ((Gtk.HeaderBar) get_header_bar ()).set_custom_title (main_stackswitcher);
         ((Gtk.Container) get_content_area ()).add (main_grid);
     }
 }