diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 31 | ||||
| -rw-r--r-- | mail/mail-accounts.h | 4 | ||||
| -rw-r--r-- | mail/mail-config.glade | 103 | ||||
| -rw-r--r-- | mail/mail-config.glade.h | 4 |
5 files changed, 151 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 823c0fe5bf..bc67dc4344 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2001-01-24 Jeffrey Stedfast <fejj@ximian.com> + + * mail-config.glade: Added a 3rd page to the account editor to + allow users to set their HTML sending preference and also allow + them to change their message status timeout. + + * mail-accounts.c (construct): Added handlers for the send-html + checkbox and for the mark-message-as timeout spinbutton. + 2001-01-23 Jeffrey Stedfast <fejj@ximian.com> * mail-account-editor.c (apply_changes): Save the source and diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index d7a71cfd82..29200a5c5a 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -330,6 +330,24 @@ news_delete (GtkButton *button, gpointer data) } #endif /* ENABLE_NNTP */ +/* temp widget callbacks */ +static void +send_html_toggled (GtkToggleButton *button, gpointer data) +{ + mail_config_set_send_html (button->active); +} + +static void +timeout_changed (GtkEntry *entry, gpointer data) +{ + MailAccountsDialog *dialog = data; + gint val; + + val = (gint) (gtk_spin_button_get_value_as_float (dialog->timeout) * 1000); + + mail_config_set_mark_as_seen_timeout (val); +} + static void construct (MailAccountsDialog *dialog) { @@ -389,6 +407,19 @@ construct (MailAccountsDialog *dialog) gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), 1); #endif + /* get those temp widgets */ + dialog->send_html = GTK_CHECK_BUTTON (glade_xml_get_widget (gui, "chkSendHTML")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->send_html), + mail_config_get_send_html ()); + gtk_signal_connect (GTK_OBJECT (dialog->send_html), "toggled", + GTK_SIGNAL_FUNC (send_html_toggled), dialog); + + dialog->timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinMarkTimeout")); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->timeout), + (1.0 * mail_config_get_mark_as_seen_timeout ()) / 1000.0); + gtk_signal_connect (GTK_OBJECT (dialog->timeout), "changed", + GTK_SIGNAL_FUNC (timeout_changed), dialog); + /* now to fill in the clists */ dialog->accounts_row = -1; dialog->accounts = mail_config_get_accounts (); diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h index 86dd7a42ea..e2f355cd3d 100644 --- a/mail/mail-accounts.h +++ b/mail/mail-accounts.h @@ -62,6 +62,10 @@ struct _MailAccountsDialog { GtkButton *news_add; GtkButton *news_edit; GtkButton *news_delete; + + /* temporary widgets */ + GtkCheckButton *send_html; + GtkSpinButton *timeout; }; typedef struct _MailAccountsDialog MailAccountsDialog; diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 577b4becf9..3573488b83 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2950,6 +2950,109 @@ SMTP <xpad>0</xpad> <ypad>0</ypad> </widget> + + <widget> + <class>GtkVBox</class> + <name>vbox38</name> + <homogeneous>False</homogeneous> + <spacing>0</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>hbox38</name> + <homogeneous>False</homogeneous> + <spacing>0</spacing> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> + + <widget> + <class>GtkLabel</class> + <name>lblMarkAsRead</name> + <label>Mark messages as "Read" after:</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>GtkSpinButton</class> + <name>spinMarkTimeout</name> + <can_focus>True</can_focus> + <climb_rate>1</climb_rate> + <digits>1</digits> + <numeric>True</numeric> + <update_policy>GTK_UPDATE_IF_VALID</update_policy> + <snap>False</snap> + <wrap>False</wrap> + <value>1.5</value> + <lower>0</lower> + <upper>10</upper> + <step>0.1</step> + <page>1</page> + <page_size>1</page_size> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + </child> + </widget> + + <widget> + <class>GtkLabel</class> + <name>lblSeconds</name> + <label>seconds.</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> + </widget> + + <widget> + <class>GtkLabel</class> + <child_name>Notebook:tab</child_name> + <name>lblOther</name> + <label>Other</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> </widget> </widget> diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h index f56c824cb0..23c8adca0a 100644 --- a/mail/mail-config.glade.h +++ b/mail/mail-config.glade.h @@ -97,3 +97,7 @@ gchar *s = N_("Add"); gchar *s = N_("Edit"); gchar *s = N_("Delete"); gchar *s = N_("News"); +gchar *s = N_("Send mail in HTML format by default."); +gchar *s = N_("Mark messages as \"Read\" after:"); +gchar *s = N_("seconds."); +gchar *s = N_("Other"); |