diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/mail-config.glade | 362 |
2 files changed, 177 insertions, 189 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 0b88ec15a4..b24587db2d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,7 @@ +2002-02-02 Ettore Perazzoli <ettore@ximian.com> + + * mail-config.glade: Some touchups from me and Anna. + 2002-01-31 Jeffrey Stedfast <fejj@ximian.com> * mail-callbacks.c (composer_get_message): Don't bother setting diff --git a/mail/mail-config.glade b/mail/mail-config.glade index f098c3442f..b21481a38d 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -228,9 +228,9 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkVBox</class> <name>identity_vbox</name> - <border_width>4</border_width> + <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>4</spacing> + <spacing>3</spacing> <widget> <class>GtkFrame</class> @@ -248,6 +248,7 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkVBox</class> <name>vbox31</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> @@ -329,12 +330,12 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkTable</class> <name>table1</name> - <border_width>4</border_width> + <border_width>3</border_width> <rows>2</rows> <columns>2</columns> <homogeneous>False</homogeneous> - <row_spacing>4</row_spacing> - <column_spacing>4</column_spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <widget> <class>GtkEntry</class> @@ -390,10 +391,10 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkLabel</class> <name>identity_address_label</name> - <label>_Email Address:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <label>_Email address:</label> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -417,10 +418,10 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkLabel</class> <name>identity_full_name_label</name> - <label>_Full Name:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <label>_Full name:</label> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -459,12 +460,12 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkTable</class> <name>table2</name> - <border_width>4</border_width> + <border_width>3</border_width> <rows>3</rows> <columns>3</columns> <homogeneous>False</homogeneous> - <row_spacing>4</row_spacing> - <column_spacing>4</column_spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <widget> <class>GnomeFileEntry</class> @@ -505,11 +506,11 @@ Click "Finish" to save your settings.</text> <class>GtkLabel</class> <name>identity_organization_label</name> <label>_Organization:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> - <xpad>7</xpad> + <xpad>0</xpad> <ypad>0</ypad> <focus_target>identity_organization</focus_target> <child> @@ -532,7 +533,7 @@ Click "Finish" to save your settings.</text> <class>GtkCheckButton</class> <name>check_html_signature</name> <can_focus>True</can_focus> - <label>_HTML Signature:</label> + <label>_HTML signature:</label> <active>False</active> <draw_indicator>True</draw_indicator> <child> @@ -590,11 +591,11 @@ Click "Finish" to save your settings.</text> <class>GtkLabel</class> <name>identity_signature_label</name> <label>_Signature file:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> - <xpad>7</xpad> + <xpad>0</xpad> <ypad>0</ypad> <focus_target>entry_signature</focus_target> <child> @@ -700,8 +701,9 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkVBox</class> <name>source_vbox</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>3</spacing> <widget> <class>GtkTable</class> @@ -721,7 +723,7 @@ Click "Finish" to save your settings.</text> <widget> <class>GtkLabel</class> <name>source_type_label</name> - <label>_Server Type: </label> + <label>_Server type: </label> <justify>GTK_JUSTIFY_RIGHT</justify> <wrap>False</wrap> <xalign>1</xalign> @@ -847,9 +849,9 @@ None <class>GtkLabel</class> <name>source_host_label</name> <label>_Host:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -874,9 +876,9 @@ None <class>GtkLabel</class> <name>source_user_label</name> <label>_Username:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -949,9 +951,9 @@ None <class>GtkLabel</class> <name>source_path_label</name> <label>_Path:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -1033,7 +1035,7 @@ None <class>GtkLabel</class> <name>source_ssl_disabled</name> <sensitive>False</sensitive> - <label>(SSL is not supported in this build of evolution)</label> + <label>(SSL is not supported in this build of Evolution)</label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -1076,7 +1078,7 @@ None <name>vbox60</name> <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>3</spacing> <widget> <class>GtkHBox</class> @@ -1092,7 +1094,7 @@ None <widget> <class>GtkLabel</class> <name>source_auth_label</name> - <label>_Authentication Type: </label> + <label>_Authentication type: </label> <justify>GTK_JUSTIFY_CENTER</justify> <wrap>False</wrap> <xalign>0.5</xalign> @@ -1186,6 +1188,7 @@ Kerberos <widget> <class>GtkFrame</class> <name>extra_mailcheck_frame</name> + <border_width>3</border_width> <label>Checking for New Mail</label> <label_xalign>0</label_xalign> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> @@ -1198,7 +1201,7 @@ Kerberos <widget> <class>GtkVBox</class> <name>extra_mailcheck_vbox</name> - <border_width>4</border_width> + <border_width>3</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> @@ -1305,6 +1308,7 @@ Kerberos <widget> <class>GtkVBox</class> <name>transport_vbox</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> <spacing>0</spacing> @@ -1380,7 +1384,7 @@ Sendmail <name>hbox59</name> <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>2</spacing> + <spacing>3</spacing> <child> <padding>0</padding> <expand>False</expand> @@ -1440,7 +1444,7 @@ Sendmail <name>vbox12</name> <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>3</spacing> <widget> <class>GtkTable</class> @@ -1574,7 +1578,7 @@ Sendmail <name>vbox61</name> <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>4</spacing> + <spacing>3</spacing> <widget> <class>GtkHBox</class> @@ -1648,7 +1652,7 @@ Kerberos <class>GtkHBox</class> <name>hbox52</name> <homogeneous>False</homogeneous> - <spacing>4</spacing> + <spacing>3</spacing> <child> <padding>0</padding> <expand>False</expand> @@ -1722,8 +1726,9 @@ Kerberos <widget> <class>GtkVBox</class> <name>folders_vbox</name> + <border_width>3</border_width> <homogeneous>False</homogeneous> - <spacing>0</spacing> + <spacing>3</spacing> <widget> <class>GtkFrame</class> @@ -1752,9 +1757,9 @@ Kerberos <class>GtkLabel</class> <name>drafts_label</name> <label>_Drafts folder:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -1779,9 +1784,9 @@ Kerberos <class>GtkLabel</class> <name>sent_label</name> <label>Sent _messages folder:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> + <justify>GTK_JUSTIFY_LEFT</justify> <wrap>False</wrap> - <xalign>1</xalign> + <xalign>0</xalign> <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> @@ -1880,6 +1885,7 @@ Kerberos <widget> <class>GtkTable</class> <name>table8</name> + <border_width>3</border_width> <rows>2</rows> <columns>2</columns> <homogeneous>False</homogeneous> @@ -1895,7 +1901,7 @@ Kerberos <class>GtkCheckButton</class> <name>always_cc</name> <can_focus>True</can_focus> - <label>Always carbon-copy to:</label> + <label>Always _carbon-copy (Cc) to:</label> <active>False</active> <draw_indicator>True</draw_indicator> <child> @@ -1918,7 +1924,7 @@ Kerberos <class>GtkCheckButton</class> <name>always_bcc</name> <can_focus>True</can_focus> - <label>Always blind carbon-copy to:</label> + <label>Always _blind carbon-copy (Bcc) to:</label> <active>False</active> <draw_indicator>True</draw_indicator> <child> @@ -2012,8 +2018,8 @@ Kerberos <widget> <class>GtkFrame</class> <name>pgp_frame</name> - <border_width>4</border_width> - <label>Pretty Good Privacy</label> + <border_width>3</border_width> + <label>Pretty Good Privacy (PGP/GPG)</label> <label_xalign>0</label_xalign> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> @@ -2023,109 +2029,83 @@ Kerberos </child> <widget> - <class>GtkTable</class> - <name>pgp_table</name> + <class>GtkVBox</class> + <name>vbox69</name> <border_width>3</border_width> - <rows>3</rows> - <columns>2</columns> <homogeneous>False</homogeneous> - <row_spacing>4</row_spacing> - <column_spacing>4</column_spacing> + <spacing>3</spacing> <widget> - <class>GtkLabel</class> - <name>pgp_key_id_label</name> - <label>PGP _Key ID:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <default_focus_target>pgp_key</default_focus_target> + <class>GtkHBox</class> + <name>hbox63</name> + <border_width>3</border_width> + <homogeneous>False</homogeneous> + <spacing>3</spacing> <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> </child> - </widget> - <widget> - <class>GtkEntry</class> - <name>pgp_key</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <left_attach>1</left_attach> - <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <widget> + <class>GtkLabel</class> + <name>pgp_key_id_label</name> + <label>PGP/GPG _Key ID:</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> + <default_focus_target>pgp_key</default_focus_target> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>pgp_key</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> </widget> <widget> <class>GtkCheckButton</class> - <name>pgp_encrypt_to_self</name> + <name>pgp_always_sign</name> <can_focus>True</can_focus> - <label>Always _encrypt to myself when sending encrypted mail</label> - <active>True</active> + <label>Always _sign outgoing messages when using this account</label> + <active>False</active> <draw_indicator>True</draw_indicator> <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> </child> </widget> <widget> <class>GtkCheckButton</class> - <name>pgp_always_sign</name> + <name>pgp_encrypt_to_self</name> <can_focus>True</can_focus> - <label>Always _sign outgoing messages when using this account</label> - <active>False</active> + <label>Always _encrypt to myself when sending encrypted mail</label> + <active>True</active> <draw_indicator>True</draw_indicator> <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> </child> </widget> </widget> @@ -2134,8 +2114,8 @@ Kerberos <widget> <class>GtkFrame</class> <name>smime_frame</name> - <border_width>4</border_width> - <label>Secure MIME</label> + <border_width>3</border_width> + <label>Secure MIME (S/MIME)</label> <label_xalign>0</label_xalign> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> @@ -2151,25 +2131,21 @@ Kerberos <rows>3</rows> <columns>3</columns> <homogeneous>False</homogeneous> - <row_spacing>4</row_spacing> - <column_spacing>4</column_spacing> + <row_spacing>3</row_spacing> + <column_spacing>3</column_spacing> <widget> - <class>GtkLabel</class> - <name>smime_key_label</name> - <label>_Certificate ID:</label> - <justify>GTK_JUSTIFY_RIGHT</justify> - <wrap>False</wrap> - <xalign>1</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <default_focus_target>smime_key</default_focus_target> + <class>GtkCheckButton</class> + <name>smime_encrypt_to_self</name> + <can_focus>True</can_focus> + <label>A_lways encrypt to myself when sending encrypted mail</label> + <active>True</active> + <draw_indicator>True</draw_indicator> <child> <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <right_attach>2</right_attach> + <top_attach>2</top_attach> + <bottom_attach>3</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2182,21 +2158,20 @@ Kerberos </widget> <widget> - <class>GtkEntry</class> - <name>smime_key</name> + <class>GtkCheckButton</class> + <name>smime_always_sign</name> <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> + <label>_Always sign outgoing messages when using this account</label> + <active>False</active> + <draw_indicator>True</draw_indicator> <child> - <left_attach>1</left_attach> + <left_attach>0</left_attach> <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>True</xexpand> + <xexpand>False</xexpand> <yexpand>False</yexpand> <xshrink>False</xshrink> <yshrink>False</yshrink> @@ -2206,17 +2181,16 @@ Kerberos </widget> <widget> - <class>GtkCheckButton</class> - <name>smime_encrypt_to_self</name> + <class>GnomeHRef</class> + <name>get_digital_id</name> <can_focus>True</can_focus> - <label>A_lways encrypt to myself when sending encrypted mail</label> - <active>True</active> - <draw_indicator>True</draw_indicator> + <url>http://www.verisign.com/products/class1/index.html</url> + <label>Get Digital ID...</label> <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> + <left_attach>2</left_attach> + <right_attach>3</right_attach> + <top_attach>1</top_attach> + <bottom_attach>2</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2251,17 +2225,16 @@ Kerberos </widget> <widget> - <class>GtkCheckButton</class> - <name>smime_always_sign</name> - <can_focus>True</can_focus> - <label>_Always sign outgoing messages when using this account</label> - <active>False</active> - <draw_indicator>True</draw_indicator> + <class>GtkHBox</class> + <name>hbox64</name> + <border_width>3</border_width> + <homogeneous>False</homogeneous> + <spacing>3</spacing> <child> <left_attach>0</left_attach> <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <top_attach>0</top_attach> + <bottom_attach>1</bottom_attach> <xpad>0</xpad> <ypad>0</ypad> <xexpand>False</xexpand> @@ -2269,30 +2242,41 @@ Kerberos <xshrink>False</xshrink> <yshrink>False</yshrink> <xfill>True</xfill> - <yfill>False</yfill> + <yfill>True</yfill> </child> - </widget> - <widget> - <class>GnomeHRef</class> - <name>get_digital_id</name> - <can_focus>True</can_focus> - <url>http://www.verisign.com/products/class1/index.html</url> - <label>Get Digital ID...</label> - <child> - <left_attach>2</left_attach> - <right_attach>3</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> + <widget> + <class>GtkLabel</class> + <name>smime_key_label</name> + <label>_Certificate ID:</label> + <justify>GTK_JUSTIFY_LEFT</justify> + <wrap>False</wrap> + <xalign>0</xalign> + <yalign>0.5</yalign> <xpad>0</xpad> <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> + <default_focus_target>smime_key</default_focus_target> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkEntry</class> + <name>smime_key</name> + <can_focus>True</can_focus> + <editable>True</editable> + <text_visible>True</text_visible> + <text_max_length>0</text_max_length> + <text></text> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> </widget> </widget> </widget> |