diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-config.glade | 200 |
2 files changed, 124 insertions, 83 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ced01de2a7..e9a6406493 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-09-26 Anna Marie Dirks <anna@ximian.com> + + * mail-config.glade: Added a "Description:" label and moved + the source_description and transport_description labels to + a more appropriate place. + 2001-09-26 Christopher James Lahey <clahey@ximian.com> * message-list.c (mlfe_callback): Check for the root node here. @@ -34,6 +40,7 @@ * component-factory.c (component_factory_init): warn and exit if oaf_active_server_register returns OAF_REG_ALREADY_ACTIVE. +>>>>>>> 1.1748 2001-09-26 Jeffrey Stedfast <fejj@ximian.com> * mail-config.c (config_read): Oops, translate the fake account diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 0a64b23478..4b383ce5e0 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -242,7 +242,7 @@ Click "Finish" to save your settings.</text> <child> <padding>0</padding> <expand>False</expand> - <fill>True</fill> + <fill>False</fill> </child> <widget> @@ -252,23 +252,6 @@ Click "Finish" to save your settings.</text> <spacing>0</spacing> <widget> - <class>GtkLabel</class> - <name>label40</name> - <label>Each account must have a different name.</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>4</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> <class>GtkHBox</class> <name>hbox24</name> <border_width>3</border_width> @@ -284,7 +267,7 @@ Click "Finish" to save your settings.</text> <class>GtkLabel</class> <name>management_name_label</name> <label>_Name:</label> - <justify>GTK_JUSTIFY_CENTER</justify> + <justify>GTK_JUSTIFY_RIGHT</justify> <wrap>False</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> @@ -721,23 +704,6 @@ Click "Finish" to save your settings.</text> <spacing>0</spacing> <widget> - <class>GtkLabel</class> - <name>source_description</name> - <label>description</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>7.45058e-09</xalign> - <yalign>0.5</yalign> - <xpad>5</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> <class>GtkTable</class> <name>table3</name> <border_width>3</border_width> @@ -807,10 +773,57 @@ None </widget> <widget> + <class>GtkHBox</class> + <name>hbox58</name> + <border_width>3</border_width> + <homogeneous>False</homogeneous> + <spacing>2</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + + <widget> + <class>GtkLabel</class> + <name>label46</name> + <label>Description:</label> + <justify>GTK_JUSTIFY_RIGHT</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0.5</yalign> + <xpad>2</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>source_description</name> + <label>description</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> + + <widget> <class>GtkFrame</class> <name>source_frame</name> <border_width>3</border_width> - <label>Server Configuration</label> + <label>Configuration</label> <label_xalign>0</label_xalign> <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type> <child> @@ -823,7 +836,7 @@ None <class>GtkTable</class> <name>table4</name> <border_width>3</border_width> - <rows>5</rows> + <rows>4</rows> <columns>2</columns> <homogeneous>False</homogeneous> <row_spacing>3</row_spacing> @@ -982,33 +995,6 @@ None </widget> <widget> - <class>GtkLabel</class> - <name>source_ssl_disabled</name> - <sensitive>False</sensitive> - <label>(SSL is not supported in this build of evolution)</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>4</top_attach> - <bottom_attach>5</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> - </child> - </widget> - - <widget> <class>GnomeFileEntry</class> <name>source_path_entry</name> <max_saved>10</max_saved> @@ -1276,23 +1262,6 @@ Kerberos <spacing>0</spacing> <widget> - <class>GtkLabel</class> - <name>transport_description</name> - <label>description</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>7.45058e-09</xalign> - <yalign>0.5</yalign> - <xpad>5</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> <class>GtkTable</class> <name>table5</name> <border_width>3</border_width> @@ -1359,6 +1328,53 @@ Sendmail </widget> <widget> + <class>GtkHBox</class> + <name>hbox59</name> + <border_width>3</border_width> + <homogeneous>False</homogeneous> + <spacing>2</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + + <widget> + <class>GtkLabel</class> + <name>label50</name> + <label>Description:</label> + <justify>GTK_JUSTIFY_RIGHT</justify> + <wrap>False</wrap> + <xalign>1</xalign> + <yalign>0</yalign> + <xpad>2</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>transport_description</name> + <label>description</label> + <justify>GTK_JUSTIFY_CENTER</justify> + <wrap>False</wrap> + <xalign>7.45058e-09</xalign> + <yalign>0</yalign> + <xpad>0</xpad> + <ypad>0</ypad> + <child> + <padding>0</padding> + <expand>True</expand> + <fill>True</fill> + </child> + </widget> + </widget> + + <widget> <class>GtkFrame</class> <name>transport_frame</name> <border_width>3</border_width> @@ -1573,7 +1589,7 @@ Kerberos <class>GtkButton</class> <name>transport_check_supported</name> <can_focus>True</can_focus> - <label>_Check for supported types</label> + <label> _Check for supported types </label> <relief>GTK_RELIEF_NORMAL</relief> </widget> </widget> @@ -2322,6 +2338,24 @@ Kerberos </child> <widget> + <class>GtkLabel</class> + <name>label52</name> + <label> +</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>GtkVButtonBox</class> <name>vbuttonbox1</name> <layout_style>GTK_BUTTONBOX_START</layout_style> |