aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-config.glade
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2001-05-15 01:18:03 +0800
committerDan Winship <danw@src.gnome.org>2001-05-15 01:18:03 +0800
commitb9401bbdf43b51b3596498d12ba2d73e2cca1805 (patch)
tree82d72a137b851efbfde70064f9d7fb3e6b81f6e7 /mail/mail-config.glade
parentf02973aaf4ee15e818981301e62b10ea1d225a53 (diff)
downloadgsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.gz
gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.tar.zst
gsoc2013-evolution-b9401bbdf43b51b3596498d12ba2d73e2cca1805.zip
Split "Other" page into three pages, Display, Composer, and PGP. Add HTML
* mail-config.glade: Split "Other" page into three pages, Display, Composer, and PGP. Add HTML image stuff on the Display page and default forward style on the Composer page. * mail-config.c (mail_config_get_default_forward_style, mail_config_set_default_forward_style): User-specified default style for forwarding messages. (config_read, mail_config_write_on_exit): Deal with forward style. * mail-accounts.c: Handle HTML image display options and default forward style. * mail-callbacks.c (forward): New. Forward in the user-selected default style. (forward_inline, forward_quoted): Simplify these some. Remove the fallback to forward attached when forwarding multiple messages: it should just forward the multiple messages inline or quoted in those cases. (Which it doesn't yet, but that's a bug.) * folder-browser.c (context_menu): Remove "Forward inline" and make "Forward" call forward() rather than forward_attached(). * folder-browser-factory.c: Update command/menu/toolbar/pixmap gunk for the "MessageForwardAttached" vs "MessageForward" split. * mail-session.c (mail_session_get_type): * mail-format.c (format_mime_part): * mail-account-gui.c (setup_service): Fix warnings. svn path=/trunk/; revision=9792
Diffstat (limited to 'mail/mail-config.glade')
-rw-r--r--mail/mail-config.glade187
1 files changed, 170 insertions, 17 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index efd09518e4..9b78e05c33 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -1881,24 +1881,11 @@ Kerberos
<widget>
<class>GtkVBox</class>
<name>vbox38</name>
+ <border_width>4</border_width>
<homogeneous>False</homogeneous>
<spacing>4</spacing>
<widget>
- <class>GtkCheckButton</class>
- <name>chkSendHTML</name>
- <can_focus>True</can_focus>
- <label>Send mail in HTML format by default.</label>
- <active>False</active>
- <draw_indicator>True</draw_indicator>
- <child>
- <padding>0</padding>
- <expand>False</expand>
- <fill>False</fill>
- </child>
- </widget>
-
- <widget>
<class>GtkHBox</class>
<name>hbox42</name>
<homogeneous>False</homogeneous>
@@ -1913,7 +1900,7 @@ Kerberos
<class>GtkCheckButton</class>
<name>chckHighlightCitations</name>
<can_focus>True</can_focus>
- <label>Highlight citations with </label>
+ <label>Highlight citations with</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
@@ -2025,6 +2012,172 @@ Kerberos
</widget>
<widget>
+ <class>GtkFrame</class>
+ <name>frame1</name>
+ <label>In HTML mail</label>
+ <label_xalign>0</label_xalign>
+ <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ </child>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>vbox65</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
+
+ <widget>
+ <class>GtkRadioButton</class>
+ <name>radioImagesNever</name>
+ <can_focus>True</can_focus>
+ <label>Never load images off the net</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <group>images</group>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkRadioButton</class>
+ <name>radioImagesSometimes</name>
+ <can_focus>True</can_focus>
+ <label>Load images if sender is in addressbook</label>
+ <active>True</active>
+ <draw_indicator>True</draw_indicator>
+ <group>images</group>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkRadioButton</class>
+ <name>radioImagesAlways</name>
+ <can_focus>True</can_focus>
+ <label>Always load images off the net</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <group>images</group>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+ </widget>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <child_name>Notebook:tab</child_name>
+ <name>display_config_label</name>
+ <label>Display</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ </widget>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>vbox63</name>
+ <border_width>4</border_width>
+ <homogeneous>False</homogeneous>
+ <spacing>4</spacing>
+
+ <widget>
+ <class>GtkCheckButton</class>
+ <name>chkSendHTML</name>
+ <can_focus>True</can_focus>
+ <label>Send mail in HTML format by default.</label>
+ <active>False</active>
+ <draw_indicator>True</draw_indicator>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkHBox</class>
+ <name>hbox55</name>
+ <homogeneous>False</homogeneous>
+ <spacing>0</spacing>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>True</fill>
+ </child>
+
+ <widget>
+ <class>GtkLabel</class>
+ <name>label39</name>
+ <label>Default &quot;Forward&quot; style is: </label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+
+ <widget>
+ <class>GtkOptionMenu</class>
+ <name>omenuForwardStyle</name>
+ <can_focus>True</can_focus>
+ <items>Attachment
+Inline
+Quoted
+</items>
+ <initial_choice>0</initial_choice>
+ <child>
+ <padding>0</padding>
+ <expand>False</expand>
+ <fill>False</fill>
+ </child>
+ </widget>
+ </widget>
+ </widget>
+
+ <widget>
+ <class>GtkLabel</class>
+ <child_name>Notebook:tab</child_name>
+ <name>composer_config_label</name>
+ <label>Composer</label>
+ <justify>GTK_JUSTIFY_CENTER</justify>
+ <wrap>False</wrap>
+ <xalign>0.5</xalign>
+ <yalign>0.5</yalign>
+ <xpad>0</xpad>
+ <ypad>0</ypad>
+ </widget>
+
+ <widget>
+ <class>GtkVBox</class>
+ <name>vbox64</name>
+ <border_width>4</border_width>
+ <homogeneous>False</homogeneous>
+ <spacing>4</spacing>
+
+ <widget>
<class>GtkHBox</class>
<name>hbox41</name>
<homogeneous>False</homogeneous>
@@ -2082,8 +2235,8 @@ Kerberos
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
- <name>other_config_label</name>
- <label>Other</label>
+ <name>pgp_config_label</name>
+ <label>PGP</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>