#include "modest-serversecurity-picker.h"
#include "modest-secureauth-picker.h"
#include "widgets/modest-validating-entry.h"
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
#include <hildon/hildon-entry.h>
#include <modest-ui-constants.h>
#include <gtk/gtkbutton.h>
auth_proto = modest_secureauth_picker_get_active_secureauth (MODEST_SECUREAUTH_PICKER (priv->outgoing_auth_picker));
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)
if (hostname && (hostname[0] != '\0') &&
(!modest_text_utils_validate_domain_name (hostname))) {
g_signal_stop_emission_by_name (dialog, "response");
- hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_servername"));
+ modest_platform_system_banner (NULL, NULL, _("mcen_ib_invalid_servername"));
gtk_widget_grab_focus (priv->entry_outgoingserver);
gtk_editable_select_region (GTK_EDITABLE (priv->entry_outgoingserver), 0, -1);
return;
MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
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);
}
}
{
ModestConnectionSpecificSmtpEditWindowPrivate *priv;
GtkWidget *dialog_box;
- GtkWidget *pannable, *vbox, *align;
+ GtkWidget *scrollable, *vbox, *align;
gchar *server_label;
/* The title of this dialog is quite long, so make the window wide enough */
/* 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_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);
/* 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);
priv->account_name = NULL;
- pannable = hildon_pannable_area_new ();
- g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
gtk_container_add (GTK_CONTAINER (align), vbox);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
- gtk_box_pack_start (GTK_BOX (dialog_box), pannable, TRUE, TRUE, 0);
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align);
+ gtk_box_pack_start (GTK_BOX (dialog_box), scrollable, TRUE, TRUE, 0);
gtk_widget_show_all (dialog_box);
gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
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_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 (
/* 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