[gnome-games/wip/exalm/gtk4: 35/48] ui: Stop using HeaderBar child properties

From: Alexander Mikhaylenko <alexm src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-games/wip/exalm/gtk4: 35/48] ui: Stop using HeaderBar child properties
Date: Wed, 21 Aug 2019 22:50:10 +0000 (UTC)
commit 2447a4fc383ce5faf90707f2beaf84481c4b9263
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Sat May 11 11:58:13 2019 +0500

    ui: Stop using HeaderBar child properties

 data/ui/collection-header-bar.ui        | 22 +++++----------------
 data/ui/display-header-bar.ui           | 35 +++++++--------------------------
 data/ui/preferences-subpage-gamepad.ui  | 10 ++--------
 data/ui/preferences-subpage-keyboard.ui | 10 ++--------
 data/ui/preferences-window.ui           | 10 ++--------
 5 files changed, 18 insertions(+), 69 deletions(-)
---
diff --git a/data/ui/collection-header-bar.ui b/data/ui/collection-header-bar.ui
index afbba57f..b5294fb7 100644
--- a/data/ui/collection-header-bar.ui
+++ b/data/ui/collection-header-bar.ui
@@ -11,7 +11,7 @@
           <object class="GtkHeaderBar" id="header_bar">
             <property name="visible">True</property>
             <property name="show-title-buttons">True</property>
-            <child>
+            <child type="start">
               <object class="GtkButton" id="add_game">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
@@ -23,11 +23,8 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">start</property>
-              </packing>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkMenuButton" id="menu">
                 <property name="popover">menu_popover</property>
                 <!-- Translators: tooltip for the application menu button -->
@@ -36,9 +33,6 @@
                 <property name="visible">True</property>
                 <property name="icon-name">open-menu-symbolic</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
             <child type="title">
               <object class="GtkStack" id="title_squeezer">
@@ -61,7 +55,7 @@
                 </child>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkToggleButton" id="search">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
@@ -74,9 +68,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -84,7 +75,7 @@
           <object class="GtkHeaderBar" id="subview_header_bar">
             <property name="visible">True</property>
             <property name="show-title-buttons">True</property>
-            <child>
+            <child type="start">
               <object class="GtkButton">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
@@ -97,7 +88,7 @@
                 </child>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkToggleButton" id="search_subview">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
@@ -110,9 +101,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/data/ui/display-header-bar.ui b/data/ui/display-header-bar.ui
index 9454e01d..5d647693 100644
--- a/data/ui/display-header-bar.ui
+++ b/data/ui/display-header-bar.ui
@@ -29,7 +29,7 @@
                 </child>
               </object>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkButton" id="restore">
                 <property name="visible">False</property>
                 <property name="can_focus">False</property>
@@ -46,11 +46,8 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkMenuButton" id="secondary_menu_button">
                 <property name="popover">secondary_menu</property>
                 <property name="visible">True</property>
@@ -58,11 +55,8 @@
                 <property name="can-focus">False</property>
                 <property name="icon-name">view-more-symbolic</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
-            <child>
+            <child type="end">
               <object class="GtkButton" id="fullscreen">
                 <property name="visible">False</property>
                 <property name="can_focus">False</property>
@@ -75,30 +69,21 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
-            <child>
+            <child type="end">
               <object class="GamesMediaMenuButton" id="media_button"/>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
-            <child>
+            <child type="end">
               <object class="GamesInputModeSwitcher" id="input_mode_switcher">
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkHeaderBar" id="savestates_header_bar">
             <property name="visible">True</property>
-            <child>
+            <child type="end">
               <object class="GtkButton" id="savestates_load_btn">
                 <property name="sensitive">False</property>
                 <property name="visible">True</property>
@@ -110,11 +95,8 @@
                   <class name="suggested-action"/>
                 </style>
               </object>
-              <packing>
-                <property name="pack-type">end</property>
-              </packing>
             </child>
-            <child>
+            <child type="start">
               <object class="GtkButton" id="savestates_back">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -127,9 +109,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="pack-type">start</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/data/ui/preferences-subpage-gamepad.ui b/data/ui/preferences-subpage-gamepad.ui
index c0a83b61..8b7cc17f 100644
--- a/data/ui/preferences-subpage-gamepad.ui
+++ b/data/ui/preferences-subpage-gamepad.ui
@@ -71,7 +71,7 @@
   <object class="GtkHeaderBar" id="header_bar">
     <property name="visible">True</property>
     <property name="expand">True</property>
-    <child>
+    <child type="start">
       <object class="GtkButton" id="back_button">
         <property name="visible">True</property>
         <property name="icon-name">go-previous-symbolic</property>
@@ -82,19 +82,13 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkButton" id="cancel_button">
         <property name="visible">True</property>
         <property name="label" translatable="yes">Cancel</property>
         <signal name="clicked" handler="on_cancel_clicked"/>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/data/ui/preferences-subpage-keyboard.ui b/data/ui/preferences-subpage-keyboard.ui
index 61d80f65..b455c25d 100644
--- a/data/ui/preferences-subpage-keyboard.ui
+++ b/data/ui/preferences-subpage-keyboard.ui
@@ -72,7 +72,7 @@
   <object class="GtkHeaderBar" id="header_bar">
     <property name="visible">True</property>
     <property name="expand">True</property>
-    <child>
+    <child type="start">
       <object class="GtkButton" id="back_button">
         <property name="visible">True</property>
         <property name="icon-name">go-previous-symbolic</property>
@@ -83,19 +83,13 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkButton" id="cancel_button">
         <property name="visible">True</property>
         <property name="label" translatable="yes">Cancel</property>
         <signal name="clicked" handler="on_cancel_clicked"/>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/data/ui/preferences-window.ui b/data/ui/preferences-window.ui
index 5cd04d38..ca29ed4a 100644
--- a/data/ui/preferences-window.ui
+++ b/data/ui/preferences-window.ui
@@ -23,7 +23,7 @@
                     <property name="visible">True</property>
                     <property name="title" translatable="yes">Preferences</property>
                     <property name="show-title-buttons">False</property>
-                    <child>
+                    <child type="start">
                       <object class="GtkButton" id="window_back_button">
                         <property name="visible">False</property>
                         <property name="icon-name">go-previous-symbolic</property>
@@ -34,9 +34,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="pack-type">start</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
@@ -55,7 +52,7 @@
                     <property name="visible">True</property>
                     <property name="hexpand">True</property>
                     <property name="show-title-buttons">True</property>
-                    <child>
+                    <child type="start">
                       <object class="GtkButton" id="page_back_button">
                         <property name="visible">False</property>
                         <property name="icon-name">go-previous-symbolic</property>
@@ -66,9 +63,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="pack-type">start</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]