X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-default-account-settings-dialog.c;h=618173da0d82015b4fc78fe4ae2c3693e3931a56;hb=203160042b2f384117aebc8f02321d08c4becbf3;hp=8a61537d87b374425224eb6800abef647c3b3992;hpb=63eedb5569e6bbed4df2e871d7397bb6a974aa43;p=modest diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 8a61537..618173d 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -33,16 +33,12 @@ #include #include #include -#include #include #include #include "modest-hildon-includes.h" #include "modest-default-account-settings-dialog.h" #include "modest-account-mgr.h" -#include "modest-secureauth-picker.h" #include "widgets/modest-validating-entry.h" -#include "modest-retrieve-picker.h" -#include "modest-limit-retrieve-picker.h" #include "modest-text-utils.h" #include "modest-account-mgr.h" #include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */ @@ -58,6 +54,8 @@ #include "widgets/modest-ui-constants.h" #include #include +#include +#include #include #include /* For strlen(). */ @@ -71,6 +69,9 @@ #define PORT_MIN 1 #define PORT_MAX 65535 +#define RESPONSE_DELETE_DUMMY 1 +#define RESPONSE_SIGNATURE_DUMMY 2 + static void modest_account_settings_dialog_init (gpointer g, gpointer iface_data); G_DEFINE_TYPE_EXTENDED (ModestDefaultAccountSettingsDialog, @@ -104,8 +105,6 @@ struct _ModestDefaultAccountSettingsDialogPrivate GtkWidget *page_account_details; GtkWidget *entry_account_title; - GtkWidget *retrieve_picker; - GtkWidget *limit_retrieve_picker; GtkWidget *checkbox_leave_messages; GtkWidget *page_user_details; @@ -113,7 +112,6 @@ struct _ModestDefaultAccountSettingsDialogPrivate GtkWidget *entry_user_username; GtkWidget *entry_user_password; GtkWidget *entry_user_email; -/* GtkWidget *entry_incoming_port; */ GtkWidget *button_signature; GtkWidget *button_delete; @@ -140,6 +138,10 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self); static gboolean save_configuration (ModestDefaultAccountSettingsDialog *dialog); +static void on_missing_mandatory_data (ModestSecurityOptionsView *security_view, + gboolean missing, + gpointer user_data); + static const gchar * null_means_empty (const gchar * str); static const gchar * @@ -203,22 +205,22 @@ on_modified_entry_changed (GtkEditable *editable, gpointer user_data) } static void -on_modified_checkbutton_toggled (GtkButton *button, gpointer user_data) +on_modified_checkbutton_toggled (GtkWidget *button, gpointer user_data) { set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE); } static void -on_modified_number_editor_changed (ModestNumberEditor *number_editor, gint new_value, gpointer user_data) +on_modified_number_entry_changed (GtkWidget *number_entry, gint new_value, gpointer user_data) { set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE); } static void -on_number_editor_notify (ModestNumberEditor *editor, GParamSpec *arg1, gpointer user_data) +on_number_entry_notify (GtkWidget *entry, GParamSpec *arg1, gpointer user_data) { ModestDefaultAccountSettingsDialog *dialog = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); - gint value = modest_number_editor_get_value (editor); + gint value = modest_number_entry_get_value (entry); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0); } @@ -229,10 +231,10 @@ on_number_editor_notify (ModestNumberEditor *editor, GParamSpec *arg1, gpointer static void connect_for_modified (ModestDefaultAccountSettingsDialog *self, GtkWidget *widget) { - if (MODEST_IS_NUMBER_EDITOR (widget)) { + if (modest_is_number_entry (widget)) { g_signal_connect (G_OBJECT (widget), "notify::value", - G_CALLBACK (on_modified_number_editor_changed), self); - g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_editor_notify), self); + G_CALLBACK (on_modified_number_entry_changed), self); + g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_entry_notify), self); } else if (GTK_IS_ENTRY (widget)) { g_signal_connect (G_OBJECT (widget), "changed", @@ -240,7 +242,7 @@ connect_for_modified (ModestDefaultAccountSettingsDialog *self, GtkWidget *widge } else if (HILDON_IS_PICKER_BUTTON (widget)) { g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (on_modified_picker_changed), self); - } else if (HILDON_IS_CHECK_BUTTON (widget)) { + } else if (modest_is_togglable (widget)) { g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (on_modified_checkbutton_toggled), self); } @@ -265,8 +267,9 @@ create_captioned (ModestDefaultAccountSettingsDialog *self, GtkWidget *result; - result = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, - label_text, use_markup, control); + result = modest_toolkit_utils_create_captioned_with_size_type (title_sizegroup, value_sizegroup, + label_text, use_markup, control, + MODEST_EDITABLE_SIZE); /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -317,18 +320,16 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data) } static GtkWidget* -create_page_account_details (ModestDefaultAccountSettingsDialog *self) +create_page_account_details (ModestDefaultAccountSettingsDialog *self, + GtkSizeGroup *title_sizegroup, + GtkSizeGroup *value_sizegroup) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup* title_sizegroup; - GtkSizeGroup* value_sizegroup; GtkWidget *hbox; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The description widgets: */ priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); @@ -369,43 +370,17 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) on_entry_max, self); hbox = gtk_hbox_new (TRUE, 0); - /* The retrieve picker: */ - priv->retrieve_picker = GTK_WIDGET (modest_retrieve_picker_new (MODEST_EDITABLE_SIZE, - HILDON_BUTTON_ARRANGEMENT_VERTICAL)); - modest_maemo_utils_set_vbutton_layout (title_sizegroup, - _("mcen_fi_advsetup_retrievetype"), priv->retrieve_picker); - - gtk_widget_show (priv->retrieve_picker); - connect_for_modified (self, priv->retrieve_picker); - gtk_box_pack_start (GTK_BOX (hbox), priv->retrieve_picker, TRUE, TRUE, 0); - - /* The limit-retrieve picker: */ - priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new (MODEST_EDITABLE_SIZE, - HILDON_BUTTON_ARRANGEMENT_VERTICAL)); - modest_maemo_utils_set_vbutton_layout (value_sizegroup, - _("mcen_fi_advsetup_limit_retrieve"), - priv->limit_retrieve_picker); - gtk_widget_show (priv->limit_retrieve_picker); - connect_for_modified (self, priv->limit_retrieve_picker); - gtk_box_pack_start (GTK_BOX (hbox), priv->limit_retrieve_picker, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0); - gtk_widget_show (hbox); /* The leave-messages widgets: */ if(!priv->checkbox_leave_messages) { priv->checkbox_leave_messages = - hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT); - gtk_button_set_label (GTK_BUTTON (priv->checkbox_leave_messages), - _("mcen_fi_advsetup_leave_on_server")); - gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_leave_messages), 0.0, 0.5); + modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (), + _("mcen_fi_advsetup_leave_on_server")); } connect_for_modified (self, priv->checkbox_leave_messages); gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, 0); gtk_widget_show (priv->checkbox_leave_messages); - g_object_unref (title_sizegroup); - g_object_unref (value_sizegroup); - gtk_widget_show (GTK_WIDGET (box)); return GTK_WIDGET (box); @@ -441,19 +416,17 @@ get_entered_account_title (ModestDefaultAccountSettingsDialog *dialog) static void -on_button_signature (GtkButton *button, gpointer user_data) +signature_button_clicked (ModestDefaultAccountSettingsDialog *self) { - ModestDefaultAccountSettingsDialog *self; gint response; ModestDefaultAccountSettingsDialogPrivate *priv; - self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); /* Create the window, if necessary: */ if (!(priv->signature_dialog)) { priv->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ()); - + gboolean use_signature = modest_account_settings_get_use_signature (priv->settings); const gchar *signature = modest_account_settings_get_signature(priv->settings); gchar* account_title = get_entered_account_title (self); @@ -482,15 +455,13 @@ on_button_signature (GtkButton *button, gpointer user_data) } } -static void -on_button_delete (GtkButton *button, gpointer user_data) +static gboolean +delete_button_clicked (ModestDefaultAccountSettingsDialog *self) { - ModestDefaultAccountSettingsDialog *self; ModestDefaultAccountSettingsDialogPrivate *priv; gchar *account_title; gboolean removed; - self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); if (priv->modified) @@ -503,30 +474,28 @@ on_button_delete (GtkButton *button, gpointer user_data) (const gchar *) account_title); g_free (account_title); - /* Close window */ - if (removed) - gtk_widget_destroy (GTK_WIDGET (self)); + return removed; } static GtkWidget* -create_page_user_details (ModestDefaultAccountSettingsDialog *self) +create_page_user_details (ModestDefaultAccountSettingsDialog *self, + GtkSizeGroup *title_sizegroup, + GtkSizeGroup *value_sizegroup) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup* title_sizegroup; - GtkSizeGroup* value_sizegroup; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - + /* The name widgets: */ priv->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 (priv->entry_user_name), HILDON_GTK_INPUT_MODE_FULL); + hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_name), + HILDON_GTK_INPUT_MODE_FULL | + HILDON_GTK_INPUT_MODE_AUTOCAP); /* Set max length as in the UI spec: * The UI spec seems to want us to show a dialog if we hit the maximum. */ gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64); @@ -579,7 +548,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) on_entry_max, self); /* The password widgets: */ - priv->entry_user_password = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + priv->entry_user_password = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); @@ -612,26 +581,17 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) /* Delete button: */ if (!priv->button_delete) - priv->button_delete = gtk_button_new_with_label (_HL("wdgt_bd_delete")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->action_area), priv->button_delete, - FALSE, FALSE, 0); + priv->button_delete = gtk_dialog_add_button (GTK_DIALOG (self), + _HL("wdgt_bd_delete"), + RESPONSE_DELETE_DUMMY); /* Signature button: */ if (!priv->button_signature) - priv->button_signature = gtk_button_new_with_label (_("mcen_bd_email_signature")); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (self)->action_area), priv->button_signature, - FALSE, FALSE, 0); + priv->button_signature = gtk_dialog_add_button (GTK_DIALOG (self), + _("mcen_bd_email_signature"), + RESPONSE_SIGNATURE_DUMMY); gtk_widget_show (priv->button_signature); - g_object_unref (title_sizegroup); - g_object_unref (value_sizegroup); - - g_signal_connect (G_OBJECT (priv->button_signature), "clicked", - G_CALLBACK (on_button_signature), self); - - g_signal_connect (G_OBJECT (priv->button_delete), "clicked", - G_CALLBACK (on_button_delete), self); - gtk_widget_show (GTK_WIDGET (box)); return GTK_WIDGET (box); @@ -656,40 +616,36 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self, incomingserver_title = g_strconcat(_("mcen_li_emailsetup_servertype"), "*", "\n(", protocol_display_name, ")", NULL); - modest_maemo_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE); + modest_toolkit_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE); g_free (incomingserver_title); } -static GtkWidget* -create_page_incoming (ModestDefaultAccountSettingsDialog *self) +/* The size groups passed as arguments are only used by the security settings */ +static GtkWidget* +create_page_incoming (ModestDefaultAccountSettingsDialog *self, + GtkSizeGroup *security_title_sizegroup, + GtkSizeGroup *security_value_sizegroup) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup *title_sizegroup; - GtkSizeGroup *value_sizegroup; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - /* 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. */ - title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - + box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); + /* The incoming server widgets: */ if(!priv->entry_incomingserver) - priv->entry_incomingserver = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + priv->entry_incomingserver = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL); if (priv->caption_incoming) gtk_widget_destroy (priv->caption_incoming); - + /* The caption title will be updated in update_incoming_server_title(). * so this default text will never be seen: */ /* (Note: Changing the title seems pointless. murrayc) */ - priv->caption_incoming = create_captioned (self, title_sizegroup, value_sizegroup, + priv->caption_incoming = create_captioned (self, security_title_sizegroup, security_value_sizegroup, "Incoming Server", FALSE, priv->entry_incomingserver); gtk_widget_show (priv->entry_incomingserver); connect_for_modified (self, priv->entry_incomingserver); @@ -697,35 +653,36 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) gtk_widget_show (priv->caption_incoming); /* Incoming security widgets */ - priv->incoming_security = - modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING, - TRUE, title_sizegroup, value_sizegroup); - gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, + priv->incoming_security = + modest_toolkit_factory_create_security_options_view (modest_runtime_get_toolkit_factory (), + MODEST_SECURITY_OPTIONS_INCOMING, + TRUE, security_title_sizegroup, + security_value_sizegroup); + gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, FALSE, FALSE, 0); gtk_widget_show (priv->incoming_security); - - g_object_unref (title_sizegroup); - g_object_unref (value_sizegroup); gtk_widget_show (GTK_WIDGET (box)); - + g_signal_connect (priv->incoming_security, "missing-mandatory-data", + G_CALLBACK (on_missing_mandatory_data), self); + return GTK_WIDGET (box); } static void -on_check_button_clicked (GtkButton *button, gpointer user_data) +on_check_button_clicked (GtkWidget *button, gpointer user_data) { GtkWidget *widget = GTK_WIDGET (user_data); /* Enable the widget only if the check button is active: */ - const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button)); + const gboolean enable = modest_togglable_get_active (button); gtk_widget_set_sensitive (widget, enable); } /* Make the sensitivity of a widget depend on a check button. */ static void -enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button) +enable_widget_for_checkbutton (GtkWidget *widget, GtkWidget* button) { g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (on_check_button_clicked), widget); @@ -763,29 +720,24 @@ on_missing_mandatory_data (ModestSecurityOptionsView *security_view, !missing); } -static GtkWidget* -create_page_outgoing (ModestDefaultAccountSettingsDialog *self) +static GtkWidget* +create_page_outgoing (ModestDefaultAccountSettingsDialog *self, + GtkSizeGroup *security_title_sizegroup, + GtkSizeGroup *security_value_sizegroup) { ModestDefaultAccountSettingsDialogPrivate *priv; gchar *smtp_caption_label; GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - - /* 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 *title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - GtkSizeGroup *value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The outgoing server widgets: */ if (!priv->entry_outgoingserver) - priv->entry_outgoingserver = - hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + priv->entry_outgoingserver = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n(SMTP)", NULL); - GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup, + GtkWidget *caption = create_captioned (self, security_title_sizegroup, security_value_sizegroup, smtp_caption_label, TRUE, priv->entry_outgoingserver); g_free (smtp_caption_label); gtk_widget_show (priv->entry_outgoingserver); @@ -795,8 +747,10 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* Outgoing security widgets */ priv->outgoing_security = - modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING, - TRUE, title_sizegroup, value_sizegroup); + modest_toolkit_factory_create_security_options_view (modest_runtime_get_toolkit_factory (), + MODEST_SECURITY_OPTIONS_OUTGOING, + TRUE, security_title_sizegroup, + security_value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security, FALSE, FALSE, 0); gtk_widget_show (priv->outgoing_security); @@ -805,16 +759,16 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) GtkWidget *separator = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT); + hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO); gtk_widget_show (separator); /* connection-specific checkbox: */ if (!priv->checkbox_outgoing_smtp_specific) { - priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (MODEST_EDITABLE_SIZE); - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific), - FALSE); - gtk_button_set_label (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), - _("mcen_fi_advsetup_connection_smtp")); - gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), 0.0, 0.5); + priv->checkbox_outgoing_smtp_specific = + modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (), + _("mcen_fi_advsetup_connection_smtp")); + modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific, + FALSE); } gtk_widget_show (priv->checkbox_outgoing_smtp_specific); gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific, @@ -831,10 +785,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* Only enable the button when the checkbox is checked: */ enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers, - GTK_BUTTON (priv->checkbox_outgoing_smtp_specific)); - - g_object_unref (title_sizegroup); - g_object_unref (value_sizegroup); + priv->checkbox_outgoing_smtp_specific); g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked", G_CALLBACK (on_button_outgoing_smtp_servers), self); @@ -843,7 +794,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) return GTK_WIDGET (box); } - + static gboolean check_data (ModestDefaultAccountSettingsDialog *self) { @@ -859,23 +810,23 @@ check_data (ModestDefaultAccountSettingsDialog *self) account_title = get_entered_account_title (self); if (!account_title) return FALSE; /* Should be prevented already anyway. */ - - if (strcmp(account_title, priv->original_account_title) != 0) { + + if (g_strcmp0 (account_title, priv->original_account_title) != 0) { gboolean name_in_use; /* Check the changed title: */ name_in_use = modest_account_mgr_account_with_display_name_exists (priv->account_manager, account_title); - + if (name_in_use) { /* Warn the user via a dialog: */ modest_platform_information_banner(NULL, NULL, _("mail_ib_account_name_already_existing")); - + g_free (account_title); return FALSE; } } - + g_free (account_title); account_title = NULL; @@ -884,7 +835,7 @@ check_data (ModestDefaultAccountSettingsDialog *self) if ((!email_address) || (strlen(email_address) == 0)) { return FALSE; } - + if (!modest_text_utils_validate_email_address (email_address, NULL)) { /* Warn the user via a dialog: */ modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_email")); @@ -960,6 +911,21 @@ on_response (GtkDialog *wizard_dialog, gboolean prevent_response = FALSE, sec_changed; ModestSecurityOptionsView *incoming_sec, *outgoing_sec; + /* Dummy and delete buttons have a response id because they're + added with gtk_dialog_add_button in order to get the proper + theme */ + if (response_id == RESPONSE_SIGNATURE_DUMMY) { + signature_button_clicked (self); + g_signal_stop_emission_by_name (wizard_dialog, "response"); + return; + } + + if (response_id == RESPONSE_DELETE_DUMMY) { + if (!delete_button_clicked (self)) + g_signal_stop_emission_by_name (wizard_dialog, "response"); + return; + } + priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); enable_buttons (self); @@ -989,7 +955,6 @@ on_response (GtkDialog *wizard_dialog, } if (prevent_response) { - /* This is a nasty hack. murrayc. */ /* Don't let the dialog close */ g_signal_stop_emission_by_name (wizard_dialog, "response"); return; @@ -1041,9 +1006,12 @@ static void modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; - GtkWidget *pannable; + GtkWidget *scrollable; GtkWidget *separator; GtkWidget *align; + GtkSizeGroup* account_title_sizegroup; + GtkSizeGroup* account_value_sizegroup; + GtkSizeGroup *sec_title_sizegroup, *sec_value_sizegroup; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self); @@ -1059,16 +1027,28 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog priv->account_manager = modest_runtime_get_account_mgr (); g_assert (priv->account_manager); g_object_ref (priv->account_manager); - + priv->protocol_authentication_incoming = MODEST_PROTOCOLS_AUTH_PASSWORD; - /* Create the common pages, - */ - priv->page_account_details = create_page_account_details (self); - priv->page_user_details = create_page_user_details (self); - priv->page_incoming = create_page_incoming (self); - priv->page_outgoing = create_page_outgoing (self); + /* Create the common pages */ + account_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + account_value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + priv->page_account_details = create_page_account_details (self, account_title_sizegroup, account_value_sizegroup); + priv->page_user_details = create_page_user_details (self, account_title_sizegroup, account_value_sizegroup); + g_object_unref (account_title_sizegroup); + g_object_unref (account_value_sizegroup); + + /* Create size groups for security settings */ + sec_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + sec_value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + + /* Create incoming and outgoing "pages" */ + priv->page_incoming = create_page_incoming (self, sec_title_sizegroup, sec_value_sizegroup); + priv->page_outgoing = create_page_outgoing (self, sec_title_sizegroup, sec_value_sizegroup); + g_object_unref (sec_title_sizegroup); + g_object_unref (sec_value_sizegroup); + /* Add the notebook pages: */ gtk_box_pack_start (GTK_BOX (priv->main_container), priv->page_account_details, @@ -1078,6 +1058,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog FALSE, FALSE, 0); separator = gtk_hseparator_new (); + hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO); gtk_box_pack_start (GTK_BOX (priv->main_container), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT); gtk_widget_show (separator); @@ -1085,6 +1066,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog priv->page_incoming, FALSE, FALSE, 0); separator = gtk_hseparator_new (); + hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO); gtk_box_pack_start (GTK_BOX (priv->main_container), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT); gtk_widget_show (separator); @@ -1093,18 +1075,17 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog FALSE, FALSE, 0); GtkDialog *dialog = GTK_DIALOG (self); - pannable = hildon_pannable_area_new (); - g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL); + scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0); gtk_widget_show (align); gtk_container_add (GTK_CONTAINER (align), priv->main_container); - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align); - gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (pannable)); + modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align); + gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (scrollable)); gtk_widget_show (GTK_WIDGET (priv->main_container)); - gtk_widget_show (GTK_WIDGET (pannable)); + gtk_widget_show (GTK_WIDGET (scrollable)); /* Add the buttons: */ gtk_dialog_add_button (GTK_DIALOG(self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK); @@ -1184,12 +1165,9 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo null_means_empty (modest_account_settings_get_fullname (settings))); gtk_entry_set_text( GTK_ENTRY (priv->entry_user_email), null_means_empty (modest_account_settings_get_email_address (settings))); - modest_limit_retrieve_picker_set_active_limit_retrieve ( - MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker), - modest_account_settings_get_retrieve_limit (settings)); - hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages), - modest_account_settings_get_leave_messages_on_server (settings)); + modest_togglable_set_active (priv->checkbox_leave_messages, + modest_account_settings_get_leave_messages_on_server (settings)); incoming_account = modest_account_settings_get_store_settings (settings); if (incoming_account) { @@ -1197,10 +1175,6 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo gchar *proto_name, *title; ModestProtocolType incoming_protocol; - modest_retrieve_picker_fill (MODEST_RETRIEVE_PICKER (priv->retrieve_picker), modest_server_account_settings_get_protocol (incoming_account)); - modest_retrieve_picker_set_active_retrieve_conf (MODEST_RETRIEVE_PICKER (priv->retrieve_picker), - modest_account_settings_get_retrieve_type (settings)); - if (!modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, modest_server_account_settings_get_protocol (incoming_account))) { gtk_widget_hide (priv->checkbox_leave_messages); @@ -1270,9 +1244,8 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo const gboolean has_specific = modest_account_settings_get_use_connection_specific_smtp (settings); - hildon_check_button_set_active ( - HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific), - has_specific); + modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific, + has_specific); g_object_unref (outgoing_account); } @@ -1302,8 +1275,6 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) const gchar* emailaddress; ModestServerAccountSettings *store_settings; ModestServerAccountSettings *transport_settings; - ModestAccountRetrieveType retrieve_type; - gint retrieve_limit; gboolean leave_on_server; const gchar* hostname; const gchar* username; @@ -1332,16 +1303,8 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) modest_account_settings_set_use_signature (priv->settings, use_signature); modest_account_settings_set_signature (priv->settings, signature); } - - retrieve_type = modest_retrieve_picker_get_active_retrieve_conf ( - MODEST_RETRIEVE_PICKER (priv->retrieve_picker)); - modest_account_settings_set_retrieve_type (priv->settings, retrieve_type); - - retrieve_limit = modest_limit_retrieve_picker_get_active_limit_retrieve ( - MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker)); - modest_account_settings_set_retrieve_limit (priv->settings, retrieve_limit); - - leave_on_server = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages)); + + leave_on_server = modest_togglable_get_active (priv->checkbox_leave_messages); modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server); store_settings = modest_account_settings_get_store_settings (priv->settings); @@ -1386,7 +1349,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) /* Save connection-specific SMTP server accounts: */ modest_account_settings_set_use_connection_specific_smtp (priv->settings, - hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific))); + modest_togglable_get_active(priv->checkbox_outgoing_smtp_specific)); /* this configuration is not persistent, we should not save */ if (account_name != NULL) @@ -1423,10 +1386,11 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) { gboolean enable_ok = TRUE; ModestProtocolRegistry *protocol_registry; + ModestSecurityOptionsView *sec_view; ModestDefaultAccountSettingsDialogPrivate *priv; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - + /* The account details title is mandatory: */ if (entry_is_empty(priv->entry_account_title)) enable_ok = FALSE; @@ -1434,7 +1398,7 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) /* The user details username is mandatory: */ if (enable_ok && entry_is_empty(priv->entry_user_username)) enable_ok = FALSE; - + /* The user details email address is mandatory: */ if (enable_ok && entry_is_empty (priv->entry_user_email)) enable_ok = FALSE; @@ -1443,12 +1407,22 @@ enable_buttons (ModestDefaultAccountSettingsDialog *self) if (enable_ok && entry_is_empty(priv->entry_incomingserver)) enable_ok = FALSE; + sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security); + if (enable_ok && + modest_security_options_view_has_missing_mandatory_data (sec_view)) + enable_ok = FALSE; + /* The custom outgoing server is mandatory: */ if (enable_ok && entry_is_empty(priv->entry_outgoingserver)) enable_ok = FALSE; + sec_view = MODEST_SECURITY_OPTIONS_VIEW (priv->outgoing_security); + if (enable_ok && + modest_security_options_view_has_missing_mandatory_data (sec_view)) + enable_ok = FALSE; + protocol_registry = modest_runtime_get_protocol_registry (); - + /* Enable the buttons, * identifying them via their associated response codes: */