GtkSizeGroup *title_size_group,
GtkSizeGroup *value_size_group,
const gchar *value,
+ gboolean use_markup,
GtkWidget *control)
{
GtkWidget *result;
result = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- value, control);
+ value, use_markup, control);
/* Connect to the appropriate changed signal for the widget,
* so we can ask for the prev/next buttons to be enabled/disabled appropriately:
domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
if (priv->entry_user_email)
- gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), domain_name);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), domain_name);
g_free (domain_name);
g_free (default_account_name_start);
default_account_name_start = NULL;
- gtk_entry_set_text( GTK_ENTRY (priv->entry_account_title), default_account_name);
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
g_free (default_account_name);
default_account_name = NULL;
- caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"),
+ caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"), FALSE,
priv->entry_account_title);
gtk_widget_show (priv->entry_account_title);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name),
on_entry_max, self);
GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_name"), priv->entry_user_name);
+ _("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name);
g_signal_connect(G_OBJECT(priv->entry_user_name), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_name);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username),
HILDON_GTK_INPUT_MODE_FULL);
- caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mail_fi_username"),
+ caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mail_fi_username"), FALSE,
priv->entry_user_username);
gtk_widget_show (priv->entry_user_username);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
on_entry_max, self);
/* The password widgets: */
- priv->entry_user_password = gtk_entry_new ();
+ priv->entry_user_password = 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 (priv->entry_user_password),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mail_fi_password"), priv->entry_user_password);
+ _("mail_fi_password"), FALSE, priv->entry_user_password);
g_signal_connect(G_OBJECT(priv->entry_user_password), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_password);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_email_address"), priv->entry_user_email);
+ _("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email);
update_user_email_from_provider (self);
gtk_widget_show (priv->entry_user_email);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
protocol_registry = modest_runtime_get_protocol_registry ();
-
+
protocol_type = modest_servertype_picker_get_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
/* This could happen when the combo box has still no active iter */
if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
gchar* incomingserver_title;
- const gchar *protocol_display_name;
+ const gchar *protocol_display_name;
+ ModestProtocol *protocol;
+ GtkWidget *label;
+ GList *children;
+
+ /* Get the label and change it. This is ugly */
+ children = gtk_container_get_children (GTK_CONTAINER (priv->caption_incoming));
+ label = (GtkWidget *) children->data;
+
+ if (!GTK_IS_LABEL (label))
+ return;
+
+ protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry,
+ protocol_type);
+ protocol_display_name = modest_protocol_get_display_name (protocol);
+
+ incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"),
+ protocol_display_name);
+
+ gtk_label_set_markup (GTK_LABEL (label), incomingserver_title);
- protocol_display_name = modest_protocol_get_display_name (modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type));
-
- incomingserver_title = g_strdup_printf(_("mcen_li_emailsetup_servertype"), protocol_display_name);
g_free(incomingserver_title);
}
}
gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->incoming_servertype_picker);
- priv->entry_incomingserver = gtk_entry_new ();
+ priv->entry_incomingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
g_signal_connect(G_OBJECT(priv->entry_incomingserver), "changed", G_CALLBACK(on_easysetup_changed), self);
/* 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);
/* The caption title will be updated in update_incoming_server_title().
* so this default text will never be seen: */
- /* (Note: Changing the title seems pointless. murrayc) */
priv->caption_incoming = create_captioned (self, title_sizegroup, value_sizegroup,
- "Incoming Server",
- priv->entry_incomingserver);
+ "This will be removed",
+ FALSE, priv->entry_incomingserver);
update_incoming_server_title (self);
gtk_widget_show (priv->entry_incomingserver);
gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
/* The outgoing server widgets: */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
- priv->entry_outgoingserver = gtk_entry_new ();
+ priv->entry_outgoingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed",
G_CALLBACK (on_easysetup_changed), self);
/* 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);
GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver);
+ _("mcen_li_emailsetup_smtp"), FALSE, priv->entry_outgoingserver);
gtk_widget_show (priv->entry_outgoingserver);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* This could happen when the combo box has still no active iter */
if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
- const gchar* email_address = gtk_entry_get_text (GTK_ENTRY(priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(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);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_incomingserver), servername);
+ hildon_entry_set_text (HILDON_ENTRY (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 = gtk_entry_get_text (GTK_ENTRY(priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY(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);
- gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), servername);
+ hildon_entry_set_text (HILDON_ENTRY (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 = gtk_entry_get_text (GTK_ENTRY (priv->entry_account_title));
+ account_title = hildon_entry_get_text (HILDON_ENTRY (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 = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+ const gchar* email_address = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_email));
if ((!email_address) || (g_utf8_strlen (email_address, -1) == 0))
return FALSE;
if (!entry)
return FALSE;
- const gchar* text = gtk_entry_get_text (GTK_ENTRY (entry));
+ const gchar* text = hildon_entry_get_text (HILDON_ENTRY (entry));
if ((!text) || (g_utf8_strlen (text, -1) == 0))
return TRUE;
else {
}
/* username and password (for both incoming and outgoing): */
- username = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username));
- password = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password));
+ username = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username));
+ password = hildon_entry_get_text (HILDON_ENTRY (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 (gtk_entry_get_text (GTK_ENTRY (priv->entry_incomingserver) ));
+ store_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (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 (gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver) ));
+ transport_hostname = g_strdup (hildon_entry_get_text (HILDON_ENTRY (priv->entry_outgoingserver) ));
store_proto = modest_protocol_registry_get_protocol_by_type (registry,
store_protocol);
g_object_unref (transport_settings);
g_free (transport_hostname);
- fullname = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_name));
- email_address = gtk_entry_get_text (GTK_ENTRY (priv->entry_user_email));
+ fullname = hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_name));
+ email_address = hildon_entry_get_text (HILDON_ENTRY (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
projects / modest / blobdiff