#include "modest-serversecurity-picker.h"
#include "modest-secureauth-picker.h"
#include "widgets/modest-validating-entry.h"
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
#include <hildon/hildon-entry.h>
#include <modest-ui-constants.h>
#include <gtk/gtkbutton.h>
}
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 = modest_entry_get_text (priv->entry_user_username);
+ if (!text || (strlen(text) == 0))
+ sensitive = FALSE;
+ }
+
+ text = modest_entry_get_text (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 =
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
- hostname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver));
+ hostname = modest_entry_get_text (priv->entry_outgoingserver);
/* Don't close the dialog if a range error occured */
if(response_id == GTK_RESPONSE_OK && priv->range_error_occured)
if (hostname && (hostname[0] != '\0') &&
(!modest_text_utils_validate_domain_name (hostname))) {
g_signal_stop_emission_by_name (dialog, "response");
- hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername"));
+ modest_platform_system_banner (NULL, NULL, _("mcen_ib_invalid_servername"));
gtk_widget_grab_focus (priv->entry_outgoingserver);
gtk_editable_select_region (GTK_EDITABLE (priv->entry_outgoingserver), 0, -1);
return;
MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
if(port_number != 0) {
- modest_number_editor_set_value (
- MODEST_NUMBER_EDITOR (priv->entry_port), port_number);
+ modest_number_entry_set_value (
+ priv->entry_port, port_number);
}
}
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
{
ModestConnectionSpecificSmtpEditWindowPrivate *priv;
GtkWidget *dialog_box;
- GtkWidget *pannable, *vbox;
+ GtkWidget *scrollable, *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);
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.
/* The outgoing server widgets: */
if (!priv->entry_outgoingserver)
- priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ 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);
- 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<small>(SMTP)</small>", NULL);
GtkWidget *captioned =
modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_smtp"),
+ 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: */
_("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 ());
/* 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 (title_sizegroup, value_sizegroup,
- _("mail_fi_username"),
+ _("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,
gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_username), 64);
/* The password widgets: */
- priv->entry_user_password = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ 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);
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 (title_sizegroup, value_sizegroup,
- _("mail_fi_password"), priv->entry_user_password);
+ _("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: */
_("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)
- priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
+ priv->entry_port = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
+ PORT_RANGE_MIN, PORT_RANGE_MAX);
captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
- _("mcen_fi_emailsetup_port"), priv->entry_port);
+ _("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);
priv->account_name = NULL;
- 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);
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
+ gtk_container_add (GTK_CONTAINER (align), vbox);
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align);
+ gtk_box_pack_start (GTK_BOX (dialog_box), scrollable, 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);
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);
if (priv->account_name)
g_free (priv->account_name);
priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver),
+ modest_entry_set_text (priv->entry_outgoingserver,
modest_server_account_settings_get_hostname (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_username),
+ modest_entry_set_text (priv->entry_user_username,
modest_server_account_settings_get_username (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_password),
+ modest_entry_set_text (priv->entry_user_password,
modest_server_account_settings_get_password (server_settings));
modest_serversecurity_picker_set_active_serversecurity (
modest_server_account_settings_get_auth_protocol (server_settings));
/* port: */
- modest_number_editor_set_value (
- MODEST_NUMBER_EDITOR (priv->entry_port),
+ modest_number_entry_set_value (
+ priv->entry_port,
modest_server_account_settings_get_port (server_settings));
const gchar *outgoing_server = NULL;
priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
- outgoing_server = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver));
+ outgoing_server = modest_entry_get_text (priv->entry_outgoingserver);
/* If the outgoing server is NULL, we are removing the connection specific
* settings */
server_settings = modest_server_account_settings_new ();
modest_server_account_settings_set_hostname (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)));
+ modest_entry_get_text (priv->entry_outgoingserver));
modest_server_account_settings_set_protocol (server_settings,
MODEST_PROTOCOLS_TRANSPORT_SMTP);
modest_server_account_settings_set_username (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)));
+ modest_entry_get_text (priv->entry_user_username));
modest_server_account_settings_set_password (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password)));
+ modest_entry_get_text (priv->entry_user_password));
modest_server_account_settings_set_security_protocol (server_settings,
modest_serversecurity_picker_get_active_serversecurity (
/* port: */
modest_server_account_settings_set_port (server_settings,
- modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->entry_port)));
+ modest_number_entry_get_value (priv->entry_port));
return server_settings;
}
projects / modest / blobdiff