Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-easysetup-wizard-dialog.c

diff --git a/src/widgets/modest-easysetup-wizard-dialog.c b/src/widgets/modest-easysetup-wizard-dialog.c
index d8a4b3c..5821f1d 100644 (file)
--- a/src/widgets/modest-easysetup-wizard-dialog.c
+++ b/src/widgets/modest-easysetup-wizard-dialog.c
@@ -141,6 +141,7 @@ struct _ModestEasysetupWizardDialogPrivate
 
        GtkWidget *page_complete_customsetup;
 
+       gint last_mcc;
        ModestProtocolType last_plugin_protocol_selected;
        GSList *missing_data_signals;
 };
@@ -460,7 +461,12 @@ on_account_country_selector_changed (GtkWidget *widget, gpointer user_data)
        /* Fill the providers selector, based on the selected country: */
        if (priv->presets != NULL) {
                gint mcc = modest_country_selector_get_active_country_mcc (priv->account_country_selector);
-               modest_provider_selector_fill (priv->account_serviceprovider_selector, priv->presets, mcc);
+               if (priv->last_mcc != mcc) {
+                       modest_provider_selector_fill (priv->account_serviceprovider_selector, priv->presets, mcc);
+               } else {
+                       modest_provider_selector_refresh (priv->account_serviceprovider_selector);
+               }
+               priv->last_mcc = mcc;
        }
 }
 
@@ -534,6 +540,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
        ModestEasysetupWizardDialogPrivate* priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
+       gchar *tmp_str;
 
        gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
@@ -617,9 +624,11 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        g_signal_connect(G_OBJECT(priv->entry_account_title), "changed",
                         G_CALLBACK(on_easysetup_changed), self);
 
+       tmp_str = g_strconcat (_("mcen_fi_account_title"), "*", NULL);
        priv->caption_account_title = create_captioned (self, title_sizegroup, value_sizegroup,
-                                                       _("mcen_fi_account_title"), FALSE,
+                                                       tmp_str, FALSE,
                                                        priv->entry_account_title);
+       g_free (tmp_str);
        gtk_widget_show (priv->entry_account_title);
        gtk_box_pack_start (GTK_BOX (box), priv->caption_account_title, FALSE, FALSE, 0);
        gtk_widget_show (priv->caption_account_title);
@@ -714,6 +723,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        ModestEasysetupWizardDialogPrivate *priv;
        GtkWidget *align;
        const gchar *my_name;
+       gchar *tmp_str;
 
        priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
 
@@ -768,8 +778,11 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username),
                                         HILDON_GTK_INPUT_MODE_FULL);
 #endif
-       caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mail_fi_username"), FALSE,
+       tmp_str = g_strconcat (_("mail_fi_username"), "*", NULL);
+       caption = create_captioned (self, title_sizegroup, value_sizegroup,
+                                   tmp_str, FALSE,
                                    priv->entry_user_username);
+       g_free (tmp_str);
        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",
@@ -810,8 +823,10 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
 #ifdef MAEMO_CHANGES
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
 #endif
+       tmp_str = g_strconcat (_("mcen_li_emailsetup_email_address"), "*", NULL);
        caption = create_captioned (self, title_sizegroup, value_sizegroup,
-                                   _("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email);
+                                   tmp_str, FALSE, priv->entry_user_email);
+       g_free (tmp_str);
        update_user_email_from_provider (self);
        gtk_widget_show (priv->entry_user_email);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
@@ -898,7 +913,7 @@ update_incoming_server_title (ModestEasysetupWizardDialog *self)
                                                                          protocol_type);
                protocol_display_name = modest_protocol_get_display_name (protocol);
 
-               incomingserver_title = g_strconcat (_("mcen_li_emailsetup_servertype"), "\n<small>(",
+               incomingserver_title = g_strconcat (_("mcen_li_emailsetup_servertype"), "*\n<small>(",
                                                    protocol_display_name, ")</small>", NULL);
 
                modest_toolkit_utils_captioned_set_label (priv->caption_incoming, incomingserver_title, TRUE);
@@ -1178,7 +1193,8 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
 #ifdef MAEMO_CHANGES
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
 #endif
-       smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
+       smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "*\n<small>(SMTP)</small>", NULL);
+
        GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
                                               smtp_caption_label, TRUE, priv->entry_outgoingserver);
        g_free (smtp_caption_label);
@@ -1388,9 +1404,13 @@ fill_providers (ModestEasysetupWizardDialog *self)
 
                modest_country_selector_set_active_country_locale (priv->account_country_selector);
                mcc = modest_country_selector_get_active_country_mcc (priv->account_country_selector);
-               modest_provider_selector_fill (
-                       priv->account_serviceprovider_selector,
-                       priv->presets, mcc);
+               if (priv->last_mcc != mcc) {
+                       modest_provider_selector_fill (priv->account_serviceprovider_selector,
+                                                      priv->presets, mcc);
+               } else {
+                       modest_provider_selector_refresh (priv->account_serviceprovider_selector);
+               }
+               priv->last_mcc = mcc;
                /* connect to providers picker's changed signal, so we can fill the email address: */
                if (GTK_IS_COMBO_BOX (priv->account_serviceprovider_selector)) {
                        g_signal_connect (priv->account_serviceprovider_selector,
@@ -1574,6 +1594,7 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
        priv->page_complete_easysetup = NULL;
        priv->page_complete_customsetup = NULL;
        priv->last_plugin_protocol_selected = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
+       priv->last_mcc = -1;
        priv->missing_data_signals = NULL;
 
        /* Add the common pages */
@@ -2111,6 +2132,9 @@ on_before_next (ModestWizardDialog *dialog, GtkWidget *current_page, GtkWidget *
                }
 
                modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+               hildon_gtk_window_take_screenshot ((GtkWindow *) dialog, FALSE);
+#endif
        }
 
 
@@ -2550,6 +2574,7 @@ on_save (ModestWizardDialog *dialog)
 {
        ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (dialog);
        ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+       gboolean result;
 
        save_to_settings (self);
 
@@ -2558,7 +2583,14 @@ on_save (ModestWizardDialog *dialog)
                return FALSE;
        }
 
-       return modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+       
+       result = modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+       if (result) {
+               hildon_gtk_window_take_screenshot ((GtkWindow *) dialog, FALSE);
+       }
+#endif
+       return result;
 
 }