/* notebook pages: */
GtkWidget *page_welcome;
+ GtkWidget *check_support_progress;
+ gboolean check_support_done;
+ guint check_support_show_progress_id;
+ guint check_support_progress_pulse_id;
+ gint pending_check_support;
+ gboolean destroyed;
GtkWidget *page_account_details;
GtkWidget *account_country_picker;
GtkWidget *account_serviceprovider_picker;
GtkWidget *entry_account_title;
+ GtkWidget *caption_account_title;
GtkWidget *page_user_details;
GtkWidget *entry_user_name;
static void save_to_settings (ModestEasysetupWizardDialog *self);
static void real_enable_buttons (ModestWizardDialog *dialog, gboolean enable_next);
+static void on_update_model (ModestWizardDialog *dialog);
+static gboolean on_save (ModestWizardDialog *dialog);
+static GList* check_for_supported_auth_methods (ModestEasysetupWizardDialog* self);
+static gboolean check_has_supported_auth_methods(ModestEasysetupWizardDialog* self);
+static void check_support_callback (ModestAccountProtocol *protocol,
+ gboolean supported,
+ gpointer userdata);
+static void check_support_of_protocols (ModestEasysetupWizardDialog *self);
+static gboolean check_support_show_progress (gpointer userdata);
+static gboolean check_support_progress_pulse (gpointer userdata);
static gboolean
on_delete_event (GtkWidget *widget,
static void
modest_easysetup_wizard_dialog_dispose (GObject *object)
{
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (object);
+ priv->destroyed = TRUE;
+
+ if (priv->check_support_show_progress_id > 0) {
+ g_source_remove (priv->check_support_show_progress_id);
+ priv->check_support_show_progress_id = 0;
+ }
+
+ if (priv->check_support_progress_pulse_id > 0) {
+ g_source_remove (priv->check_support_progress_pulse_id);
+ priv->check_support_progress_pulse_id = 0;
+ }
+
if (G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose)
G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->dispose (object);
}
{
ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (object);
ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
-
+
if (priv->account_manager)
g_object_unref (G_OBJECT (priv->account_manager));
-
+
if (priv->presets)
modest_presets_destroy (priv->presets);
modest_signal_mgr_disconnect_all_and_destroy (priv->missing_data_signals);
priv->missing_data_signals = NULL;
}
-
+
G_OBJECT_CLASS (modest_easysetup_wizard_dialog_parent_class)->finalize (object);
}
invoke_enable_buttons_vfunc (ModestEasysetupWizardDialog *wizard_dialog)
{
ModestWizardDialogClass *klass = MODEST_WIZARD_DIALOG_GET_CLASS (wizard_dialog);
-
+
/* Call the vfunc, which may be overridden by derived classes: */
if (klass->enable_buttons) {
GtkNotebook *notebook = NULL;
g_object_get (wizard_dialog, "wizard-notebook", ¬ebook, NULL);
-
+
const gint current_page_num = gtk_notebook_get_current_page (notebook);
if (current_page_num == -1)
return;
-
+
GtkWidget* current_page_widget = gtk_notebook_get_nth_page (notebook, current_page_num);
(*(klass->enable_buttons))(MODEST_WIZARD_DIALOG (wizard_dialog), current_page_widget);
}
static void
on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
{
- ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
- g_assert(self);
+ ModestEasysetupWizardDialog *self;
+
+ g_return_if_fail (user_data);
+
+ self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+
invoke_enable_buttons_vfunc(self);
}
invoke_enable_buttons_vfunc(self);
}
+static void
+on_serviceprovider_picker_button_value_changed (HildonPickerButton *widget, gpointer user_data)
+{
+ gchar* default_account_name_start;
+ gchar* default_account_name;
+ ModestEasysetupWizardDialog *self;
+ ModestEasysetupWizardDialogPrivate *priv;
+ ModestProviderPickerIdType provider_id_type;
+ ModestProtocol *protocol;
+ gchar *proto_name;
+ ModestProtocolType proto_type;
+ gboolean hide_account_title;
+
+ self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ on_picker_button_value_changed (widget, user_data);
+
+ provider_id_type = modest_provider_picker_get_active_id_type (
+ MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+ if (provider_id_type == MODEST_PROVIDER_PICKER_ID_OTHER) {
+ default_account_name_start = g_strdup (_("mcen_ia_emailsetup_defaultname"));
+ } else {
+ GtkWidget *selector;
+
+ selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (widget)));
+ default_account_name_start =
+ g_strdup (hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
+
+ }
+ default_account_name = modest_account_mgr_get_unused_account_display_name (
+ priv->account_manager, default_account_name_start);
+ g_free (default_account_name_start);
+ default_account_name_start = NULL;
+
+ hide_account_title = FALSE;
+ proto_name = modest_provider_picker_get_active_provider_id (MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+ if (proto_name != NULL) {
+ protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+ MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS,
+ proto_name);
+ if (protocol != NULL) {
+ proto_type = modest_protocol_get_type_id (protocol);
+
+ hide_account_title = (modest_protocol_registry_protocol_type_has_tag
+ (modest_runtime_get_protocol_registry (),
+ proto_type,
+ MODEST_PROTOCOL_REGISTRY_SINGLETON_PROVIDER_PROTOCOLS) ||
+ modest_protocol_registry_protocol_type_has_tag
+ (modest_runtime_get_protocol_registry (),
+ proto_type,
+ MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS));
+ }
+ }
+
+ if (hide_account_title)
+ gtk_widget_hide (priv->caption_account_title);
+ else
+ gtk_widget_show (priv->caption_account_title);
+
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_account_title), default_account_name);
+ g_free (default_account_name);
+}
+
/** This is a convenience function to create a caption containing a mandatory widget.
* When the widget is edited, the enable_buttons() vfunc will be called.
*/
static GtkWidget*
create_page_welcome (ModestEasysetupWizardDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
+ GtkWidget *box;
+ GtkWidget *align;
+ GtkWidget *label;
+ ModestEasysetupWizardDialogPrivate *priv;
+
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+ box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+ label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
+ priv->check_support_progress = gtk_progress_bar_new ();
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
/* So that it is not truncated: */
- gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), priv->check_support_progress, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (align), box);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+ return GTK_WIDGET (align);
}
static void
update_user_email_from_provider (ModestEasysetupWizardDialog *self)
{
ModestEasysetupWizardDialogPrivate *priv;
- gchar* provider_id;
- gchar* domain_name = NULL;
+ gchar* provider_id = NULL, *with_at = NULL;
g_assert(self);
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
/* Fill the providers combo, based on the selected country: */
provider_id = modest_provider_picker_get_active_provider_id (
MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
-
- if(provider_id)
- domain_name = modest_presets_get_domain (priv->presets, provider_id);
-
- if(!domain_name)
- domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
-
+
+ if (provider_id) {
+ gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id);
+ with_at = g_strdup_printf ("%c%s", '@', domain_name);
+ g_free (domain_name);
+ }
+
+ /* The sample address already contains the '@' */
+ if (!with_at)
+ with_at = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
+
if (priv->entry_user_email)
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), domain_name);
-
- g_free (domain_name);
-
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), with_at);
+
+ g_free (with_at);
g_free (provider_id);
}
static GtkWidget*
create_page_account_details (ModestEasysetupWizardDialog *self)
{
- GtkWidget *caption;
+ GtkWidget *align;
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);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
/* Create a size group to be used by all captions.
gtk_box_pack_start (GTK_BOX (box), priv->account_country_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->account_country_picker);
- GtkWidget *separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (separator);
-
/* The service provider widgets: */
priv->account_serviceprovider_picker = GTK_WIDGET (modest_provider_picker_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
_("mcen_fi_serviceprovider"),
priv->account_serviceprovider_picker);
g_signal_connect (G_OBJECT (priv->account_serviceprovider_picker), "value-changed",
- G_CALLBACK (on_picker_button_value_changed), self);
- gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
+ G_CALLBACK (on_serviceprovider_picker_button_value_changed), self);
+ gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, 0);
gtk_widget_show (priv->account_serviceprovider_picker);
/* The description widgets: */
g_free (default_account_name);
default_account_name = NULL;
- caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"), FALSE,
- priv->entry_account_title);
+ priv->caption_account_title = 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);
- gtk_widget_show (caption);
+ gtk_box_pack_start (GTK_BOX (box), priv->caption_account_title, FALSE, FALSE, 0);
+ gtk_widget_show (priv->caption_account_title);
+ gtk_widget_set_no_show_all (priv->caption_account_title, TRUE);
/* Prevent the use of some characters in the account title,
* as required by our UI specification: */
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
- return GTK_WIDGET (box);
+ return GTK_WIDGET (align);
}
static GtkWidget*
GtkSizeGroup* value_sizegroup;
GtkWidget *box;
ModestEasysetupWizardDialogPrivate *priv;
+ GtkWidget *align;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
g_signal_connect(G_OBJECT(priv->entry_user_name), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_name);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
/* Prevent the use of some characters in the name,
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);
+ 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);
gtk_widget_show (caption);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- modest_validating_entry_set_unallowed_characters_whitespace (
- MODEST_VALIDATING_ENTRY (priv->entry_user_username));
modest_validating_entry_set_func(MODEST_VALIDATING_ENTRY(priv->entry_user_username),
modest_utils_on_entry_invalid_character, self);
g_signal_connect(G_OBJECT(priv->entry_user_password), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_password);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
/* The email address widgets: */
_("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);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(priv->entry_user_email), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (caption);
gtk_widget_show (GTK_WIDGET (box));
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
- return GTK_WIDGET (box);
+ return GTK_WIDGET (align);
}
-static GtkWidget*
+static GtkWidget*
create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
{
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-
+
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- /* The documentation for gtk_label_set_line_wrap() says that we must
- * call gtk_widget_set_size_request() with a hard-coded width,
- * though I wonder why gtk_label_set_max_width_chars() isn't enough. */
+
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
-
+
label = gtk_label_new (_("mcen_ia_easysetup_complete"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
-
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
-
+
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ return GTK_WIDGET (align);
}
/** Change the caption title for the incoming server,
{
ModestProtocolRegistry *protocol_registry;
ModestEasysetupWizardDialogPrivate* priv;
- GtkWidget *box;
- GtkWidget *scrolled_window;
+ GtkWidget *box;
+ GtkWidget *align;
+ GtkWidget *pannable;
GtkWidget *label;
GtkSizeGroup *title_sizegroup;
GtkSizeGroup *value_sizegroup;
protocol_registry = modest_runtime_get_protocol_registry ();
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC);
+ pannable = hildon_pannable_area_new ();
/* Show note that account type cannot be changed in future: */
label = gtk_label_new (_("mcen_ia_emailsetup_account_type"));
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_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
priv->incoming_servertype_picker = GTK_WIDGET (modest_servertype_picker_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
TRUE));
- hildon_button_set_title (HILDON_BUTTON (priv->incoming_servertype_picker), _("mcen_li_emailsetup_type"));
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_type"),
+ priv->incoming_servertype_picker);
g_signal_connect (G_OBJECT (priv->incoming_servertype_picker), "value-changed",
G_CALLBACK (on_picker_button_value_changed), self);
- gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
+ 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);
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);
+ gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, 0);
gtk_widget_show (priv->caption_incoming);
/* Change the caption title when the servertype changes,
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING,
FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
- FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show_all (priv->incoming_security);
+ FALSE, FALSE, 0);
+ gtk_widget_show (priv->incoming_security);
/* Set default selection */
modest_servertype_picker_set_active_servertype (
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker),
MODEST_PROTOCOLS_STORE_POP);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box);
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
gtk_widget_show (GTK_WIDGET (box));
- gtk_widget_show (scrolled_window);
+ gtk_widget_show (pannable);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
- return GTK_WIDGET (scrolled_window);
+ return GTK_WIDGET (pannable);
}
static void
create_page_custom_outgoing (ModestEasysetupWizardDialog *self)
{
ModestEasysetupWizardDialogPrivate *priv;
+ gchar *smtp_caption_label;
+ GtkWidget *pannable;
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+
+ pannable = hildon_pannable_area_new ();
/* 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.
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);
+ smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mcen_li_emailsetup_smtp"), FALSE, priv->entry_outgoingserver);
+ smtp_caption_label, TRUE, priv->entry_outgoingserver);
+ g_free (smtp_caption_label);
gtk_widget_show (priv->entry_outgoingserver);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
set_default_custom_servernames (self);
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING,
FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
gtk_widget_show (priv->outgoing_security);
GtkWidget *separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 0);
gtk_widget_show (separator);
/* connection-specific checkbox: */
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
/* Connection-specific SMTP-Severs Edit button: */
priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_advsetup_optional_smtp"));
HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_widget_show (priv->button_outgoing_smtp_servers);
gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
/* Only enable the button when the checkbox is checked: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed",
G_CALLBACK (on_entry_outgoing_servername_changed), self);
+
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
gtk_widget_show (GTK_WIDGET (box));
+ gtk_widget_show (pannable);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
- return GTK_WIDGET (box);
+ return GTK_WIDGET (pannable);
}
static gboolean
static GtkWidget*
create_page_complete_custom (ModestEasysetupWizardDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+ 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);
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);
-
+
gtk_widget_show (button_edit);
- gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, MODEST_MARGIN_HALF);
-
+ gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, 0);
+
g_signal_connect (G_OBJECT (button_edit), "clicked",
G_CALLBACK (on_button_edit_advanced_settings), self);
-
+
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ return GTK_WIDGET (align);
}
}
}
-typedef struct IdleData {
- ModestEasysetupWizardDialog *dialog;
- ModestPresets *presets;
-} IdleData;
-
-static gboolean
-presets_idle (gpointer userdata)
+static void
+fill_providers (ModestEasysetupWizardDialog *self)
{
- IdleData *idle_data = (IdleData *) userdata;
- ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (idle_data->dialog);
ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
- g_assert (idle_data->presets);
-
- gdk_threads_enter ();
-
- priv->presets = idle_data->presets;
-
if (MODEST_IS_COUNTRY_PICKER (priv->account_country_picker)) {
/* gint mcc = get_default_country_code(); */
gint mcc;
priv->dirty = FALSE;
+}
+
+typedef struct IdleData {
+ ModestEasysetupWizardDialog *dialog;
+ ModestPresets *presets;
+} IdleData;
+
+static gboolean
+presets_idle (gpointer userdata)
+{
+ IdleData *idle_data = (IdleData *) userdata;
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (idle_data->dialog);
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ g_assert (idle_data->presets);
+
+ gdk_threads_enter ();
+
+ priv->presets = idle_data->presets;
+
+ if (priv->check_support_done)
+ fill_providers (self);
+
g_object_unref (idle_data->dialog);
g_free (idle_data);
/* Create the notebook to be used by the ModestWizardDialog base class:
* Each page of the notebook will be a page of the wizard: */
GtkNotebook *notebook = GTK_NOTEBOOK (gtk_notebook_new());
- gtk_widget_set_size_request (GTK_WIDGET (notebook), DIALOG_WIDTH, -1);
+ gtk_widget_set_size_request (GTK_WIDGET (notebook), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
/* Set the notebook used by the ModestWizardDialog base class: */
g_object_set (G_OBJECT(self), "wizard-notebook", notebook, NULL);
g_object_ref (priv->account_manager);
/* Initialize fields */
+ priv->check_support_done = FALSE;
+ priv->check_support_show_progress_id = 0;
+ priv->check_support_progress_pulse_id = 0;
+ priv->pending_check_support = 0;
+ priv->destroyed = FALSE;
priv->page_welcome = create_page_welcome (self);
+ gtk_widget_show (priv->page_welcome);
priv->page_account_details = create_page_account_details (self);
init_user_page (priv);
/* Reset dirty, because there was no user input until now */
priv->dirty = FALSE;
-
+
/* When this window is shown, hibernation should not be possible,
* because there is no sensible way to save the state: */
modest_window_mgr_prevent_hibernation_while_window_is_shown (
g_thread_create (presets_loader, self, FALSE, NULL);
priv->settings = modest_account_settings_new ();
+
+ check_support_of_protocols (self);
}
ModestEasysetupWizardDialog*
picker = MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker);
id_type = modest_provider_picker_get_active_id_type (picker);
g_object_get (self, "wizard-notebook", ¬ebook, NULL);
+ modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+ NULL);
+
if (id_type == MODEST_PROVIDER_PICKER_ID_OTHER) {
/* "Other..." was selected: */
proto_type != priv->last_plugin_protocol_selected) {
ModestPairList *tabs;
GSList *tmp;
+ gboolean first_page = TRUE;
+ ModestWizardDialogResponseOverrideFunc response_override;
/* Remember the last selected plugin protocol */
priv->last_plugin_protocol_selected = proto_type;
/* Get tabs */
tabs = modest_account_protocol_get_easysetupwizard_tabs (MODEST_ACCOUNT_PROTOCOL (protocol));
+ response_override = modest_account_protocol_get_wizard_response_override
+ (MODEST_ACCOUNT_PROTOCOL (protocol));
+ modest_wizard_dialog_set_response_override_handler (MODEST_WIZARD_DIALOG (self),
+ response_override);
tmp = (GSList *) tabs;
while (tmp) {
ModestPair *pair = (ModestPair *) tmp->data;
modest_easysetup_wizard_dialog_append_page (notebook,
GTK_WIDGET (pair->second),
(const gchar *) pair->first);
+ if (first_page) {
+ gtk_container_set_focus_child (GTK_CONTAINER (notebook),
+ GTK_WIDGET (pair->second));
+ first_page = FALSE;
+ }
/* Connect signals */
- priv->missing_data_signals =
- modest_signal_mgr_connect (priv->missing_data_signals,
- G_OBJECT (pair->second),
- "missing-mandatory-data",
- G_CALLBACK (on_missing_mandatory_data),
- self);
+ if (MODEST_IS_EASYSETUP_WIZARD_PAGE (pair->second)) {
+ priv->missing_data_signals =
+ modest_signal_mgr_connect (priv->missing_data_signals,
+ G_OBJECT (pair->second),
+ "missing-mandatory-data",
+ G_CALLBACK (on_missing_mandatory_data),
+ self);
+ }
g_free (pair->first);
tmp = g_slist_next (tmp);
set_default_custom_servernames (self);
/* Check if the server supports secure authentication */
-/* if (modest_security_options_view_auth_check (security_options)) */
-/* if (!check_has_supported_auth_methods (self)) */
-/* return FALSE; */
+ if (modest_security_options_view_auth_check (MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security)))
+ if (!check_has_supported_auth_methods (self))
+ return FALSE;
gtk_widget_show (priv->outgoing_security);
}
/* Get data */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (dialog);
g_object_get (dialog, "wizard-notebook", ¬ebook, NULL);
-
+
/* Disable the Finish button until we are on the last page,
* because HildonWizardDialog enables this for all but the
* first page */
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
MODEST_WIZARD_DIALOG_FINISH,
FALSE);
+
+ /* If the check support is not done then do not enable
+ the wizard to continue */
+ enable_next = enable_next && priv->check_support_done;
}
-
+
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
MODEST_WIZARD_DIALOG_NEXT,
enable_next);
ModestWizardDialogClass *base_klass = (ModestWizardDialogClass*)(klass);
base_klass->before_next = on_before_next;
base_klass->enable_buttons = on_enable_buttons;
+ base_klass->update_model = on_update_model;
+ base_klass->save = on_save;
}
/**
/* Get details from the specified presets: */
id_type = modest_provider_picker_get_active_id_type (picker);
provider_id = modest_provider_picker_get_active_provider_id (picker);
-
+
/* Let the plugin save the settings. We do a return in order
to save an indentation level */
if (id_type == MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL) {
ModestProtocolType store_provider_server_type;
gboolean store_provider_use_alternate_port;
/* Use presets: */
- store_hostname = modest_presets_get_server (priv->presets, provider_id,
+ store_hostname = modest_presets_get_server (priv->presets, provider_id,
TRUE /* store */);
-
+
store_provider_server_type = modest_presets_get_info_server_type (priv->presets,
- provider_id,
+ provider_id,
TRUE /* store */);
store_security = modest_presets_get_info_server_security (priv->presets,
- provider_id,
- TRUE /* store */);
+ provider_id,
+ TRUE /* store */);
store_auth_protocol = modest_presets_get_info_server_auth (priv->presets,
- provider_id,
- TRUE /* store */);
+ provider_id,
+ TRUE /* store */);
store_provider_use_alternate_port = modest_presets_get_info_server_use_alternate_port (priv->presets,
- provider_id,
+ provider_id,
TRUE /* store */);
/* We don't check for SMTP here as that is impossible for an incoming server. */
g_object_unref (transport_settings);
g_free (transport_hostname);
-
+
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
any. By default account settings are set to headers only */
-
+
/* Save the connection-specific SMTP server accounts. */
- modest_account_settings_set_use_connection_specific_smtp
- (priv->settings,
- hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ 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)));
+ }
display_name = get_entered_account_title (self);
modest_account_settings_set_display_name (priv->settings, display_name);
g_free (provider_id);
}
+
+static void
+on_update_model (ModestWizardDialog *dialog)
+{
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (dialog);
+ save_to_settings (self);
+
+}
+
+static gboolean
+on_save (ModestWizardDialog *dialog)
+{
+ ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (dialog);
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ save_to_settings (self);
+
+ if (modest_account_mgr_check_already_configured_account (priv->account_manager, priv->settings)) {
+ modest_platform_information_banner (NULL, NULL, _("mail_ib_setting_failed"));
+ return FALSE;
+ }
+
+ return modest_account_mgr_add_account_from_settings (priv->account_manager, priv->settings);
+
+}
+
+
+static GList*
+check_for_supported_auth_methods (ModestEasysetupWizardDialog* self)
+{
+ GError *error = NULL;
+ ModestProtocolType protocol_type;
+ const gchar* hostname;
+ const gchar* username;
+ ModestProtocolType security_protocol_incoming_type;
+ ModestProtocolRegistry *registry;
+ int port_num;
+ GList *list_auth_methods;
+ ModestEasysetupWizardDialogPrivate *priv;
+
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+ registry = modest_runtime_get_protocol_registry ();
+ protocol_type = modest_servertype_picker_get_active_servertype (
+ MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker));
+ hostname = gtk_entry_get_text(GTK_ENTRY(priv->entry_incomingserver));
+ username = gtk_entry_get_text(GTK_ENTRY(priv->entry_user_username));
+ security_protocol_incoming_type = modest_security_options_view_get_connection_protocol
+ (MODEST_SECURITY_OPTIONS_VIEW (priv->incoming_security));
+ port_num = get_port_from_protocol(protocol_type, FALSE);
+ list_auth_methods = modest_utils_get_supported_secure_authentication_methods (protocol_type, hostname, port_num,
+ username, GTK_WINDOW (self), &error);
+
+ if (list_auth_methods) {
+ /* TODO: Select the correct method */
+ GList* list = NULL;
+ GList* method;
+ for (method = list_auth_methods; method != NULL; method = g_list_next(method)) {
+ ModestProtocolType auth_protocol_type = (ModestProtocolType) (GPOINTER_TO_INT(method->data));
+ if (modest_protocol_registry_protocol_type_has_tag (registry, auth_protocol_type,
+ MODEST_PROTOCOL_REGISTRY_SECURE_PROTOCOLS)) {
+ list = g_list_append(list, GINT_TO_POINTER(auth_protocol_type));
+ }
+ }
+
+ g_list_free(list_auth_methods);
+
+ if (list)
+ return list;
+ }
+
+ if(error == NULL || error->domain != modest_utils_get_supported_secure_authentication_error_quark() ||
+ error->code != MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED)
+ {
+ modest_platform_information_banner (GTK_WIDGET(self), NULL,
+ _("mcen_ib_unableto_discover_auth_methods"));
+ }
+
+ if(error != NULL)
+ g_error_free(error);
+
+ return NULL;
+}
+
+static gboolean
+check_has_supported_auth_methods(ModestEasysetupWizardDialog* self)
+{
+ GList* methods = check_for_supported_auth_methods(self);
+ if (!methods)
+ {
+ return FALSE;
+ }
+
+ g_list_free(methods);
+ return TRUE;
+}
+
+static gboolean
+check_support_progress_pulse (gpointer userdata)
+{
+ ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata;
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ if (priv->destroyed) {
+ priv->check_support_progress_pulse_id = 0;
+ return FALSE;
+ }
+
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress));
+
+ return TRUE;
+}
+
+static gboolean
+check_support_show_progress (gpointer userdata)
+{
+ ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata;
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ priv->check_support_show_progress_id = 0;
+
+ if (priv->destroyed)
+ return FALSE;
+
+ gtk_widget_show (priv->check_support_progress);
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->check_support_progress));
+
+ priv->check_support_progress_pulse_id = g_timeout_add (200, check_support_progress_pulse, self);
+
+ return FALSE;
+}
+
+static void
+check_support_callback (ModestAccountProtocol *protocol,
+ gboolean supported,
+ gpointer userdata)
+{
+ ModestEasysetupWizardDialog *self = (ModestEasysetupWizardDialog *) userdata;
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ priv->pending_check_support --;
+
+ if (priv->check_support_show_progress_id > 0) {
+ g_source_remove (priv->check_support_show_progress_id);
+ priv->check_support_show_progress_id = 0;
+ }
+
+ if (priv->check_support_progress_pulse_id > 0) {
+ g_source_remove (priv->check_support_progress_pulse_id);
+ priv->check_support_progress_pulse_id = 0;
+ }
+
+ if (priv->pending_check_support == 0) {
+ priv->check_support_done = TRUE;
+
+ if (!priv->destroyed) {
+ if (priv->presets)
+ fill_providers (self);
+ gtk_widget_hide (priv->check_support_progress);
+ invoke_enable_buttons_vfunc (self);
+ }
+ }
+ g_object_unref (self);
+}
+
+
+static void
+check_support_of_protocols (ModestEasysetupWizardDialog *self)
+{
+ ModestProtocolRegistry *registry;
+ GSList *provider_protos, *node;
+ ModestEasysetupWizardDialogPrivate *priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
+ registry = modest_runtime_get_protocol_registry ();
+ provider_protos = modest_protocol_registry_get_by_tag (registry,
+ MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS);
+
+ for (node = provider_protos; node != NULL; node = g_slist_next (node)) {
+ ModestProtocol *proto = MODEST_PROTOCOL (node->data);
+
+ if (!modest_protocol_registry_protocol_type_has_tag (registry,
+ modest_protocol_get_type_id (proto),
+ MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS))
+ continue;
+
+ if (modest_protocol_registry_protocol_type_has_tag
+ (registry,
+ modest_protocol_get_type_id (proto),
+ MODEST_PROTOCOL_REGISTRY_SINGLETON_PROVIDER_PROTOCOLS)) {
+ /* Check if there's already an account configured with this account type */
+ if (modest_account_mgr_singleton_protocol_exists (modest_runtime_get_account_mgr (),
+ modest_protocol_get_type_id (proto)))
+ continue;
+ }
+
+ if (MODEST_ACCOUNT_PROTOCOL (proto)) {
+ priv->pending_check_support ++;
+ modest_account_protocol_check_support (MODEST_ACCOUNT_PROTOCOL (proto),
+ check_support_callback,
+ g_object_ref (self));
+ }
+ }
+ g_slist_free (provider_protos);
+
+ if (priv->pending_check_support > 0) {
+ priv->check_support_show_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
+ check_support_show_progress,
+ g_object_ref (self), g_object_unref);
+ } else {
+ priv->check_support_done = TRUE;
+ }
+ invoke_enable_buttons_vfunc (self);
+}
projects / modest / blobdiff