GNOME.org
 

[gnome-music] ui: Stop using deprecated Gtk.Box child properties

commit abe475e33bd8c1b27fe77079ccc4d42f35e8fc12
Author: Sumaid Syed <sumaid ali students iiit ac in>
Date:   Sat Mar 30 20:46:49 2019 +0530

    ui: Stop using deprecated Gtk.Box child properties
    
    GTK4 does not support padding, fill and expand child properties in Gtk.Box
    anymore.
    Replace by appropriate properties in the child widgets.
    
    Closes: #215

 data/ui/AlbumWidget.ui        | 17 +----------------
 data/ui/ArtistAlbumWidget.ui  | 12 ------------
 data/ui/ArtistAlbumsWidget.ui |  4 ----
 data/ui/DiscBox.ui            |  4 ----
 data/ui/EmptyView.ui          |  8 --------
 data/ui/PlayerToolbar.ui      | 26 --------------------------
 data/ui/PlaylistDialog.ui     | 41 +++++++----------------------------------
 data/ui/SidebarRow.ui         |  2 +-
 data/ui/SongWidget.ui         | 22 ++++------------------
 data/ui/TwoLineTip.ui         |  2 +-
 10 files changed, 14 insertions(+), 124 deletions(-)
---
diff --git a/data/ui/AlbumWidget.ui b/data/ui/AlbumWidget.ui
index 9dd7253d..04f70b03 100644
--- a/data/ui/AlbumWidget.ui
+++ b/data/ui/AlbumWidget.ui
@@ -22,6 +22,7 @@
             <property name="margin_top">64</property>
             <property name="margin_bottom">32</property>
             <property name="vexpand">True</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="GtkBox" id="albumDetails">
                 <property name="visible">True</property>
@@ -40,8 +41,6 @@
                     <property name="margin_end">1</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -65,8 +64,6 @@
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -83,15 +80,11 @@
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -198,22 +191,16 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -252,8 +239,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/data/ui/ArtistAlbumWidget.ui b/data/ui/ArtistAlbumWidget.ui
index fffc703e..6f92a7b4 100644
--- a/data/ui/ArtistAlbumWidget.ui
+++ b/data/ui/ArtistAlbumWidget.ui
@@ -13,8 +13,6 @@
         </style>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
@@ -42,8 +40,6 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -58,15 +54,11 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -77,15 +69,11 @@
             <property name="orientation">vertical</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/data/ui/ArtistAlbumsWidget.ui b/data/ui/ArtistAlbumsWidget.ui
index c3bfa5d7..be12175e 100644
--- a/data/ui/ArtistAlbumsWidget.ui
+++ b/data/ui/ArtistAlbumsWidget.ui
@@ -20,8 +20,6 @@
         </style>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
         <property name="position">0</property>
       </packing>
     </child>
@@ -32,8 +30,6 @@
         <property name="margin_top">6</property>
       </object>
       <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
         <property name="position">1</property>
       </packing>
     </child>
diff --git a/data/ui/DiscBox.ui b/data/ui/DiscBox.ui
index c869d46a..c949d24b 100644
--- a/data/ui/DiscBox.ui
+++ b/data/ui/DiscBox.ui
@@ -20,8 +20,6 @@
           </style>
         </object>
         <packing>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
           <property name="position">0</property>
         </packing>
       </child>
@@ -36,8 +34,6 @@
           <property name="selection_mode">none</property>
         </object>
         <packing>
-          <property name="expand">False</property>
-          <property name="fill">True</property>
           <property name="position">1</property>
         </packing>
       </child>
diff --git a/data/ui/EmptyView.ui b/data/ui/EmptyView.ui
index c500348f..66f71f54 100644
--- a/data/ui/EmptyView.ui
+++ b/data/ui/EmptyView.ui
@@ -26,8 +26,6 @@
             </style>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -48,8 +46,6 @@
 
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -64,15 +60,11 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/data/ui/PlayerToolbar.ui b/data/ui/PlayerToolbar.ui
index da2e9166..3eebcf6e 100644
--- a/data/ui/PlayerToolbar.ui
+++ b/data/ui/PlayerToolbar.ui
@@ -71,8 +71,6 @@
             <signal name="clicked" handler="_on_prev_button_clicked" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -89,8 +87,6 @@
             <signal name="clicked" handler="_on_play_button_clicked" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -107,8 +103,6 @@
             <signal name="clicked" handler="_on_next_button_clicked" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -132,8 +126,6 @@
             <property name="can_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -160,8 +152,6 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -180,15 +170,11 @@
                 </style>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -220,8 +206,6 @@
             <property name="label">0:00</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -234,8 +218,6 @@
             <property name="label">/</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -248,8 +230,6 @@
             <property name="label">0:00</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -282,8 +262,6 @@
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -295,8 +273,6 @@
                     <property name="icon_size">1</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -304,8 +280,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
diff --git a/data/ui/PlaylistDialog.ui b/data/ui/PlaylistDialog.ui
index d31c073a..e2bcdca9 100644
--- a/data/ui/PlaylistDialog.ui
+++ b/data/ui/PlaylistDialog.ui
@@ -18,8 +18,6 @@
             <property name="can_focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -40,7 +38,9 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="valign">end</property>
+                    <property name="valign">fill</property>
+                    <property name="vexpand">True</property>
+                    <property name="margin">18</property>
                     <child>
                       <object class="GtkImage" id="image">
                         <property name="visible">True</property>
@@ -50,14 +50,12 @@
                         <property name="icon_name">emblem-music-symbolic</property>
                         <property name="icon_size">0</property>
                         <property name="margin_bottom">16</property>
+                        <property name="vexpand">True</property>
                         <style>
                           <class name="grey-image"/>
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">18</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -66,10 +64,9 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Enter a name for your first 
playlist</property>
+                        <property name="valign">end</property>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -81,14 +78,12 @@
                         <property name="can_focus">True</property>
                         <property name="halign">center</property>
                         <property name="margin_bottom">16</property>
+                        <property name="margin">18</property>
                         <signal name="activate" handler="_on_editing_done" swapped="no"/>
                         <signal name="changed" handler="_on_add_playlist_entry_changed" swapped="no"/>
                         <signal name="focus-in-event" handler="_on_add_playlist_entry_focused" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="padding">18</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -106,20 +101,16 @@
                         <property name="valign">center</property>
                         <property name="margin_top">10</property>
                         <property name="margin_bottom">20</property>
+                        <property name="margin">18</property>
                         <signal name="clicked" handler="_on_editing_done" swapped="no"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">3</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
                     <property name="position">0</property>
-                    <property name="padding">18</property>
                   </packing>
                 </child>
                 <child>
@@ -127,8 +118,6 @@
                     <property name="can_focus">False</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -150,8 +139,6 @@
                         <property name="can_focus">False</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -174,8 +161,6 @@
                             </style>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
@@ -193,8 +178,6 @@
                             </style>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -203,15 +186,11 @@
                         </style>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="pack_type">end</property>
                     <property name="position">0</property>
                   </packing>
@@ -243,8 +222,6 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -253,8 +230,6 @@
                     <property name="can_focus">False</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -265,8 +240,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/data/ui/SidebarRow.ui b/data/ui/SidebarRow.ui
index 040ae153..eb89444b 100644
--- a/data/ui/SidebarRow.ui
+++ b/data/ui/SidebarRow.ui
@@ -4,7 +4,7 @@
     <child>
       <object class="GtkBox">
         <property name="can_focus">False</property>
-        <property name="expand">False</property>
+        <property name="hexpand">False</property>
         <property name="orientation">horizontal</property>
         <property name="visible">True</property>
         <child>
diff --git a/data/ui/SongWidget.ui b/data/ui/SongWidget.ui
index c8837536..28f4675a 100644
--- a/data/ui/SongWidget.ui
+++ b/data/ui/SongWidget.ui
@@ -29,8 +29,6 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -43,8 +41,6 @@
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -59,16 +55,12 @@
                 </style>
               </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>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -78,21 +70,21 @@
             <property name="can_focus">False</property>
             <property name="margin_top">1</property>
             <property name="margin_bottom">1</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="DzlBoldingLabel" id="_title_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-               <property name="xalign">0</property>
+                <property name="xalign">0</property>
                 <property name="halign">start</property>
+                <property name="hexpand">True</property>
                 <property name="valign">start</property>
                 <property name="ellipsize">end</property>
                 <property name="max_width_chars">90</property>
                 <property name="justify">fill</property>
+                <property name="margin_start">9</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="padding">9</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -106,15 +98,11 @@
                 <property name="single_line_mode">True</property>
               </object>
               <packing>
-                <property name="expand">False</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>
@@ -139,8 +127,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/data/ui/TwoLineTip.ui b/data/ui/TwoLineTip.ui
index 588abc3f..54cb04e9 100644
--- a/data/ui/TwoLineTip.ui
+++ b/data/ui/TwoLineTip.ui
@@ -2,7 +2,7 @@
 <interface>
   <template class="TwoLineTip" parent="GtkBox">
     <property name="can_focus">False</property>
-    <property name="expand">False</property>
+    <property name="vexpand">False</property>
     <property name="orientation">vertical</property>
     <property name="visible">True</property>
     <child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]