X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=bf542636b697e3b2f7d2a32f7472cea693741187;hp=9223814b98a51bceeeeb48e1589074c8aa620f74;hb=aab65ff35930f7c7d33ec080ae179f09150fabe2;hpb=8851083b87e5c361877461d5b65cdfb866d3b443 diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 9223814..bf54263 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -16,12 +16,10 @@ #include #include #include -#include "maemo/easysetup/modest-easysetup-country-combo-box.h" -#include "maemo/easysetup/modest-easysetup-provider-combo-box.h" -#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h" -#include "maemo/easysetup/modest-easysetup-serversecurity-combo-box.h" -#include "maemo/easysetup/modest-easysetup-secureauth-combo-box.h" -#include "maemo/easysetup/modest-validating-entry.h" +#include +#include "widgets/modest-serversecurity-combo-box.h" +#include "widgets/modest-secureauth-combo-box.h" +#include "widgets/modest-validating-entry.h" #include "widgets/modest-retrieve-combo-box.h" #include "widgets/modest-limit-retrieve-combo-box.h" #include "modest-text-utils.h" @@ -29,6 +27,8 @@ #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 #include #include /* For strlen(). */ @@ -96,6 +96,12 @@ modest_account_settings_dialog_finalize (GObject *object) if (self->account_manager) g_object_unref (G_OBJECT (self->account_manager)); + + 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); } @@ -210,12 +216,20 @@ static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *s return caption; } + +static void +on_entry_max (EasysetupValidatingEntry *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. @@ -229,7 +243,7 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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, @@ -251,8 +265,10 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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); + easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), + on_entry_max, self); /* The retrieve combobox: */ self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ()); @@ -260,7 +276,7 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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: */ @@ -269,14 +285,14 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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); + gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->checkbox_leave_messages); connect_for_modified (self, self->checkbox_leave_messages); @@ -288,13 +304,43 @@ create_page_account_details (ModestAccountSettingsDialog *self) 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. @@ -303,14 +349,18 @@ create_page_user_details (ModestAccountSettingsDialog *self) /* The name widgets: */ self->entry_user_name = GTK_WIDGET (easysetup_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); + easysetup_validating_entry_set_max_func (EASYSETUP_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, @@ -324,11 +374,13 @@ create_page_user_details (ModestAccountSettingsDialog *self) /* The username widgets: */ self->entry_user_username = GTK_WIDGET (easysetup_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, @@ -337,42 +389,50 @@ create_page_user_details (ModestAccountSettingsDialog *self) EASYSETUP_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); + easysetup_validating_entry_set_max_func (EASYSETUP_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 ()); + /* 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); - + easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_user_email), + on_entry_max, self); /* Signature button: */ if (!self->button_signature) - self->button_signature = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit")); + self->button_signature = gtk_button_new_with_label (_("mcen_bd_edit")); caption = hildon_caption_new (sizegroup, _("mcen_fi_email_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", @@ -409,13 +469,13 @@ static void update_incoming_server_security_choices (ModestAccountSettingsDialog { /* Fill the combo with appropriately titled choices for POP or IMAP. */ /* The choices are the same, but the titles are different, as in the UI spec. */ - easysetup_serversecurity_combo_box_fill ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol); + modest_serversecurity_combo_box_fill ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol); } 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. @@ -425,6 +485,8 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) /* 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); @@ -436,18 +498,18 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) "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: */ /* This will be filled by update_incoming_server_security_choices(). */ if (!self->combo_incoming_security) - self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ()); + self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); GtkWidget *caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 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: */ @@ -457,19 +519,19 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) /* The port widgets: */ /* TODO: There are various rules about this in the UI spec. */ if (!self->entry_incoming_port) - self->entry_incoming_port = GTK_WIDGET (gtk_entry_new ()); + self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), 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); + gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->checkbox_incoming_auth); connect_for_modified (self, self->checkbox_incoming_auth); @@ -499,29 +561,24 @@ enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button) /* Set the starting sensitivity: */ on_toggle_button_changed (button, widget); } - -static void -on_smtp_servers_window_hide (GtkWindow *window, gpointer user_data) -{ - /* Destroy the window when it is closed: */ - gtk_widget_destroy (GTK_WIDGET (window)); -} static void on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) { - ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); - /* Show the window: */ - /* TODO: Retrieve the chosen settings, - * so we can supply them when creating the connection somehow. - */ - GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); - gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window)); - g_signal_connect (G_OBJECT (window), "hide", - G_CALLBACK (on_smtp_servers_window_hide), self); - gtk_widget_show (window); + /* Create the window if necessary: */ + if (!(self->specific_window)) { + self->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ()); + modest_connection_specific_smtp_window_fill_with_connections ( + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager, + self->account_name); + } + + /* Show the window: */ + gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self)); + gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE); + gtk_widget_show (self->specific_window); } static void @@ -530,8 +587,8 @@ on_combo_outgoing_auth_changed (GtkComboBox *widget, gpointer user_data) ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); ModestProtocol protocol_security = - easysetup_secureauth_combo_box_get_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth)); + modest_secureauth_combo_box_get_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth)); const gboolean secureauth_used = protocol_security != MODEST_PROTOCOL_AUTH_NONE; gtk_widget_set_sensitive (self->caption_outgoing_username, secureauth_used); @@ -544,13 +601,12 @@ on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data) ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); const gint port_number = - easysetup_serversecurity_combo_box_get_active_serversecurity_port ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security)); + modest_serversecurity_combo_box_get_active_serversecurity_port ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security)); if(port_number != 0) { - gchar* str = g_strdup_printf ("%d", port_number); - gtk_entry_set_text (GTK_ENTRY (self->entry_outgoing_port), str); - g_free (str); + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (self->entry_outgoing_port), port_number); } } @@ -560,20 +616,19 @@ on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); const gint port_number = - easysetup_serversecurity_combo_box_get_active_serversecurity_port ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security)); + modest_serversecurity_combo_box_get_active_serversecurity_port ( + MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security)); if(port_number != 0) { - gchar* str = g_strdup_printf ("%d", port_number); - gtk_entry_set_text (GTK_ENTRY (self->entry_incoming_port), str); - g_free (str); + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (self->entry_incoming_port), port_number); } } 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. @@ -583,21 +638,23 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* 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: */ if (!self->combo_outgoing_auth) - self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ()); + self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ()); caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 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: */ @@ -605,11 +662,13 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* The username widgets: */ self->entry_outgoing_username = GTK_WIDGET (easysetup_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, @@ -618,31 +677,35 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) EASYSETUP_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); - + easysetup_validating_entry_set_max_func (EASYSETUP_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: */ - /* This will be filled and set with easysetup_serversecurity_combo_box_fill() - * and easysetup_serversecurity_combo_box_set_active_serversecurity(). + /* This will be filled and set with modest_serversecurity_combo_box_fill() + * and modest_serversecurity_combo_box_set_active_serversecurity(). */ if (!self->combo_outgoing_security) - self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ()); + self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ()); caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), 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: */ @@ -650,31 +713,36 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* The port widgets: */ if (!self->entry_outgoing_port) - self->entry_outgoing_port = GTK_WIDGET (gtk_entry_new ()); + self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), 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, 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")); 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); + gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (self->checkbox_outgoing_smtp_specific); connect_for_modified (self, self->checkbox_outgoing_smtp_specific); /* Connection-specific SMTP-Severs Edit button: */ if (!self->button_outgoing_smtp_servers) - self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit")); + self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit")); caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 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: */ @@ -817,6 +885,7 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) 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: */ @@ -934,22 +1003,13 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo const ModestProtocol security = modest_server_account_get_security ( dialog->account_manager, incoming_account->account_name); - easysetup_serversecurity_combo_box_set_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security); + modest_serversecurity_combo_box_set_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security); const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name, MODEST_ACCOUNT_PORT, TRUE /* server account */); - gchar *port_str = g_strdup_printf ("%d", port_num); - gtk_entry_set_text (GTK_ENTRY (dialog->entry_incoming_port), port_str); - g_free (port_str); - - /* TODO: - gchar *uri; - ModestProtocol proto; - gchar *password; - time_t last_updated; - GSList *options; - */ + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (dialog->entry_incoming_port), port_num); } @@ -966,24 +1026,23 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo /* Get the secure-auth setting: */ const ModestProtocol secure_auth = modest_server_account_get_secure_auth( dialog->account_manager, outgoing_account->account_name); - easysetup_secureauth_combo_box_set_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth); + modest_secureauth_combo_box_set_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth); on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog); - easysetup_serversecurity_combo_box_fill ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto); + modest_serversecurity_combo_box_fill ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto); /* Get the security setting: */ const ModestProtocol security = modest_server_account_get_security ( dialog->account_manager, outgoing_account->account_name); - easysetup_serversecurity_combo_box_set_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security); + modest_serversecurity_combo_box_set_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security); const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name, MODEST_ACCOUNT_PORT, TRUE /* server account */); - gchar *port_str = g_strdup_printf ("%d", port_num); - gtk_entry_set_text (GTK_ENTRY (dialog->entry_outgoing_port), port_str); - g_free (port_str); + hildon_number_editor_set_value ( + HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port), port_num); } /* account_data->is_enabled, */ @@ -1016,6 +1075,18 @@ save_configuration (ModestAccountSettingsDialog *dialog) 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)); @@ -1063,15 +1134,13 @@ save_configuration (ModestAccountSettingsDialog *dialog) : MODEST_PROTOCOL_AUTH_NONE; modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming); - const ModestProtocol protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security)); + const ModestProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security)); modest_server_account_set_security (dialog->account_manager, incoming_account_name, protocol_security_incoming); /* port: */ - const gchar* port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incoming_port)); - gint port_num = 0; - if (port_str) - port_num = atoi (port_str); + gint port_num = hildon_number_editor_get_value ( + HILDON_NUMBER_EDITOR (dialog->entry_incoming_port)); modest_account_mgr_set_int (dialog->account_manager, incoming_account_name, MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */); @@ -1100,19 +1169,17 @@ save_configuration (ModestAccountSettingsDialog *dialog) if (!test) return FALSE; - const ModestProtocol protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity ( - EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security)); + const ModestProtocol protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity ( + MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security)); modest_server_account_set_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing); - const ModestProtocol protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth ( - EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth)); + const ModestProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth ( + MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth)); modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing); /* port: */ - port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_port)); - port_num = 0; - if (port_str) - port_num = atoi (port_str); + port_num = hildon_number_editor_get_value ( + HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port)); modest_account_mgr_set_int (dialog->account_manager, outgoing_account_name, MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */); @@ -1132,7 +1199,12 @@ save_configuration (ModestAccountSettingsDialog *dialog) return FALSE; } - return TRUE; + /* Save connection-specific SMTP server accounts: */ + if (dialog->specific_window) + return modest_connection_specific_smtp_window_save_server_accounts ( + MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name); + else + return TRUE; } static gboolean entry_is_empty (GtkWidget *entry)