* Captioned labels are not expanded.
* Fixed size for wizard and its labels.
* Advanced settings button set to the expected layout in specs.
* Fixed typo in hbutton layout
pmo-trunk-r6812
MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \
ModestEasysetupWizardDialogPrivate))
MODEST_TYPE_EASYSETUP_WIZARD_DIALOG, \
ModestEasysetupWizardDialogPrivate))
+#define LABELS_WIDTH 480
+#define DIALOG_WIDTH LABELS_WIDTH + MODEST_MARGIN_DOUBLE
typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
typedef struct _ModestEasysetupWizardDialogPrivate ModestEasysetupWizardDialogPrivate;
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_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_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
{
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
{
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
- GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
+ 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_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_widget_show (label);
label = gtk_label_new (_("mcen_ia_customsetup_complete"));
gtk_widget_show (label);
label = gtk_label_new (_("mcen_ia_customsetup_complete"));
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ 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_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_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- GtkWidget *caption = modest_maemo_utils_create_captioned (NULL, NULL,
- _("mcen_fi_advanced_settings"),
- button_edit);
gtk_widget_show (button_edit);
gtk_widget_show (button_edit);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (caption);
+ 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);
g_signal_connect (G_OBJECT (button_edit), "clicked",
G_CALLBACK (on_button_edit_advanced_settings), self);
/* 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());
/* 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);
/* Set the notebook used by the ModestWizardDialog base class: */
g_object_set (G_OBJECT(self), "wizard-notebook", notebook, NULL);
/* Set the notebook used by the ModestWizardDialog base class: */
g_object_set (G_OBJECT(self), "wizard-notebook", notebook, NULL);
GtkWidget *box;
label = gtk_label_new (title);
GtkWidget *box;
label = gtk_label_new (title);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
hildon_gtk_widget_set_theme_size (label, HILDON_SIZE_FINGER_HEIGHT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
hildon_gtk_widget_set_theme_size (label, HILDON_SIZE_FINGER_HEIGHT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
- box = gtk_hbox_new (TRUE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, MODEST_MARGIN_HALF);
+ box = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, MODEST_MARGIN_HALF);
if (title_size_group)
gtk_size_group_add_widget (title_size_group, label);
gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, MODEST_MARGIN_HALF);
if (title_size_group)
gtk_size_group_add_widget (title_size_group, label);
if (title_sizegroup)
hildon_button_add_title_size_group (HILDON_BUTTON (button), title_sizegroup);
if (value_sizegroup)
if (title_sizegroup)
hildon_button_add_title_size_group (HILDON_BUTTON (button), title_sizegroup);
if (value_sizegroup)
- hildon_button_add_title_size_group (HILDON_BUTTON (button), value_sizegroup);
+ hildon_button_add_value_size_group (HILDON_BUTTON (button), value_sizegroup);
hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 0.0);
hildon_button_set_title_alignment (HILDON_BUTTON (button), 0.0, 0.5);
hildon_button_set_value_alignment (HILDON_BUTTON (button), 0.0, 0.5);
hildon_button_set_alignment (HILDON_BUTTON (button), 0.0, 0.5, 1.0, 0.0);
hildon_button_set_title_alignment (HILDON_BUTTON (button), 0.0, 0.5);
hildon_button_set_value_alignment (HILDON_BUTTON (button), 0.0, 0.5);