#include "modest-hildon-includes.h"
#include "modest-runtime.h"
-#include "modest-serversecurity-picker.h"
-#include "modest-secureauth-picker.h"
#include "widgets/modest-validating-entry.h"
#include <modest-scrollable.h>
#include <hildon/hildon-entry.h>
#include <gtk/gtkstock.h>
#include "modest-text-utils.h"
#include "modest-maemo-utils.h"
+#include <modest-toolkit-factory.h>
#include <glib/gi18n.h>
struct _ModestConnectionSpecificSmtpEditWindowPrivate
{
GtkWidget *entry_outgoingserver;
- GtkWidget *outgoing_auth_picker;
+ GtkWidget *outgoing_auth_selector;
GtkWidget *entry_user_username;
GtkWidget *entry_user_password;
- GtkWidget *outgoing_security_picker;
+ GtkWidget *outgoing_security_selector;
GtkWidget *entry_port;
GtkWidget *button_ok;
/* Check all mandatory entries */
on_change (widget, self);
- auth_proto = modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker));
+ auth_proto = modest_secureauth_selector_get_active_secureauth (priv->outgoing_auth_selector);
if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (),
auth_proto)) {
- text = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
+ text = modest_entry_get_text (priv->entry_user_username);
if (!text || (strlen(text) == 0))
sensitive = FALSE;
}
- text = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver));
+ text = modest_entry_get_text (priv->entry_outgoingserver);
if (!text || (strlen(text) == 0))
sensitive = FALSE;
ModestConnectionSpecificSmtpEditWindowPrivate *priv =
CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
- hostname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver));
+ hostname = modest_entry_get_text (priv->entry_outgoingserver);
/* Don't close the dialog if a range error occured */
if(response_id == GTK_RESPONSE_OK && priv->range_error_occured)
}
static void
-security_picker_set_port (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
+security_selector_set_port (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
{
const gint port_number =
- modest_serversecurity_picker_get_active_serversecurity_port (
- MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
+ modest_serversecurity_selector_get_active_serversecurity_port (priv->outgoing_security_selector);
if(port_number != 0) {
- modest_number_editor_set_value (
- MODEST_NUMBER_EDITOR (priv->entry_port), port_number);
+ modest_number_entry_set_value (
+ priv->entry_port, port_number);
}
}
static void
-on_security_picker_changed (HildonPickerButton *widget, gpointer user_data)
+on_security_selector_changed (GtkWidget *widget, gpointer user_data)
{
ModestConnectionSpecificSmtpEditWindow *self =
MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data);
on_change(GTK_WIDGET(widget), self);
/* Enable/disable username and password fields */
- security_picker_set_port (priv);
+ security_selector_set_port (priv);
}
static void
-auth_picker_set_sensitive (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
+auth_selector_set_sensitive (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
{
ModestProtocolType auth_proto;
auth_proto =
- modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker));
+ modest_secureauth_selector_get_active_secureauth (priv->outgoing_auth_selector);
if (auth_proto == modest_protocol_registry_get_none_auth_type_id ()) {
gtk_widget_set_sensitive (priv->entry_user_username, FALSE);
}
static void
-on_auth_picker_changed (HildonPickerButton *widget, gpointer user_data)
+on_auth_selector_changed (GtkWidget *widget, gpointer user_data)
{
ModestConnectionSpecificSmtpEditWindow *self;
ModestConnectionSpecificSmtpEditWindowPrivate *priv;
on_change (GTK_WIDGET(widget), self);
/* Enable/disable username and password fields */
- auth_picker_set_sensitive (priv);
+ auth_selector_set_sensitive (priv);
/* Check missing mandatory data */
on_mandatory_entry_changed (priv->entry_user_username, self);
/* The outgoing server widgets: */
if (!priv->entry_outgoingserver)
- priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ priv->entry_outgoingserver = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
/* Auto-capitalization is the default, so let's turn it off: */
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_mandatory_entry_changed), self);
gtk_widget_show (captioned);
/* The secure authentication widgets: */
- if (!priv->outgoing_auth_picker) {
- priv->outgoing_auth_picker =
- GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ if (!priv->outgoing_auth_selector) {
+ priv->outgoing_auth_selector =
+ modest_toolkit_factory_create_secureauth_selector (modest_runtime_get_toolkit_factory ());
}
- modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_secure_authentication"),
- priv->outgoing_auth_picker);
- gtk_widget_show (priv->outgoing_auth_picker);
- gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_picker, FALSE, FALSE, 0);
+ if (GTK_IS_COMBO_BOX (priv->outgoing_auth_selector)) {
+ GtkWidget *captioned;
+ captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_secure_authentication"), FALSE,
+ priv->outgoing_auth_selector);
+ gtk_widget_show (captioned);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, 0);
+ } else {
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_secure_authentication"),
+ priv->outgoing_auth_selector);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_auth_selector, FALSE, FALSE, 0);
+ }
+ gtk_widget_show (priv->outgoing_auth_selector);
/* The username widgets: */
priv->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_username), 64);
/* The password widgets: */
- priv->entry_user_password = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ priv->entry_user_password = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_widget_show (captioned);
/* The secure connection widgets: */
- 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, 0);
+ if (!priv->outgoing_security_selector)
+ priv->outgoing_security_selector =
+ modest_toolkit_factory_create_serversecurity_selector (modest_runtime_get_toolkit_factory ());
+ modest_serversecurity_selector_fill (priv->outgoing_security_selector, MODEST_PROTOCOLS_TRANSPORT_SMTP);
+ modest_serversecurity_selector_set_active_serversecurity (priv->outgoing_security_selector, MODEST_PROTOCOLS_CONNECTION_NONE);
+ if (GTK_IS_COMBO_BOX (priv->outgoing_security_selector)) {
+ GtkWidget *captioned;
+
+ captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_secure_connection"), FALSE,
+ priv->outgoing_security_selector);
+ gtk_box_pack_start (GTK_BOX (vbox), captioned, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (captioned);
+ } else {
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_secure_connection"),
+ priv->outgoing_security_selector);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->outgoing_security_selector, FALSE, FALSE, 0);
+ }
+ gtk_widget_show (priv->outgoing_security_selector);
/* The port number widgets: */
if (!priv->entry_port)
- priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
+ priv->entry_port = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
+ PORT_RANGE_MIN, PORT_RANGE_MAX);
captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
_("mcen_fi_emailsetup_port"), FALSE, priv->entry_port);
gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK);
modest_runtime_get_window_mgr (), GTK_WINDOW (self));
/* Refresh view with current settings */
- auth_picker_set_sensitive (priv);
- security_picker_set_port (priv);
+ auth_selector_set_sensitive (priv);
+ security_selector_set_port (priv);
/* Connect signals to track changes */
- g_signal_connect (G_OBJECT (priv->outgoing_security_picker),
- "value-changed",
- (GCallback) on_security_picker_changed,
- self);
- g_signal_connect (G_OBJECT (priv->outgoing_auth_picker),
- "value-changed",
- (GCallback) on_auth_picker_changed,
- self);
+ if (GTK_IS_COMBO_BOX (priv->outgoing_security_selector)) {
+ g_signal_connect (G_OBJECT (priv->outgoing_security_selector),
+ "changed",
+ (GCallback) on_security_selector_changed,
+ self);
+ } else {
+ g_signal_connect (G_OBJECT (priv->outgoing_security_selector),
+ "value-changed",
+ (GCallback) on_security_selector_changed,
+ self);
+ }
+ if (GTK_IS_COMBO_BOX (priv->outgoing_auth_selector)) {
+ g_signal_connect (G_OBJECT (priv->outgoing_auth_selector),
+ "changed",
+ (GCallback) on_auth_selector_changed,
+ self);
+ } else {
+ g_signal_connect (G_OBJECT (priv->outgoing_auth_selector),
+ "value-changed",
+ (GCallback) on_auth_selector_changed,
+ self);
+ }
g_signal_connect(G_OBJECT(priv->entry_port),
"range-error",
G_CALLBACK(on_range_error),
if (priv->account_name)
g_free (priv->account_name);
priv->account_name = g_strdup (modest_server_account_settings_get_account_name (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver),
+ modest_entry_set_text (priv->entry_outgoingserver,
modest_server_account_settings_get_hostname (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_username),
+ modest_entry_set_text (priv->entry_user_username,
modest_server_account_settings_get_username (server_settings));
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_password),
+ modest_entry_set_text (priv->entry_user_password,
modest_server_account_settings_get_password (server_settings));
- modest_serversecurity_picker_set_active_serversecurity (
- MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker),
- modest_server_account_settings_get_security_protocol (server_settings));
+ modest_serversecurity_selector_set_active_serversecurity
+ (priv->outgoing_security_selector,
+ modest_server_account_settings_get_security_protocol (server_settings));
- modest_secureauth_picker_set_active_secureauth (
- MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker),
- modest_server_account_settings_get_auth_protocol (server_settings));
+ modest_secureauth_selector_set_active_secureauth (priv->outgoing_auth_selector,
+ modest_server_account_settings_get_auth_protocol (server_settings));
/* port: */
- modest_number_editor_set_value (
- MODEST_NUMBER_EDITOR (priv->entry_port),
+ modest_number_entry_set_value (
+ priv->entry_port,
modest_server_account_settings_get_port (server_settings));
const gchar *outgoing_server = NULL;
priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
- outgoing_server = hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver));
+ outgoing_server = modest_entry_get_text (priv->entry_outgoingserver);
/* If the outgoing server is NULL, we are removing the connection specific
* settings */
server_settings = modest_server_account_settings_new ();
modest_server_account_settings_set_hostname (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver)));
+ modest_entry_get_text (priv->entry_outgoingserver));
modest_server_account_settings_set_protocol (server_settings,
MODEST_PROTOCOLS_TRANSPORT_SMTP);
modest_server_account_settings_set_username (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)));
+ modest_entry_get_text (priv->entry_user_username));
modest_server_account_settings_set_password (server_settings,
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password)));
+ modest_entry_get_text (priv->entry_user_password));
modest_server_account_settings_set_security_protocol (server_settings,
- modest_serversecurity_picker_get_active_serversecurity (
- MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker)));
- modest_server_account_settings_set_auth_protocol (server_settings,
- modest_secureauth_picker_get_active_secureauth (
- MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker)));
+ modest_serversecurity_selector_get_active_serversecurity (
+ priv->outgoing_security_selector));
+ modest_server_account_settings_set_auth_protocol
+ (server_settings,
+ modest_secureauth_selector_get_active_secureauth (priv->outgoing_auth_selector));
modest_server_account_settings_set_account_name (server_settings,
priv->account_name);
/* port: */
modest_server_account_settings_set_port (server_settings,
- modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->entry_port)));
+ modest_number_entry_get_value (priv->entry_port));
return server_settings;
}
projects / modest / blobdiff