[totem] preferences-dialog: Replace GtkTable table2 by GtkGrid

[Bastien Nocera <hadess src gnome org>]

commit a29f8d3bc9d12e7763e2dd33f731db70a74044ca
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jun 30 22:03:37 2021 -0300

    preferences-dialog: Replace GtkTable table2 by GtkGrid
    
    Almost identically to previous commit, except that the
    "hexpand" property was set to all children to make sure
    the grid is pixel-by-pixel similar to the current state.

 data/totem-preferences-dialog.ui | 66 +++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 38 deletions(-)
---
diff --git a/data/totem-preferences-dialog.ui b/data/totem-preferences-dialog.ui
index 2156c3fdd..83bc776fe 100644
--- a/data/totem-preferences-dialog.ui
+++ b/data/totem-preferences-dialog.ui
@@ -487,11 +487,8 @@
                      <property name="right_padding">0</property>
 
                      <child>
-                       <object class="GtkTable" id="table2">
+                       <object class="GtkGrid">
                          <property name="visible">True</property>
-                         <property name="n_rows">5</property>
-                         <property name="n_columns">2</property>
-                         <property name="homogeneous">False</property>
                          <property name="row_spacing">6</property>
                          <property name="column_spacing">12</property>
 
@@ -499,6 +496,7 @@
                            <object class="GtkLabel" id="tpw_brightness_label">
                              <property name="visible" bind-source="tpw_bright_scale" bind-property="visible" 
bind-flags="default|sync-create"/>
                              <property name="label" translatable="yes">_Brightness:</property>
+                             <property name="hexpand">True</property>
                              <property name="use_underline">True</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -514,11 +512,9 @@
                            </object>
                            <packing>
                              <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
+                             <property name="width">1</property>
                              <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"/>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
@@ -526,6 +522,7 @@
                            <object class="GtkLabel" id="tpw_contrast_label">
                              <property name="visible" bind-source="tpw_contrast_scale" 
bind-property="visible" bind-flags="default|sync-create"/>
                              <property name="label" translatable="yes">Co_ntrast:</property>
+                             <property name="hexpand">True</property>
                              <property name="use_underline">True</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -541,17 +538,16 @@
                            </object>
                            <packing>
                              <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
+                             <property name="width">1</property>
                              <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"/>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
                          <child>
                            <object class="GtkScale" id="tpw_bright_scale">
                              <property name="visible">True</property>
+                             <property name="hexpand">True</property>
                              <property name="can_focus">True</property>
                              <property name="draw_value">False</property>
                              <property name="value_pos">GTK_POS_TOP</property>
@@ -561,16 +557,16 @@
                            </object>
                            <packing>
                              <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
+                             <property name="width">1</property>
                              <property name="top_attach">0</property>
-                             <property name="bottom_attach">1</property>
-                             <property name="y_options"/>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
                          <child>
                            <object class="GtkScale" id="tpw_contrast_scale">
                              <property name="visible">True</property>
+                             <property name="hexpand">True</property>
                              <property name="can_focus">True</property>
                              <property name="draw_value">False</property>
                              <property name="value_pos">GTK_POS_TOP</property>
@@ -580,11 +576,9 @@
                            </object>
                            <packing>
                              <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
+                             <property name="width">1</property>
                              <property name="top_attach">1</property>
-                             <property name="bottom_attach">2</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options">fill</property>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
@@ -592,6 +586,7 @@
                            <object class="GtkLabel" id="tpw_saturation_label">
                              <property name="visible" bind-source="tpw_saturation_scale" 
bind-property="visible" bind-flags="default|sync-create"/>
                              <property name="label" translatable="yes">Sat_uration:</property>
+                             <property name="hexpand">True</property>
                              <property name="use_underline">True</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -607,11 +602,9 @@
                            </object>
                            <packing>
                              <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
+                             <property name="width">1</property>
                              <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"/>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
@@ -619,6 +612,7 @@
                            <object class="GtkLabel" id="tpw_hue_label">
                              <property name="visible" bind-source="tpw_hue_scale" bind-property="visible" 
bind-flags="default|sync-create"/>
                              <property name="label" translatable="yes">_Hue:</property>
+                             <property name="hexpand">True</property>
                              <property name="use_underline">True</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -634,17 +628,16 @@
                            </object>
                            <packing>
                              <property name="left_attach">0</property>
-                             <property name="right_attach">1</property>
+                             <property name="width">1</property>
                              <property name="top_attach">3</property>
-                             <property name="bottom_attach">4</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options"/>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
                          <child>
                            <object class="GtkScale" id="tpw_saturation_scale">
                              <property name="visible">True</property>
+                             <property name="hexpand">True</property>
                              <property name="can_focus">True</property>
                              <property name="draw_value">False</property>
                              <property name="value_pos">GTK_POS_TOP</property>
@@ -654,17 +647,16 @@
                            </object>
                            <packing>
                              <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
+                             <property name="width">1</property>
                              <property name="top_attach">2</property>
-                             <property name="bottom_attach">3</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options">fill</property>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
                          <child>
                            <object class="GtkScale" id="tpw_hue_scale">
                              <property name="visible">True</property>
+                             <property name="hexpand">True</property>
                              <property name="can_focus">True</property>
                              <property name="draw_value">False</property>
                              <property name="value_pos">GTK_POS_TOP</property>
@@ -674,17 +666,16 @@
                            </object>
                            <packing>
                              <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
+                             <property name="width">1</property>
                              <property name="top_attach">3</property>
-                             <property name="bottom_attach">4</property>
-                             <property name="x_options">fill</property>
-                             <property name="y_options">fill</property>
+                             <property name="height">1</property>
                            </packing>
                          </child>
 
                          <child>
                            <object class="GtkButton" id="tpw_color_reset">
                              <property name="visible">True</property>
+                             <property name="hexpand">True</property>
                              <property name="can_focus">True</property>
                              <property name="halign">end</property>
                              <property name="label" translatable="yes">Reset to _Defaults</property>
@@ -695,10 +686,9 @@
                            </object>
                            <packing>
                              <property name="left_attach">1</property>
-                             <property name="right_attach">2</property>
+                             <property name="width">1</property>
                              <property name="top_attach">4</property>
-                             <property name="bottom_attach">5</property>
-                             <property name="x_options">shrink|fill</property>
+                             <property name="height">1</property>
                            </packing>
                          </child>
                        </object>