From 087a1d8a5f57fcbb64e99f51d712df2a7c31536b Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 9 Oct 2008 10:07:08 +0000 Subject: [PATCH] * Removed the icon in wizards for hildon2 platform. * Dropped the default label sizes for easysetup wizard, to make strings get their width automatically (fixes NB#89326). pmo-trunk-r5975 --- src/hildon2/modest-easysetup-wizard-dialog.c | 16 +++++++++------- src/widgets/modest-wizard-dialog.c | 23 +++++++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index d94262e..84db5ba 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -71,6 +71,8 @@ G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODE MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \ ModestEasysetupWizardDialogPrivate)) +#define LABELS_WIDTH -1 + typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate; @@ -290,7 +292,7 @@ create_page_welcome (ModestEasysetupWizardDialog *self) GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); /* So that it is not truncated: */ - gtk_widget_set_size_request (label, 600, -1); + gtk_widget_set_size_request (label, LABELS_WIDTH, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); gtk_widget_show (GTK_WIDGET (box)); @@ -359,7 +361,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) ModestEasysetupWizardDialogPrivate* priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_widget_set_size_request (label, 600, -1); + gtk_widget_set_size_request (label, LABELS_WIDTH, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (label); @@ -565,7 +567,7 @@ create_page_complete_easysetup (ModestEasysetupWizardDialog *self) 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, 600, -1); + 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, @@ -575,7 +577,7 @@ create_page_complete_easysetup (ModestEasysetupWizardDialog *self) label = gtk_label_new (_("mcen_ia_easysetup_complete")); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_widget_set_size_request (label, 600, -1); + 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); @@ -690,7 +692,7 @@ 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_widget_set_size_request (label, 600, -1); + gtk_widget_set_size_request (label, LABELS_WIDTH, -1); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -923,14 +925,14 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self) GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_bd_edit")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_set_size_request (label, 600, -1); + 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, FALSE, FALSE, 0); gtk_widget_show (label); label = gtk_label_new (_("mcen_ia_customsetup_complete")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_set_size_request (label, 600, -1); + 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, FALSE, FALSE, 0); gtk_widget_show (label); diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c index 16ce274..975cf7e 100644 --- a/src/widgets/modest-wizard-dialog.c +++ b/src/widgets/modest-wizard-dialog.c @@ -249,7 +249,12 @@ init (ModestWizardDialog *wizard_dialog) gtk_dialog_set_has_separator (dialog, FALSE); wizard_dialog->priv = priv; priv->box = GTK_BOX (gtk_hbox_new (FALSE, 0)); -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 + priv->image = NULL; +#else +#ifdef MODEST_TOOLKIT_GTK + priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG); +#else /*MODEST_TOOLKIT_GTK*/ #if MODEST_HILDON_API == 0 priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard", HILDON_ICON_SIZE_WIDG_WIZARD); @@ -260,9 +265,8 @@ init (ModestWizardDialog *wizard_dialog) priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard", icon_size); #endif /*MODEST_HILDON_API == 0*/ -#else /*MODEST_TOOLKIT_GTK*/ - priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG); #endif /*!MODEST_TOOLKIT_GTK*/ +#endif /*MODEST_TOOLKIT_HILDON2 */ /* Default values for user provided properties */ priv->notebook = NULL; priv->wizard_name = NULL; @@ -271,7 +275,8 @@ init (ModestWizardDialog *wizard_dialog) /* Build wizard layout */ gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), GTK_WIDGET (priv->box)); gtk_box_pack_start_defaults (GTK_BOX (priv->box), GTK_WIDGET (vbox)); - gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0); + if (priv->image) + gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0); /* Add response buttons: finish, previous, next, cancel */ #ifdef MODEST_TOOLKIT_HILDON1 @@ -566,10 +571,12 @@ response (ModestWizardDialog *wizard_dialog, /* We show the default image on first and last pages */ last = gtk_notebook_get_n_pages (notebook) - 1; - if (current == last || current == 0) - gtk_widget_show (GTK_WIDGET(priv->image)); - else - gtk_widget_hide (GTK_WIDGET(priv->image)); + if (priv->image) { + if (current == last || current == 0) + gtk_widget_show (GTK_WIDGET(priv->image)); + else + gtk_widget_hide (GTK_WIDGET(priv->image)); + } /* New page number may appear in the title, update it */ if (priv->autotitle) -- 1.7.9.5