[swell-foop/arnaudb/wip/gtk4: 42/55] Adapt UI files.

From: Arnaud B. <arnaudb src gnome org>
To: commits-list gnome org
Cc:
Subject: [swell-foop/arnaudb/wip/gtk4: 42/55] Adapt UI files.
Date: Tue, 14 Jul 2020 10:38:39 +0000 (UTC)
commit 206f2231a72dcaef793c2e70f64225e5d9f58b6d
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat May 23 17:49:22 2020 +0200

    Adapt UI files.

 data/ui/first-run-stack.ui |  8 +-------
 data/ui/help-overlay.ui    | 14 --------------
 data/ui/swell-foop.ui      | 48 +++++++++-------------------------------------
 3 files changed, 10 insertions(+), 60 deletions(-)
---
diff --git a/data/ui/first-run-stack.ui b/data/ui/first-run-stack.ui
index fe280b7..e26883c 100644
--- a/data/ui/first-run-stack.ui
+++ b/data/ui/first-run-stack.ui
@@ -18,12 +18,10 @@
    along with Swell-Foop.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.98"/>
   <object class="GtkStack" id="first_run_stack">
-    <property name="visible">True</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <property name="halign">center</property>
@@ -31,14 +29,12 @@
         <child>
           <object class="GtkImage">
             <property name="icon-name">org.gnome.SwellFoop</property>
-            <property name="visible">True</property>
             <property name="icon-size">6</property>
             <property name="pixel-size">96</property>
           </object>
         </child>
         <child>
           <object class="GtkLabel">
-            <property name="visible">True</property>
             <!-- Translators: text appearing on the first-run screen; to test, run `gsettings set 
org.gnome.swell-foop first-run true` before launching application -->
             <property name="label" translatable="yes">Welcome to Swell Foop</property>
             <style>
@@ -48,7 +44,6 @@
         </child>
         <child>
           <object class="GtkLabel" id="tip_label">
-            <property name="visible">True</property>
             <!-- label cannot be set there because it is multi-line; see window.vala -->
             <property name="justify">center</property>
             <style>
@@ -58,7 +53,6 @@
         </child>
         <child>
           <object class="GtkButton" id="play_button">
-            <property name="visible">True</property>
             <property name="use-underline">True</property>
             <!-- Translators: label of the button of the first-run screen; to test, run `gsettings set 
org.gnome.swell-foop first-run true` before launching application -->
             <property name="label" translatable="yes">Let’s _Play</property>
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index a568925..3d572a3 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -22,16 +22,13 @@
   <object class="GtkShortcutsWindow" id="help_overlay">
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">True</property>
         <property name="max-height">7</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains "Move keyboard 
highlight" and "Destroy selected block" -->
             <property name="title" translatable="yes" context="shortcut window">Play with keyboard</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Left/Right/Up/Down arrows actions description in the Keyboard Shortcuts 
dialog, section "Play with keyboard"; moves highlight -->
                 <property name="title" translatable="yes" context="shortcut window">Move keyboard 
highlight</property>
                 <property name="accelerator">Left Right Up Down</property>
@@ -39,7 +36,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Return/space actions description in the Keyboard Shortcuts dialog, section 
"Play with keyboard"; does as a mouse click -->
                 <property name="title" translatable="yes" context="shortcut window">Destroy selected 
block</property>
                 <property name="accelerator">Return space</property>
@@ -49,12 +45,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains "Undo" and 
"Redo" -->
             <property name="title" translatable="yes" context="shortcut window">History</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-Z shortcut description in the Keyboard Shortcuts dialog, section 
"History"; undoes a move -->
                 <property name="title" translatable="yes" context="shortcut window">Undo</property>
                 <property name="accelerator">&lt;Ctrl&gt;Z</property>
@@ -62,7 +56,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-Shift-Z shortcut description in the Keyboard Shortcuts dialog, 
section "History"; redoes an undone move -->
                 <property name="title" translatable="yes" context="shortcut window">Redo</property>
                 <property name="accelerator">&lt;Ctrl&gt;&lt;Shift&gt;Z</property>
@@ -80,12 +73,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains (only) "Start a 
new game" -->
             <property name="title" translatable="yes" context="shortcut window">Main functions</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <property name="accelerator">&lt;Ctrl&gt;N</property>
                 <!-- Translators: Ctrl-N shortcut description in the Keyboard Shortcuts dialog, section Main 
Functions -->
                 <property name="title" translatable="yes" context="shortcut window">Start a new 
game</property>
@@ -95,12 +86,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains "Help", "About", 
"Quit"... -->
             <property name="title" translatable="yes" context="shortcut window">Generic</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: F10 shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": toggles the hamburger menu -->
                 <property name="title" translatable="yes" context="shortcut window">Open menu</property>
                 <property name="accelerator">F10</property>
@@ -108,7 +97,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-? shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": opens 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 
-->
@@ -116,7 +104,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: F1 shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": opens the application help -->
                 <property name="title" translatable="yes" context="shortcut window">Help</property>
                 <property name="accelerator">F1</property>
@@ -132,7 +119,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-Q shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": quits the application -->
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
                 <property name="accelerator">&lt;Primary&gt;q</property>
diff --git a/data/ui/swell-foop.ui b/data/ui/swell-foop.ui
index f7a3f20..5714249 100644
--- a/data/ui/swell-foop.ui
+++ b/data/ui/swell-foop.ui
@@ -133,86 +133,56 @@
       </item>
     </section>
   </menu>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.98"/>
   <template class="SwellFoopWindow" parent="GtkApplicationWindow">
     <property name="resizable">False</property>
     <property name="icon-name">org.gnome.SwellFoop</property>
-    <!-- Translators: title of the window displayed by window managers; name of the application -->
+    <!-- Translators: title of the window displayed on the headerbar; name of the application -->
     <property name="title" translatable="yes">Swell Foop</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
-        <!-- Translators: title of the window displayed on the headerbar; name of the application -->
-        <property name="title" translatable="yes">Swell Foop</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="valign">center</property>
             <style>
               <class name="linked"/>
             </style>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="valign">center</property>
                 <!-- Translators: tooltip text of the Undo button; probably a verb -->
                 <property name="tooltip-text" translatable="yes">Undo</property>
                 <property name="action-name">win.undo</property>
                 <property name="focus-on-click">False</property>
-                <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>
+                <property name="icon-name">edit-undo-symbolic</property>
               </object>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="valign">center</property>
                 <!-- Translators: tooltip text of the Undo button; probably a verb -->
                 <property name="tooltip-text" translatable="yes">Redo</property>
                 <property name="action-name">win.redo</property>
                 <property name="focus-on-click">False</property>
-                <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>
+                <property name="icon-name">edit-redo-symbolic</property>
               </object>
             </child>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkMenuButton" id="hamburger_button">
-            <property name="visible">True</property>
             <property name="menu-model">hamburger-menu</property>
+            <property name="icon-name">open-menu-symbolic</property>
             <style>
               <class name="image-button"/>
             </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">open-menu-symbolic</property>
-                <property name="visible">True</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="main_box">
-        <property name="visible">True</property>
-      </object>
+      <object class="GtkBox" id="main_box"/>
     </child>
   </template>
 </interface>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]