[gnome-mines] Do not hide any buttons

[Robert Roth <robertroth src gnome org>]

commit 55b6fe9abf5412060a213734d0c707a7b39f1625
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Jan 14 08:49:02 2015 +0200

    Do not hide any buttons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=737048

 data/interface.ui    |    2 +-
 src/gnome-mines.vala |   65 +++++++++++++------------------------------------
 2 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/data/interface.ui b/data/interface.ui
index b2e6a45..e736e52 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -362,7 +362,7 @@
                         <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="pack_type">end</property>
-                        <property name="position">5</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
diff --git a/src/gnome-mines.vala b/src/gnome-mines.vala
index 15d2356..4bdd134 100644
--- a/src/gnome-mines.vala
+++ b/src/gnome-mines.vala
@@ -191,7 +191,7 @@ public class Mines : Gtk.Application
 
         add_action_entries (action_entries, this);
         new_game_action = lookup_action ("new-game") as SimpleAction;
-        new_game_action.set_enabled (false);
+        new_game_action.set_enabled (true);
         repeat_size_action = lookup_action ("repeat-size") as SimpleAction;
         repeat_size_action.set_enabled (false);
         pause_action = lookup_action ("pause") as SimpleAction;
@@ -567,9 +567,6 @@ public class Mines : Gtk.Application
 
         window.resize (window_width, window_height);
 
-        new_game_button.show ();
-
-        new_game_action.set_enabled (false);
         repeat_size_action.set_enabled (false);
         pause_action.set_enabled (false);
 
@@ -581,9 +578,10 @@ public class Mines : Gtk.Application
         window_skip_configure = true;
         minefield_view.has_focus = true;
 
-        play_pause_button.hide ();
-        replay_button.hide ();
-        new_game_button.hide ();
+        repeat_size_action.set_enabled (false);
+        play_pause_label.label = _("_Pause");
+        replay_button.label = _("St_art Over");
+        play_pause_button.show ();
         high_scores_button.hide ();
 
         tick_cb ();
@@ -640,10 +638,6 @@ public class Mines : Gtk.Application
         minefield_aspect.set_size_request (request_x, request_y);
         update_flag_label ();
 
-        new_game_action.set_enabled (true);
-        repeat_size_action.set_enabled (true);
-        pause_action.set_enabled (true);
-
         minefield.paused = false;
         pause_requested = false;
 
@@ -678,9 +672,9 @@ public class Mines : Gtk.Application
     private void paused_changed_cb ()
     {
         if (minefield.paused)
-            display_unpause_button ();
+            play_pause_label.label = _("_Resume");
         else if (minefield.elapsed > 0)
-            display_pause_button ();
+            play_pause_label.label = _("_Pause");
         paused_box.visible = minefield.paused;
     }
 
@@ -691,14 +685,15 @@ public class Mines : Gtk.Application
 
     private void explode_cb (Minefield minefield)
     {
-        new_game_button.show ();
+        game_ended ();
+    }
 
+    private void game_ended ()
+    {
         replay_button.label = _("Play _Again");
-        replay_button.show ();
-
-        high_scores_button.show ();
         pause_action.set_enabled (false);
         play_pause_button.hide ();
+        high_scores_button.show ();
     }
 
     private void cleared_cb (Minefield minefield)
@@ -712,21 +707,15 @@ public class Mines : Gtk.Application
         if (show_scores (entry, true) == Gtk.ResponseType.OK)
             show_new_game_screen ();
         else
-        {
-            new_game_button.show ();
-
-            replay_button.label = _("Play _Again");
-            replay_button.show ();
-
-            high_scores_button.show ();
-            pause_action.set_enabled (false);
-            play_pause_button.hide ();
-        }
+            game_ended ();
     }
 
     private void clock_started_cb ()
     {
-        display_pause_button ();
+        play_pause_label.label = _("_Pause");
+        replay_button.sensitive = true;
+        pause_action.set_enabled (true);
+        repeat_size_action.set_enabled (true);
     }
 
     private void tick_cb ()
@@ -873,26 +862,6 @@ public class Mines : Gtk.Application
         }
     }
 
-    private void display_pause_button ()
-    {
-        replay_button.hide ();
-        new_game_button.hide ();
-
-        play_pause_button.show ();
-        play_pause_label.label = _("_Pause");
-    }
-
-    private void display_unpause_button ()
-    {
-        replay_button.label = _("St_art Over");
-        replay_button.show ();
-
-        new_game_button.show ();
-
-        play_pause_button.show ();
-        play_pause_label.label = _("_Resume");
-    }
-
     public static int main (string[] args)
     {
         Intl.setlocale (LocaleCategory.ALL, "");