#include "modest-hildon-includes.h"
#include "modest-runtime.h"
-#include "widgets/modest-serversecurity-combo-box.h"
-#include "widgets/modest-secureauth-combo-box.h"
+#include "modest-serversecurity-picker.h"
+#include "modest-secureauth-picker.h"
#include "widgets/modest-validating-entry.h"
+#include <hildon/hildon-pannable-area.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
struct _ModestConnectionSpecificSmtpEditWindowPrivate
{
GtkWidget *entry_outgoingserver;
- GtkWidget *combo_outgoing_auth;
+ GtkWidget *outgoing_auth_picker;
GtkWidget *entry_user_username;
GtkWidget *entry_user_password;
- GtkWidget *combo_outgoing_security;
+ GtkWidget *outgoing_security_picker;
GtkWidget *entry_port;
GtkWidget *button_ok;
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 (_HL("ckct_ib_maximum_value"));
+ } else if (type == HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED) {
+ msg = g_strdup (_HL("ckct_ib_minimum_value"));
+ } 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_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)
{
gint response;
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (user_data),
_("imum_nc_wizard_confirm_lose_changes"));
- if (response == GTK_RESPONSE_CANCEL)
+ if (response != GTK_RESPONSE_OK)
g_signal_stop_emission_by_name (dialog, "response");
}
}
}
static void
-on_combo_security_changed (GtkComboBox *widget, gpointer user_data)
+on_security_picker_changed (HildonPickerButton *widget, gpointer user_data)
{
ModestConnectionSpecificSmtpEditWindow *self =
MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data);
on_change(GTK_WIDGET(widget), self);
const gint port_number =
- modest_serversecurity_combo_box_get_active_serversecurity_port (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+ modest_serversecurity_picker_get_active_serversecurity_port (
+ MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
if(port_number != 0) {
hildon_number_editor_set_value (
{
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); */
/* 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)
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 *caption = hildon_caption_new (sizegroup,
- _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
+ GtkWidget *captioned =
+ modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_smtp"),
+ priv->entry_outgoingserver);
gtk_widget_show (priv->entry_outgoingserver);
- gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (captioned);
/* The secure authentication widgets: */
- if (!priv->combo_outgoing_auth)
- priv->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
- caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
- 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 (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ if (!priv->outgoing_auth_picker) {
+ priv->outgoing_auth_picker =
+ GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ }
+ 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", G_CALLBACK(on_change), self);
+ gtk_widget_show (priv->outgoing_auth_picker);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
/* 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);
- caption = hildon_caption_new (sizegroup, _("mail_fi_username"),
- priv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
+ 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);
- gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (captioned);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
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), '*'); */
- caption = hildon_caption_new (sizegroup,
- _("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
+ 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);
- gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (captioned);
/* The secure connection widgets: */
- if (!priv->combo_outgoing_security)
- priv->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
- modest_serversecurity_combo_box_fill (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOLS_TRANSPORT_SMTP);
- modest_serversecurity_combo_box_set_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOLS_CONNECTION_NONE);
- 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 (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ if (!priv->outgoing_security_picker)
+ priv->outgoing_security_picker =
+ GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE,
+ 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_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));
- caption = hildon_caption_new (sizegroup,
- _("mcen_fi_emailsetup_port"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL);
+ 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), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ 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->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
- on_combo_security_changed (GTK_COMBO_BOX (priv->combo_outgoing_security), self);
+ 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), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+ 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;
- 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: */
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_user_password),
modest_server_account_settings_get_password (server_settings));
- modest_serversecurity_combo_box_set_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security),
+ modest_serversecurity_picker_set_active_serversecurity (
+ MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker),
modest_server_account_settings_get_security_protocol (server_settings));
- modest_secureauth_combo_box_set_active_secureauth (
- MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth),
+ modest_secureauth_picker_set_active_secureauth (
+ MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker),
modest_server_account_settings_get_auth_protocol (server_settings));
/* port: */
/* 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;
- }
-
}
}
gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password)));
modest_server_account_settings_set_security_protocol (server_settings,
- modest_serversecurity_combo_box_get_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security)));
+ modest_serversecurity_picker_get_active_serversecurity (
+ MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker)));
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_secureauth_picker_get_active_secureauth (
+ MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker)));
modest_server_account_settings_set_account_name (server_settings,
priv->account_name);
projects / modest / blobdiff