#include "modest-account-protocol.h"
#include "widgets/modest-ui-constants.h"
#include "widgets/modest-validating-entry.h"
-#include "modest-secureauth-picker.h"
#include "modest-maemo-utils.h"
#include "modest-hildon-includes.h"
+#include <modest-toolkit-factory.h>
+#include <modest-toolkit-utils.h>
#define PORT_MIN 1
#define PORT_MAX 65535
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 */
- modest_togglable_set_active (ppriv->auth_view,
- is_secure);
- gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
- } else {
-
- }
-
if (ppriv->full) {
- gint port_number =
+ gint port_number =
modest_serversecurity_selector_get_active_serversecurity_port (ppriv->security_view);
-
+
if(port_number) {
modest_number_entry_set_value (ppriv->port_view,
port_number);
ModestMaemoSecurityOptionsView *self)
{
ModestSecurityOptionsViewPrivate* ppriv;
- 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 ();
- picker = MODEST_SECUREAUTH_PICKER (ppriv->auth_view);
- auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
+ auth_proto = modest_secureauth_selector_get_active_secureauth (ppriv->auth_view);
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);
if (GTK_IS_COMBO_BOX (ppriv->security_view)) {
GtkWidget *captioned;
- captioned = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- _("mcen_li_emailsetup_secure_connection"), FALSE,
- ppriv->security_view);
+ captioned = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+ _("mcen_li_emailsetup_secure_connection"), FALSE,
+ ppriv->security_view);
g_signal_connect (G_OBJECT (ppriv->security_view), "changed",
G_CALLBACK (on_security_changed), self);
gtk_box_pack_start (GTK_BOX (self), captioned, FALSE, FALSE, 0);
gtk_widget_show (captioned);
} else {
- modest_maemo_utils_set_hbutton_layout (title_size_group,
- value_size_group,
- _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view);
+ modest_toolkit_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_connection"),
+ ppriv->security_view);
g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
G_CALLBACK (on_security_changed), self);
gtk_box_pack_start (GTK_BOX (self), ppriv->security_view, FALSE, FALSE, 0);
ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
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);
+ modest_toolkit_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);
gpointer user_data)
{
modest_platform_information_banner (GTK_WIDGET (self), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
/*
ModestSecurityOptionsView* self;
ModestMaemoSecurityOptionsViewPrivate *priv;
ModestSecurityOptionsViewPrivate *ppriv;
- ModestSecureauthPicker *picker;
gboolean is_secure = FALSE;
ModestProtocolRegistry *protocol_registry;
protocol_registry = modest_runtime_get_protocol_registry ();
/* Check if it's a secure protocol */
- if (MODEST_IS_SECUREAUTH_PICKER (ppriv->auth_view)) {
+ if (modest_is_secureauth_selector (ppriv->auth_view)) {
ModestProtocolType auth_proto;
- picker = MODEST_SECUREAUTH_PICKER (ppriv->auth_view);
- auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
+ auth_proto = modest_secureauth_selector_get_active_secureauth (ppriv->auth_view);
is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
auth_proto);
} else if (modest_is_togglable (ppriv->auth_view)) {
GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsViewPrivate *ppriv;
- GtkWidget *user_caption = NULL, *security_caption = NULL;
+ GtkWidget *user_caption = NULL, *security_caption = NULL, *auth_caption = NULL;
GtkWidget *pwd_caption = NULL, *port_caption = NULL;
ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self);
/* The secure connection widgets */
- ppriv->security_view = modest_toolkit_factory_create_serversecurity (modest_runtime_get_toolkit_factory ());
+ ppriv->security_view = modest_toolkit_factory_create_serversecurity_selector (modest_runtime_get_toolkit_factory ());
modest_serversecurity_selector_fill (ppriv->security_view,
MODEST_PROTOCOLS_TRANSPORT_SMTP);
if (GTK_IS_COMBO_BOX (ppriv->security_view)) {
- security_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- _("mcen_li_emailsetup_secure_connection"), FALSE,
- ppriv->security_view);
+ security_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+ _("mcen_li_emailsetup_secure_connection"), FALSE,
+ ppriv->security_view);
+ gtk_widget_show (security_caption);
} else {
- modest_maemo_utils_set_hbutton_layout (title_size_group,
- value_size_group,
- _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view);
+ modest_toolkit_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_connection"),
+ ppriv->security_view);
security_caption = ppriv->security_view;
}
/* The secure authentication widgets */
- 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);
+ ppriv->auth_view = modest_toolkit_factory_create_secureauth_selector (modest_runtime_get_toolkit_factory ());
+ if (GTK_IS_COMBO_BOX (ppriv->auth_view)) {
+ auth_caption = modest_toolkit_utils_create_captioned (title_size_group, value_size_group,
+ _("mcen_li_emailsetup_secure_authentication"), FALSE,
+ ppriv->auth_view);
+ gtk_widget_show (auth_caption);
+ } else {
+ modest_toolkit_utils_set_hbutton_layout (title_size_group,
+ value_size_group,
+ _("mcen_li_emailsetup_secure_authentication"),
+ ppriv->auth_view);
+ auth_caption = ppriv->auth_view;
+ }
if (ppriv->full) {
gchar *user_label;
#endif
user_label = g_strdup_printf("%s*", _("mail_fi_username"));
- 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);
+ user_caption = modest_toolkit_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
gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
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);
+ modest_toolkit_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 = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
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);
+ modest_toolkit_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_CALLBACK (on_security_changed), self);
}
if (ppriv->full) {
- g_signal_connect (G_OBJECT (ppriv->auth_view), "value-changed",
- G_CALLBACK (on_auth_changed), self);
+ if (GTK_IS_COMBO_BOX (ppriv->auth_view)) {
+ g_signal_connect (G_OBJECT (ppriv->auth_view), "changed",
+ G_CALLBACK (on_auth_changed), self);
+ } else {
+ 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);
#ifdef MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
modest_serversecurity_selector_set_active_serversecurity (
ppriv->security_view,
MODEST_PROTOCOLS_CONNECTION_NONE);
- modest_secureauth_picker_set_active_secureauth (
- MODEST_SECUREAUTH_PICKER (ppriv->auth_view),
+ modest_secureauth_selector_set_active_secureauth (
+ ppriv->auth_view,
MODEST_PROTOCOLS_AUTH_NONE);
/* Pack into container */
if (ppriv->full) {
- gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), auth_caption, 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), security_caption, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (self), port_caption, FALSE, FALSE, 0);
} else {
- 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_box_pack_start (GTK_BOX (self), auth_caption, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), security_caption, FALSE, FALSE, 0);
}
/* Show widgets */
projects / modest / blobdiff