2007-06-02 Armin Burgmeier <armin@openismus.com>

* src/maemo/easysetup/modest-easysetup-wizard.c: Made labels wrapping
	and assigned max width chars so that they wrap instead of being
	truncated. Fixes projects.maemo.org bug NB#56126.

pmo-trunk-r2045

diff --git a/ChangeLog2 b/ChangeLog2
index 368d07e..6f11916 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-06-02  Armin Burgmeier  <armin@openismus.com>
 
 2007-06-02  Armin Burgmeier  <armin@openismus.com>
 

+       * src/maemo/easysetup/modest-easysetup-wizard.c: Made labels wrapping
+       and assigned max width chars so that they wrap instead of being
+       truncated. Fixes projects.maemo.org bug NB#56126.
+
+2007-06-02  Armin Burgmeier  <armin@openismus.com>
+

        * src/maemo/modest-connection-specific-smtp-window.c: Add an
        introductory note to the connection specific smtp servers dialog, as
        section 8.12 of the email UI specification requires. This fixes
        * src/maemo/modest-connection-specific-smtp-window.c: Add an
        introductory note to the connection specific smtp servers dialog, as
        section 8.12 of the email UI specification requires. This fixes

@@ -2159,4 +2165,3 @@
        
 Started ChangeLog2 file, because I cannot work without a ChangeLog. murrayc.
 Apparently ChangeLog is not used for some vague Nokia legal reasons.
        
 Started ChangeLog2 file, because I cannot work without a ChangeLog. murrayc.
 Apparently ChangeLog is not used for some vague Nokia legal reasons.

-

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index 77ac8dd..80e5cbd 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -216,6 +216,9 @@ create_page_welcome (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        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_label_set_max_width_chars (GTK_LABEL (label), 40);

        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));

@@ -274,6 +277,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
 {
        GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
        GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));

+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       gtk_label_set_max_width_chars (GTK_LABEL (label), 40);

        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (label);
        
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
        gtk_widget_show (label);
        

@@ -498,11 +503,15 @@ static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *s
        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"));

+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       gtk_label_set_max_width_chars (GTK_LABEL (label), 40);

        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
        
        label = gtk_label_new (_("mcen_ia_easysetup_complete"));
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
        
        label = gtk_label_new (_("mcen_ia_easysetup_complete"));

+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       gtk_label_set_max_width_chars (GTK_LABEL (label), 40);

        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);
        gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
        gtk_widget_show (label);

@@ -914,7 +923,6 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self)
         * because we need _some_ final page to enable the Next and Finish buttons: */
        create_subsequent_easysetup_pages (self);
 
         * because we need _some_ final page to enable the Next and Finish buttons: */
        create_subsequent_easysetup_pages (self);
 

-            

        /* Connect to the dialog's response signal so we can enable/disable buttons 
         * for the newly-selected page, because the prev/next buttons cause response to be emitted.
         * Note that we use g_signal_connect_after() instead of g_signal_connect()
        /* Connect to the dialog's response signal so we can enable/disable buttons 
         * for the newly-selected page, because the prev/next buttons cause response to be emitted.
         * Note that we use g_signal_connect_after() instead of g_signal_connect()

diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c
index c64490c..26278ce 100644 (file)
--- a/src/maemo/modest-connection-specific-smtp-window.c
+++ b/src/maemo/modest-connection-specific-smtp-window.c
@@ -345,13 +345,13 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow
        
        GtkWidget *vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
 
        
        GtkWidget *vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
 

-  /* Introductory note: */
-  GtkWidget *label = gtk_label_new(_("mcen_ia_optionalsmtp_note"));
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  /* So that it is shown without being truncated: */
-  gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
-  gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, MODEST_MARGIN_HALF);
+       /* Introductory note: */
+       GtkWidget *label = gtk_label_new(_("mcen_ia_optionalsmtp_note"));
+       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+       /* So that it is shown without being truncated: */
+       gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, MODEST_MARGIN_HALF);

        
        /* Put the treeview in a scrolled window and add it to the box: */
        GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
        
        /* Put the treeview in a scrolled window and add it to the box: */
        GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);