X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-easysetup-wizard-dialog.c;h=00b7fd24c0a25f42a85369c14ff5eda70b77d2f0;hb=c9bd027ebae07f5f26bbd7bb450eef36f89180b8;hp=4ba15347b3d73380301b03b7d698ed8c7b44e52e;hpb=42201d447c7f6d511fda5dca4aad7938ce7290ce;p=modest diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 4ba1534..00b7fd2 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; @@ -313,6 +314,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 +341,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); } @@ -376,6 +406,7 @@ static GtkWidget* create_page_welcome (ModestEasysetupWizardDialog *self) { GtkWidget *box; + GtkWidget *align; GtkWidget *label; ModestEasysetupWizardDialogPrivate *priv; @@ -383,15 +414,19 @@ create_page_welcome (ModestEasysetupWizardDialog *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 @@ -464,7 +499,7 @@ 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")); ModestEasysetupWizardDialogPrivate* priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self); @@ -522,11 +557,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, 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: */ @@ -559,8 +596,13 @@ create_page_account_details (ModestEasysetupWizardDialog *self) 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* @@ -570,6 +612,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) GtkSizeGroup* value_sizegroup; GtkWidget *box; ModestEasysetupWizardDialogPrivate *priv; + GtkWidget *align; priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self); @@ -595,7 +638,7 @@ create_page_user_details (ModestEasysetupWizardDialog *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, @@ -617,7 +660,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) 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); @@ -645,7 +688,7 @@ create_page_user_details (ModestEasysetupWizardDialog *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: */ @@ -656,7 +699,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) _("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); @@ -672,17 +715,24 @@ create_page_user_details (ModestEasysetupWizardDialog *self) g_object_unref (title_sizegroup); g_object_unref (value_sizegroup); - 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); } 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); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); @@ -692,12 +742,19 @@ create_page_complete_easysetup (ModestEasysetupWizardDialog *self) 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, @@ -793,7 +850,8 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) { ModestProtocolRegistry *protocol_registry; ModestEasysetupWizardDialogPrivate* priv; - GtkWidget *box; + GtkWidget *box; + GtkWidget *align; GtkWidget *pannable; GtkWidget *label; GtkSizeGroup *title_sizegroup; @@ -808,6 +866,8 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) /* 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); @@ -822,10 +882,12 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) 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); @@ -841,7 +903,7 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) 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, @@ -860,15 +922,20 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) 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); - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box); + 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_container_set_focus_vadjustment (GTK_CONTAINER (box), hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable))); gtk_widget_show (GTK_WIDGET (box)); @@ -936,6 +1003,7 @@ 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 (); @@ -958,7 +1026,7 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) 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); @@ -968,11 +1036,11 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *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: */ @@ -988,7 +1056,7 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) 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")); @@ -996,7 +1064,7 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) 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, @@ -1009,7 +1077,12 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) G_CALLBACK (on_entry_outgoing_servername_changed), self); - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box); + 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_container_set_focus_vadjustment (GTK_CONTAINER (box), hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable))); gtk_widget_show (GTK_WIDGET (box)); @@ -1056,6 +1129,7 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data) static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self) { + 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")); @@ -1063,6 +1137,8 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self) 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); @@ -1070,17 +1146,25 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self) 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); } @@ -1307,6 +1391,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);