[gnome-sudoku] Better use of the gnome-sudoku.ui file.

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 3da13ff071703488fe586d657475beb369ac28c0
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sun Jul 20 08:59:19 2014 +0200

    Better use of the gnome-sudoku.ui file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733435

 data/gnome-sudoku.ui  |   41 ++++++++++++++++++++++++++++++++++++++++-
 src/gnome-sudoku.vala |   29 -----------------------------
 2 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/data/gnome-sudoku.ui b/data/gnome-sudoku.ui
index 7529554..031e7da 100644
--- a/data/gnome-sudoku.ui
+++ b/data/gnome-sudoku.ui
@@ -164,11 +164,48 @@
                         <property name="spacing">20</property>
                         <property name="margin">20</property>
                         <child>
-                            <object class="GtkBox" id="controls_box">
+                            <object class="GtkButtonBox" id="controls_box">
                                 <property name="visible">True</property>
+                                <property name="valign">end</property>
                                 <property name="can_focus">False</property>
                                 <property name="orientation">vertical</property>
                                 <property name="spacing">10</property>
+                                <child>
+                                    <object class="GtkButton" id="clear_button">
+                                        <property name="visible">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="label" translatable="yes">_Clear Board</property>
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
+                                        <property name="action-name">app.reset</property>
+                                        <property name="tooltip-text" translatable="yes">Reset the board to 
its original state</property>
+                                        <property name="width-request">120</property>
+                                        <property name="height-request">60</property>
+                                    </object>
+                                    <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                    </packing>
+                                </child>
+                                <child>
+                                    <object class="GtkButton" id="new_button">
+                                        <property name="visible">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="label" translatable="yes">_New Puzzle</property>
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
+                                        <property name="action-name">app.new-game</property>
+                                        <property name="tooltip-text" translatable="yes">Start a new 
puzzle</property>
+                                        <property name="width-request">120</property>
+                                        <property name="height-request">60</property>
+                                    </object>
+                                    <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                    </packing>
+                                </child>
                             </object>  <!-- End of controls_box -->
                             <packing>
                                 <property name="expand">False</property>
@@ -177,6 +214,8 @@
                         </child>
                         <child>
                             <object class="GtkBox" id="grid_box">
+                                <property name="width-request">475</property>
+                                <property name="height-request">475</property>
                                 <property name="visible">True</property>
                                 <child>
                                     <placeholder/>
diff --git a/src/gnome-sudoku.vala b/src/gnome-sudoku.vala
index e346b73..f21d300 100644
--- a/src/gnome-sudoku.vala
+++ b/src/gnome-sudoku.vala
@@ -19,7 +19,6 @@ public class Sudoku : Gtk.Application
     private HeaderBar header_bar;
     private Stack main_stack;
     private Box grid_box; // Holds the view
-    private Box controls_box; // Holds the controls
 
     private Box undo_redo_box;
     private Button back_button;
@@ -132,37 +131,9 @@ public class Sudoku : Gtk.Application
         header_bar = (HeaderBar) builder.get_object ("headerbar");
         main_stack = (Stack) builder.get_object ("main_stack");
         grid_box = (Box) builder.get_object ("grid_box");
-        controls_box = (Box) builder.get_object ("controls_box");
         undo_redo_box = (Box) builder.get_object ("undo_redo_box");
-
         back_button = (Button) builder.get_object ("back_button");
 
-        var control_sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.BOTH);
-
-        var clear_button = new Gtk.Button ();
-        var clear_label = new Gtk.Label.with_mnemonic (_("_Clear Board"));
-        clear_label.margin = 10;
-        clear_button.add (clear_label);
-        clear_button.valign = Gtk.Align.CENTER;
-        clear_button.halign = Gtk.Align.CENTER;
-        clear_button.action_name = "app.reset";
-        clear_button.tooltip_text = _("Reset the board to its original state");
-        clear_button.show_all ();
-        controls_box.pack_end (clear_button, false, false, 0);
-        control_sizegroup.add_widget (clear_button);
-
-        var new_button = new Gtk.Button ();
-        var new_label = new Gtk.Label.with_mnemonic (_("_New Puzzle"));
-        new_label.margin = 10;
-        new_button.add (new_label);
-        new_button.valign = Gtk.Align.CENTER;
-        new_button.halign = Gtk.Align.CENTER;
-        new_button.action_name = "app.new-game";
-        new_button.tooltip_text = _("Start a new puzzle");
-        new_button.show_all ();
-        controls_box.pack_end (new_button, false, false, 0);
-        control_sizegroup.add_widget (new_button);
-
         undo_action = (SimpleAction) lookup_action ("undo");
         redo_action = (SimpleAction) lookup_action ("redo");
         print_action = (SimpleAction) lookup_action ("print");