static void save_to_settings (ModestEasysetupWizardDialog *self);
static void real_enable_buttons (ModestWizardDialog *dialog, gboolean enable_next);
+static GList* check_for_supported_auth_methods (ModestEasysetupWizardDialog* self);
+static gboolean check_has_supported_auth_methods(ModestEasysetupWizardDialog* self);
static gboolean
on_delete_event (GtkWidget *widget,
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;
+
+ 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;
+
+ 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.
*/
_("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);
+ G_CALLBACK (on_serviceprovider_picker_button_value_changed), self);
gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->account_serviceprovider_picker);
/* 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);
gtk_widget_show (GTK_WIDGET (box));
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
-
+
return GTK_WIDGET (box);
}
-static GtkWidget*
+static GtkWidget*
create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
{
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_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_widget_show (label);
-
+
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
}
ModestProtocolRegistry *protocol_registry;
ModestEasysetupWizardDialogPrivate* priv;
GtkWidget *box;
- GtkWidget *scrolled_window;
+ 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"));
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker),
MODEST_PROTOCOLS_STORE_POP);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), box);
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window)));
+ hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
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 *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_widget_show (caption);
g_signal_connect (G_OBJECT (priv->entry_outgoingserver), "changed",
G_CALLBACK (on_entry_outgoing_servername_changed), self);
+
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
+ hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
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 *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_label_set_line_wrap (GTK_LABEL (label), TRUE);
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_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);
-
+
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);
}
/* 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);
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 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_free (provider_id);
}
+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;
+}
+