[five-or-more/arnaudb/gtk3: 18/24] Revert "Adapt UI files."

From: Arnaud B. <arnaudb src gnome org>
To: commits-list gnome org
Cc:
Subject: [five-or-more/arnaudb/gtk3: 18/24] Revert "Adapt UI files."
Date: Thu, 22 Oct 2020 15:32:55 +0000 (UTC)

commit 1a934c3d2aefab1c32e5bfdc1c16734299be4260
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Oct 22 17:29:50 2020 +0200

    Revert "Adapt UI files."
    
    This reverts commit 038311bdafa43af54d2edfdc165c32d5bce28bc2.

 data/ui/five-or-more.ui | 36 +++++++++++++++++++++++++++---------
 data/ui/help-overlay.ui | 13 ++++++++++++-
 2 files changed, 39 insertions(+), 10 deletions(-)
---
diff --git a/data/ui/five-or-more.ui b/data/ui/five-or-more.ui
index c2ad0f8..9976372 100644
--- a/data/ui/five-or-more.ui
+++ b/data/ui/five-or-more.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.99"/>
+  <!-- interface-requires gtk+ 3.10 -->
   <menu id="primary-menu">
     <section>
       <item>
@@ -110,23 +110,26 @@
     <property name="default_width">320</property>
     <property name="default_height">400</property>
     <property name="icon_name">five-or-more</property>
-<!--    <property name="border-width">18</property> FIXME -->
+    <property name="border-width">18</property>
     <accel-groups>
       <group name="accelgroup"/>
     </accel-groups>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="show_title_buttons">True</property>
+        <property name="show_close_button">True</property>
         <!-- Translators: name of the application, as displayed in the window manager -->
         <property name="title" translatable="yes">Five or More</property>
-        <child type="start">
+        <child>
           <object class="GtkBox" id="preview_hbox">
+            <property name="visible">True</property>
             <property name="can_focus">False</property>
-<!--            <property name="border_width">12</property> FIXME -->
+            <property name="border_width">12</property>
             <property name="orientation">horizontal</property>
             <child>
               <object class="GtkLabel" id="labelNext">
+                <property name="visible">True</property>
                 <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
                 <property name="can_focus">False</property>
                 <!-- Translators: label displayed in the headerbar, introducing the next balls to be added 
to the board -->
@@ -135,21 +138,36 @@
                   <attribute name="weight" value="bold"/>
                 </attributes>
               </object>
+              <packing>
+                <property name="pack_type">start</property>
+              </packing>
             </child>
           </object>
         </child>
-        <child type="end">
+        <child>
           <object class="GtkMenuButton">
+            <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="menu_model">primary-menu</property>
-            <property name="icon_name">open-menu-symbolic</property>
-<!--            <accelerator key="F10" signal="activate"/> FIXME -->
+            <accelerator key="F10" signal="activate"/>
+            <child>
+              <object class="GtkImage" id="primary-menu-button-image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">open-menu-symbolic</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
         </child>
       </object>
     </child>
     <child>
-      <object class="GamesGridFrame" id="grid_frame"/>
+      <object class="GamesGridFrame" id="grid_frame">
+        <property name="visible">True</property>
+      </object>
     </child>
   </template>
 </interface>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index f86bce4..e70717b 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -16,17 +16,20 @@
   along with Five-or-More.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <interface>
-  <requires lib="gtk+" version="3.99"/>
+  <requires lib="gtk+" version="3.12"/>
   <object class="GtkShortcutsWindow" id="help_overlay">
     <child>
       <object class="GtkShortcutsSection">
+        <property name="visible">True</property>
         <property name="max-height">6</property>
         <child>
           <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
             <!-- Translators: header of the "Start a new game" (only) shortcut section -->
             <property name="title" translatable="yes" context="shortcut window">New game</property>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "New game"; action of the Ctrl-N 
shortcut -->
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
                 <property name="accelerator">&lt;Primary&gt;n</property>
@@ -36,10 +39,12 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
             <!-- Translators: header of the "Play with keyboard" shortcut section -->
             <property name="title" translatable="yes" context="shortcut window">Play with keyboard</property>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; action of 
the arrows -->
                 <property name="title" translatable="yes" context="shortcut window">Move keyboard 
cursor</property>
                 <property name="accelerator">Left Up Right Down</property>
@@ -47,6 +52,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Play with keyboard"; action of 
the return or space keys -->
                 <property name="title" translatable="yes" context="shortcut window">Select or drop 
tile</property>
                 <property name="accelerator">Return space</property>
@@ -56,10 +62,12 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
+            <property name="visible">True</property>
             <!-- Translators: header of the "Toggle main menu," "Keyboard shortcuts," "About," "Quit," etc. 
shortcuts section -->
             <property name="title" translatable="yes" context="shortcut window">Generic</property>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic"; action of the F10 
shortcut; toggles the hamburger menu -->
                 <property name="title" translatable="yes" context="shortcut window">Toggle main 
menu</property>
                 <property name="accelerator">F10</property>
@@ -67,6 +75,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic"; action of the 
Ctrl-Shift-? shortcut; opens the Keyboard Shortcuts dialog -->
                 <property name="title" translatable="yes" context="shortcut window">Keyboard 
shortcuts</property>
                 <property name="accelerator">&lt;Primary&gt;question</property> <!-- TODO &lt;Primary&gt;F1 
-->
@@ -74,6 +83,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic"; action of the F1 
shortcut; opens the help of the application -->
                 <property name="title" translatable="yes" context="shortcut window">Help</property>
                 <property name="accelerator">F1</property>
@@ -89,6 +99,7 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
                 <!-- Translators: in the Keyboard Shortcuts window, section "Generic"; action of the Ctrl-Q 
shortcut; quits the application -->
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
                 <property name="accelerator">&lt;Primary&gt;q</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]