#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
+#include "modest-hildon-includes.h"
+
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
#include "widgets/modest-validating-entry.h"
#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
#include "maemo/modest-connection-specific-smtp-window.h"
+#include "maemo/modest-signature-editor-dialog.h"
+#include <maemo/modest-maemo-ui-constants.h>
#include <gconf/gconf-client.h>
#include <string.h> /* For strlen(). */
if (self->specific_window)
gtk_widget_destroy (self->specific_window);
+
+ if (self->signature_dialog)
+ gtk_widget_destroy (self->signature_dialog);
G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
}
return caption;
}
+
+static void
+on_entry_max (ModestValidatingEntry *self, gpointer user_data)
+{
+ ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ show_error (GTK_WINDOW (dialog), _("ckdg_ib_maximum_characters_reached"));
+}
+
static GtkWidget*
create_page_account_details (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (label);
/* Create a size group to be used by all captions.
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The description widgets: */
- self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
+ /* Do use auto-capitalization: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_account_title),
+ HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"),
self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_account_title);
connect_for_modified (self, self->entry_account_title);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the account title,
list_prevent = g_list_append (list_prevent, ">");
list_prevent = g_list_append (list_prevent, "|");
list_prevent = g_list_append (list_prevent, "^");
- easysetup_validating_entry_set_unallowed_characters (
- EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
+ modest_validating_entry_set_unallowed_characters (
+ MODEST_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
g_list_free (list_prevent);
/* Set max length as in the UI spec:
- * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+ * The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_account_title), 64);
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_account_title),
+ on_entry_max, self);
/* The retrieve combobox: */
self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
self->combo_retrieve, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->combo_retrieve);
connect_for_modified (self, self->combo_retrieve);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The limit-retrieve combobox: */
self->combo_limit_retrieve, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->combo_limit_retrieve);
connect_for_modified (self, self->combo_limit_retrieve);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The leave-messages widgets: */
if(!self->checkbox_leave_messages)
- self->checkbox_leave_messages =
- gtk_check_button_new_with_label (_("mcen_fi_advsetup_leave_on_server"));
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, 2);
+ self->checkbox_leave_messages = gtk_check_button_new ();
+ caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"),
+ self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->checkbox_leave_messages);
connect_for_modified (self, self->checkbox_leave_messages);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
gtk_widget_show (GTK_WIDGET (box));
static void
on_button_signature (GtkButton *button, gpointer user_data)
{
+ ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ /* Create the window, if necessary: */
+ if (!(self->signature_dialog)) {
+ self->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ());
+
+ gboolean use_signature = FALSE;
+ gchar *signature = modest_account_mgr_get_signature(self->account_manager, self->account_name,
+ &use_signature);
+ const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
+ modest_signature_editor_dialog_set_settings (
+ MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog),
+ use_signature, signature, account_title);
+ g_free (signature);
+ signature = NULL;
+ }
+
+ /* Show the window: */
+ gtk_window_set_transient_for (GTK_WINDOW (self->signature_dialog), GTK_WINDOW (self));
+ gtk_window_set_modal (GTK_WINDOW (self->signature_dialog), TRUE);
+ const gint response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog));
+ gtk_widget_hide (self->signature_dialog);
+ if (response != GTK_RESPONSE_OK) {
+ /* Destroy the widget now, and its data: */
+ gtk_widget_destroy (self->signature_dialog);
+ self->signature_dialog = NULL;
+ }
+ else {
+ /* Mark modified, so we use the dialog's data later: */
+ self->modified = TRUE;
+ }
}
static GtkWidget*
create_page_user_details (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The name widgets: */
- self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_name), HILDON_GTK_INPUT_MODE_FULL);
/* Set max length as in the UI spec:
- * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+ * The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64);
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_name),
+ on_entry_max, self);
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup,
_("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_user_name);
connect_for_modified (self, self->entry_user_name);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the name,
GList *list_prevent = NULL;
list_prevent = g_list_append (list_prevent, "<");
list_prevent = g_list_append (list_prevent, ">");
- easysetup_validating_entry_set_unallowed_characters (
- EASYSETUP_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
+ modest_validating_entry_set_unallowed_characters (
+ MODEST_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
g_list_free (list_prevent);
/* The username widgets: */
- self->entry_user_username = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"),
self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_user_username);
connect_for_modified (self, self->entry_user_username);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- easysetup_validating_entry_set_unallowed_characters_whitespace (
- EASYSETUP_VALIDATING_ENTRY (self->entry_user_username));
+ modest_validating_entry_set_unallowed_characters_whitespace (
+ MODEST_VALIDATING_ENTRY (self->entry_user_username));
/* Set max length as in the UI spec:
- * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+ * The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_username), 64);
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_username),
+ on_entry_max, self);
/* The password widgets: */
self->entry_user_password = gtk_entry_new ();
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_password), HILDON_GTK_INPUT_MODE_FULL);
gtk_entry_set_visibility (GTK_ENTRY (self->entry_user_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */
caption = create_caption_new_with_asterix (self, sizegroup,
_("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_user_password);
connect_for_modified (self, self->entry_user_password);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The email address widgets: */
- self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
caption = create_caption_new_with_asterix (self, sizegroup,
_("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
gtk_widget_show (self->entry_user_email);
connect_for_modified (self, self->entry_user_email);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Set max length as in the UI spec:
- * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+ * The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_email), 64);
-
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_email),
+ on_entry_max, self);
/* Signature button: */
if (!self->button_signature)
self->button_signature, NULL, HILDON_CAPTION_OPTIONAL);
hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
gtk_widget_show (self->button_signature);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
g_signal_connect (G_OBJECT (self->button_signature), "clicked",
static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
/* The incoming server widgets: */
if(!self->entry_incomingserver)
self->entry_incomingserver = gtk_entry_new ();
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL);
if (self->caption_incoming)
gtk_widget_destroy (self->caption_incoming);
"Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_incomingserver);
connect_for_modified (self, self->entry_incomingserver);
- gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_incoming);
/* The secure connection widgets: */
self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_incoming_security);
connect_for_modified (self, self->combo_incoming_security);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Show a default port number when the security method changes, as per the UI spec: */
self->entry_incoming_port, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_incoming_port);
connect_for_modified (self, self->entry_incoming_port);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The secure authentication widgets: */
if(!self->checkbox_incoming_auth)
- self->checkbox_incoming_auth =
- gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, 2);
+ self->checkbox_incoming_auth = gtk_check_button_new ();
+ caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
+ self->checkbox_incoming_auth, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->checkbox_incoming_auth);
connect_for_modified (self, self->checkbox_incoming_auth);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
gtk_widget_show (GTK_WIDGET (box));
static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
/* The outgoing server widgets: */
if (!self->entry_outgoingserver)
self->entry_outgoingserver = gtk_entry_new ();
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup,
_("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoingserver);
connect_for_modified (self, self->entry_outgoingserver);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The secure authentication widgets: */
self->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_auth);
connect_for_modified (self, self->combo_outgoing_auth);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */
g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self);
/* The username widgets: */
- self->entry_outgoing_username = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_outgoing_username = GTK_WIDGET (modest_validating_entry_new ());
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_username), HILDON_GTK_INPUT_MODE_FULL);
self->caption_outgoing_username = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"),
self->entry_outgoing_username, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_outgoing_username);
connect_for_modified (self, self->entry_outgoing_username);
- gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_outgoing_username);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- easysetup_validating_entry_set_unallowed_characters_whitespace (
- EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username));
+ modest_validating_entry_set_unallowed_characters_whitespace (
+ MODEST_VALIDATING_ENTRY (self->entry_outgoing_username));
/* Set max length as in the UI spec:
- * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+ * The UI spec seems to want us to show a dialog if we hit the maximum. */
gtk_entry_set_max_length (GTK_ENTRY (self->entry_outgoing_username), 64);
-
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_outgoing_username),
+ on_entry_max, self);
+
/* The password widgets: */
self->entry_outgoing_password = gtk_entry_new ();
+ /* Auto-capitalization is the default, so let's turn it off: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_password), HILDON_GTK_INPUT_MODE_FULL);
gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */
self->caption_outgoing_password = create_caption_new_with_asterix (self, sizegroup,
_("mail_fi_password"), self->entry_outgoing_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoing_password);
connect_for_modified (self, self->entry_outgoing_password);
- gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_outgoing_password);
/* The secure connection widgets: */
self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_security);
connect_for_modified (self, self->combo_outgoing_security);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Show a default port number when the security method changes, as per the UI spec: */
self->entry_outgoing_port, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoing_port);
connect_for_modified (self, self->entry_outgoing_port);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
GtkWidget *separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (separator);
/* connection-specific checkbox: */
if (!self->checkbox_outgoing_smtp_specific) {
- self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp"));
+ self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific),
FALSE);
}
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
+ caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"),
+ self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->checkbox_outgoing_smtp_specific);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
connect_for_modified (self, self->checkbox_outgoing_smtp_specific);
/* Connection-specific SMTP-Severs Edit button: */
self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
gtk_widget_show (self->button_outgoing_smtp_servers);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Only enable the button when the checkbox is checked: */
GtkDialog *dialog = GTK_DIALOG (self);
gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook));
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF);
gtk_widget_show (GTK_WIDGET (notebook));
/* Add the buttons: */
MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */);
if (!test)
return FALSE;
+
+ /* Signature: */
+ if (dialog->signature_dialog) {
+ gboolean use_signature = FALSE;
+ gchar *signature = modest_signature_editor_dialog_get_settings (
+ MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog),
+ &use_signature);
+
+ modest_account_mgr_set_signature(dialog->account_manager, account_name,
+ signature, use_signature);
+ g_free (signature);
+ }
gchar *retrieve = modest_retrieve_combo_box_get_active_retrieve_conf (
MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve));
projects / modest / blobdiff