[gnome-sudoku/arnaudb/wip/gtk4: 47/47] Adapt UI files.




commit 03349c3a5f98437c33f033089c267fd56d84f2db
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Wed Sep 23 18:32:41 2020 +0200

    Adapt UI files.

 data/gnome-sudoku.ui | 419 +++++++++++++++++++++------------------------------
 data/print-dialog.ui | 144 ++++++------------
 2 files changed, 221 insertions(+), 342 deletions(-)
---
diff --git a/data/gnome-sudoku.ui b/data/gnome-sudoku.ui
index 970488b..770bde3 100644
--- a/data/gnome-sudoku.ui
+++ b/data/gnome-sudoku.ui
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.10 -->
+  <requires lib="gtk+" version="3.99"/>
   <object class="GtkHeaderBar" id="headerbar">
-    <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="show-close-button">True</property>
-    <child>
+    <property name="show-title-buttons">True</property>
+    <child type="start">
       <object class="GtkBox" id="undo_redo_box">
-        <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="homogeneous">True</property>
         <style>
@@ -16,72 +14,45 @@
         </style>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="valign">center</property>
             <property name="tooltip-text" translatable="yes">Undo your last action</property>
-            <property name="can-focus">True</property>
             <property name="focus-on-click">False</property>
             <property name="action-name">app.undo</property>
+            <property name="icon-name">edit-undo-symbolic</property>
             <style>
               <class name="image-button"/>
             </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">edit-undo-symbolic</property>
-                <property name="visible">True</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
           </object>
         </child>
         <child>
           <object class="GtkButton">
-            <property name="visible">True</property>
             <property name="sensitive">False</property>
             <property name="valign">center</property>
             <property name="tooltip-text" translatable="yes">Redo your last action</property>
-            <property name="can-focus">True</property>
             <property name="focus-on-click">False</property>
             <property name="action-name">app.redo</property>
+            <property name="icon-name">edit-redo-symbolic</property>
             <style>
               <class name="image-button"/>
             </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">edit-redo-symbolic</property>
-                <property name="visible">True</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
           </object>
         </child>
       </object>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkMenuButton">
-        <property name="visible">True</property>
         <property name="menu-model">primary-menu</property>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="halign">center</property>
-            <property name="icon-name">open-menu-symbolic</property>
-          </object>
-        </child>
+        <property name="valign">center</property>
+        <property name="icon-name">open-menu-symbolic</property>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkImage" id="clock_image">
-            <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="icon-name">preferences-system-time-symbolic</property>
             <property name="icon-size">1</property>
@@ -89,15 +60,11 @@
         </child>
         <child>
           <object class="GtkLabel" id="clock_label">
-            <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="halign">center</property>
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
     <child>
       <object class="GtkButton" id="back_button">
@@ -107,16 +74,10 @@
         <property name="tooltip-text" translatable="yes">Go back to the current game</property>
         <property name="use-underline">True</property>
         <property name="action-name">app.back</property>
+        <property name="icon-name">go-previous-symbolic</property>
         <style>
           <class name="image-button"/>
         </style>
-        <child>
-          <object class="GtkImage">
-            <property name="icon-name">go-previous-symbolic</property>
-            <property name="visible">True</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
       </object>
     </child>
   </object>
@@ -162,229 +123,195 @@
     <child>
       <object class="GtkBox"> <!-- vbox -->
         <property name="orientation">vertical</property>
-        <property name="visible">True</property>
         <child>
           <object class="GtkStack" id="main_stack">
-            <property name="visible">True</property>
-            <property name="homogeneous">True</property>
-            <property name="margin">25</property>
-            <property name="expand">True</property>
+            <property name="hhomogeneous">True</property>
+            <property name="vhomogeneous">True</property>
+            <property name="margin-start">25</property>
+            <property name="margin-end">25</property>
+            <property name="margin-top">25</property>
+            <property name="margin-bottom">25</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <child>
-              <object class="GtkBox"> <!-- start_box -->
-                <property name="orientation">vertical</property>
-                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin">0</property>
-                <property name="width-request">350</property>
-                <property name="height-request">350</property>
-                <child>
-                  <object class="GtkFrame">
-                    <property name="visible">True</property>
-                    <property name="shadow-type">GTK_SHADOW_IN</property>
+              <object class="GtkStackPage"> <!-- start_box page -->
+                <property name="name">start_box</property>
+                <property name="child">
+                  <object class="GtkBox"> <!-- start_box -->
+                    <property name="orientation">vertical</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="margin-start">0</property>
+                    <property name="margin-end">0</property>
+                    <property name="margin-top">0</property>
+                    <property name="margin-bottom">0</property>
+                    <property name="width-request">350</property>
+                    <property name="height-request">350</property>
                     <child>
-                      <object class="GtkListBox">
-                        <property name="show-separators">True</property>
-                        <property name="can-focus">False</property>
+                      <object class="GtkFrame">
                         <child>
-                          <object class="GtkListBoxRow">
-                            <property name="action-name">app.start-game</property>
-                            <property name="action-target">1</property>  <!-- 1 corresponds to enum 
DifficultyCategory.EASY -->
-                            <property name="height-request">80</property>
-                            <property name="can-focus">True</property>
-                            <property name="child">
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">_Easy</property>
-                                <property name="use-underline">True</property>
+                          <object class="GtkListBox">
+                            <property name="show-separators">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkListBoxRow">
+                                <property name="action-name">app.start-game</property>
+                                <property name="action-target">1</property>  <!-- 1 corresponds to enum 
DifficultyCategory.EASY -->
+                                <property name="height-request">80</property>
+                                <property name="can-focus">True</property>
+                                <property name="child">
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">_Easy</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </property>
                               </object>
-                            </property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBoxRow">
-                            <property name="action-name">app.start-game</property>
-                            <property name="action-target">2</property>  <!-- 2 corresponds to enum 
DifficultyCategory.MEDIUM -->
-                            <property name="height-request">80</property>
-                            <property name="can-focus">True</property>
-                            <property name="child">
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">_Medium</property>
-                                <property name="use-underline">True</property>
+                            </child>
+                            <child>
+                              <object class="GtkListBoxRow">
+                                <property name="action-name">app.start-game</property>
+                                <property name="action-target">2</property>  <!-- 2 corresponds to enum 
DifficultyCategory.MEDIUM -->
+                                <property name="height-request">80</property>
+                                <property name="can-focus">True</property>
+                                <property name="child">
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">_Medium</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </property>
                               </object>
-                            </property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBoxRow">
-                            <property name="action-name">app.start-game</property>
-                            <property name="action-target">3</property>  <!-- 3 corresponds to enum 
DifficultyCategory.HARD -->
-                            <property name="height-request">80</property>
-                            <property name="can-focus">True</property>
-                            <property name="child">
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">_Hard</property>
-                                <property name="use-underline">True</property>
+                            </child>
+                            <child>
+                              <object class="GtkListBoxRow">
+                                <property name="action-name">app.start-game</property>
+                                <property name="action-target">3</property>  <!-- 3 corresponds to enum 
DifficultyCategory.HARD -->
+                                <property name="height-request">80</property>
+                                <property name="can-focus">True</property>
+                                <property name="child">
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">_Hard</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </property>
                               </object>
-                            </property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBoxRow">
-                            <property name="action-name">app.start-game</property>
-                            <property name="action-target">4</property>  <!-- 4 corresponds to enum 
DifficultyCategory.VERY_HARD -->
-                            <property name="height-request">80</property>
-                            <property name="can-focus">True</property>
-                            <property name="child">
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">_Very Hard</property>
-                                <property name="use-underline">True</property>
+                            </child>
+                            <child>
+                              <object class="GtkListBoxRow">
+                                <property name="action-name">app.start-game</property>
+                                <property name="action-target">4</property>  <!-- 4 corresponds to enum 
DifficultyCategory.VERY_HARD -->
+                                <property name="height-request">80</property>
+                                <property name="can-focus">True</property>
+                                <property name="child">
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">_Very Hard</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </property>
                               </object>
-                            </property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBoxRow">
-                            <property name="action-name">app.create-game</property>
-                            <property name="height-request">80</property>
-                            <property name="can-focus">True</property>
-                            <property name="child">
-                              <object class="GtkLabel">
-                                <property name="label" translatable="yes">_Create your own puzzle</property>
-                                <property name="use-underline">True</property>
+                            </child>
+                            <child>
+                              <object class="GtkListBoxRow">
+                                <property name="action-name">app.create-game</property>
+                                <property name="height-request">80</property>
+                                <property name="can-focus">True</property>
+                                <property name="child">
+                                  <object class="GtkLabel">
+                                    <property name="label" translatable="yes">_Create your own 
puzzle</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </property>
                               </object>
-                            </property>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object> <!-- End of start_box -->
-              <packing>
-                <property name="name">start_box</property>
-              </packing>
+                  </object> <!-- End of start_box -->
+                </property>
+              </object> <!-- End of start_box page -->
             </child>
             <child>
-              <object class="GtkAspectFrame"> <!-- frame -->
-                <property name="visible">True</property>
-                <property name="obey-child">False</property>
-                <property name="ratio">1.4</property>
-                <child>
-                  <object class="GtkBox" id="game_box">
-                    <property name="visible">True</property>
-                    <property name="spacing">25</property>
+              <object class="GtkStackPage"> <!-- frame page -->
+                <property name="name">frame</property>
+                <property name="child">
+                  <object class="GtkAspectFrame"> <!-- frame -->
+                    <property name="obey-child">False</property>
+                    <property name="ratio">1.4</property>
                     <child>
-                      <object class="GtkButtonBox"> <!-- controls_box -->
-                        <property name="visible">True</property>
-                        <property name="halign">end</property>
-                        <property name="valign">end</property>
-                        <property name="can-focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                      <object class="GtkBox" id="game_box">
+                        <property name="spacing">25</property>
                         <child>
-                          <object class="GtkButton" id="play_pause_button">
-                            <property name="visible">True</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="width-request">120</property>
-                            <property name="height-request">60</property>
+                          <object class="GtkBox"> <!-- controls_box -->
+                            <property name="halign">end</property>
+                            <property name="valign">end</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkLabel" id="play_pause_label">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin">12</property>
-                                <property name="label" translatable="yes">_Pause</property>
+                              <object class="GtkButton" id="play_pause_button">
+                                <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="width-request">120</property>
+                                <property name="height-request">60</property>
+                                <child>
+                                  <object class="GtkLabel" id="play_pause_label">
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-start">12</property>
+                                    <property name="margin-end">12</property>
+                                    <property name="margin-top">12</property>
+                                    <property name="margin-bottom">12</property>
+                                    <property name="label" translatable="yes">_Pause</property>
+                                    <property name="use-underline">True</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="pack-type">end</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton">
-                            <property name="visible">True</property>
-                            <property name="use-underline">True</property>
-                            <property name="label" translatable="yes">_Clear Board</property>
-                            <property name="halign">fill</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">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton">
-                            <property name="visible">True</property>
-                            <property name="use-underline">True</property>
-                            <property name="label" translatable="yes">_New Puzzle</property>
-                            <property name="halign">fill</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">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="play_custom_game_button">
-                            <property name="visible">False</property>
-                            <property name="use-underline">True</property>
-                            <property name="label" translatable="yes">_Start Playing</property>
-                            <property name="halign">fill</property>
-                            <property name="valign">center</property>
-                            <property name="action-name">app.play-custom-game</property>
-                            <property name="tooltip-text" translatable="yes">Start playing the custom puzzle 
you have created</property>
-                            <property name="width-request">120</property>
-                            <property name="height-request">60</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">3</property>
-                          </packing>
+                            <child>
+                              <object class="GtkButton">
+                                <property name="use-underline">True</property>
+                                <property name="label" translatable="yes">_Clear Board</property>
+                                <property name="halign">fill</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>
+                            </child>
+                            <child>
+                              <object class="GtkButton">
+                                <property name="use-underline">True</property>
+                                <property name="label" translatable="yes">_New Puzzle</property>
+                                <property name="halign">fill</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>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="play_custom_game_button">
+                                <property name="use-underline">True</property>
+                                <property name="label" translatable="yes">_Start Playing</property>
+                                <property name="halign">fill</property>
+                                <property name="valign">center</property>
+                                <property name="action-name">app.play-custom-game</property>
+                                <property name="tooltip-text" translatable="yes">Start playing the custom 
puzzle you have created</property>
+                                <property name="width-request">120</property>
+                                <property name="height-request">60</property>
+                              </object>
+                            </child>
+                          </object>  <!-- End of controls_box -->
                         </child>
-                      </object>  <!-- End of controls_box -->
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack-type">end</property>
-                        <property name="padding">0</property>
-                      </packing>
+                      </object> <!-- End of game_box -->
                     </child>
-                  </object> <!-- End of game_box -->
-                </child>
-              </object> <!-- End of frame -->
-              <packing>
-                <property name="name">frame</property>
-              </packing>
+                  </object> <!-- End of frame -->
+                </property>
+              </object> <!-- End of frame page -->
             </child>
           </object> <!-- End of main_stack -->
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
         </child>
       </object> <!-- End of vbox -->
     </child>
diff --git a/data/print-dialog.ui b/data/print-dialog.ui
index cd0d586..106525b 100644
--- a/data/print-dialog.ui
+++ b/data/print-dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.99"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
@@ -18,17 +18,13 @@
     <property name="title" translatable="yes">Print Multiple Puzzles</property>
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
-    <property name="type-hint">dialog</property>
     <property name="width-request">460</property>
-    <property name="expand">False</property>
+    <property name="hexpand">False</property>
+    <property name="vexpand">False</property>
     <property name="modal">True</property>
     <child type="action">
       <object class="GtkButton" id="cancelbutton1">
         <property name="label" translatable="yes">_Cancel</property>
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="can-default">True</property>
-        <property name="receives-default">False</property>
         <property name="use-underline">True</property>
         <property name="valign">center</property>
       </object>
@@ -36,31 +32,28 @@
     <child type="action">
       <object class="GtkButton" id="print_button">
         <property name="label" translatable="yes">_Print</property>
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="can-default">True</property>
-        <property name="receives-default">False</property>
         <property name="use-underline">True</property>
         <property name="valign">center</property>
       </object>
     </child>
-    <child internal-child="vbox">
+    <child internal-child="content_area">
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkGrid" id="print_grid">
-            <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="border-width">12</property>
             <property name="row-spacing">16</property>
-            <property name="column-spacing">10</property>
-            <property name="margin">6</property>
+            <property name="column-spacing">22</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="orientation">vertical</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="label" translatable="yes">_Number of puzzles</property>
                 <property name="use-underline">True</property>
@@ -69,34 +62,27 @@
                 <property name="halign">end</property>
                 <property name="width-request">150</property>
                 <property name="xalign">1.0</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">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="n_sudokus_button">
-                <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="halign">center</property>
-                <property name="primary-icon-activatable">False</property>
-                <property name="secondary-icon-activatable">False</property>
-                <property name="primary-icon-sensitive">True</property>
-                <property name="secondary-icon-sensitive">True</property>
+                <property name="halign">start</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="climb-rate">1</property>
                 <property name="valign">center</property>
-                <property name="margin-start">12</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="label" translatable="yes">_Number of puzzles per page</property>
                 <property name="use-underline">True</property>
@@ -105,121 +91,87 @@
                 <property name="halign">end</property>
                 <property name="width-request">150</property>
                 <property name="xalign">1.0</property>
+                <property name="margin-top">2</property> <!-- TODO hackish, alignment with first radiobutton 
text 1/2 -->
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkSpinButton" id="n_sudokus_per_page_button">
-                <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="halign">center</property>
-                <property name="primary-icon-activatable">False</property>
-                <property name="secondary-icon-activatable">False</property>
-                <property name="primary-icon-sensitive">True</property>
-                <property name="secondary-icon-sensitive">True</property>
+                <property name="halign">start</property>
                 <property name="adjustment">adjustment2</property>
                 <property name="climb-rate">1</property>
                 <property name="valign">center</property>
-                <property name="margin-start">12</property>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">Difficulty</property>
                 <property name="halign">end</property>
                 <property name="width-request">150</property>
                 <property name="xalign">1.0</property>
+                <property name="margin-top">2</property> <!-- TODO hackish, alignment with first radiobutton 
text 2/2 -->
+                <layout>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <property name="homogeneous">True</property>
-                <property name="halign">center</property>
+                <property name="halign">start</property>
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkCheckButton" id="easy_radio_button">
                     <property name="label" translatable="yes">_Easy</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
                     <property name="use-underline">True</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="medium_radio_button">
                     <property name="label" translatable="yes">_Medium</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
                     <property name="use-underline">True</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="group">easy_radio_button</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="hard_radio_button">
                     <property name="label" translatable="yes">_Hard</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
                     <property name="use-underline">True</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="group">easy_radio_button</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="very_hard_radio_button">
                     <property name="label" translatable="yes">_Very Hard</property>
-                    <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
                     <property name="use-underline">True</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="group">easy_radio_button</property>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
                 </child>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
+                </layout>
               </object>
-              <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">2</property>
-              </packing>
             </child>
           </object>
         </child>



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