diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-05-31 05:41:42 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-05-31 05:41:42 +0800 |
| commit | 2bb495b6eb8e1e7e2c22691a5b3891879baa5f76 (patch) | |
| tree | 4c9d5c1954d25335d1494a67358e1ef31487729c /mail/mail-config.glade | |
| parent | f40024c7265dcd7dbbb667647f05ed8a64fb83e7 (diff) | |
| download | gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar.gz gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar.bz2 gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar.lz gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar.xz gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.tar.zst gsoc2013-evolution-2bb495b6eb8e1e7e2c22691a5b3891879baa5f76.zip | |
Rename the "PGP" page back to "Other" and add a "default charset" option
* mail-config.glade: Rename the "PGP" page back to "Other" and add
a "default charset" option menu.
* mail-config.c (config_read, mail_config_write_on_exit,
mail_config_get_default_charset, mail_config_set_default_charset):
Handle "default charset".
* mail-accounts.c (construct): Fill in the "default_charset" menu
with an e_charset_picker menu.
(charset_menu_deactivate): Update the default charset.
svn path=/trunk/; revision=10057
Diffstat (limited to 'mail/mail-config.glade')
| -rw-r--r-- | mail/mail-config.glade | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index f6fcfc9464..f4c5519882 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2182,7 +2182,7 @@ Quoted <name>vbox64</name> <border_width>4</border_width> <homogeneous>False</homogeneous> - <spacing>4</spacing> + <spacing>8</spacing> <widget> <class>GtkHBox</class> @@ -2203,7 +2203,7 @@ Quoted <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> - <xpad>4</xpad> + <xpad>0</xpad> <ypad>0</ypad> <child> <padding>0</padding> @@ -2237,13 +2237,56 @@ Quoted </widget> </widget> </widget> + + <widget> + <class>GtkHBox</class> + <name>hbox56</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkLabel</class> + <name>lblCharset</name> + <label>Default character set: </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>omenuCharset</name> + <can_focus>True</can_focus> + <items>placeholder +</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>pgp_config_label</name> - <label>PGP</label> + <name>other_config_label</name> + <label>Other</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> |