Signature dialog alignment fixes

[modest] / src / hildon2 / modest-easysetup-wizard-dialog.c

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 03b0aea..9ba584e 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -471,6 +471,7 @@ 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);
@@ -531,7 +532,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
        caption = 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_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
        gtk_widget_show (caption);
        
        /* Prevent the use of some characters in the account title, 
@@ -565,8 +566,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*
@@ -576,6 +582,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self)
        GtkSizeGroup* value_sizegroup;
        GtkWidget *box;
        ModestEasysetupWizardDialogPrivate *priv;
+       GtkWidget *align;
 
        priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
        
@@ -601,7 +608,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, 
@@ -623,7 +630,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);
@@ -651,7 +658,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: */        
@@ -662,7 +669,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);
@@ -678,17 +685,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);
@@ -698,12 +712,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, 
@@ -799,7 +820,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;
@@ -814,6 +836,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);
@@ -828,10 +852,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);
@@ -847,7 +873,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, 
@@ -866,7 +892,7 @@ 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);
+                           FALSE, FALSE, 0);
        gtk_widget_show_all (priv->incoming_security);
 
        /* Set default selection */
@@ -874,7 +900,12 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self)
                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));
@@ -942,6 +973,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 ();
@@ -964,7 +996,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);
 
@@ -974,11 +1006,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: */
@@ -994,7 +1026,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"));
@@ -1002,7 +1034,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, 
@@ -1015,7 +1047,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));
@@ -1062,6 +1099,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"));
@@ -1069,6 +1107,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);
 
@@ -1076,17 +1116,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);
 }