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

* src/maemo/easysetup/modest-easysetup-wizard.c:
        (create_page_account_details), (create_page_custom_outgoing),
        (create_page_complete_custom):
        * src/maemo/modest-account-settings-dialog.c:
        (create_page_user_details), (create_page_incoming),
        (create_page_outgoing):
        * src/maemo/modest-connection-specific-smtp-edit-window.c:
        (modest_connection_specific_smtp_edit_window_init):
        Use the correct (UI spec) port min/max, and use horizontal separators,
        as per the UI spec.

pmo-trunk-r1636

diff --git a/ChangeLog2 b/ChangeLog2
index 9ec9bcd..67452a6 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,6 +1,19 @@
 2007-04-23  Murray Cumming  <murrayc@murrayc.com>
 
        * src/maemo/easysetup/modest-easysetup-wizard.c:
+       (create_page_account_details), (create_page_custom_outgoing),
+       (create_page_complete_custom):
+       * src/maemo/modest-account-settings-dialog.c:
+       (create_page_user_details), (create_page_incoming),
+       (create_page_outgoing):
+       * src/maemo/modest-connection-specific-smtp-edit-window.c:
+       (modest_connection_specific_smtp_edit_window_init): 
+       Use the correct (UI spec) port min/max, and use horizontal separators, 
+       as per the UI spec.
+
+2007-04-23  Murray Cumming  <murrayc@murrayc.com>
+
+       * src/maemo/easysetup/modest-easysetup-wizard.c:
        (set_default_custom_servernames):
        * src/maemo/modest-account-settings-dialog.c:
        (create_page_incoming), (on_combo_outgoing_security_changed),

diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c
index f0ac9a8..5919ee3 100644 (file)
--- a/src/maemo/easysetup/modest-easysetup-wizard.c
+++ b/src/maemo/easysetup/modest-easysetup-wizard.c
@@ -14,6 +14,7 @@
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkseparator.h>
 #include <hildon-widgets/hildon-caption.h>
 #include "maemo/easysetup/modest-easysetup-country-combo-box.h"
 #include "maemo/easysetup/modest-easysetup-provider-combo-box.h"
@@ -262,7 +263,10 @@ create_page_account_details (ModestEasysetupWizardDialog *self)
     g_signal_connect (G_OBJECT (self->combo_account_country), "changed",
             G_CALLBACK (on_combo_account_country), self);
             
-       
+       GtkWidget *separator = gtk_hseparator_new ();
+       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 2);
+       gtk_widget_show (separator);
+            
        /* The service provider widgets: */     
        self->combo_account_serviceprovider = GTK_WIDGET (easysetup_provider_combo_box_new ());
        
@@ -645,11 +649,16 @@ static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self
        gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
        gtk_widget_show (self->checkbox_outgoing_smtp_specific);
        
+       GtkWidget *separator = gtk_hseparator_new ();
+       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 2);
+       gtk_widget_show (separator);
+       
        /* Connection-specific SMTP-Severs Edit button: */
        if (!self->button_outgoing_smtp_servers)
                self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
                self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
+       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (self->button_outgoing_smtp_servers);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
        gtk_widget_show (caption);
@@ -678,6 +687,7 @@ static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self
                self->button_edit = gtk_button_new_with_label (_("mcen_bd_edit"));
        GtkWidget *caption = hildon_caption_new (NULL, _("mcen_fi_advanced_settings"), 
                self->button_edit, NULL, HILDON_CAPTION_OPTIONAL);
+       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (self->button_edit);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
        gtk_widget_show (caption);

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 05ee8a5..5370b84 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -372,6 +372,7 @@ create_page_user_details (ModestAccountSettingsDialog *self)
                self->button_signature = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_email_signature"), 
                self->button_signature, NULL, HILDON_CAPTION_OPTIONAL);
+       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (self->button_signature);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
        gtk_widget_show (caption);
@@ -458,7 +459,7 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
        /* The port widgets: */
        /* TODO: There are various rules about this in the UI spec. */
        if (!self->entry_incoming_port)
-               self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (0, 10000 /* arbitrary min and max */));
+               self->entry_incoming_port = GTK_WIDGET (hildon_number_editor_new (0, 65535));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), 
                self->entry_incoming_port, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_incoming_port);
@@ -644,7 +645,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        
        /* The port widgets: */
        if (!self->entry_outgoing_port)
-               self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 10000 /* arbitrary min and max */));
+               self->entry_outgoing_port = GTK_WIDGET (hildon_number_editor_new (0, 65535));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_emailsetup_port"), 
                self->entry_outgoing_port, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_outgoing_port);
@@ -652,6 +653,10 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
        gtk_widget_show (caption);
        
+       GtkWidget *separator = gtk_hseparator_new ();
+       gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 2);
+       gtk_widget_show (separator);
+       
        /* 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"));
@@ -667,6 +672,7 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
                self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit"));
        caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), 
                self->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL);
+       hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE);
        gtk_widget_show (self->button_outgoing_smtp_servers);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
        gtk_widget_show (caption);

diff --git a/src/maemo/modest-connection-specific-smtp-edit-window.c b/src/maemo/modest-connection-specific-smtp-edit-window.c
index 9c66625..bf0c38f 100644 (file)
--- a/src/maemo/modest-connection-specific-smtp-edit-window.c
+++ b/src/maemo/modest-connection-specific-smtp-edit-window.c
@@ -181,7 +181,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        
        /* The port number widgets: */
        if (!priv->entry_port)
-               priv->entry_port = GTK_WIDGET (hildon_number_editor_new (0, 10000 /* arbitrary min and max */));
+               priv->entry_port = GTK_WIDGET (hildon_number_editor_new (0, 65535));
        caption = hildon_caption_new (sizegroup, 
                _("mcen_li_emailsetup_smtp"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (priv->entry_port);