From 4824db0923bce84c1bf0d9db9c79be78fe69a461 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 31 Oct 2009 22:57:14 +0100
Subject: [PATCH] [Grigroy] align colors buttons. Fixes #5385

---
 data/glade/preferences_window.glade | 52 ++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index 82eb6b8173..fa912df8b2 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -1709,6 +1709,8 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -1747,6 +1749,8 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -1763,6 +1767,9 @@ $T will be replaced by auto-not-available timeout</property>
                             <child>
                               <widget class="GtkHBox" id="hbox9">
                                 <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <widget class="GtkColorButton" id="incoming_nick_colorbutton">
                                     <property name="visible">True</property>
@@ -1773,23 +1780,25 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
-                                    <property name="position">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </widget>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkHBox" id="hbox10">
                                 <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <widget class="GtkColorButton" id="status_msg_colorbutton">
                                     <property name="visible">True</property>
@@ -1800,25 +1809,27 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
-                                    <property name="position">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </widget>
                               <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>
-                                <property name="x_options"></property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkHBox" id="hbox11">
                                 <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <widget class="GtkColorButton" id="outgoing_nick_colorbutton">
                                     <property name="visible">True</property>
@@ -1829,23 +1840,25 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_outgoing_nick_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
-                                    <property name="position">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </widget>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="x_options"></property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkHBox" id="hbox12">
                                 <property name="visible">True</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
                                 <child>
                                   <widget class="GtkColorButton" id="url_msg_colorbutton">
                                     <property name="visible">True</property>
@@ -1856,19 +1869,18 @@ $T will be replaced by auto-not-available timeout</property>
                                     <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/>
                                   </widget>
                                   <packing>
-                                    <property name="position">0</property>
+                                    <property name="expand">False</property>
+                                    <property name="pack_type">end</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </widget>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="x_options"></property>
+                                <property name="x_options">GTK_FILL</property>
                                 <property name="y_options"></property>
                               </packing>
                             </child>
-- 
GitLab