#include "modest-serversecurity-picker.h"
#include "modest-secureauth-picker.h"
#include "modest-maemo-utils.h"
-#include <hildon/hildon-number-editor.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
if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) {
/* Activate and dim checkbutton if it's secure */
- hildon_check_button_set_active (GTK_BUTTON (ppriv->auth_view),
+ hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->auth_view),
is_secure);
gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
} else {
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);
}
}
static void
create_incoming_security (ModestSecurityOptionsView* self,
- GtkSizeGroup *size_group)
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsViewPrivate *ppriv;
- GtkWidget *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_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
- modest_maemo_utils_create_picker_layout (size_group,
- _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view);
+ 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);
if (ppriv->full) {
- ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
- entry_caption = modest_maemo_utils_create_captioned (size_group, _("mcen_fi_emailsetup_port"),
+ ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+ entry_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ _("mcen_fi_emailsetup_port"),
ppriv->port_view);
}
ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE);
- check_caption = modest_maemo_utils_create_captioned (size_group,
- _("mcen_li_emailsetup_secure_authentication"),
- ppriv->auth_view);
+ 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",
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,
+ gtk_box_pack_start (GTK_BOX (self), ppriv->auth_view,
FALSE, FALSE, MODEST_MARGIN_HALF);
/* Show widgets */
}
gtk_widget_show (ppriv->security_view);
gtk_widget_show (ppriv->auth_view);
- gtk_widget_show (check_caption);
}
static void
auth_proto);
if (is_secure &&
- !g_ascii_strcasecmp (gtk_entry_get_text (GTK_ENTRY (ppriv->user_entry)), "")) {
+ !g_ascii_strcasecmp (hildon_entry_get_text (HILDON_ENTRY (ppriv->user_entry)), "")) {
missing = TRUE;
} else {
missing = FALSE;
static void
create_outgoing_security (ModestSecurityOptionsView* self,
- GtkSizeGroup *size_group)
+ GtkSizeGroup *title_size_group,
+ GtkSizeGroup *value_size_group)
{
ModestSecurityOptionsViewPrivate *ppriv;
GtkWidget *user_caption = NULL;
/* The secure connection widgets */
ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view),
MODEST_PROTOCOLS_TRANSPORT_SMTP);
- modest_maemo_utils_create_picker_layout (size_group, _("mcen_li_emailsetup_secure_connection"),
- ppriv->security_view);
+ 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_picker_new (MODEST_EDITABLE_SIZE,
- MODEST_EDITABLE_ARRANGEMENT));
- modest_maemo_utils_create_picker_layout (size_group, _("mcen_li_emailsetup_secure_authentication"),
- ppriv->auth_view);
+ 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 = modest_maemo_utils_create_captioned (size_group, user_label,
+ user_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ user_label,
ppriv->user_entry);
g_free (user_label);
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 = modest_maemo_utils_create_captioned (size_group, _("mail_fi_password"),
+ pwd_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ _("mail_fi_password"),
ppriv->pwd_entry);
- ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX));
- port_caption = modest_maemo_utils_create_captioned (size_group, _("mcen_fi_emailsetup_port"),
+ ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+ port_caption = modest_maemo_utils_create_captioned (title_size_group,
+ value_size_group,
+ _("mcen_fi_emailsetup_port"),
ppriv->port_view);
}
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;
}
} 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_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
}
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