X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-default-account-settings-dialog.c;h=d4e3d5ce5d4aba1f7ed6c7c46ee947be6eda34d8;hp=24b854f3843feb911e4bd5589aee26d8a848326b;hb=448d8d5a3f665e689ceeed19ade2f33a0091a289;hpb=51372832576ac3b1423ee599cc5b142aabdebd42 diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 24b854f..d4e3d5c 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -54,6 +54,7 @@ #include #include "modest-maemo-utils.h" #include "modest-maemo-security-options-view.h" +#include "modest-ui-actions.h" #include "widgets/modest-ui-constants.h" #include #include @@ -105,7 +106,6 @@ struct _ModestDefaultAccountSettingsDialogPrivate GtkWidget *entry_account_title; GtkWidget *retrieve_picker; GtkWidget *limit_retrieve_picker; - GtkWidget *caption_leave_messages; GtkWidget *checkbox_leave_messages; GtkWidget *page_user_details; @@ -115,6 +115,7 @@ struct _ModestDefaultAccountSettingsDialogPrivate GtkWidget *entry_user_email; /* GtkWidget *entry_incoming_port; */ GtkWidget *button_signature; + GtkWidget *button_delete; GtkWidget *page_complete_easysetup; @@ -162,16 +163,16 @@ modest_default_account_settings_dialog_finalize (GObject *object) self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (object); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - + if (priv->account_name) g_free (priv->account_name); - + if (priv->original_account_title) g_free (priv->original_account_title); - + if (priv->account_manager) g_object_unref (G_OBJECT (priv->account_manager)); - + if (priv->signature_dialog) gtk_widget_destroy (priv->signature_dialog); @@ -179,11 +180,11 @@ modest_default_account_settings_dialog_finalize (GObject *object) g_object_unref (priv->settings); priv->settings = NULL; } - + G_OBJECT_CLASS (modest_default_account_settings_dialog_parent_class)->finalize (object); } -static void +static void set_modified (ModestDefaultAccountSettingsDialog *self, gboolean modified) { ModestDefaultAccountSettingsDialogPrivate *priv; @@ -205,22 +206,22 @@ on_modified_entry_changed (GtkEditable *editable, gpointer user_data) } static void -on_modified_checkbutton_clicked (GtkButton *button, gpointer user_data) +on_modified_checkbutton_toggled (GtkButton *button, gpointer user_data) { set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE); } static void -on_modified_number_editor_changed (HildonNumberEditor *number_editor, gint new_value, gpointer user_data) +on_modified_number_editor_changed (ModestNumberEditor *number_editor, gint new_value, gpointer user_data) { set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE); } static void -on_number_editor_notify (HildonNumberEditor *editor, GParamSpec *arg1, gpointer user_data) +on_number_editor_notify (ModestNumberEditor *editor, GParamSpec *arg1, gpointer user_data) { ModestDefaultAccountSettingsDialog *dialog = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); - gint value = hildon_number_editor_get_value (editor); + gint value = modest_number_editor_get_value (editor); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0); } @@ -231,7 +232,7 @@ on_number_editor_notify (HildonNumberEditor *editor, GParamSpec *arg1, gpointer static void connect_for_modified (ModestDefaultAccountSettingsDialog *self, GtkWidget *widget) { - if (HILDON_IS_NUMBER_EDITOR (widget)) { + if (MODEST_IS_NUMBER_EDITOR (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); @@ -242,9 +243,9 @@ 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 (GTK_IS_BUTTON (widget)) { - g_signal_connect (G_OBJECT (widget), "clicked", - G_CALLBACK (on_modified_checkbutton_clicked), self); + } else if (HILDON_IS_CHECK_BUTTON (widget)) { + g_signal_connect (G_OBJECT (widget), "toggled", + G_CALLBACK (on_modified_checkbutton_toggled), self); } } @@ -258,14 +259,17 @@ on_caption_entry_changed (GtkEditable *editable, gpointer user_data) static GtkWidget* create_captioned (ModestDefaultAccountSettingsDialog *self, - GtkSizeGroup *group, + GtkSizeGroup *title_sizegroup, + GtkSizeGroup *value_sizegroup, const gchar *label_text, + gboolean use_markup, GtkWidget *control) { GtkWidget *result; - result = modest_maemo_utils_create_captioned (group, label_text, control); + result = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + label_text, use_markup, control); /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -320,18 +324,22 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup* sizegroup; + 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); - sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + 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 ()); /* Do use auto-capitalization: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_account_title), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); - GtkWidget *caption = create_captioned (self, sizegroup, _("mcen_fi_account_title"), + GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup, + _("mcen_fi_account_title"), FALSE, priv->entry_account_title); gtk_widget_show (priv->entry_account_title); connect_for_modified (self, priv->entry_account_title); @@ -356,45 +364,50 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) g_list_free (list_prevent); modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_account_title), on_entry_invalid_account_title_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. */ gtk_entry_set_max_length (GTK_ENTRY (priv->entry_account_title), 64); modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_account_title), 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, - MODEST_EDITABLE_ARRANGEMENT)); - modest_maemo_utils_create_picker_layout (sizegroup, _("mcen_fi_advsetup_retrievetype"), priv->retrieve_picker); - + 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 (box), priv->retrieve_picker, FALSE, FALSE, MODEST_MARGIN_HALF); - + gtk_box_pack_start (GTK_BOX (hbox), priv->retrieve_picker, TRUE, TRUE, MODEST_MARGIN_HALF); + /* The limit-retrieve picker: */ priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new (MODEST_EDITABLE_SIZE, - MODEST_EDITABLE_ARRANGEMENT)); - modest_maemo_utils_create_picker_layout (sizegroup, _("mcen_fi_advsetup_limit_retrieve"), priv->limit_retrieve_picker); + 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 (box), priv->limit_retrieve_picker, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (hbox), priv->limit_retrieve_picker, TRUE, TRUE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (hbox); /* The leave-messages widgets: */ - if(!priv->checkbox_leave_messages) - priv->checkbox_leave_messages = gtk_check_button_new (); - if (!priv->caption_leave_messages) { - priv->caption_leave_messages = - create_captioned (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), - priv->checkbox_leave_messages); + 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); } - - gtk_widget_show (priv->checkbox_leave_messages); connect_for_modified (self, priv->checkbox_leave_messages); - gtk_box_pack_start (GTK_BOX (box), priv->caption_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (priv->caption_leave_messages); + gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_widget_show (priv->checkbox_leave_messages); - g_object_unref (sizegroup); + g_object_unref (title_sizegroup); + g_object_unref (value_sizegroup); gtk_widget_show (GTK_WIDGET (box)); @@ -458,7 +471,7 @@ on_button_signature (GtkButton *button, gpointer user_data) /* Show the window: */ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - GTK_WINDOW (priv->signature_dialog)); + GTK_WINDOW (priv->signature_dialog), GTK_WINDOW (self)); response = gtk_dialog_run (GTK_DIALOG (priv->signature_dialog)); gtk_widget_hide (priv->signature_dialog); @@ -472,17 +485,45 @@ on_button_signature (GtkButton *button, gpointer user_data) } } +static void +on_button_delete (GtkButton *button, gpointer user_data) +{ + 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) + account_title = g_strdup (priv->original_account_title); + else + account_title = get_entered_account_title (self); + + removed = modest_ui_actions_on_delete_account (GTK_WINDOW (self), + priv->account_name, + (const gchar *) account_title); + g_free (account_title); + + /* Close window */ + if (removed) + gtk_widget_destroy (GTK_WIDGET (self)); +} + static GtkWidget* create_page_user_details (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup* sizegroup; + GtkSizeGroup* title_sizegroup; + GtkSizeGroup* value_sizegroup; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + 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 ()); @@ -495,8 +536,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name), on_entry_max, self); GtkWidget *caption = - create_captioned (self, sizegroup, - _("mcen_li_emailsetup_name"), priv->entry_user_name); + create_captioned (self, title_sizegroup, value_sizegroup, + _("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name); gtk_widget_show (priv->entry_user_name); connect_for_modified (self, priv->entry_user_name); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -518,7 +559,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) priv->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 (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL); - caption = create_captioned (self, sizegroup, _("mail_fi_username"), + caption = create_captioned (self, title_sizegroup, value_sizegroup, + _("mail_fi_username"), FALSE, priv->entry_user_username); gtk_widget_show (priv->entry_user_username); connect_for_modified (self, priv->entry_user_username); @@ -546,8 +588,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */ - caption = create_captioned (self, sizegroup, - _("mail_fi_password"), priv->entry_user_password); + caption = create_captioned (self, title_sizegroup, value_sizegroup, + _("mail_fi_password"), FALSE, priv->entry_user_password); gtk_widget_show (priv->entry_user_password); connect_for_modified (self, priv->entry_user_password); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -557,8 +599,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) priv->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 (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL); - caption = create_captioned (self, sizegroup, - _("mcen_li_emailsetup_email_address"), priv->entry_user_email); + caption = create_captioned (self, title_sizegroup, value_sizegroup, + _("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email); gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */ gtk_widget_show (priv->entry_user_email); connect_for_modified (self, priv->entry_user_email); @@ -571,19 +613,28 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_email), on_entry_max, 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); + /* Signature button: */ if (!priv->button_signature) - priv->button_signature = gtk_button_new_with_label (_("mcen_bd_edit")); - caption = create_captioned (self, sizegroup, _("mcen_fi_email_signature"), 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); gtk_widget_show (priv->button_signature); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (caption); - g_object_unref (sizegroup); + 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); @@ -598,7 +649,6 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self, ModestProtocol *protocol; const gchar *protocol_display_name; gchar* incomingserver_title; - gchar *with_asterisk; ModestDefaultAccountSettingsDialogPrivate *priv; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); @@ -606,16 +656,11 @@ update_incoming_server_title (ModestDefaultAccountSettingsDialog *self, protocol_registry = modest_runtime_get_protocol_registry (); protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type); protocol_display_name = modest_protocol_get_display_name (protocol); - incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), - protocol_display_name); + incomingserver_title = g_strconcat(_("mcen_li_emailsetup_servertype"), "*", + "\n(", protocol_display_name, ")", NULL); - /* This is a mandatory field, so add a *. This is usually done by - * create_caption_new_with_asterisk() but we can't use that here. */ - with_asterisk = g_strconcat (incomingserver_title, "*", NULL); + modest_maemo_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE); g_free (incomingserver_title); - - g_object_set (G_OBJECT (priv->caption_incoming), "label", with_asterisk, NULL); - g_free (with_asterisk); } static GtkWidget* @@ -623,7 +668,8 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkSizeGroup *sizegroup; + GtkSizeGroup *title_sizegroup; + GtkSizeGroup *value_sizegroup; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); @@ -631,7 +677,8 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *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. */ - sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The incoming server widgets: */ if(!priv->entry_incomingserver) @@ -645,8 +692,8 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) /* 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, sizegroup, - "Incoming Server", priv->entry_incomingserver); + priv->caption_incoming = create_captioned (self, title_sizegroup, value_sizegroup, + "Incoming Server", FALSE, priv->entry_incomingserver); gtk_widget_show (priv->entry_incomingserver); connect_for_modified (self, priv->entry_incomingserver); gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -655,13 +702,14 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) /* Incoming security widgets */ priv->incoming_security = modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING, - TRUE, sizegroup); + TRUE, title_sizegroup, value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (priv->incoming_security); - g_object_unref (sizegroup); + g_object_unref (title_sizegroup); + g_object_unref (value_sizegroup); gtk_widget_show (GTK_WIDGET (box)); return GTK_WIDGET (box); @@ -673,7 +721,7 @@ on_check_button_clicked (GtkButton *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 (button); + const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button)); gtk_widget_set_sensitive (widget, enable); } @@ -684,7 +732,7 @@ enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button) { g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (on_check_button_clicked), widget); - + /* Set the starting sensitivity: */ on_check_button_clicked (button, widget); } @@ -702,10 +750,9 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) smtp_win = modest_connection_specific_smtp_window_new (); modest_connection_specific_smtp_window_fill_with_connections (smtp_win, priv->account_manager); - /* Show the window: */ - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win)); + /* Show the window: */ + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win), GTK_WINDOW (self)); gtk_widget_show (GTK_WIDGET (smtp_win)); - priv->modified = TRUE; } static void @@ -723,23 +770,27 @@ static GtkWidget* create_page_outgoing (ModestDefaultAccountSettingsDialog *self) { 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 *sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - + 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); /* 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); - GtkWidget *caption = create_captioned (self, sizegroup, - _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver); + smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n(SMTP)", NULL); + GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup, + smtp_caption_label, TRUE, priv->entry_outgoingserver); + g_free (smtp_caption_label); gtk_widget_show (priv->entry_outgoingserver); connect_for_modified (self, priv->entry_outgoingserver); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -748,7 +799,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* Outgoing security widgets */ priv->outgoing_security = modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING, - TRUE, sizegroup); + TRUE, title_sizegroup, value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (priv->outgoing_security); @@ -758,40 +809,41 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) 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 (!priv->checkbox_outgoing_smtp_specific) { priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (MODEST_EDITABLE_SIZE); - hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), + 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); } - caption = create_captioned (self, sizegroup, _("mcen_fi_advsetup_connection_smtp"), - priv->checkbox_outgoing_smtp_specific); gtk_widget_show (priv->checkbox_outgoing_smtp_specific); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (caption); + gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific, + FALSE, FALSE, MODEST_MARGIN_HALF); connect_for_modified (self, priv->checkbox_outgoing_smtp_specific); - + /* Connection-specific SMTP-Severs Edit button: */ if (!priv->button_outgoing_smtp_servers) - priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit")); - caption = create_captioned (self, sizegroup, _("mcen_fi_advsetup_optional_smtp"), - priv->button_outgoing_smtp_servers); + priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_advsetup_optional_smtp")); + hildon_gtk_widget_set_theme_size (priv->button_outgoing_smtp_servers, + HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); gtk_widget_show (priv->button_outgoing_smtp_servers); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); - gtk_widget_show (caption); - + gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers, FALSE, FALSE, MODEST_MARGIN_HALF); + /* 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 (sizegroup); - + g_object_unref (title_sizegroup); + g_object_unref (value_sizegroup); + g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked", G_CALLBACK (on_button_outgoing_smtp_servers), self); - + gtk_widget_show (GTK_WIDGET (box)); - + return GTK_WIDGET (box); } @@ -877,11 +929,31 @@ check_data (ModestDefaultAccountSettingsDialog *self) gtk_editable_select_region (GTK_EDITABLE (priv->entry_outgoingserver), 0, -1); return FALSE; } - + return TRUE; } -static void +static gboolean +on_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + ModestDefaultAccountSettingsDialog *self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); + ModestDefaultAccountSettingsDialogPrivate *priv; + ModestSecurityOptionsView *incoming_sec, *outgoing_sec; + + priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); + + /* Check if security widgets changed */ + incoming_sec = MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security); + outgoing_sec = MODEST_SECURITY_OPTIONS_VIEW (priv->outgoing_security); + + return modest_security_options_view_changed (incoming_sec, priv->settings) || + modest_security_options_view_changed (outgoing_sec, priv->settings) || + priv->modified; +} + +static void on_response (GtkDialog *wizard_dialog, gint response_id, gpointer user_data) @@ -902,14 +974,15 @@ on_response (GtkDialog *wizard_dialog, modest_security_options_view_changed (outgoing_sec, priv->settings); /* Warn about unsaved changes: */ - if (response_id == GTK_RESPONSE_CANCEL && (priv->modified || sec_changed)) { + if ((response_id == GTK_RESPONSE_CANCEL || response_id == GTK_RESPONSE_DELETE_EVENT) && + (priv->modified || sec_changed)) { GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self), _("imum_nc_wizard_confirm_lose_changes"))); /* TODO: These button names will be ambiguous, and not specified in the UI specification. */ - + const gint dialog_response = gtk_dialog_run (dialog); gtk_widget_destroy (GTK_WIDGET (dialog)); - + if (dialog_response != GTK_RESPONSE_OK) prevent_response = TRUE; } @@ -917,16 +990,16 @@ on_response (GtkDialog *wizard_dialog, else if (response_id != GTK_RESPONSE_CANCEL && !check_data (self)) { prevent_response = TRUE; } - + 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; + return; } else { modest_tny_account_store_set_send_mail_blocked (modest_runtime_get_account_store (), FALSE); } - + if (response_id == GTK_RESPONSE_OK) { /* Try to save the changes if modified (NB #59251): */ if (priv->modified || sec_changed) { @@ -946,7 +1019,7 @@ on_response (GtkDialog *wizard_dialog, transport_settings = modest_account_settings_get_transport_settings (priv->settings); store_account_name = modest_server_account_settings_get_account_name (store_settings); transport_account_name = modest_server_account_settings_get_account_name (transport_settings); - + if (store_account_name) { modest_account_mgr_notify_account_update (priv->account_manager, store_account_name); @@ -957,7 +1030,7 @@ on_response (GtkDialog *wizard_dialog, } g_object_unref (store_settings); g_object_unref (transport_settings); - + modest_platform_information_banner(NULL, NULL, _("mcen_ib_advsetup_settings_saved")); } } else { @@ -972,6 +1045,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *pannable; + GtkWidget *separator; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self); @@ -999,25 +1073,30 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog /* Add the notebook pages: */ gtk_box_pack_start (GTK_BOX (priv->main_container), - modest_maemo_utils_create_group_box (_("mcen_ti_account_settings_account"), - priv->page_account_details), + priv->page_account_details, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (priv->main_container), - modest_maemo_utils_create_group_box (_("mcen_ti_account_settings_userinfo"), - priv->page_user_details), + priv->page_user_details, FALSE, FALSE, 0); + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (priv->main_container), separator, + FALSE, FALSE, 0); + gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (priv->main_container), - modest_maemo_utils_create_group_box (_("mcen_ti_advsetup_retrieval"), - priv->page_incoming), + priv->page_incoming, + FALSE, FALSE, 0); + separator = gtk_hseparator_new (); + gtk_box_pack_start (GTK_BOX (priv->main_container), separator, FALSE, FALSE, 0); + gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (priv->main_container), - modest_maemo_utils_create_group_box (_("mcen_ti_advsetup_sending"), - priv->page_outgoing), + priv->page_outgoing, FALSE, FALSE, 0); GtkDialog *dialog = GTK_DIALOG (self); pannable = hildon_pannable_area_new (); + g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL); hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->main_container); gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (pannable)); gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF); @@ -1025,18 +1104,14 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog gtk_widget_show (GTK_WIDGET (pannable)); /* Add the buttons: */ - gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG(self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK); gtk_window_set_default_size (GTK_WINDOW (self), -1, 340); - - /* Connect to the dialog's response signal: */ - /* We use connect-before - * so we can stop the signal emission, - * to stop the default signal handler from closing the dialog. - */ - g_signal_connect (G_OBJECT (self), "response", - G_CALLBACK (on_response), self); - + + /* Connect to the dialog's "response" and "delete-event" signals */ + g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self); + g_signal_connect (G_OBJECT (self), "delete-event", G_CALLBACK (on_delete_event), self); + priv->modified = FALSE; /* When this window is shown, hibernation should not be possible, @@ -1048,8 +1123,6 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog * while sending messages causes an error dialog and we have a lock */ modest_tny_account_store_set_send_mail_blocked (modest_runtime_get_account_store (), TRUE); - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings", - modest_maemo_utils_get_osso_context()); } ModestAccountSettingsDialog* @@ -1088,6 +1161,11 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo g_free (priv->account_name); priv->account_name = g_strdup (account_name); + if (priv->account_name) + gtk_widget_show (priv->button_delete); + else + gtk_widget_hide (priv->button_delete); + if (priv->settings) g_object_unref (priv->settings); priv->settings = g_object_ref (settings); @@ -1112,7 +1190,7 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo modest_account_settings_get_retrieve_limit (settings)); - hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_leave_messages), + hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages), modest_account_settings_get_leave_messages_on_server (settings)); @@ -1127,9 +1205,9 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo if (!modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry, modest_server_account_settings_get_protocol (incoming_account))) { - gtk_widget_hide (priv->caption_leave_messages); + gtk_widget_hide (priv->checkbox_leave_messages); } else { - gtk_widget_show (priv->caption_leave_messages); + gtk_widget_show (priv->checkbox_leave_messages); } /* Remember this for later: */ @@ -1195,7 +1273,7 @@ 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 ( - GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), + HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific), has_specific); g_object_unref (outgoing_account); } @@ -1262,7 +1340,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) 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 (GTK_BUTTON (priv->checkbox_leave_messages)); + leave_on_server = hildon_check_button_get_active (HILDON_CHECK_BUTTON (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); @@ -1307,7 +1385,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(GTK_BUTTON(priv->checkbox_outgoing_smtp_specific))); + hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific))); /* this configuration is not persistent, we should not save */ if (account_name != NULL)