#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkseparator.h>
#include "modest-country-picker.h"
#include "modest-maemo-security-options-view.h"
#include "modest-account-protocol.h"
#include "modest-address-book.h"
+#include <modest-scrollable.h>
+#include <modest-toolkit-factory.h>
/* Include config.h so that _() works: */
#ifdef HAVE_CONFIG_H
else
gtk_widget_show (priv->caption_account_title);
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
+ modest_entry_set_text (priv->entry_account_title, default_account_name);
g_free (default_account_name);
}
GtkWidget *align;
GtkWidget *label;
GtkWidget *privacy_note;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
ModestEasysetupWizardDialogPrivate *priv;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- pannable = hildon_pannable_area_new ();
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
privacy_note = gtk_label_new (_("mcen_ia_privacy_notice"));
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_widget_show (label);
gtk_widget_show (privacy_note);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align);
gtk_widget_show (GTK_WIDGET (box));
gtk_widget_show (GTK_WIDGET (align));
- gtk_widget_show (pannable);
+ gtk_widget_show (scrollable);
- return GTK_WIDGET (pannable);
+ return GTK_WIDGET (scrollable);
}
static void
with_at = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
if (priv->entry_user_email)
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), with_at);
+ modest_entry_set_text (priv->entry_user_email, with_at);
g_free (with_at);
g_free (provider_id);
g_free (default_account_name_start);
default_account_name_start = NULL;
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
+ modest_entry_set_text (priv->entry_account_title, default_account_name);
g_free (default_account_name);
default_account_name = NULL;
gchar *email_address;
gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id);
- current_username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
+ current_username = modest_entry_get_text (priv->entry_user_username);
if (current_username && strstr (current_username, "@")) {
email_address = g_strdup (current_username);
}
/* Update the email address */
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address);
+ modest_entry_set_text (priv->entry_user_email, email_address);
g_free (email_address);
g_free (domain_name);
on_entry_max, self);
/* 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);
ModestEasysetupWizardDialogPrivate* priv;
GtkWidget *box;
GtkWidget *align;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *label;
GtkSizeGroup *title_sizegroup;
GtkSizeGroup *value_sizegroup;
protocol_registry = modest_runtime_get_protocol_registry ();
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- pannable = hildon_pannable_area_new ();
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
/* Show note that account type cannot be changed in future: */
label = gtk_label_new (_("mcen_ia_emailsetup_account_type"));
gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, 0);
gtk_widget_show (priv->incoming_servertype_picker);
- priv->entry_incomingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
+ priv->entry_incomingserver = 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_incomingserver), HILDON_GTK_INPUT_MODE_FULL);
gtk_widget_show (align);
gtk_container_add (GTK_CONTAINER (align), box);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align);
gtk_widget_show (GTK_WIDGET (box));
- gtk_widget_show (pannable);
+ gtk_widget_show (scrollable);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
G_CALLBACK(on_easysetup_changed), self);
- return GTK_WIDGET (pannable);
+ return GTK_WIDGET (scrollable);
}
static void
-on_check_button_changed (HildonCheckButton *button, gpointer user_data)
+on_check_button_changed (GtkWidget *button, gpointer user_data)
{
GtkWidget *widget = GTK_WIDGET (user_data);
/* Enable the widget only if the check button is active: */
- const gboolean enable = hildon_check_button_get_active (button);
+ const gboolean enable = modest_togglable_get_active (button);
gtk_widget_set_sensitive (widget, enable);
}
/* Make the sensitivity of a widget depend on a check button.
*/
static void
-enable_widget_for_checkbutton (GtkWidget *widget, HildonCheckButton* button)
+enable_widget_for_checkbutton (GtkWidget *widget, GtkWidget* button)
{
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (on_check_button_changed), widget);
{
ModestEasysetupWizardDialogPrivate *priv;
gchar *smtp_caption_label;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- pannable = hildon_pannable_area_new ();
+ scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
/* Create a size group to be used by all captions.
* Note that HildonCaption does not create a default size group if we do not specify one.
/* The outgoing server widgets: */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
- 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);
gtk_widget_show (separator);
/* connection-specific checkbox: */
- priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- FALSE);
- gtk_button_set_label (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- _("mcen_fi_advsetup_connection_smtp"));
- gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- 0.0, 0.5);
+ priv->checkbox_outgoing_smtp_specific = modest_toolkit_factory_create_check_button
+ (modest_runtime_get_toolkit_factory (),
+ _("mcen_fi_advsetup_connection_smtp"));
+ modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific,
+ FALSE);
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
/* Only enable the button when the checkbox is checked: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
- HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific));
+ priv->checkbox_outgoing_smtp_specific);
g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
G_CALLBACK (on_button_outgoing_smtp_servers), self);
gtk_widget_show (align);
gtk_container_add (GTK_CONTAINER (align), box);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
+ modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (scrollable), align);
gtk_widget_show (GTK_WIDGET (box));
- gtk_widget_show (pannable);
+ gtk_widget_show (scrollable);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled",
G_CALLBACK (on_easysetup_changed), self);
- return GTK_WIDGET (pannable);
+ return GTK_WIDGET (scrollable);
}
static gboolean
/* This could happen when the combo box has still no active iter */
if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
- const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(priv->entry_user_email));
+ const gchar* email_address = modest_entry_get_text (priv->entry_user_email);
gchar* servername = util_get_default_servername_from_email_address (email_address,
protocol_type);
/* Do not set the INCOMING_CHANGED flag because of this edit */
g_signal_handlers_block_by_func (G_OBJECT (priv->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), self);
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_incomingserver), servername);
+ modest_entry_set_text (priv->entry_incomingserver, servername);
g_signal_handlers_unblock_by_func (G_OBJECT (priv->entry_incomingserver), G_CALLBACK (on_entry_incoming_servername_changed), self);
g_free (servername);
if (priv->entry_user_email
&& ((priv->server_changes & MODEST_EASYSETUP_WIZARD_DIALOG_OUTGOING_CHANGED) == 0)) {
- const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(priv->entry_user_email));
+ const gchar* email_address = modest_entry_get_text (priv->entry_user_email);
gchar* servername = util_get_default_servername_from_email_address (email_address, MODEST_PROTOCOLS_TRANSPORT_SMTP);
/* Do not set the OUTGOING_CHANGED flag because of this edit */
g_signal_handlers_block_by_func (G_OBJECT (priv->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), self);
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_outgoingserver), servername);
+ modest_entry_set_text (priv->entry_outgoingserver, servername);
g_signal_handlers_unblock_by_func (G_OBJECT (priv->entry_outgoingserver), G_CALLBACK (on_entry_outgoing_servername_changed), self);
g_free (servername);
const gchar* account_title;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
- account_title = hildon_entry_get_text (HILDON_ENTRY (priv->entry_account_title));
+ account_title = modest_entry_get_text (priv->entry_account_title);
if (!account_title || (g_utf8_strlen (account_title, -1) == 0)) {
return NULL;
} else if (current_page == priv->page_user_details) {
/* Check that the email address is valud: */
- const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));
+ const gchar* email_address = modest_entry_get_text (priv->entry_user_email);
if ((!email_address) || (g_utf8_strlen (email_address, -1) == 0))
return FALSE;
if (!entry)
return FALSE;
- const gchar* text = hildon_entry_get_text (HILDON_ENTRY (entry));
+ const gchar* text = modest_entry_get_text (entry);
if ((!text) || (g_utf8_strlen (text, -1) == 0))
return TRUE;
else {
}
/* username and password (for both incoming and outgoing): */
- username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
- password = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_password));
+ username = modest_entry_get_text (priv->entry_user_username);
+ password = modest_entry_get_text (priv->entry_user_password);
store_settings = modest_account_settings_get_store_settings (priv->settings);
transport_settings = modest_account_settings_get_transport_settings (priv->settings);
modest_server_account_settings_set_port (store_settings, store_port);
} else {
/* Use custom pages because no preset was specified: */
- store_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (priv->entry_incomingserver) ));
+ store_hostname = g_strdup (modest_entry_get_text (priv->entry_incomingserver ));
store_protocol = modest_servertype_picker_get_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
registry = modest_runtime_get_protocol_registry ();
/* Use custom pages because no preset was specified: */
- transport_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver) ));
+ transport_hostname = g_strdup (modest_entry_get_text (priv->entry_outgoingserver ));
store_proto = modest_protocol_registry_get_protocol_by_type (registry,
store_protocol);
if (alternate_username)
g_free (alternate_username);
- fullname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_name));
- email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));
+ fullname = modest_entry_get_text (priv->entry_user_name);
+ email_address = modest_entry_get_text (priv->entry_user_email);
modest_account_settings_set_fullname (priv->settings, fullname);
modest_account_settings_set_email_address (priv->settings, email_address);
/* we don't set retrieve type to preserve advanced settings if
if (priv->checkbox_outgoing_smtp_specific) {
modest_account_settings_set_use_connection_specific_smtp
(priv->settings,
- hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ modest_togglable_get_active(priv->checkbox_outgoing_smtp_specific));
}
display_name = get_entered_account_title (self);
projects / modest / blobdiff