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

[Alexander Mikhaylenko <alexm src gnome org>]

commit 71ee99ad4ecf5068bbc8ed64273c0eda06081eb5
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        | 15 +++------------
 data/ui/display-header-bar.ui           | 22 +++++-----------------
 data/ui/preferences-subpage-gamepad.ui  | 10 ++--------
 data/ui/preferences-subpage-keyboard.ui | 10 ++--------
 data/ui/preferences-window.ui           |  5 +----
 5 files changed, 13 insertions(+), 49 deletions(-)
---
diff --git a/data/ui/collection-header-bar.ui b/data/ui/collection-header-bar.ui
index 6c26b5d5..cd413a72 100644
--- a/data/ui/collection-header-bar.ui
+++ b/data/ui/collection-header-bar.ui
@@ -4,7 +4,7 @@
   <template class="GamesCollectionHeaderBar" parent="GtkHeaderBar">
     <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>
@@ -17,11 +17,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 -->
@@ -31,9 +28,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_stack">
@@ -55,7 +49,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkToggleButton" id="search">
         <property name="visible">True</property>
         <property name="valign">center</property>
@@ -67,9 +61,6 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
   </template>
   <object class="GtkPopover" id="menu_popover">
diff --git a/data/ui/display-header-bar.ui b/data/ui/display-header-bar.ui
index 3e394893..1f35f4f9 100644
--- a/data/ui/display-header-bar.ui
+++ b/data/ui/display-header-bar.ui
@@ -7,7 +7,7 @@
     <property name="show-title-buttons">True</property>
     <signal name="notify::is-fullscreen" handler="on_fullscreen_changed"/>
     <signal name="notify::can-fullscreen" handler="on_fullscreen_changed"/>
-    <child>
+    <child type="start">
       <object class="GtkButton" id="back">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -22,7 +22,7 @@
         </child>
       </object>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkButton" id="fullscreen">
         <property name="visible">False</property>
         <property name="can_focus">False</property>
@@ -36,11 +36,8 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
-    <child>
+    <child type="end">
       <object class="GtkButton" id="restore">
         <property name="visible">False</property>
         <property name="can_focus">False</property>
@@ -54,27 +51,18 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
-    <child>
+    <child type="end">
       <object class="GamesMediaMenuButton" id="media_button">
         <property name="visible">False</property>
         <property name="valign">center</property>
         <property name="use-underline">True</property>
       </object>
-      <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>
   </template>
 </interface>
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 7e24a365..cedddf0a 100644
--- a/data/ui/preferences-window.ui
+++ b/data/ui/preferences-window.ui
@@ -40,7 +40,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="back_button">
                         <property name="visible">False</property>
                         <property name="icon-name">go-previous-symbolic</property>
@@ -51,9 +51,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="pack-type">start</property>
-                      </packing>
                     </child>
                   </object>
                 </child>