gboolean is_dirty;
gboolean range_error_occured;
- guint range_error_banner_timeout;
};
static void
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;
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)
{
+ gchar *msg;
ModestConnectionSpecificSmtpEditWindow *self = user_data;
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
* 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);
+
+ if (type == HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED) {
+ msg = g_strdup_printf (dgettext ("hildon-libs", "ckct_ib_maximum_value"), 65535);
+ } else if (type == HILDON_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);
/* Show error message by not returning TRUE */
return TRUE;
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;
- }
-
/* Don't close the dialog if a range error occured */
if(response_id == GTK_RESPONSE_OK && priv->range_error_occured)
{
if(port_number != 0) {
hildon_number_editor_set_value (
HILDON_NUMBER_EDITOR (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);
+ ModestProtocolType auth_proto;
+
+ on_change (GTK_WIDGET(widget), self);
+
+ /* Enable/disable username and password fields */
+ 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
modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEditWindow *self)
{
ModestConnectionSpecificSmtpEditWindowPrivate *priv;
/* 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)
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);
if (!priv->outgoing_auth_picker) {
priv->outgoing_auth_picker =
GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
}
- modest_maemo_utils_create_picker_layout (sizegroup,
- _("mcen_li_emailsetup_secure_authentication"),
- priv->outgoing_auth_picker);
- 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);
+ g_signal_connect (G_OBJECT (priv->outgoing_auth_picker), "value-changed", (GCallback)on_auth_picker_changed, self);
gtk_widget_show (priv->outgoing_auth_picker);
gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
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);
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);
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);
- modest_maemo_utils_create_picker_layout (sizegroup, _("mcen_li_emailsetup_secure_connection"), priv->outgoing_security_picker);
+ 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);
+ 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);
/* 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(vbox), "set-focus-child", G_CALLBACK(on_set_focus_child), self);
- priv->range_error_banner_timeout = 0;
priv->account_name = NULL;
pannable = hildon_pannable_area_new ();
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 */
+ on_auth_picker_changed (HILDON_PICKER_BUTTON (priv->outgoing_auth_picker), self);
+ on_security_picker_changed (HILDON_PICKER_BUTTON (priv->outgoing_security_picker), self);
}
ModestConnectionSpecificSmtpEditWindow*
/* 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;
- }
-
}
}
projects / modest / blobdiff