[rhythmbox: 1/8] song-info-multiple: basic-tab - replace GtkTable with GtkGrid

[Jonathan Matthew <jmatthew src gnome org>]

commit 7cac0f7dfc863b22cc3d0c6a0a9685becd1b6a8d
Author: crvi <crvisqr gmail com>
Date:   Sun Feb 16 17:34:16 2020 +0530

    song-info-multiple: basic-tab - replace GtkTable with GtkGrid

 data/ui/song-info-multiple.ui | 111 +++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 73 deletions(-)
---
diff --git a/data/ui/song-info-multiple.ui b/data/ui/song-info-multiple.ui
index 484fbb5d0..8642f1320 100644
--- a/data/ui/song-info-multiple.ui
+++ b/data/ui/song-info-multiple.ui
@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.6"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkNotebook" id="song_info_notebook">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="show_border">True</property>
     <child>
-      <object class="GtkTable" id="song_info_basic">
+      <object class="GtkGrid" id="song_info_basic">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">6</property>
-        <property name="n_rows">9</property>
-        <property name="n_columns">4</property>
-        <property name="column_spacing">12</property>
         <property name="row_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkEntry" id="song_info_artist">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
             <property name="invisible_char">●</property>
             <property name="activates_default">True</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
-            <property name="y_options"/>
+            <property name="top_attach">0</property>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
@@ -37,56 +35,50 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="y_options"/>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="album_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">Albu_m:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_album</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-            <property name="bottom_attach">2</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="artist_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Artist:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_artist</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="genre_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Genre:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_genre</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -98,26 +90,22 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">4</property>
-            <property name="bottom_attach">5</property>
-            <property name="y_options"/>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="rating_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
             <property name="label" translatable="yes">_Rating:</property>
             <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="yalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">6</property>
-            <property name="bottom_attach">7</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -131,27 +119,22 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">6</property>
-            <property name="bottom_attach">7</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options">GTK_FILL</property>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="year_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Year:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_year</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">5</property>
-            <property name="bottom_attach">6</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -163,26 +146,22 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">5</property>
-            <property name="bottom_attach">6</property>
-            <property name="y_options"/>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="discn_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Disc number:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_disc_cur</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
-            <property name="x_options">GTK_FILL</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -194,25 +173,21 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">2</property>
             <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="album_artist_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">Album a_rtist:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_album_artist</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -223,25 +198,22 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">2</property>
-            <property name="bottom_attach">3</property>
-            <property name="y_options"/>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="composer_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Composer:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_composer</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"/>
           </packing>
         </child>
         <child>
@@ -252,10 +224,8 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">3</property>
-            <property name="bottom_attach">4</property>
-            <property name="y_options"/>
+            <property name="width">3</property>
           </packing>
         </child>
         <child>
@@ -266,9 +236,7 @@
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="right_attach">3</property>
             <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
           </packing>
         </child>
         <child>
@@ -278,23 +246,21 @@
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">8</property>
-            <property name="bottom_attach">9</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="track_total_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Track count:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_track_total</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="left_attach">0</property>
             <property name="top_attach">7</property>
-            <property name="bottom_attach">8</property>
           </packing>
         </child>
         <child>
@@ -304,9 +270,8 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="right_attach">4</property>
             <property name="top_attach">7</property>
-            <property name="bottom_attach">8</property>
+            <property name="width">3</property>
           </packing>
         </child>
       </object>
@@ -363,10 +328,10 @@
           <object class="GtkLabel" id="album_sortname_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">Albu_m sort order:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_album_sortname</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="top_attach">1</property>
@@ -379,10 +344,10 @@
           <object class="GtkLabel" id="artist_sortname_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Artist sort order:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_artist_sortname</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="x_options">GTK_FILL</property>
@@ -393,10 +358,10 @@
           <object class="GtkLabel" id="album_artist_sortname_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">Album a_rtist sort order:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_album_artist_sortname</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="top_attach">2</property>
@@ -423,10 +388,10 @@
           <object class="GtkLabel" id="composer_sortname_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
             <property name="label" translatable="yes">_Composer sort order:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">song_info_composer_sortname</property>
+            <property name="xalign">0</property>
           </object>
           <packing>
             <property name="top_attach">3</property>