[gnome-mines/arnaudb/wip/gtk4: 24/40] Adapt UI files.




commit 0e89ac03380a979219f605d99d33ad0aed3476e7
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Apr 14 00:01:25 2020 +0200

    Adapt UI files.

 src/help-overlay.ui |  19 --
 src/interface.ui    | 630 ++++++++++++++++++++++------------------------------
 2 files changed, 270 insertions(+), 379 deletions(-)
---
diff --git a/src/help-overlay.ui b/src/help-overlay.ui
index 8ae80f9..bf1a664 100644
--- a/src/help-overlay.ui
+++ b/src/help-overlay.ui
@@ -5,56 +5,47 @@
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">1</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes" context="shortcut window">Window and game</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;N</property>
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;R</property>
                 <property name="title" translatable="yes" context="shortcut window">Restart game with 
current settings</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Pause</property>
                 <property name="title" translatable="yes" context="shortcut window">Pause the game</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F1</property>
                 <property name="title" translatable="yes" context="shortcut window">Show Help</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F10</property>
                 <property name="title" translatable="yes" context="shortcut window">Open Menu</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;question</property>
                 <property name="title" translatable="yes" context="shortcut window">Show Keyboard 
Shortcuts</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Ctrl&gt;Q</property>
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
               </object>
@@ -63,32 +54,27 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes" context="shortcut window">Game size 
selection</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">1</property>
                 <property name="title" translatable="yes" context="shortcut window">Game size: 
small</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">2</property>
                 <property name="title" translatable="yes" context="shortcut window">Game size: 
medium</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">3</property>
                 <property name="title" translatable="yes" context="shortcut window">Game size: 
large</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">4</property>
                 <property name="title" translatable="yes" context="shortcut window">Game size: 
custom</property>
               </object>
@@ -97,32 +83,27 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes" context="shortcut window">In-game</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">Up Down Left Right</property>
                 <property name="title" translatable="yes" context="shortcut window">Move the keyboard 
cursor</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">u j h k</property>
                 <property name="title" translatable="yes" context="shortcut window">Move the keyboard 
cursor</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">space</property>
                 <property name="title" translatable="yes" context="shortcut window">Reveal field</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;Primary&gt;space</property>
                 <property name="title" translatable="yes" context="shortcut window">Toggle field flag 
state</property>
               </object>
diff --git a/src/interface.ui b/src/interface.ui
index c511a55..a84a67e 100644
--- a/src/interface.ui
+++ b/src/interface.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
 <interface>
-  <requires lib="gtk+" version="3.10"/>
+  <requires lib="gtk+" version="3.98"/>
   <object class="GtkSizeGroup" id="buttons_size_group">
     <property name="mode">both</property>
     <widgets>
@@ -19,424 +18,342 @@
     <property name="icon_name">gnome-mines</property>
     <child>
       <object class="GtkBox" id="main_vbox">
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">18</property>
+        <property name="margin_start">18</property>
+        <property name="margin_end">18</property>
+        <property name="margin_top">18</property>
+        <property name="margin_bottom">18</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkStack" id="stack">
-            <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="transition-type">slide-left-right</property>
             <child>
-              <object class="GtkAspectFrame" id="new_game_screen">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <property name="obey_child">False</property>
-                <child>
-                  <object class="GtkGrid" id="new_game_grid">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">18</property>
-                    <property name="column_spacing">18</property>
-                    <property name="row_homogeneous">True</property>
-                    <property name="column_homogeneous">True</property>
-                    <child>
-                      <object class="GtkButton" id="small_size_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="large_size_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="medium_size_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="custom_size_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
+              <object class="GtkStackPage">
                 <property name="name" translatable="no">new_game</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAspectFrame" id="custom_game_screen">
-                <property name="can_focus">False</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkGrid" id="custom_game_grid">
-                    <property name="visible">True</property>
+                <property name="child">
+                  <object class="GtkAspectFrame" id="new_game_screen">
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="width_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Width</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">width_spin_btn</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="width_spin_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="height_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">_Height</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">height_spin_btn</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="height_spin_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="percent_mines_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">Percent _mines</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="mines_spin_btn">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <property name="obey_child">False</property>
                     <child>
-                      <object class="GtkGrid" id="custom_buttons_grid">
-                        <property name="visible">True</property>
+                      <object class="GtkGrid" id="new_game_grid">
                         <property name="can_focus">False</property>
-                        <property name="margin_top">12</property>
-                        <property name="row_spacing">5</property>
+                        <property name="row_spacing">18</property>
+                        <property name="column_spacing">18</property>
+                        <property name="row_homogeneous">True</property>
+                        <property name="column_homogeneous">True</property>
                         <child>
-                          <object class="GtkButton" id="cancel_btn">
-                            <property name="label" translatable="yes">_Cancel</property>
-                            <property name="visible">True</property>
+                          <object class="GtkButton" id="small_size_btn">
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="valign">center</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="use_underline">True</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="play_game_btn">
-                            <property name="label" translatable="yes">_Play Game</property>
-                            <property name="visible">True</property>
+                          <object class="GtkButton" id="large_size_btn">
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
-                            <property name="valign">center</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="use_underline">True</property>
-                            <style>
-                              <class name="suggested-action"/>
-                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="medium_size_btn">
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="custom_size_btn">
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">2</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name" translatable="no">custom_game</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkBox" id="main_screen">
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkAspectFrame" id="minefield_aspect">
-                    <property name="visible">True</property>
+              <object class="GtkStackPage">
+                <property name="name" translatable="no">custom_game</property>
+                <property name="child">
+                  <object class="GtkAspectFrame" id="custom_game_screen">
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
-                    <property name="xalign">0.5</property>
-                    <property name="obey_child">False</property>
                     <child>
-                      <object class="GtkBox" id="aspect_child">
-                        <property name="visible">True</property>
+                      <object class="GtkGrid" id="custom_game_grid">
                         <property name="can_focus">False</property>
-                        <property name="spacing">24</property>
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkOverlay" id="minefield_overlay">
-                            <property name="visible">True</property>
+                          <object class="GtkLabel" id="width_label">
                             <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolled">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                            </child>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">_Width</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">width_spin_btn</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="width_spin_btn">
+                            <property name="can_focus">True</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="height_label">
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">_Height</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">height_spin_btn</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="height_spin_btn">
+                            <property name="can_focus">True</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="percent_mines_label">
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Percent _mines</property>
+                            <property name="use_underline">True</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="buttons_box">
-                            <property name="width_request">150</property>
-                            <property name="visible">True</property>
+                          <object class="GtkSpinButton" id="mines_spin_btn">
+                            <property name="can_focus">True</property>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">2</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkGrid" id="custom_buttons_grid">
                             <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">4</property>
+                            <property name="margin_top">12</property>
+                            <property name="row_spacing">5</property>
                             <child>
-                              <object class="GtkImage" id="flag_image">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="pixel_size">32</property>
-                                <property name="icon_name">flag</property>
+                              <object class="GtkButton" id="cancel_btn">
+                                <property name="label" translatable="yes">_Cancel</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="valign">center</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="use_underline">True</property>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">1</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="flag_label">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="margin_bottom">12</property>
-                                <property name="label">5/10</property>
+                              <object class="GtkButton" id="play_game_btn">
+                                <property name="label" translatable="yes">_Play Game</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="valign">center</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="use_underline">True</property>
+                                <style>
+                                  <class name="suggested-action"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">0</property>
+                                </layout>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                              <property name="column_span">2</property>
+                            </layout>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkStackPage">
+                <property name="name" translatable="no">game</property>
+                <property name="child">
+                  <object class="GtkBox" id="main_screen">
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkAspectFrame" id="minefield_aspect">
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">none</property>
+                        <property name="xalign">0.5</property>
+                        <property name="obey_child">False</property>
+                        <child>
+                          <object class="GtkBox" id="aspect_child">
+                            <property name="can_focus">False</property>
+                            <property name="spacing">24</property>
                             <child>
-                              <object class="GtkImage" id="clock_image">
-                                <property name="visible">True</property>
+                              <object class="GtkOverlay" id="minefield_overlay">
                                 <property name="can_focus">False</property>
-                                <property name="pixel_size">32</property>
-                                <property name="icon_name">preferences-system-time-symbolic</property>
+                                <child>
+                                  <object class="GtkScrolledWindow" id="scrolled">
+                                    <property name="can_focus">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </object>
+                                </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="clock_label">
-                                <property name="visible">True</property>
+                              <object class="GtkBox" id="buttons_box">
+                                <property name="width_request">150</property>
                                 <property name="can_focus">False</property>
-                                <property name="margin_bottom">12</property>
-                                <property name="yalign">0</property>
-                                <property name="label">0:00</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="play_pause_button">
-                                <property name="width_request">120</property>
-                                <property name="height_request">60</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="action_name">app.pause</property>
-                                <property name="use_underline">True</property>
+                                <property name="orientation">vertical</property>
+                                <property name="spacing">4</property>
+                                <child>
+                                  <object class="GtkImage" id="flag_image">
+                                    <property name="can_focus">False</property>
+                                    <property name="pixel_size">32</property>
+                                    <property name="icon_name">flag</property>
+                                  </object>
+                                </child>
                                 <child>
-                                  <object class="GtkLabel" id="play_pause_label">
-                                    <property name="visible">True</property>
+                                  <object class="GtkLabel" id="flag_label">
                                     <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Pause</property>
+                                    <property name="margin_bottom">12</property>
+                                    <property name="label">5/10</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkImage" id="clock_image">
+                                    <property name="can_focus">False</property>
+                                    <property name="pixel_size">32</property>
+                                    <property name="icon_name">preferences-system-time-symbolic</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="clock_label">
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_bottom">12</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label">0:00</property>
+                                  </object>
+                                </child>
+                                <!-- buttons are at the end, due to the replay_button vexpand+valign props 
-->
+                                <child>
+                                  <object class="GtkButton" id="replay_button">
+                                    <property name="width_request">120</property>
+                                    <property name="height_request">60</property>
+                                    <property name="label" translatable="yes">_Play Again</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="action_name">app.repeat-size</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="valign">end</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="high_scores_button">
+                                    <property name="width_request">120</property>
+                                    <property name="height_request">60</property>
+                                    <property name="label" translatable="yes">_Best Times</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="action_name">app.scores</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="play_pause_button">
+                                    <property name="width_request">120</property>
+                                    <property name="height_request">60</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="action_name">app.pause</property>
+                                    <property name="use_underline">True</property>
+                                    <child>
+                                      <object class="GtkLabel" id="play_pause_label">
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">_Pause</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="new_game_button">
+                                    <property name="width_request">120</property>
+                                    <property name="height_request">60</property>
+                                    <property name="label" translatable="yes">Change _Difficulty</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="action_name">app.new-game</property>
                                     <property name="use_underline">True</property>
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="new_game_button">
-                                <property name="width_request">120</property>
-                                <property name="height_request">60</property>
-                                <property name="label" translatable="yes">Change _Difficulty</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="action_name">app.new-game</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="high_scores_button">
-                                <property name="width_request">120</property>
-                                <property name="height_request">60</property>
-                                <property name="label" translatable="yes">_Best Times</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="action_name">app.scores</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="replay_button">
-                                <property name="width_request">120</property>
-                                <property name="height_request">60</property>
-                                <property name="label" translatable="yes">_Play Again</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="action_name">app.repeat-size</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="pack_type">end</property>
-                                <property name="position">7</property>
-                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name" translatable="no">game</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -449,7 +366,6 @@
     </widgets>
   </object>
   <object class="GtkBox" id="paused_box">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
@@ -457,17 +373,11 @@
     <property name="spacing">12</property>
     <child>
       <object class="GtkLabel" id="paused_label">
-        <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="label" translatable="yes">Paused</property>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
     <style>
       <class name="pausedOverlay"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]