[Xfce4-commits] [apps/xfce4-terminal] 01/01: Replace deprecated GtkTable with GtkGrid

noreply at xfce.org noreply at xfce.org
Fri Sep 2 16:21:36 CEST 2016


This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.

commit 7a02a412760f5eca1e9631eec5bc416455291365
Author: Igor <f2404 at yandex.ru>
Date:   Fri Sep 2 17:21:30 2016 +0300

    Replace deprecated GtkTable with GtkGrid
---
 terminal/terminal-preferences.glade | 108 +++++++++++++++---------------------
 1 file changed, 45 insertions(+), 63 deletions(-)

diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index 2001527..8d85808 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -860,16 +860,17 @@
                       <object class="GtkAlignment" id="alignment25">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">6</property>
+                        <property name="left_padding">12</property>
                         <child>
-                          <object class="GtkTable" id="table7">
+                          <object class="GtkGrid" id="grid8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="border_width">6</property>
-                            <property name="n_rows">5</property>
-                            <property name="n_columns">3</property>
-                            <property name="column_spacing">2</property>
-                            <property name="row_spacing">6</property>
+                            <property name="margin_left">6</property>
+                            <property name="margin_right">6</property>
+                            <property name="margin_top">6</property>
+                            <property name="margin_bottom">6</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="label36">
                                 <property name="visible">True</property>
@@ -880,8 +881,8 @@
                                 <property name="mnemonic_widget">scale-width</property>
                               </object>
                               <packing>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="x_padding">6</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
@@ -894,10 +895,8 @@
                                 <property name="mnemonic_widget">scale-height</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="x_padding">6</property>
                               </packing>
                             </child>
                             <child>
@@ -910,10 +909,8 @@
                                 <property name="mnemonic_widget">scale-opacity</property>
                               </object>
                               <packing>
+                                <property name="left_attach">0</property>
                                 <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="x_padding">6</property>
                               </packing>
                             </child>
                             <child>
@@ -926,46 +923,61 @@
                                 <property name="mnemonic_widget">scale-duration</property>
                               </object>
                               <packing>
+                                <property name="left_attach">0</property>
                                 <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="x_padding">6</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkScale" id="scale-height">
+                              <object class="GtkCheckButton" id="dropdown-always-show-tabs">
+                                <property name="label" translatable="yes">_Always show tabs</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">dropdown-height</property>
+                                <property name="receives_default">False</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">4</property>
+                                <property name="width">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScale" id="scale-width">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="adjustment">dropdown-width</property>
                                 <property name="round_digits">0</property>
                                 <property name="digits">0</property>
                                 <property name="value_pos">right</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkScale" id="scale-width">
+                              <object class="GtkScale" id="scale-height">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="adjustment">dropdown-width</property>
+                                <property name="hexpand">True</property>
+                                <property name="adjustment">dropdown-height</property>
                                 <property name="round_digits">0</property>
                                 <property name="digits">0</property>
                                 <property name="value_pos">right</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="scale-opacity">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
                                 <property name="adjustment">dropdown-opacity</property>
                                 <property name="round_digits">0</property>
                                 <property name="digits">0</property>
@@ -973,15 +985,14 @@
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
                                 <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkScale" id="scale-duration">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
                                 <property name="adjustment">dropdown-animation-time</property>
                                 <property name="round_digits">0</property>
                                 <property name="digits">0</property>
@@ -989,24 +1000,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label42">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="label" translatable="yes">ms</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
                                 <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
@@ -1018,8 +1012,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
@@ -1031,10 +1024,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
@@ -1046,27 +1036,19 @@
                               </object>
                               <packing>
                                 <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="dropdown-always-show-tabs">
-                                <property name="label" translatable="yes">_Always show tabs</property>
+                              <object class="GtkLabel" id="label42">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
+                                <property name="can_focus">False</property>
                                 <property name="halign">start</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="label" translatable="yes">ms</property>
                               </object>
                               <packing>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">4</property>
-                                <property name="bottom_attach">5</property>
-                                <property name="x_padding">6</property>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">3</property>
                               </packing>
                             </child>
                           </object>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list