X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-connection-specific-smtp-edit-window.c;h=d2c0f4e852d16c7ac224092ab76482c315358c47;hp=f18dfa6578e8d6dfd78d7dabaf9fc891a12fdca8;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=b2e5d9a85f5c121f29dc0eaeafcffca9de64f3c5 diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index f18dfa6..d2c0f4e 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -35,6 +35,9 @@ #include "modest-serversecurity-picker.h" #include "modest-secureauth-picker.h" #include "widgets/modest-validating-entry.h" +#include +#include +#include #include #include #include @@ -74,7 +77,6 @@ struct _ModestConnectionSpecificSmtpEditWindowPrivate gboolean is_dirty; gboolean range_error_occured; - guint range_error_banner_timeout; }; static void @@ -113,10 +115,6 @@ modest_connection_specific_smtp_edit_window_finalize (GObject *object) ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - if (priv->range_error_banner_timeout > 0) { - g_source_remove (priv->range_error_banner_timeout); - priv->range_error_banner_timeout = 0; - } if (priv->account_name) { g_free (priv->account_name); priv->account_name = NULL; @@ -161,39 +159,46 @@ on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpE on_change(widget, self); } -gboolean -show_banner_handler (gpointer userdata) +static gboolean +on_range_error (GtkWidget *widget, ModestNumberEditorErrorType type, gpointer user_data) { - ModestConnectionSpecificSmtpEditWindow *self = userdata; + gchar *msg; + ModestConnectionSpecificSmtpEditWindow *self = user_data; ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - gchar *msg; - msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"), PORT_RANGE_MIN, PORT_RANGE_MAX); + /* We want to prevent the closure of the dialog when a range error occured. The problem is that + * the hildon number editor already resets the value to the default value, so we have to + * remember that such an error occured. */ + priv->range_error_occured = TRUE; - hildon_banner_show_information (NULL, NULL, msg); + if (type == MODEST_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED) { + msg = g_strdup_printf (dgettext ("hildon-libs", "ckct_ib_maximum_value"), 65535); + } else if (type == MODEST_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED) { + msg = g_strdup_printf (dgettext ("hildon-libs", "ckct_ib_minimum_value"), 1); + } else { + msg = g_strdup_printf (_HL("ckct_ib_set_a_value_within_range"), PORT_RANGE_MIN, PORT_RANGE_MAX); + } + modest_platform_information_banner (widget, NULL, msg); g_free (msg); - priv->range_error_banner_timeout = 0; - return FALSE; + /* Show error message by not returning TRUE */ + return TRUE; } static gboolean -on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer user_data) +on_delete_event (GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { ModestConnectionSpecificSmtpEditWindow *self = user_data; ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - /* We want to prevent the closure of the dialog when a range error occured. The problem is that - * the hildon number editor already resets the value to the default value, so we have to - * remember that such an error occured. */ - priv->range_error_occured = TRUE; - if (priv->range_error_banner_timeout == 0) - priv->range_error_banner_timeout = g_timeout_add (200, show_banner_handler, self); - - /* Show error message by not returning TRUE */ - return TRUE; + /* If it's dirty, them the response method already asked the + user, because it's always executed before (see GtkDialog + code). If it's not then simply close */ + return priv->is_dirty; } static void @@ -204,13 +209,7 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data) ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)); - - if ((response_id != GTK_RESPONSE_OK) && - (priv->range_error_banner_timeout > 0)) { - g_source_remove (priv->range_error_banner_timeout); - priv->range_error_banner_timeout = 0; - } + hostname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)); /* Don't close the dialog if a range error occured */ if(response_id == GTK_RESPONSE_OK && priv->range_error_occured) @@ -222,7 +221,7 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data) } /* Don't close the dialog if a range error occured */ - if(response_id == GTK_RESPONSE_OK) { + if (response_id == GTK_RESPONSE_OK) { if (hostname && (hostname[0] != '\0') && (!modest_text_utils_validate_domain_name (hostname))) { g_signal_stop_emission_by_name (dialog, "response"); @@ -237,13 +236,15 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data) gint response; response = modest_platform_run_confirmation_dialog (GTK_WINDOW (user_data), _("imum_nc_wizard_confirm_lose_changes")); + if (response != GTK_RESPONSE_OK) g_signal_stop_emission_by_name (dialog, "response"); } } } -static void on_set_focus_child (GtkContainer *container, GtkWidget *widget, gpointer user_data) +static void +on_set_focus_child (GtkContainer *container, GtkWidget *widget, gpointer user_data) { ModestConnectionSpecificSmtpEditWindow *self = user_data; ModestConnectionSpecificSmtpEditWindowPrivate *priv = @@ -256,23 +257,62 @@ static void on_set_focus_child (GtkContainer *container, GtkWidget *widget, gpoi } static void +security_picker_set_port (ModestConnectionSpecificSmtpEditWindowPrivate *priv) +{ + const gint port_number = + modest_serversecurity_picker_get_active_serversecurity_port ( + MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker)); + + if(port_number != 0) { + modest_number_editor_set_value ( + MODEST_NUMBER_EDITOR (priv->entry_port), port_number); + } +} + +static void on_security_picker_changed (HildonPickerButton *widget, gpointer user_data) { ModestConnectionSpecificSmtpEditWindow *self = MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data); ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - + on_change(GTK_WIDGET(widget), self); - - const gint port_number = - modest_serversecurity_picker_get_active_serversecurity_port ( - MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker)); - if(port_number != 0) { - hildon_number_editor_set_value ( - HILDON_NUMBER_EDITOR (priv->entry_port), port_number); - } + /* Enable/disable username and password fields */ + security_picker_set_port (priv); +} + +static void +auth_picker_set_sensitive (ModestConnectionSpecificSmtpEditWindowPrivate *priv) +{ + ModestProtocolType auth_proto; + + auth_proto = + modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker)); + + if (auth_proto == modest_protocol_registry_get_none_auth_type_id ()) { + gtk_widget_set_sensitive (priv->entry_user_username, FALSE); + gtk_widget_set_sensitive (priv->entry_user_password, FALSE); + } else { + gtk_widget_set_sensitive (priv->entry_user_username, TRUE); + gtk_widget_set_sensitive (priv->entry_user_password, TRUE); + } + +} + +static void +on_auth_picker_changed (HildonPickerButton *widget, gpointer user_data) +{ + ModestConnectionSpecificSmtpEditWindow *self = + MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data); + ModestConnectionSpecificSmtpEditWindowPrivate *priv = + CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); + + on_change (GTK_WIDGET(widget), self); + + /* Enable/disable username and password fields */ + auth_picker_set_sensitive (priv); } static void @@ -280,10 +320,10 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd { ModestConnectionSpecificSmtpEditWindowPrivate *priv; GtkWidget *dialog_box; - GtkWidget *scrolled_window, *vbox; + GtkWidget *pannable, *vbox; /* The title of this dialog is quite long, so make the window wide enough */ - gtk_widget_set_size_request (GTK_WIDGET (self), 600, -1); + gtk_widget_set_size_request (GTK_WIDGET (self), 600, 320); priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); dialog_box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */ @@ -295,17 +335,18 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd /* 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 = gtk_entry_new (); + priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE); /* 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); g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_change), self); GtkWidget *captioned = - modest_maemo_utils_create_captioned (sizegroup, + modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver); gtk_widget_show (priv->entry_outgoingserver); @@ -316,10 +357,11 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd if (!priv->outgoing_auth_picker) { priv->outgoing_auth_picker = GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE, - MODEST_EDITABLE_ARRANGEMENT)); - hildon_button_set_title (HILDON_BUTTON (priv->outgoing_auth_picker), _("mcen_li_emailsetup_secure_authentication")); + HILDON_BUTTON_ARRANGEMENT_HORIZONTAL)); } - g_signal_connect (G_OBJECT (priv->outgoing_auth_picker), "value-changed", G_CALLBACK(on_change), self); + modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup, + _("mcen_li_emailsetup_secure_authentication"), + priv->outgoing_auth_picker); gtk_widget_show (priv->outgoing_auth_picker); gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -327,7 +369,8 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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); - captioned = modest_maemo_utils_create_captioned (sizegroup, _("mail_fi_username"), + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + _("mail_fi_username"), priv->entry_user_username); g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self); gtk_widget_show (priv->entry_user_username); @@ -344,13 +387,13 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_username), 64); /* The password widgets: */ - priv->entry_user_password = gtk_entry_new (); + priv->entry_user_password = hildon_entry_new (MODEST_EDITABLE_SIZE); /* 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); gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */ - captioned = modest_maemo_utils_create_captioned (sizegroup, + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, _("mail_fi_password"), priv->entry_user_password); g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_change), self); gtk_widget_show (priv->entry_user_password); @@ -361,61 +404,80 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd if (!priv->outgoing_security_picker) priv->outgoing_security_picker = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE, - MODEST_EDITABLE_ARRANGEMENT)); + HILDON_BUTTON_ARRANGEMENT_HORIZONTAL)); modest_serversecurity_picker_fill ( MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), MODEST_PROTOCOLS_TRANSPORT_SMTP); modest_serversecurity_picker_set_active_serversecurity ( MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), MODEST_PROTOCOLS_CONNECTION_NONE); - hildon_button_set_title (HILDON_BUTTON (priv->outgoing_security_picker), _("mcen_li_emailsetup_secure_connection")); + modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup, + _("mcen_li_emailsetup_secure_connection"), + priv->outgoing_security_picker); gtk_widget_show (priv->outgoing_security_picker); gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_security_picker, FALSE, FALSE, MODEST_MARGIN_HALF); /* The port number widgets: */ if (!priv->entry_port) - priv->entry_port = GTK_WIDGET (hildon_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX)); - captioned = modest_maemo_utils_create_captioned (sizegroup, - _("mcen_fi_emailsetup_port"), priv->entry_port); + priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX)); + captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, + _("mcen_fi_emailsetup_port"), priv->entry_port); gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK); - g_signal_connect(G_OBJECT(priv->entry_port), "range-error", G_CALLBACK(on_range_error), self); - g_signal_connect(G_OBJECT(priv->entry_port), "notify::value", G_CALLBACK(on_value_changed), self); gtk_widget_show (priv->entry_port); gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (captioned); - - /* Show a default port number when the security method changes, as per the UI spec: */ - g_signal_connect (G_OBJECT (priv->outgoing_security_picker), "value-changed", (GCallback)on_security_picker_changed, self); - on_security_picker_changed (HILDON_PICKER_BUTTON (priv->outgoing_security_picker), self); - + /* 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); priv->is_dirty = FALSE; priv->range_error_occured = FALSE; 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); g_signal_connect(G_OBJECT(vbox), "set-focus-child", G_CALLBACK(on_set_focus_child), self); - priv->range_error_banner_timeout = 0; priv->account_name = NULL; - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), vbox); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (dialog_box), scrolled_window, TRUE, TRUE, 0); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), - gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); - + 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), vbox); + gtk_box_pack_start (GTK_BOX (dialog_box), pannable, TRUE, TRUE, 0); + gtk_widget_show_all (dialog_box); gtk_window_set_default_size (GTK_WINDOW (self), -1, 220); - - + + g_object_unref (title_sizegroup); + g_object_unref (value_sizegroup); + /* When this window is shown, hibernation should not be possible, * because there is no sensible way to save the state: */ modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); - + hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_connectionspecificsmtpconf", modest_maemo_utils_get_osso_context()); + + /* Refresh view with current settings */ + auth_picker_set_sensitive (priv); + security_picker_set_port (priv); + + /* Connect signals to track changes */ + g_signal_connect (G_OBJECT (priv->outgoing_security_picker), + "value-changed", + (GCallback) on_security_picker_changed, + self); + g_signal_connect (G_OBJECT (priv->outgoing_auth_picker), + "value-changed", + (GCallback) on_auth_picker_changed, + self); + g_signal_connect(G_OBJECT(priv->entry_port), + "range-error", + G_CALLBACK(on_range_error), + self); + g_signal_connect(G_OBJECT(priv->entry_port), + "notify::value", + G_CALLBACK(on_value_changed), + self); + } ModestConnectionSpecificSmtpEditWindow* @@ -439,16 +501,16 @@ modest_connection_specific_smtp_edit_window_set_connection ( if (server_settings) { - + /* Setting known values */ if (priv->account_name) g_free (priv->account_name); priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), - modest_server_account_settings_get_hostname (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username), - modest_server_account_settings_get_username (server_settings)); - gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password), - modest_server_account_settings_get_password (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver), + modest_server_account_settings_get_hostname (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_username), + modest_server_account_settings_get_username (server_settings)); + hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_password), + modest_server_account_settings_get_password (server_settings)); modest_serversecurity_picker_set_active_serversecurity ( MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), @@ -459,18 +521,13 @@ modest_connection_specific_smtp_edit_window_set_connection ( modest_server_account_settings_get_auth_protocol (server_settings)); /* port: */ - hildon_number_editor_set_value ( - HILDON_NUMBER_EDITOR (priv->entry_port), + modest_number_editor_set_value ( + MODEST_NUMBER_EDITOR (priv->entry_port), modest_server_account_settings_get_port (server_settings)); /* This will cause changed signals so we set dirty back to FALSE */ priv->is_dirty = FALSE; - if (priv->range_error_banner_timeout > 0) { - g_source_remove (priv->range_error_banner_timeout); - priv->range_error_banner_timeout = 0; - } - } } @@ -482,7 +539,7 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif const gchar *outgoing_server = NULL; priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window); - outgoing_server = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)); + outgoing_server = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)); /* If the outgoing server is NULL, we are removing the connection specific * settings */ @@ -493,13 +550,13 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif server_settings = modest_server_account_settings_new (); modest_server_account_settings_set_hostname (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver))); modest_server_account_settings_set_protocol (server_settings, MODEST_PROTOCOLS_TRANSPORT_SMTP); modest_server_account_settings_set_username (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username))); modest_server_account_settings_set_password (server_settings, - gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password))); + hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password))); modest_server_account_settings_set_security_protocol (server_settings, modest_serversecurity_picker_get_active_serversecurity ( @@ -512,7 +569,7 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif /* port: */ modest_server_account_settings_set_port (server_settings, - hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->entry_port))); + modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->entry_port))); return server_settings; }