X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-connection-specific-smtp-edit-window.c;h=5268249e204c87660f15556f964dd8189a897bf9;hb=2064f741529da69844c75001c8af22684b9108de;hp=d37bc6d212a0f7eb660590507db616b73396070f;hpb=31cd8a2a77f1c87e3c46bf318dca752f1cec513f;p=modest diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index d37bc6d..5268249 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -150,6 +150,35 @@ on_change(GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self) } static void +on_mandatory_entry_changed (GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self) +{ + const gchar *text; + gboolean sensitive = TRUE; + ModestConnectionSpecificSmtpEditWindowPrivate *priv; + ModestProtocolType auth_proto; + + priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); + + /* Check all mandatory entries */ + on_change (widget, self); + + auth_proto = modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker)); + if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (), + auth_proto)) { + text = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)); + if (!text || (strlen(text) == 0)) + sensitive = FALSE; + } + + text = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)); + if (!text || (strlen(text) == 0)) + sensitive = FALSE; + + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, sensitive); +} + + +static void on_value_changed(GtkWidget* widget, GValue* value, ModestConnectionSpecificSmtpEditWindow *self) { ModestConnectionSpecificSmtpEditWindowPrivate *priv = @@ -304,15 +333,19 @@ auth_picker_set_sensitive (ModestConnectionSpecificSmtpEditWindowPrivate *priv) 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); + ModestConnectionSpecificSmtpEditWindow *self; + ModestConnectionSpecificSmtpEditWindowPrivate *priv; + + self = MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data); + 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); + + /* Check missing mandatory data */ + on_mandatory_entry_changed (priv->entry_user_username, self); } static void @@ -320,7 +353,8 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd { ModestConnectionSpecificSmtpEditWindowPrivate *priv; GtkWidget *dialog_box; - GtkWidget *pannable, *vbox; + GtkWidget *pannable, *vbox, *align; + gchar *server_label; /* The title of this dialog is quite long, so make the window wide enough */ gtk_widget_set_size_request (GTK_WIDGET (self), 600, 320); @@ -328,9 +362,10 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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); + 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); /* 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. @@ -343,14 +378,17 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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); + g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_mandatory_entry_changed), self); + + server_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n(SMTP)", NULL); GtkWidget *captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, - _("mcen_li_emailsetup_smtp"), FALSE, + server_label, TRUE, priv->entry_outgoingserver); + g_free (server_label); gtk_widget_show (priv->entry_outgoingserver); - gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); gtk_widget_show (captioned); /* The secure authentication widgets: */ @@ -363,7 +401,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd _("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); + gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, 0); /* The username widgets: */ priv->entry_user_username = GTK_WIDGET (modest_validating_entry_new ()); @@ -372,9 +410,9 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup, _("mail_fi_username"), FALSE, priv->entry_user_username); - g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self); + g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_mandatory_entry_changed), self); gtk_widget_show (priv->entry_user_username); - gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); gtk_widget_show (captioned); /* Prevent the use of some characters in the username, @@ -397,7 +435,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd _("mail_fi_password"), FALSE, 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); - gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); gtk_widget_show (captioned); /* The secure connection widgets: */ @@ -413,7 +451,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd _("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); + gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_security_picker, FALSE, FALSE, 0); /* The port number widgets: */ if (!priv->entry_port) @@ -422,12 +460,13 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd _("mcen_fi_emailsetup_port"), FALSE, priv->entry_port); gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK); gtk_widget_show (priv->entry_port); - gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0); gtk_widget_show (captioned); - /* Add the buttons: */ + /* Add the button. Disabled by default */ gtk_dialog_add_button (GTK_DIALOG (self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK); - + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE); + priv->is_dirty = FALSE; priv->range_error_occured = FALSE; g_signal_connect(G_OBJECT(self), "response", G_CALLBACK(on_response), self); @@ -438,11 +477,12 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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_container_add (GTK_CONTAINER (align), vbox); + hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align); 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); + gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT); g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); @@ -452,10 +492,6 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd 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);