Merge lp:~elementary-apps/scratch/prefs-to-gtk-dialog into lp:~elementary-apps/scratch/scratch

[Danielle Foré]

port prefs to gtk.dialog

Ports Scratch's prefs dialog to gtk.dialog

[Danielle Foré (danrabbit)]

Close button isn't working. No idea why.

review: Needs Fixing

[lp:~elementary-apps/scratch/prefs-to-gtk-dialog]

1270. By Avi Romanoff on 2014-04-07

Close button works now!

[Danielle Foré (danrabbit)]

review: Approve

=== modified file 'src/Dialogs/PreferencesDialog.vala'
--- src/Dialogs/PreferencesDialog.vala	2013-06-09 18:39:15 +0000
+++ src/Dialogs/PreferencesDialog.vala	2014-04-07 03:45:22 +0000
@@ -24,7 +24,7 @@
 
 namespace Scratch.Dialogs {
 
-    public class Preferences : Granite.Widgets.LightWindow {
+    public class Preferences : Gtk.Dialog {
 
         public StaticNotebook main_static_notebook;
         
@@ -43,20 +43,17 @@
         public Preferences () {
 
             this.title = _("Preferences");
-            this.type_hint = Gdk.WindowTypeHint.DIALOG;
+            this.border_width = 5;
             set_default_size (630, 330);
             resizable = false;
             
             main_static_notebook = new StaticNotebook (false);
-            main_static_notebook.margin = 5;
             
             create_layout ();
 
         }
 
         private void create_layout () {
-            // Create main box
-            var box = new Box (Orientation.VERTICAL, 0);
             
             //create static notebook Behavior tab
             var behavior_label = new Label (_("Behavior"));
@@ -81,23 +78,16 @@
             }
             
             // Close button
-            var close = new Button.with_label (_("Close"));
-            close.clicked.connect (() => {
-                this.destroy ();
-            });
-            
-            var bbox = new ButtonBox (Orientation.HORIZONTAL);
-            bbox.halign = Align.END;
-            bbox.margin_bottom = 11;
-            bbox.margin_right = 8;
-            bbox.add (close);
+	        this.response.connect ((response_id) => { 
+		        this.destroy();
+		    });
+            add_button ("_Close", Gtk.ResponseType.CLOSE);
             
             // Pack everything into the dialog
-            box.pack_start (main_static_notebook, true, true, 0);
-            box.pack_start (bbox, true, false, 0);
-            this.add (box);
+            Gtk.Box content = get_content_area () as Gtk.Box;
+            content.pack_start (main_static_notebook, true, true, 0);
         }
-        
+
         void add_section (Gtk.Grid grid, Gtk.Label name, ref int row) {
             name.use_markup = true;
             name.set_markup ("<b>%s</b>".printf (name.get_text ()));
@@ -287,4 +277,4 @@
 
     }
 
-} // Namespace
+} // Namespace
 \ No newline at end of file