[epiphany/wip/exalm/gtk4-cleanups-3: 1/18] resources: Stop using GtkBox child properties

[Alexander Mikhaylenko <alexm src gnome org>]

commit 1f08dca51d92389609e7c87fb587be19838b4ca0
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Dec 1 04:20:53 2021 +0500

    resources: Stop using GtkBox child properties

 src/resources/gtk/action-bar-end.ui        | 86 +++++++++++++-----------------
 src/resources/gtk/bookmark-properties.ui   |  8 ---
 src/resources/gtk/bookmark-row.ui          | 16 ------
 src/resources/gtk/bookmarks-popover.ui     |  6 ---
 src/resources/gtk/data-view.ui             |  6 ---
 src/resources/gtk/encoding-dialog.ui       | 15 ------
 src/resources/gtk/history-dialog.ui        |  3 --
 src/resources/gtk/page-menu-popover.ui     | 35 ------------
 src/resources/gtk/page-row.ui              | 20 -------
 src/resources/gtk/prefs-appearance-page.ui |  5 --
 src/resources/gtk/prefs-lang-dialog.ui     | 22 +-------
 11 files changed, 38 insertions(+), 184 deletions(-)
---
diff --git a/src/resources/gtk/action-bar-end.ui b/src/resources/gtk/action-bar-end.ui
index 902ea47c4..1e8dfd743 100644
--- a/src/resources/gtk/action-bar-end.ui
+++ b/src/resources/gtk/action-bar-end.ui
@@ -10,52 +10,6 @@
         <property name="homogeneous">False</property>
         <property name="layout-style">expand</property>
       </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkMenuButton" id="bookmarks_button">
-        <property name="visible">True</property>
-        <property name="valign">center</property>
-        <!-- Translators: tooltip for the bookmarks popover button -->
-        <property name="tooltip_text" translatable="yes">View and manage your bookmarks</property>
-        <property name="popover">bookmarks_popover</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child>
-          <object class="GtkImage" id="bookmarks_image">
-            <property name="visible">True</property>
-            <property name="icon-name">ephy-library-symbolic</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="bookmark_button">
-        <property name="visible">True</property>
-        <property name="valign">center</property>
-        <!-- Translators: tooltip for the bookmark button -->
-        <property name="tooltip_text" translatable="yes">Bookmark page</property>
-        <child>
-          <object class="GtkImage" id="bookmark_image">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">non-starred-symbolic</property>
-          </object>
-        </child>
-        <style>
-          <class name="image-button"/>
-        </style>
-      </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
     </child>
     <child>
       <object class="GtkRevealer" id="downloads_revealer">
@@ -98,9 +52,43 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
+    </child>
+    <child>
+      <object class="GtkButton" id="bookmark_button">
+        <property name="visible">True</property>
+        <property name="valign">center</property>
+        <!-- Translators: tooltip for the bookmark button -->
+        <property name="tooltip_text" translatable="yes">Bookmark page</property>
+        <child>
+          <object class="GtkImage" id="bookmark_image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">non-starred-symbolic</property>
+          </object>
+        </child>
+        <style>
+          <class name="image-button"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuButton" id="bookmarks_button">
+        <property name="visible">True</property>
+        <property name="valign">center</property>
+        <!-- Translators: tooltip for the bookmarks popover button -->
+        <property name="tooltip_text" translatable="yes">View and manage your bookmarks</property>
+        <property name="popover">bookmarks_popover</property>
+        <style>
+          <class name="image-button"/>
+        </style>
+        <child>
+          <object class="GtkImage" id="bookmarks_image">
+            <property name="visible">True</property>
+            <property name="icon-name">ephy-library-symbolic</property>
+            <property name="icon-size">1</property>
+          </object>
+        </child>
+      </object>
     </child>
   </template>
   <object class="EphyBookmarksPopover" id="bookmarks_popover">
diff --git a/src/resources/gtk/bookmark-properties.ui b/src/resources/gtk/bookmark-properties.ui
index c48a908af..304050221 100644
--- a/src/resources/gtk/bookmark-properties.ui
+++ b/src/resources/gtk/bookmark-properties.ui
@@ -98,10 +98,6 @@
             <property name="activates_default">True</property>
             <property name="placeholder_text" translatable="yes">Add Tag…</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="add_tag_button">
@@ -112,10 +108,6 @@
             <property name="action_name">bookmark-properties.add-tag</property>
             <property name="use_underline">True</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-          </packing>
         </child>
         <style>
           <class name="linked"/>
diff --git a/src/resources/gtk/bookmark-row.ui b/src/resources/gtk/bookmark-row.ui
index 66597afee..2800e6f9f 100644
--- a/src/resources/gtk/bookmark-row.ui
+++ b/src/resources/gtk/bookmark-row.ui
@@ -13,11 +13,6 @@
             <property name="visible">True</property>
             <property name="margin_left">6</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="title_label">
@@ -28,11 +23,6 @@
             <property name="max_width_chars">1</property>
             <property name="xalign">0</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="properties_button">
@@ -46,12 +36,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/resources/gtk/bookmarks-popover.ui b/src/resources/gtk/bookmarks-popover.ui
index 64091333c..8d869ca80 100644
--- a/src/resources/gtk/bookmarks-popover.ui
+++ b/src/resources/gtk/bookmarks-popover.ui
@@ -105,9 +105,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="pack-type">start</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="tag_detail_label">
@@ -119,9 +116,6 @@
                           <attribute name="weight" value="bold"/>
                         </attributes>
                       </object>
-                      <packing>
-                        <property name="pack-type">start</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/src/resources/gtk/data-view.ui b/src/resources/gtk/data-view.ui
index bc6e0ab90..5d1318adc 100644
--- a/src/resources/gtk/data-view.ui
+++ b/src/resources/gtk/data-view.ui
@@ -76,9 +76,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="stack">
@@ -112,9 +109,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-          </packing>
         </child>
         <child>
           <object class="GtkActionBar">
diff --git a/src/resources/gtk/encoding-dialog.ui b/src/resources/gtk/encoding-dialog.ui
index 1e095cbce..6f7066456 100644
--- a/src/resources/gtk/encoding-dialog.ui
+++ b/src/resources/gtk/encoding-dialog.ui
@@ -21,11 +21,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox">
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkGrid">
@@ -58,11 +53,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="type_stack">
@@ -208,11 +198,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/src/resources/gtk/history-dialog.ui b/src/resources/gtk/history-dialog.ui
index cfd62343b..4d8d02dc9 100644
--- a/src/resources/gtk/history-dialog.ui
+++ b/src/resources/gtk/history-dialog.ui
@@ -149,9 +149,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
         </child>
         <child>
           <object class="GtkStack" id="history_presentation_stack">
diff --git a/src/resources/gtk/page-menu-popover.ui b/src/resources/gtk/page-menu-popover.ui
index 9f3a554d6..b8ba9d454 100644
--- a/src/resources/gtk/page-menu-popover.ui
+++ b/src/resources/gtk/page-menu-popover.ui
@@ -30,11 +30,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
@@ -49,11 +44,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
@@ -67,11 +57,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -92,11 +77,6 @@
                 <property name="icon">print</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkModelButton">
@@ -107,11 +87,6 @@
                 <property name="icon">find</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkModelButton">
@@ -122,11 +97,6 @@
                 <property name="icon">fullscreen</property>
                 <property name="visible">True</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="combined_stop_reload_button">
@@ -144,11 +114,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/src/resources/gtk/page-row.ui b/src/resources/gtk/page-row.ui
index 5424ceea2..c1581efa3 100644
--- a/src/resources/gtk/page-row.ui
+++ b/src/resources/gtk/page-row.ui
@@ -34,11 +34,6 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="title">
@@ -51,11 +46,6 @@
                 <property name="single_line_mode">True</property>
                 <property name="xalign">0</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkImage" id="speaker_icon">
@@ -64,11 +54,6 @@
                 <property name="icon_name">audio-volume-high-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton" id="close_button">
@@ -93,11 +78,6 @@
                   <class name="close-button"/>
                 </style>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
             </child>
           </object>
         </child>
diff --git a/src/resources/gtk/prefs-appearance-page.ui b/src/resources/gtk/prefs-appearance-page.ui
index 92689a7cc..3c1987985 100644
--- a/src/resources/gtk/prefs-appearance-page.ui
+++ b/src/resources/gtk/prefs-appearance-page.ui
@@ -80,11 +80,6 @@
           </object>
         </child>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
     </child>
     <child>
       <object class="HdyPreferencesGroup">
diff --git a/src/resources/gtk/prefs-lang-dialog.ui b/src/resources/gtk/prefs-lang-dialog.ui
index d3c189262..269b0c3e0 100644
--- a/src/resources/gtk/prefs-lang-dialog.ui
+++ b/src/resources/gtk/prefs-lang-dialog.ui
@@ -40,12 +40,6 @@
             <property name="visible">False</property>
             <property name="layout_style">end</property>
           </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="GtkBox" id="vbox198">
@@ -61,17 +55,13 @@
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">languages_treeview</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow3">
                 <property name="visible">True</property>
                 <property name="hscrollbar_policy">never</property>
                 <property name="shadow_type">in</property>
+                <property name="vexpand">True</property>
                 <child>
                   <object class="GtkTreeView" id="languages_treeview">
                     <property name="visible">True</property>
@@ -82,18 +72,8 @@
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>