#include "modest-account-protocol.h"
#include "widgets/modest-ui-constants.h"
#include "widgets/modest-validating-entry.h"
-#include "widgets/modest-serversecurity-combo-box.h"
-#include "widgets/modest-secureauth-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#else
-#include <hildon/hildon-caption.h>
-#include <hildon/hildon-number-editor.h>
-#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
+#include "modest-serversecurity-picker.h"
+#include "modest-secureauth-picker.h"
+#include "modest-maemo-utils.h"
+#include <modest-number-editor.h>
+#include <hildon/hildon-check-button.h>
+#include "modest-hildon-includes.h"
#define PORT_MIN 1
#define PORT_MAX 65535
typedef struct _ModestMaemoSecurityOptionsViewPrivate ModestMaemoSecurityOptionsViewPrivate;
struct _ModestMaemoSecurityOptionsViewPrivate {
+ gboolean missing_data;
};
#define MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE(o) \
static void on_entry_changed (GtkEditable *editable, gpointer user_data);
-/* Tracks changes in the incoming security combo box */
+static void on_valid_changed (ModestNumberEditor *editor, gboolean valid, ModestSecurityOptionsView *self);
+
+/* Tracks changes in the incoming security picker */
static void
on_security_changed (GtkWidget *widget,
ModestMaemoSecurityOptionsView *self)
{
ModestSecurityOptionsViewPrivate* ppriv;
- ModestServersecurityComboBox *combo;
+ ModestServersecurityPicker *picker;
ModestProtocolType proto_type;
ModestProtocolRegistry *proto_registry;
gboolean is_secure;
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
proto_registry = modest_runtime_get_protocol_registry ();
- combo = MODEST_SERVERSECURITY_COMBO_BOX (ppriv->security_view);
- proto_type = modest_serversecurity_combo_box_get_active_serversecurity (combo);
+ picker = MODEST_SERVERSECURITY_PICKER (ppriv->security_view);
+ proto_type = modest_serversecurity_picker_get_active_serversecurity (picker);
is_secure = modest_protocol_registry_protocol_type_has_tag (proto_registry, proto_type,
MODEST_PROTOCOL_REGISTRY_SECURE_PROTOCOLS);
- if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) {
- /* Activate and dim checkbutton if it's secure */
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ppriv->auth_view),
- is_secure);
- gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
- } else {
-
- }
-
if (ppriv->full) {
gint port_number =
- modest_serversecurity_combo_box_get_active_serversecurity_port (MODEST_SERVERSECURITY_COMBO_BOX (ppriv->security_view));
-
+ modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
+
if(port_number) {
- hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view),
+ modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view),
port_number);
}
}
ModestMaemoSecurityOptionsView *self)
{
ModestSecurityOptionsViewPrivate* ppriv;
- ModestSecureauthComboBox *combo;
+ ModestSecureauthPicker *picker;
ModestProtocolRegistry *protocol_registry;
ModestProtocolType auth_proto;
gboolean secureauth_used;
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
protocol_registry = modest_runtime_get_protocol_registry ();
- combo = MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view);
+ picker = MODEST_SECUREAUTH_PICKER (ppriv->auth_view);
- auth_proto = modest_secureauth_combo_box_get_active_secureauth (combo);
+ auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
secureauth_used = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
auth_proto);
/* Get captions, well dimm the whole widget */
user_caption = gtk_widget_get_parent (ppriv->user_entry);
pwd_caption = gtk_widget_get_parent (ppriv->pwd_entry);
-
+
/* Enable / disable */
gtk_widget_set_sensitive (user_caption, secureauth_used);
gtk_widget_set_sensitive (pwd_caption, secureauth_used);
static void
create_incoming_security (ModestSecurityOptionsView* self,
- GtkSizeGroup *size_group)
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsViewPrivate *ppriv;
- GtkWidget *combo_caption, *check_caption, *entry_caption = NULL;
+ GtkWidget *entry_caption = NULL;
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
/* Create widgets for incoming security */
- ppriv->security_view = GTK_WIDGET (modest_serversecurity_combo_box_new ());
- combo_caption = hildon_caption_new (size_group, _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view, NULL,
- HILDON_CAPTION_OPTIONAL);
-
- if (ppriv->full) {
- ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
- entry_caption = hildon_caption_new (size_group, _("mcen_fi_emailsetup_port"),
- ppriv->port_view, NULL,
- HILDON_CAPTION_OPTIONAL);
- }
-
- ppriv->auth_view = gtk_check_button_new ();
- check_caption =
- hildon_caption_new (size_group, _("mcen_li_emailsetup_secure_authentication"),
- ppriv->auth_view, NULL, HILDON_CAPTION_OPTIONAL);
-
- /* Track changes in UI */
- g_signal_connect (G_OBJECT (ppriv->security_view), "changed",
+ ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view),
+ modest_protocol_registry_get_pop_type_id ());
+ modest_maemo_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_connection"),
+ ppriv->security_view);
+
+ ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE);
+ gtk_button_set_label (GTK_BUTTON (ppriv->auth_view), _("mcen_li_emailsetup_secure_authentication"));
+ gtk_button_set_alignment (GTK_BUTTON (ppriv->auth_view), 0.0, 0.5);
+
+ /* Track changes in UI */
+ g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
G_CALLBACK (on_security_changed), self);
- /* Pack into container */
- gtk_box_pack_start (GTK_BOX (self), combo_caption,
- FALSE, FALSE, MODEST_MARGIN_HALF);
- if (ppriv->full)
- gtk_box_pack_start (GTK_BOX (self), entry_caption,
- FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), check_caption,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ /* Pack into container & show */
+ gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
+ gtk_widget_show (ppriv->security_view);
+ gtk_widget_show (ppriv->auth_view);
- /* Show widgets */
if (ppriv->full) {
+ ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+ entry_caption =
+ modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+ value_size_group,
+ _("mcen_fi_emailsetup_port"),
+ FALSE,
+ ppriv->port_view,
+ MODEST_EDITABLE_SIZE);
+ /* Pack & show widgets */
+ gtk_box_pack_start (GTK_BOX (self), entry_caption, FALSE, FALSE, 0);
gtk_widget_show (ppriv->port_view);
gtk_widget_show (entry_caption);
+
+ /* Track changes in UI */
+ g_signal_connect (G_OBJECT (ppriv->port_view), "valid-changed",
+ G_CALLBACK (on_valid_changed), self);
}
- gtk_widget_show (ppriv->security_view);
- gtk_widget_show (ppriv->auth_view);
- gtk_widget_show (combo_caption);
- gtk_widget_show (check_caption);
}
static void
}
/*
- * TODO: call this whenever the auth combo changes. If we set it
+ * TODO: call this whenever the auth picker changes. If we set it
* explicitely at the beggining to a value then there is no need to
* call this handler directly at the beginning
*/
gpointer user_data)
{
ModestSecurityOptionsView* self;
+ ModestMaemoSecurityOptionsViewPrivate *priv;
ModestSecurityOptionsViewPrivate *ppriv;
- ModestProtocolType auth_proto;
- ModestSecureauthComboBox *combo;
- gboolean is_secure, missing;
+ ModestSecureauthPicker *picker;
+ gboolean is_secure = FALSE;
ModestProtocolRegistry *protocol_registry;
self = MODEST_SECURITY_OPTIONS_VIEW (user_data);
+ priv = MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
protocol_registry = modest_runtime_get_protocol_registry ();
- /* Outgoing username is mandatory if outgoing auth is secure */
- combo = MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view);
- auth_proto = modest_secureauth_combo_box_get_active_secureauth (combo);
- is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
- auth_proto);
+ /* Check if it's a secure protocol */
+ if (MODEST_IS_SECUREAUTH_PICKER (ppriv->auth_view)) {
+ ModestProtocolType auth_proto;
+ picker = MODEST_SECUREAUTH_PICKER (ppriv->auth_view);
+ auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
+ is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
+ auth_proto);
+ } else if (HILDON_IS_CHECK_BUTTON (ppriv->auth_view)) {
+ is_secure = hildon_check_button_get_active (HILDON_CHECK_BUTTON (ppriv->auth_view));
+ }
- if (is_secure &&
- !g_ascii_strcasecmp (gtk_entry_get_text (GTK_ENTRY (ppriv->user_entry)), "")) {
- missing = TRUE;
+ if (is_secure &&
+ !g_strcmp0 (hildon_entry_get_text (HILDON_ENTRY (ppriv->user_entry)), "")) {
+ priv->missing_data = TRUE;
} else {
- missing = FALSE;
+ priv->missing_data = FALSE;
}
-
+
+ if (!priv->missing_data &&
+ ppriv->full &&
+ !modest_number_editor_is_valid (MODEST_NUMBER_EDITOR (ppriv->port_view)))
+ priv->missing_data = TRUE;
+
/* Emit a signal to notify if mandatory data is missing */
- g_signal_emit_by_name (G_OBJECT (self), "missing_mandatory_data",
- missing, NULL);
+ g_signal_emit_by_name (G_OBJECT (self), "missing_mandatory_data",
+ priv->missing_data, NULL);
+}
+
+static void
+on_valid_changed (ModestNumberEditor *editor,
+ gboolean valid,
+ ModestSecurityOptionsView *self)
+{
+ on_entry_changed (NULL, (gpointer) self);
}
static void
create_outgoing_security (ModestSecurityOptionsView* self,
- GtkSizeGroup *size_group)
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsViewPrivate *ppriv;
- GtkWidget *sec_caption, *auth_caption, *user_caption = NULL;
+ GtkWidget *user_caption = NULL;
GtkWidget *pwd_caption = NULL, *port_caption = NULL;
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
/* The secure connection widgets */
- ppriv->security_view = GTK_WIDGET (modest_serversecurity_combo_box_new ());
- modest_serversecurity_combo_box_fill (MODEST_SERVERSECURITY_COMBO_BOX (ppriv->security_view),
+ ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view),
MODEST_PROTOCOLS_TRANSPORT_SMTP);
- sec_caption = hildon_caption_new (size_group, _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view, NULL, HILDON_CAPTION_OPTIONAL);
+ modest_maemo_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_connection"),
+ ppriv->security_view);
/* The secure authentication widgets */
- ppriv->auth_view = GTK_WIDGET (modest_secureauth_combo_box_new ());
- auth_caption = hildon_caption_new (size_group, _("mcen_li_emailsetup_secure_authentication"),
- ppriv->auth_view, NULL, HILDON_CAPTION_OPTIONAL);
+ ppriv->auth_view = GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ modest_maemo_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_authentication"),
+ ppriv->auth_view);
if (ppriv->full) {
gchar *user_label;
HILDON_GTK_INPUT_MODE_FULL);
user_label = g_strdup_printf("%s*", _("mail_fi_username"));
- user_caption = hildon_caption_new (size_group, user_label,
- ppriv->user_entry, NULL,
- HILDON_CAPTION_MANDATORY);
+ user_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+ value_size_group,
+ user_label,
+ FALSE,
+ ppriv->user_entry,
+ MODEST_EDITABLE_SIZE);
g_free (user_label);
/* Prevent the use of some characters. Limit the max
on_entry_max, self);
/* Password widgets */
- ppriv->pwd_entry = gtk_entry_new ();
+ ppriv->pwd_entry = 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 (ppriv->pwd_entry),
HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
- pwd_caption = hildon_caption_new (size_group, _("mail_fi_password"),
- ppriv->pwd_entry, NULL,
- HILDON_CAPTION_OPTIONAL);
-
- ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
- port_caption = hildon_caption_new (size_group, _("mcen_fi_emailsetup_port"),
- ppriv->port_view, NULL,
- HILDON_CAPTION_OPTIONAL);
+ pwd_caption =
+ modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+ value_size_group,
+ _("mail_fi_password"),
+ FALSE,
+ ppriv->pwd_entry,
+ MODEST_EDITABLE_SIZE);
+
+ ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+ port_caption =
+ modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+ value_size_group,
+ _("mcen_fi_emailsetup_port"),
+ FALSE,
+ ppriv->port_view,
+ MODEST_EDITABLE_SIZE);
}
/* Track changes in UI */
- g_signal_connect (G_OBJECT (ppriv->security_view), "changed",
+ g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
G_CALLBACK (on_security_changed), self);
if (ppriv->full) {
- g_signal_connect (G_OBJECT (ppriv->auth_view), "changed",
+ g_signal_connect (G_OBJECT (ppriv->auth_view), "value-changed",
G_CALLBACK (on_auth_changed), self);
g_signal_connect (G_OBJECT (ppriv->user_entry), "changed",
G_CALLBACK (on_entry_changed), self);
+ g_signal_connect (G_OBJECT (ppriv->port_view), "valid-changed",
+ G_CALLBACK (on_valid_changed), self);
}
/* Initialize widgets */
- modest_serversecurity_combo_box_set_active_serversecurity (
- MODEST_SERVERSECURITY_COMBO_BOX (ppriv->security_view),
+ modest_serversecurity_picker_set_active_serversecurity (
+ MODEST_SERVERSECURITY_PICKER (ppriv->security_view),
MODEST_PROTOCOLS_CONNECTION_NONE);
- modest_secureauth_combo_box_set_active_secureauth (
- MODEST_SECUREAUTH_COMBO_BOX (ppriv->auth_view),
+ modest_secureauth_picker_set_active_secureauth (
+ MODEST_SECUREAUTH_PICKER (ppriv->auth_view),
MODEST_PROTOCOLS_AUTH_NONE);
/* Pack into container */
if (ppriv->full) {
- gtk_box_pack_start (GTK_BOX (self), auth_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), user_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), pwd_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), sec_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), port_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), user_caption, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), pwd_caption, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), port_caption, FALSE, FALSE, 0);
} else {
- /* The order is different */
- gtk_box_pack_start (GTK_BOX (self), sec_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (self), auth_caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
}
/* Show widgets */
}
gtk_widget_show (ppriv->security_view);
gtk_widget_show (ppriv->auth_view);
- gtk_widget_show (sec_caption);
- gtk_widget_show (auth_caption);
}
GtkWidget *
modest_maemo_security_options_view_new (ModestSecurityOptionsType type,
gboolean full,
- GtkSizeGroup *size_group)
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsView* self;
ModestSecurityOptionsViewPrivate *ppriv;
ppriv->full = full;
self->type = type;
if (self->type == MODEST_SECURITY_OPTIONS_INCOMING)
- create_incoming_security (self, size_group);
+ create_incoming_security (self, title_size_group, value_size_group);
else
- create_outgoing_security (self, size_group);
+ create_outgoing_security (self, title_size_group, value_size_group);
return (GtkWidget *) self;
}
-static void
-modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* self,
+gboolean
+modest_security_options_view_has_missing_mandatory_data (ModestSecurityOptionsView* self)
+{
+ ModestMaemoSecurityOptionsViewPrivate *priv;
+
+ priv = MODEST_MAEMO_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
+
+ return priv->missing_data;
+}
+
+static void
+modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* self,
ModestAccountSettings *settings)
{
ModestSecurityOptionsViewPrivate *ppriv;
} else if (ppriv->full) {
/* Keep the user-entered port-number, or the
* already-appropriate automatic port number */
- hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->port_view),
+ modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view),
port_number);
}
/* Frees */
server_settings = modest_account_settings_get_transport_settings (settings);
if (ppriv->full) {
- server_port = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view));
+ server_port = modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
} else {
- server_port = modest_serversecurity_combo_box_get_active_serversecurity_port (MODEST_SERVERSECURITY_COMBO_BOX (ppriv->security_view));
+ server_port = modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
}
modest_server_account_settings_set_port (server_settings, server_port);
server_settings = modest_account_settings_get_transport_settings (settings);
server_port =
- hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (ppriv->port_view));
+ modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
/* Frees */
g_object_unref (server_settings);
projects / modest / blobdiff