X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-connection-specific-smtp-edit-window.c;h=f95265370b7096cfaa6232467f93b2f9ce1ebc88;hp=bdf793b0581e91b0837e44e85281eefc37823c5c;hb=99ee6016434192a8fb359070556e85390a3df1dc;hpb=aaf3f94831e627d2b712f752169766cfe7792f58 diff --git a/src/maemo/modest-connection-specific-smtp-edit-window.c b/src/maemo/modest-connection-specific-smtp-edit-window.c index bdf793b..f952653 100644 --- a/src/maemo/modest-connection-specific-smtp-edit-window.c +++ b/src/maemo/modest-connection-specific-smtp-edit-window.c @@ -44,6 +44,9 @@ #include +#define PORT_RANGE_MIN 1 +#define PORT_RANGE_MAX 65535 + G_DEFINE_TYPE (ModestConnectionSpecificSmtpEditWindow, modest_connection_specific_smtp_edit_window, GTK_TYPE_DIALOG); #define CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE(o) \ @@ -62,9 +65,12 @@ struct _ModestConnectionSpecificSmtpEditWindowPrivate GtkWidget *button_ok; GtkWidget *button_cancel; + + gchar *account_name; gboolean is_dirty; gboolean range_error_occured; + guint range_error_banner_timeout; }; static void @@ -90,6 +96,8 @@ modest_connection_specific_smtp_edit_window_set_property (GObject *object, guint static void modest_connection_specific_smtp_edit_window_dispose (GObject *object) { + + if (G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->dispose) G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->dispose (object); } @@ -97,6 +105,18 @@ modest_connection_specific_smtp_edit_window_dispose (GObject *object) static void modest_connection_specific_smtp_edit_window_finalize (GObject *object) { + ModestConnectionSpecificSmtpEditWindow *self = (ModestConnectionSpecificSmtpEditWindow *) 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; + } G_OBJECT_CLASS (modest_connection_specific_smtp_edit_window_parent_class)->finalize (object); } @@ -137,6 +157,23 @@ on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpE on_change(widget, self); } +gboolean +show_banner_handler (gpointer userdata) +{ + ModestConnectionSpecificSmtpEditWindow *self = userdata; + 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); + + hildon_banner_show_information (NULL, NULL, msg); + g_free (msg); + + priv->range_error_banner_timeout = 0; + return FALSE; +} + static gboolean on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer user_data) { @@ -148,9 +185,11 @@ on_range_error (GtkWidget *widget, HildonNumberEditorErrorType type, gpointer us * 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 FALSE; + return TRUE; } static void @@ -163,6 +202,12 @@ on_response (GtkDialog *dialog, int response_id, gpointer user_data) hostname = gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)); + if ((response_id == GTK_RESPONSE_CANCEL) && + (priv->range_error_banner_timeout > 0)) { + g_source_remove (priv->range_error_banner_timeout); + priv->range_error_banner_timeout = 0; + } + /* Don't close the dialog if a range error occured */ if(response_id == GTK_RESPONSE_OK && priv->range_error_occured) { @@ -221,12 +266,18 @@ on_combo_security_changed (GtkComboBox *widget, gpointer user_data) static void modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEditWindow *self) { - ModestConnectionSpecificSmtpEditWindowPrivate *priv = - CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); - - GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */ - gtk_box_set_spacing (GTK_BOX (box), MODEST_MARGIN_NONE); - gtk_container_set_border_width (GTK_CONTAINER (box), MODEST_MARGIN_HALF); + ModestConnectionSpecificSmtpEditWindowPrivate *priv; + GtkWidget *dialog_box; + GtkWidget *scrolled_window, *vbox; + + gtk_widget_set_size_request (GTK_WIDGET (self), 600, -1); + + priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); + dialog_box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */ + gtk_box_set_spacing (GTK_BOX (dialog_box), MODEST_MARGIN_NONE); + gtk_container_set_border_width (GTK_CONTAINER (dialog_box), MODEST_MARGIN_HALF); + + vbox = gtk_vbox_new (FALSE, 0); /* 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. @@ -243,7 +294,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd GtkWidget *caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (priv->entry_outgoingserver); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The secure authentication widgets: */ @@ -253,7 +304,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd priv->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL); g_signal_connect (G_OBJECT (priv->combo_outgoing_auth), "changed", G_CALLBACK(on_change), self); gtk_widget_show (priv->combo_outgoing_auth); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The username widgets: */ @@ -264,7 +315,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd priv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY); g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self); gtk_widget_show (priv->entry_user_username); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Prevent the use of some characters in the username, @@ -287,7 +338,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd _("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL); g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_change), self); gtk_widget_show (priv->entry_user_password); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The secure connection widgets: */ @@ -300,19 +351,19 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"), priv->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL); gtk_widget_show (priv->combo_outgoing_security); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* The port number widgets: */ if (!priv->entry_port) - priv->entry_port = GTK_WIDGET (hildon_number_editor_new (1, 65535)); + priv->entry_port = GTK_WIDGET (hildon_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX)); caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL); 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 (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Show a default port number when the security method changes, as per the UI spec: */ @@ -326,9 +377,20 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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(box), "set-focus-child", G_CALLBACK(on_set_focus_child), 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))); - gtk_widget_show (box); + gtk_widget_show_all (dialog_box); + gtk_window_set_default_size (GTK_WINDOW (self), -1, 220); /* When this window is shown, hibernation should not be possible, @@ -359,9 +421,13 @@ modest_connection_specific_smtp_edit_window_set_connection ( gchar* title = g_strdup_printf (_("mcen_ti_connection_connection_name"), iap_name); gtk_window_set_title (GTK_WINDOW (window), title); g_free (title); - + if (server_settings) { + + 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), @@ -385,6 +451,11 @@ modest_connection_specific_smtp_edit_window_set_connection ( /* 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; + } + } } @@ -421,6 +492,8 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif modest_server_account_settings_set_auth_protocol (server_settings, modest_secureauth_combo_box_get_active_secureauth ( MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth))); + modest_server_account_settings_set_account_name (server_settings, + priv->account_name); /* port: */ modest_server_account_settings_set_port (server_settings,