X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-account-settings-dialog.c;h=4001977949c168d80a116d0828e48550d1956104;hp=4df00826006022c099ad58aaa319e6f6d539c561;hb=193d70ae22fc51b52d327e63791a025d5a4dcba8;hpb=a7a13999485be2916dc3611ce7a2abc93de1d6fe diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 4df0082..4001977 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -139,10 +139,7 @@ modest_account_settings_dialog_finalize (GObject *object) } static void -show_error (GtkWindow *parent_window, const gchar* text); - -static void -show_ok (GtkWindow *parent_window, const gchar* text); +show_error (GtkWidget *parent_widget, const gchar* text); static void on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data); @@ -171,21 +168,32 @@ on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data) self->modified = TRUE; } +static void +on_modified_number_editor_changed (HildonNumberEditor *number_editor, gint new_value, gpointer user_data) +{ + ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); + self->modified = TRUE; +} + /* Set a modified boolean whenever the widget is changed, * so we can check for it later. */ static void connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget) { - if (GTK_IS_ENTRY (widget)) { - g_signal_connect (G_OBJECT (widget), "changed", - G_CALLBACK (on_modified_entry_changed), self); + if (HILDON_IS_NUMBER_EDITOR (widget)) { + g_signal_connect (G_OBJECT (widget), "notify::value", + G_CALLBACK (on_modified_number_editor_changed), self); + } + else if (GTK_IS_ENTRY (widget)) { + g_signal_connect (G_OBJECT (widget), "changed", + G_CALLBACK (on_modified_entry_changed), self); } else if (GTK_IS_COMBO_BOX (widget)) { g_signal_connect (G_OBJECT (widget), "changed", - G_CALLBACK (on_modified_combobox_changed), self); + G_CALLBACK (on_modified_combobox_changed), self); } else if (GTK_IS_TOGGLE_BUTTON (widget)) { g_signal_connect (G_OBJECT (widget), "toggled", - G_CALLBACK (on_modified_checkbox_toggled), self); + G_CALLBACK (on_modified_checkbox_toggled), self); } } @@ -246,12 +254,23 @@ static GtkWidget* create_caption_new_with_asterisk(ModestAccountSettingsDialog * return caption; } +static void +on_entry_invalid_character (ModestValidatingEntry *self, const gchar* character, gpointer user_data) +{ + /* ModestEasysetupWizardDialog *dialog = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); */ + /* We could add a special case for whitespace here + if (character == NULL) ... + */ + /* TODO: Should this show just this one bad character or all the not-allowed characters? */ + gchar *message = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), character); + show_error (GTK_WIDGET (self), message); +} 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")); + /* ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data); */ + show_error (GTK_WIDGET (self), _CS("ckdg_ib_maximum_characters_reached")); } static GtkWidget* @@ -296,6 +315,8 @@ create_page_account_details (ModestAccountSettingsDialog *self) modest_validating_entry_set_unallowed_characters ( MODEST_VALIDATING_ENTRY (self->entry_account_title), list_prevent); g_list_free (list_prevent); + modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(self->entry_account_title), + on_entry_invalid_character, self); /* Set max length as in the UI spec: * The UI spec seems to want us to show a dialog if we hit the maximum. */ @@ -379,11 +400,15 @@ static GtkWidget* create_page_user_details (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkAdjustment *focus_adjustment = NULL; /* 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. * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */ GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + GtkWidget *scrollwin = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The name widgets: */ self->entry_user_name = GTK_WIDGET (modest_validating_entry_new ()); @@ -478,8 +503,13 @@ create_page_user_details (ModestAccountSettingsDialog *self) G_CALLBACK (on_button_signature), self); gtk_widget_show (GTK_WIDGET (box)); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box); + gtk_widget_show (scrollwin); + + focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - return GTK_WIDGET (box); + return GTK_WIDGET (scrollwin); } /** Change the caption title for the incoming server, @@ -564,7 +594,7 @@ 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 (hildon_number_editor_new (0, 65535)); + self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (1, 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); @@ -676,6 +706,13 @@ on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) { GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + GtkAdjustment *focus_adjustment = NULL; + + /* Put it all in a scrolled window, so that all widgets can be + * accessed even when the on-screen keyboard is visible: */ + GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* 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. @@ -762,7 +799,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) /* The port widgets: */ if (!self->entry_outgoing_port) - self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 65535)); + self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (1, 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); @@ -805,10 +842,18 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) G_CALLBACK (on_button_outgoing_smtp_servers), self); gtk_widget_show (GTK_WIDGET (box)); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box); + gtk_widget_show(scrollwin); + + focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); + gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - return GTK_WIDGET (box); + return GTK_WIDGET (scrollwin); } + + + static gboolean check_data (ModestAccountSettingsDialog *self) { @@ -824,18 +869,18 @@ check_data (ModestAccountSettingsDialog *self) if (name_in_use) { /* Warn the user via a dialog: */ - show_error (GTK_WINDOW (self), _("mail_ib_account_name_already_existing")); + hildon_banner_show_information(NULL, NULL, _("mail_ib_account_name_already_existing")); return FALSE; } } - - /* Check that the email address is valud: */ + + /* Check that the email address is valid: */ const gchar* email_address = gtk_entry_get_text (GTK_ENTRY (self->entry_user_email)); if ((!email_address) || (strlen(email_address) == 0)) return FALSE; - if (!modest_text_utils_validate_email_address (email_address)) { + if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); @@ -846,8 +891,39 @@ check_data (ModestAccountSettingsDialog *self) return FALSE; } - /* Find a suitable authentication method when secure authentication is desired */ + /* make sure the domain name for the incoming server is valid */ const gchar* hostname = gtk_entry_get_text (GTK_ENTRY (self->entry_incomingserver)); + if ((!hostname) || (strlen(hostname) == 0)) + return FALSE; + if (!modest_text_utils_validate_domain_name (hostname)) { + /* Warn the user via a dialog: */ + /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ + hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername")); + + /* Return focus to the email address entry: */ + gtk_widget_grab_focus (self->entry_incomingserver); + gtk_editable_select_region (GTK_EDITABLE (self->entry_incomingserver), 0, -1); + return FALSE; + } + + /* make sure the domain name for the outgoing server is valid */ + const gchar* hostname2 = gtk_entry_get_text (GTK_ENTRY (self->entry_outgoingserver)); + if ((!hostname2) || (strlen(hostname2) == 0)) + return FALSE; + if (!modest_text_utils_validate_domain_name (hostname2)) { + /* Warn the user via a dialog: */ + /*show_error (GTK_WINDOW (self), _("mcen_ib_invalid_email"));*/ + hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername")); + + /* Return focus to the email address entry: */ + gtk_widget_grab_focus (self->entry_outgoingserver); + gtk_editable_select_region (GTK_EDITABLE (self->entry_outgoingserver), 0, -1); + return FALSE; + } + + + /* Find a suitable authentication method when secure authentication is desired */ + gint port_num = hildon_number_editor_get_value ( HILDON_NUMBER_EDITOR (self->entry_incoming_port)); const gchar* username = gtk_entry_get_text (GTK_ENTRY (self->entry_user_username)); @@ -887,14 +963,12 @@ check_data (ModestAccountSettingsDialog *self) if(error == NULL || error->domain != modest_maemo_utils_get_supported_secure_authentication_error_quark() || error->code != MODEST_MAEMO_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED) { - GtkWidget* error_dialog = gtk_message_dialog_new(GTK_WINDOW(self), - GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, (error != NULL) ? error->message : _("Server does not support secure authentication!")); - gtk_dialog_run(GTK_DIALOG(error_dialog)); - gtk_widget_destroy(error_dialog); + show_error (GTK_WIDGET (self), _("Could not discover supported secure authentication methods.")); } - if(error != NULL) g_error_free(error); + if(error != NULL) + g_error_free(error); + /* This is a nasty hack. jschmid. */ /* Don't let the dialog close */ /*g_signal_stop_emission_by_name (dialog, "response");*/ @@ -903,10 +977,9 @@ check_data (ModestAccountSettingsDialog *self) } } - /* TODO: The UI Spec wants us to check that the servernames are valid, - * but does not specify how. - */ - + + + return TRUE; } /* @@ -920,7 +993,7 @@ on_response (GtkDialog *wizard_dialog, enable_buttons (self); gboolean prevent_response = FALSE; - + /* Warn about unsaved changes: */ if (response_id == GTK_RESPONSE_CANCEL && self->modified) { GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), @@ -958,10 +1031,10 @@ on_response (GtkDialog *wizard_dialog, const gboolean enabled = modest_account_mgr_get_enabled (self->account_manager, self->account_name); if (enabled) - show_ok (GTK_WINDOW (self), _("mcen_ib_advsetup_settings_saved")); + show_error (GTK_WIDGET (self), _("mcen_ib_advsetup_settings_saved")); } else - show_error (GTK_WINDOW (self), _("mail_ib_setting_failed")); + show_error (GTK_WIDGET (self), _("mail_ib_setting_failed")); } } } @@ -971,7 +1044,7 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) { /* Create the notebook to be used by the GtkDialog base class: * Each page of the notebook will be a page of the wizard: */ - GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new()); + self->notebook = GTK_NOTEBOOK (gtk_notebook_new()); /* Get the account manager object, * so we can check for existing accounts, @@ -990,19 +1063,19 @@ modest_account_settings_dialog_init (ModestAccountSettingsDialog *self) self->page_outgoing = create_page_outgoing (self); /* Add the notebook pages: */ - gtk_notebook_append_page (notebook, self->page_account_details, + gtk_notebook_append_page (self->notebook, self->page_account_details, gtk_label_new (_("mcen_ti_account_settings_account"))); - gtk_notebook_append_page (notebook, self->page_user_details, + gtk_notebook_append_page (self->notebook, self->page_user_details, gtk_label_new (_("mcen_ti_account_settings_userinfo"))); - gtk_notebook_append_page (notebook, self->page_incoming, + gtk_notebook_append_page (self->notebook, self->page_incoming, gtk_label_new (_("mcen_ti_advsetup_retrieval"))); - gtk_notebook_append_page (notebook, self->page_outgoing, + gtk_notebook_append_page (self->notebook, self->page_outgoing, gtk_label_new (_("mcen_ti_advsetup_sending"))); GtkDialog *dialog = GTK_DIALOG (self); - gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook)); + gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (self->notebook)); gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF); - gtk_widget_show (GTK_WIDGET (notebook)); + gtk_widget_show (GTK_WIDGET (self->notebook)); /* Add the buttons: */ gtk_dialog_add_button (GTK_DIALOG(self), GTK_STOCK_OK, GTK_RESPONSE_OK); @@ -1242,6 +1315,24 @@ void modest_account_settings_dialog_set_account_name (ModestAccountSettingsDialo dialog->modified = FALSE; } +/** Show the User Info tab. + */ +void modest_account_settings_dialog_switch_to_user_info (ModestAccountSettingsDialog *dialog) +{ + const gint page_num = gtk_notebook_page_num (dialog->notebook, dialog->page_user_details); + if (page_num == -1) { + g_warning ("%s: notebook page not found.\n", __FUNCTION__); + } + + /* Ensure that the widget is visible so that gtk_notebook_set_current_page() works: */ + /* TODO: even this hack (recommened by the GTK+ documentation) doesn't seem to work. */ + + gtk_widget_show (dialog->page_user_details); + gtk_widget_show (GTK_WIDGET (dialog->notebook)); + gtk_widget_show (GTK_WIDGET (dialog)); + gtk_notebook_set_current_page (dialog->notebook, page_num); +} + static gboolean save_configuration (ModestAccountSettingsDialog *dialog) { @@ -1442,29 +1533,21 @@ modest_account_settings_dialog_class_init (ModestAccountSettingsDialogClass *kla } static void -show_error (GtkWindow *parent_window, const gchar* text) +show_error (GtkWidget *parent_widget, const gchar* text) { - GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); - /* - GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, - (GtkDialogFlags)0, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, - text )); - */ + hildon_banner_show_information(parent_widget, NULL, text); +#if 0 + GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_widget, text); + /* + GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window, + (GtkDialogFlags)0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + text )); + */ + gtk_dialog_run (dialog); gtk_widget_destroy (GTK_WIDGET (dialog)); +#endif } - -static void -show_ok (GtkWindow *parent_window, const gchar* text) -{ - /* Don't show a dialog but Banner (NB #59248) */ - hildon_banner_show_information(GTK_WIDGET( - gtk_widget_get_parent_window(GTK_WIDGET(parent_window))), NULL, text); -} - - - -