2007-04-24 Murray Cumming <murrayc@murrayc.com>

* src/maemo/easysetup/modest-easysetup-wizard.c:
        (create_page_custom_incoming), (create_page_custom_outgoing):
        * src/maemo/modest-account-settings-dialog.c:
        (create_page_account_details), (create_page_incoming),
        (create_page_outgoing): Use a separate label in a caption for GtkCheckButtons,
        instead of using gtk_check_button_with_label(), so they are aligned like the other
        widgets, as per the UI spec.

pmo-trunk-r1645

diff --git a/ChangeLog2 b/ChangeLog2
index 1b5e69a..99dd92c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,6 +1,16 @@
 2007-04-24  Murray Cumming  <murrayc@murrayc.com>
 
        * src/maemo/easysetup/modest-easysetup-wizard.c:
+       (create_page_custom_incoming), (create_page_custom_outgoing):
+       * src/maemo/modest-account-settings-dialog.c:
+       (create_page_account_details), (create_page_incoming),
+       (create_page_outgoing): Use a separate label in a caption for GtkCheckButtons, 
+       instead of using gtk_check_button_with_label(), so they are aligned like the other 
+       widgets, as per the UI spec.
+
+2007-04-24  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
        * src/maemo/modest-connection-specific-smtp-edit-window.c:
        * src/widgets/modest-validating-entry.c:
        * src/widgets/modest-validating-entry.h: Rename the validating widget so it has a 

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index b282e30..62c1075 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -574,10 +574,12 @@ static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self
        gtk_widget_show (caption);
        
        if(!self->checkbox_incoming_auth)
-               self->checkbox_incoming_auth = 
-                       gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, MODEST_MARGIN_HALF);
+               self->checkbox_incoming_auth = gtk_check_button_new ();
+       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
+               self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->checkbox_incoming_auth);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (caption);
        
        gtk_widget_show (GTK_WIDGET (box));
        
@@ -669,12 +671,15 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        
        /* connection-specific checkbox: */
        if (!self->checkbox_outgoing_smtp_specific) {
-               self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp"));
+               self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), 
                        FALSE);
        }
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, MODEST_MARGIN_HALF);
+       caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), 
+               self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->checkbox_outgoing_smtp_specific);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (caption);
        
        GtkWidget *separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 4df4873..5bb810a 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -290,11 +290,13 @@ create_page_account_details (ModestAccountSettingsDialog *self)
 
        /* The leave-messages widgets: */
        if(!self->checkbox_leave_messages)
-               self->checkbox_leave_messages = 
-                       gtk_check_button_new_with_label (_("mcen_fi_advsetup_leave_on_server"));
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF);
+               self->checkbox_leave_messages = gtk_check_button_new ();
+       caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), 
+               self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->checkbox_leave_messages);
        connect_for_modified (self, self->checkbox_leave_messages);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (caption);
        
        gtk_widget_show (GTK_WIDGET (box));
        
@@ -529,11 +531,13 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
        
        /* The secure authentication widgets: */
        if(!self->checkbox_incoming_auth)
-               self->checkbox_incoming_auth = 
-                       gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, MODEST_MARGIN_HALF);
+               self->checkbox_incoming_auth = gtk_check_button_new ();
+       caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"), 
+               self->checkbox_incoming_auth, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->checkbox_incoming_auth);
        connect_for_modified (self, self->checkbox_incoming_auth);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (caption);
        
        gtk_widget_show (GTK_WIDGET (box));
        
@@ -727,12 +731,15 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        
        /* connection-specific checkbox: */
        if (!self->checkbox_outgoing_smtp_specific) {
-               self->checkbox_outgoing_smtp_specific = gtk_check_button_new_with_label (_("mcen_fi_advsetup_connection_smtp"));
+               self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific), 
                        FALSE);
        }
-       gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, MODEST_MARGIN_HALF);
+       caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), 
+               self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->checkbox_outgoing_smtp_specific);
+       gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+       gtk_widget_show (caption);
        connect_for_modified (self, self->checkbox_outgoing_smtp_specific);
        
        /* Connection-specific SMTP-Severs Edit button: */