#include "modest-hildon-includes.h"
#include "modest-maemo-security-options-view.h"
#include "modest-account-protocol.h"
+#include "modest-address-book.h"
/* Include config.h so that _() works: */
#ifdef HAVE_CONFIG_H
MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \
ModestEasysetupWizardDialogPrivate))
-#define LABELS_WIDTH 480
+#define LABELS_WIDTH 520
#define DIALOG_WIDTH LABELS_WIDTH + MODEST_MARGIN_DOUBLE
typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
{
GtkWidget *result;
- result = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
- value, use_markup, control);
+ result = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group,
+ value, use_markup, control,
+ MODEST_EDITABLE_SIZE);
/* Connect to the appropriate changed signal for the widget,
* so we can ask for the prev/next buttons to be enabled/disabled appropriately:
return GTK_WIDGET (align);
}
+static void
+on_user_username_changed(GtkWidget* widget, ModestEasysetupWizardDialog *self)
+{
+ ModestEasysetupWizardDialogPrivate* priv;
+ gchar* provider_id = NULL;
+
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ /* Work out the user email address */
+ provider_id = modest_provider_picker_get_active_provider_id (
+ MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+
+ if (provider_id) {
+ const gchar *current_username;
+ 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));
+
+ if (current_username && strstr (current_username, "@")) {
+ email_address = g_strdup (current_username);
+ } else {
+ email_address = g_strdup_printf ("%s@%s",
+ current_username,
+ domain_name);
+ }
+
+ /* Update the email address */
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address);
+
+ g_free (email_address);
+ g_free (domain_name);
+ g_free (provider_id);
+ }
+
+ /* Update state */
+ on_easysetup_changed(widget, self);
+}
+
+
static GtkWidget*
create_page_user_details (ModestEasysetupWizardDialog *self)
{
GtkWidget *box;
ModestEasysetupWizardDialogPrivate *priv;
GtkWidget *align;
+ const gchar *my_name;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
on_entry_max, self);
GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
_("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name);
+
+ /* Try to initialize the user name with my own contact */
+ my_name = modest_address_book_get_my_name ();
+ if (my_name)
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_name), my_name);
+
g_signal_connect(G_OBJECT(priv->entry_user_name), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_name);
gtk_widget_show (priv->entry_user_username);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(priv->entry_user_username), "changed",
- G_CALLBACK(on_easysetup_changed), self);
+ G_CALLBACK(on_user_username_changed), self);
gtk_widget_show (caption);
/* Prevent the use of some characters in the username,
static GtkWidget*
create_page_complete_custom (ModestEasysetupWizardDialog *self)
{
+ gchar *complete_string;
GtkWidget *align;
- GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
- GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
- GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
- hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ GtkWidget *box;
+ GtkWidget *label;
+ GtkWidget *button_edit;
+
+ box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+ complete_string = g_strconcat (_("mcen_ia_emailsetup_setup_complete"), " ",
+ _("mcen_ia_customsetup_complete"), NULL);
+ label = gtk_label_new(complete_string);
+ g_free (complete_string);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
- gtk_widget_show (label);
-
- label = gtk_label_new (_("mcen_ia_customsetup_complete"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
+ button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
+ hildon_gtk_widget_set_theme_size (button_edit, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_widget_show (button_edit);
gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, 0);
/* This is mostly copied from
* src/maemo/modest-account-settings-dialog.c */
if (priv->dirty) {
- GtkDialog *dialog = GTK_DIALOG (hildon_note_new_confirmation (GTK_WINDOW (self),
- _("imum_nc_wizard_confirm_lose_changes")));
- /* TODO: These button names will be ambiguous, and not
- * specified in the UI specification. */
+ gint dialog_response;
+ GtkWidget *dialog;
- const gint dialog_response = gtk_dialog_run (dialog);
+ dialog = hildon_note_new_confirmation ((GtkWindow *) self,
+ _("imum_nc_wizard_confirm_lose_changes"));
+
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
+ (GtkWindow *) dialog,
+ (GtkWindow *) wizard_dialog);
+
+ dialog_response = gtk_dialog_run ((GtkDialog *) dialog);
gtk_widget_destroy (GTK_WIDGET (dialog));
if (dialog_response != GTK_RESPONSE_OK) {
const gchar *label)
{
gint index;
+
/* Append page and set attributes */
index = gtk_notebook_append_page (notebook, page, gtk_label_new (label));
gtk_container_child_set (GTK_CONTAINER (notebook), page,
"tab-expand", TRUE, "tab-fill", TRUE,
NULL);
+
+ /* Give focus to page and show it */
+ gtk_container_set_focus_child (GTK_CONTAINER (notebook), page);
gtk_widget_show (page);
}
gchar *proto_name;
ModestProtocolType proto_type;
+ /* Get protocol data */
+ proto_name = modest_provider_picker_get_active_provider_id (picker);
+ protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+ MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS,
+ proto_name);
+ proto_type = modest_protocol_get_type_id (protocol);
+
/* If we come from a rollbacked easy setup */
- if (priv->last_plugin_protocol_selected ==
- MODEST_PROTOCOL_REGISTRY_TYPE_INVALID &&
+ if (priv->last_plugin_protocol_selected != proto_type &&
priv->page_complete_easysetup) {
remove_non_common_tabs (notebook, TRUE);
init_user_page (priv);
priv->page_complete_easysetup = NULL;
}
- proto_name = modest_provider_picker_get_active_provider_id (picker);
- protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
- MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS,
- proto_name);
- proto_type = modest_protocol_get_type_id (protocol);
-
if (protocol && MODEST_IS_ACCOUNT_PROTOCOL (protocol) &&
proto_type != priv->last_plugin_protocol_selected) {
ModestPairList *tabs;
priv->settings);
g_list_free (wizard_pages);
} else {
- g_warning ("The selected protocol is a plugin protocol "//
- "but it's not a ModestAccountProtocol");
+ g_debug ("The selected protocol is a plugin protocol "//
+ "but it's not a ModestAccountProtocol");
}
g_free (provider_id);
modest_account_settings_set_display_name (priv->settings, display_name);
g_free (display_name);
g_free (provider_id);
+
+ /* This values are hardcoded for Fremantle */
+ modest_account_settings_set_retrieve_type (priv->settings,
+ MODEST_ACCOUNT_RETRIEVE_MESSAGES_AND_ATTACHMENTS);
+ modest_account_settings_set_retrieve_limit (priv->settings, 20);
}
projects / modest / blobdiff