From 566f8f6208f1e12ad342517abf550df870f07f2e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sat, 7 Feb 2009 22:04:14 +0000
Subject: More preferences cleanup.  Convert forward and reply style option
 menus to combo boxes, and bind them to EShellSettings properties.

svn path=/branches/kill-bonobo/; revision=37234
---
 mail/mail-config.glade | 79 ++++++++++++++++++--------------------------------
 1 file changed, 28 insertions(+), 51 deletions(-)

(limited to 'mail/mail-config.glade')

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 84b3bbd6ab..d2d8da8ea7 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -1132,6 +1132,7 @@ For example: "Work" or "Personal"</property>
                     <property name="visible">True</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -4229,6 +4230,33 @@ For example: "Work" or "Personal"</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">12</property>
                                 <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkComboBox" id="comboboxReplyStyle">
+                                    <property name="visible">True</property>
+                                    <property name="items" translatable="yes">Attachment
+Inline (Outlook style)
+Quoted
+Do Not Quote</property>
+                                  </widget>
+                                  <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>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkComboBox" id="comboboxForwardStyle">
+                                    <property name="visible">True</property>
+                                    <property name="items" translatable="yes">Attachment
+Inline
+Quoted</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <widget class="GtkLabel" id="lblCharset">
                                     <property name="visible">True</property>
@@ -4250,7 +4278,6 @@ For example: "Work" or "Personal"</property>
                                     <property name="label" translatable="yes">_Forward style:</property>
                                     <property name="use_underline">True</property>
                                     <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="mnemonic_widget">omenuForwardStyle</property>
                                   </widget>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
@@ -4272,55 +4299,6 @@ For example: "Work" or "Personal"</property>
                                     <property name="y_options"></property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <widget class="GtkHBox" id="hboxForwardStyle">
-                                    <property name="visible">True</property>
-                                    <child>
-                                      <widget class="GtkOptionMenu" id="omenuForwardStyle">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="response_id">0</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options">GTK_FILL</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkAlignment" id="alignment25">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">7.4505801528346183e-09</property>
-                                    <property name="xscale">0</property>
-                                    <child>
-                                      <widget class="GtkHBox" id="hboxReplyStyle">
-                                        <property name="visible">True</property>
-                                        <child>
-                                          <widget class="GtkOptionMenu" id="omenuReplyStyle">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="response_id">0</property>
-                                          </widget>
-                                        </child>
-                                      </widget>
-                                    </child>
-                                  </widget>
-                                  <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="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
-                                  </packing>
-                                </child>
                                 <child>
                                   <widget class="GtkLabel" id="lblReplyStyle">
                                     <property name="visible">True</property>
@@ -4328,7 +4306,6 @@ For example: "Work" or "Personal"</property>
                                     <property name="label" translatable="yes">_Reply style:</property>
                                     <property name="use_underline">True</property>
                                     <property name="justify">GTK_JUSTIFY_CENTER</property>
-                                    <property name="mnemonic_widget">omenuReplyStyle</property>
                                   </widget>
                                   <packing>
                                     <property name="top_attach">1</property>
-- 
cgit v1.2.3