X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-easysetup-wizard-dialog.c;h=b47332d600325598edb4878bc42d7dcb58f410da;hp=9ba584e6943179050225a160d3104763865495e7;hb=08da5510e8f59e09cf5f517dc222235c24f5bbf8;hpb=28f0c325c89bc4b65120c2ef41ff0b51c533b4c8 diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 9ba584e..b47332d 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -114,6 +114,7 @@ struct _ModestEasysetupWizardDialogPrivate GtkWidget *account_country_picker; GtkWidget *account_serviceprovider_picker; GtkWidget *entry_account_title; + GtkWidget *caption_account_title; GtkWidget *page_user_details; GtkWidget *entry_user_name; @@ -266,27 +267,12 @@ static void on_caption_entry_changed (GtkEditable *editable, gpointer user_data) { ModestEasysetupWizardDialog *self; - gboolean mandatory, empty; - ModestEasysetupWizardDialogPrivate *priv; g_return_if_fail (user_data); self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data); - priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self); invoke_enable_buttons_vfunc(self); - - empty = !g_utf8_collate (gtk_entry_get_text (GTK_ENTRY (editable)), ""); - mandatory = ((GtkWidget *) editable == priv->entry_account_title) || - ((GtkWidget *) editable == priv->entry_user_username) || - ((GtkWidget *) editable == priv->entry_user_email); - - /* Show a banner & get focus */ - if (empty && mandatory) { - modest_platform_information_banner ((GtkWidget *) editable, NULL, - _CS("ckct_ib_enter_some_text")); - gtk_widget_grab_focus (GTK_WIDGET (editable)); - } } static void @@ -313,6 +299,10 @@ on_serviceprovider_picker_button_value_changed (HildonPickerButton *widget, gpoi 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); @@ -336,6 +326,31 @@ on_serviceprovider_picker_button_value_changed (HildonPickerButton *widget, gpoi 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); } @@ -396,7 +411,6 @@ create_page_welcome (ModestEasysetupWizardDialog *self) gtk_container_add (GTK_CONTAINER (align), box); gtk_widget_show (label); gtk_widget_show (GTK_WIDGET (box)); - gtk_widget_show (align); return GTK_WIDGET (align); } @@ -470,7 +484,6 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data) 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")); @@ -529,11 +542,13 @@ create_page_account_details (ModestEasysetupWizardDialog *self) 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, 0); - 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: */ @@ -893,7 +908,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) FALSE, title_sizegroup, value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, FALSE, FALSE, 0); - gtk_widget_show_all (priv->incoming_security); + gtk_widget_show (priv->incoming_security); /* Set default selection */ modest_servertype_picker_set_active_servertype ( @@ -906,8 +921,6 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) gtk_container_add (GTK_CONTAINER (align), box); hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align); - 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); @@ -1053,8 +1066,6 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) gtk_container_add (GTK_CONTAINER (align), box); hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align); - 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); @@ -1361,6 +1372,7 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) 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);