GNOME.org
 

[gnome-music/wip/mschraal/remove-ui-packing: 1/5] ui: Remove packing attributes for GTK4


commit 5d96cb79cfe7a80007f1fb8da75ccd568ec0867d
Author: Marinus Schraal <mschraal gnome org>
Date:   Sun Apr 11 21:57:18 2021 +0200

    ui: Remove packing attributes for GTK4
    
    Most GtkBox packing attributes can be removed already.

 data/ui/AlbumWidget.ui            | 24 -------------
 data/ui/AppMenu.ui                | 19 -----------
 data/ui/ArtistAlbumWidget.ui      | 12 -------
 data/ui/DiscBox.ui                |  6 ----
 data/ui/EmptyView.ui              | 15 +-------
 data/ui/PlayerToolbar.ui          | 40 ----------------------
 data/ui/PlaylistDialog.ui         | 72 +++++++++------------------------------
 data/ui/SelectionBarMenuButton.ui |  8 -----
 8 files changed, 17 insertions(+), 179 deletions(-)
---
diff --git a/data/ui/AlbumWidget.ui b/data/ui/AlbumWidget.ui
index 128041359..9eed9f81a 100644
--- a/data/ui/AlbumWidget.ui
+++ b/data/ui/AlbumWidget.ui
@@ -41,9 +41,6 @@
                     <property name="hhomogeneous">False</property>
                     <property name="vhomogeneous">False</property>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="artistBox">
@@ -64,9 +61,6 @@
                           <class name="title-artist"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="_artist_label">
@@ -80,14 +74,8 @@
                           <class name="dim-label"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkGrid" id="grid">
@@ -189,19 +177,10 @@
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledWindow">
@@ -231,9 +210,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/data/ui/AppMenu.ui b/data/ui/AppMenu.ui
index 127544592..71ae356b9 100644
--- a/data/ui/AppMenu.ui
+++ b/data/ui/AppMenu.ui
@@ -22,9 +22,6 @@
             <property name="action_name">app.lastfm-configure</property>
             <property name="text" translatable="yes">Last.fm Account</property>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="_lastfm_box">
@@ -49,17 +46,11 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkSeparator">
             <property name="visible">True</property>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton" id="_keyboard_shortcuts_model_button">
@@ -71,9 +62,6 @@
             <property name="action_name">win.show-help-overlay</property>
             <property name="text" translatable="yes">_Keyboard Shortcuts</property>
           </object>
-          <packing>
-            <property name="position">3</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton" id="_help_model_button">
@@ -85,9 +73,6 @@
             <property name="action_name">app.help</property>
             <property name="text" translatable="yes">_Help</property>
           </object>
-          <packing>
-            <property name="position">4</property>
-          </packing>
         </child>
         <child>
           <object class="GtkModelButton" id="_about_model_button">
@@ -99,14 +84,10 @@
             <property name="action_name">app.about</property>
             <property name="text" translatable="yes">_About Music</property>
           </object>
-          <packing>
-            <property name="position">5</property>
-          </packing>
         </child>
       </object>
       <packing>
         <property name="submenu">main</property>
-        <property name="position">1</property>
       </packing>
     </child>
   </template>
diff --git a/data/ui/ArtistAlbumWidget.ui b/data/ui/ArtistAlbumWidget.ui
index c7884b944..944fc61c7 100644
--- a/data/ui/ArtistAlbumWidget.ui
+++ b/data/ui/ArtistAlbumWidget.ui
@@ -16,9 +16,6 @@
         <property name="can_focus">False</property>
         <property name="valign">start</property>
       </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="_album_box">
@@ -44,9 +41,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="DiscListBox" id="_disc_list_box">
@@ -55,14 +49,8 @@
             <property name="selection-mode">0</property>
             <!-- <property name="orientation">vertical</property> -->
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/data/ui/DiscBox.ui b/data/ui/DiscBox.ui
index cfb32403e..d75b72f92 100644
--- a/data/ui/DiscBox.ui
+++ b/data/ui/DiscBox.ui
@@ -23,9 +23,6 @@
               <class name="disc-label"/>
             </style>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkListBox" id="_list_box">
@@ -37,9 +34,6 @@
               <class name="songs-list"/>
             </style>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/data/ui/EmptyView.ui b/data/ui/EmptyView.ui
index f76f89ba6..c5ddc8d93 100644
--- a/data/ui/EmptyView.ui
+++ b/data/ui/EmptyView.ui
@@ -26,14 +26,11 @@
               <class name="grey-image"/>
             </style>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="box">
             <property name="orientation">vertical</property>
-                <property name="visible">True</property>
+            <property name="visible">True</property>
             <child>
               <object class="GtkLabel" id="_main_label">
                 <property name="visible">True</property>
@@ -45,11 +42,7 @@
                   <class name="no-music-found-label"/>
                   <class name="dim-label"/>
                 </style>
-
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="_information_label">
@@ -61,14 +54,8 @@
                   <class name="dim-label"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/data/ui/PlayerToolbar.ui b/data/ui/PlayerToolbar.ui
index b6940d7a7..404bf97f5 100644
--- a/data/ui/PlayerToolbar.ui
+++ b/data/ui/PlayerToolbar.ui
@@ -69,9 +69,6 @@
             <property name="tooltip_text" translatable="yes">Previous</property>
             <signal name="clicked" handler="_on_prev_button_clicked" swapped="no"/>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="_play_button">
@@ -85,9 +82,6 @@
             <property name="tooltip_text" translatable="yes">Play</property>
             <signal name="clicked" handler="_on_play_button_clicked" swapped="no"/>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="_next_button">
@@ -101,9 +95,6 @@
             <property name="tooltip_text" translatable="yes">Next</property>
             <signal name="clicked" handler="_on_next_button_clicked" swapped="no"/>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
         <style>
           <class name="linked"/>
@@ -124,9 +115,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkBox" id="nowplaying_labels">
@@ -150,9 +138,6 @@
                   <class name="player-title-label"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="_artist_label">
@@ -168,14 +153,8 @@
                   <class name="player-artist-label"/>
                 </style>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -207,9 +186,6 @@
               <attribute name="font-features" value="tnum=1"/>
             </attributes>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="separator">
@@ -219,9 +195,6 @@
             <property name="valign">center</property>
             <property name="label">/</property>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkLabel" id="_duration_label">
@@ -234,9 +207,6 @@
               <attribute name="font-features" value="tnum=1"/>
             </attributes>
           </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -266,9 +236,6 @@
                     <property name="icon_name">media-playlist-consecutive-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkImage" id="downArrow">
@@ -277,17 +244,10 @@
                     <property name="icon_name">pan-down-symbolic</property>
                     <property name="icon_size">1</property>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/data/ui/PlaylistDialog.ui b/data/ui/PlaylistDialog.ui
index 5d64c5f4c..30e2384ab 100644
--- a/data/ui/PlaylistDialog.ui
+++ b/data/ui/PlaylistDialog.ui
@@ -58,9 +58,6 @@
                           <class name="grey-image"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label">
@@ -69,9 +66,6 @@
                         <property name="label" translatable="yes">Enter a name for your first 
playlist</property>
                         <property name="valign">end</property>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkEntry" id="_first_playlist_entry">
@@ -88,9 +82,6 @@
                         <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="position">2</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="_first_playlist_button">
@@ -110,22 +101,13 @@
                         <property name="margin-top">10</property>
                         <signal name="clicked" handler="_on_editing_done" swapped="no"/>
                       </object>
-                      <packing>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkButtonBox">
                     <property name="can_focus">False</property>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
             </child>
@@ -134,6 +116,22 @@
                 <property name="visible">False</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkScrolledWindow" id="scrolledwindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="vexpand">True</property>
+                    <child>
+                      <object class="GtkListBox" id="_listbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="selection_mode">single</property>
+                        <property name="valign">start</property>
+                        <signal name="selected-rows-changed" handler="_on_selected_rows_changed" 
swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
@@ -144,9 +142,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="new-playlist-hbox">
@@ -166,9 +161,6 @@
                               <class name="linked"/>
                             </style>
                           </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="_new_playlist_button">
@@ -183,17 +175,11 @@
                               <class name="linked"/>
                             </style>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                         <style>
                           <class name="linked"/>
                         </style>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -201,25 +187,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="GtkListBox" id="_listbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="selection_mode">single</property>
-                        <property name="valign">start</property>
-                        <signal name="selected-rows-changed" handler="_on_selected_rows_changed" 
swapped="no"/>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkButtonBox">
                     <property name="can_focus">False</property>
@@ -229,14 +196,8 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -274,7 +235,6 @@
       </object>
       <packing>
         <property name="pack_type">end</property>
-        <property name="position">1</property>
       </packing>
     </child>
   </object>
diff --git a/data/ui/SelectionBarMenuButton.ui b/data/ui/SelectionBarMenuButton.ui
index d9eea8830..77bde61b7 100644
--- a/data/ui/SelectionBarMenuButton.ui
+++ b/data/ui/SelectionBarMenuButton.ui
@@ -30,10 +30,6 @@
             <property name="can-focus">False</property>
             <property name="label" translatable="yes">Click on items to select them</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-            <property name="position">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkImage">
@@ -41,10 +37,6 @@
             <property name="can-focus">False</property>
             <property name="icon-name">pan-down-symbolic</property>
           </object>
-          <packing>
-            <property name="pack-type">start</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]