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

[modest] / src / maemo / modest-account-settings-dialog.c

diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c
index 331c409..bf54263 100644 (file)
--- a/src/maemo/modest-account-settings-dialog.c
+++ b/src/maemo/modest-account-settings-dialog.c
@@ -216,6 +216,14 @@ static GtkWidget* create_caption_new_with_asterix(ModestAccountSettingsDialog *s
        return caption;
 }
 
+
+static void
+on_entry_max (EasysetupValidatingEntry *self, gpointer user_data)
+{
+       ModestAccountSettingsDialog *dialog = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+       show_error (GTK_WINDOW (dialog), _("ckdg_ib_maximum_characters_reached"));
+}
+
 static GtkWidget*
 create_page_account_details (ModestAccountSettingsDialog *self)
 {
@@ -257,8 +265,10 @@ create_page_account_details (ModestAccountSettingsDialog *self)
        g_list_free (list_prevent);
        
        /* Set max length as in the UI spec:
-        * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_account_title), 64);
+       easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), 
+               on_entry_max, self);
        
        /* The retrieve combobox: */
        self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
@@ -339,9 +349,13 @@ create_page_user_details (ModestAccountSettingsDialog *self)
         
        /* The name widgets: */
        self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ());
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_name), HILDON_GTK_INPUT_MODE_FULL);
        /* Set max length as in the UI spec:
-        * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_name), 64);
+       easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_user_name), 
+               on_entry_max, self);
        GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
                _("mcen_li_emailsetup_name"), self->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_user_name);
@@ -360,6 +374,8 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        
        /* The username widgets: */     
        self->entry_user_username = GTK_WIDGET (easysetup_validating_entry_new ());
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
        caption = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
                self->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_user_username);
@@ -373,11 +389,15 @@ create_page_user_details (ModestAccountSettingsDialog *self)
                EASYSETUP_VALIDATING_ENTRY (self->entry_user_username));
        
        /* Set max length as in the UI spec:
-        * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_username), 64);
+       easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_user_username), 
+               on_entry_max, self);
        
        /* The password widgets: */     
        self->entry_user_password = gtk_entry_new ();
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_password), HILDON_GTK_INPUT_MODE_FULL);
        gtk_entry_set_visibility (GTK_ENTRY (self->entry_user_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_user_password), '*'); */
        caption = create_caption_new_with_asterix (self, sizegroup, 
@@ -389,6 +409,8 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        
        /* The email address widgets: */        
        self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ());
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
        caption = create_caption_new_with_asterix (self, sizegroup, 
                _("mcen_li_emailsetup_email_address"), self->entry_user_email, NULL, HILDON_CAPTION_MANDATORY);
        gtk_entry_set_text (GTK_ENTRY (self->entry_user_email), EXAMPLE_EMAIL_ADDRESS); /* Default text. */
@@ -398,9 +420,10 @@ create_page_user_details (ModestAccountSettingsDialog *self)
        gtk_widget_show (caption);
        
        /* Set max length as in the UI spec:
-        * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_user_email), 64);
-       
+       easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_user_email), 
+               on_entry_max, self);
        
        /* Signature button: */
        if (!self->button_signature)
@@ -462,6 +485,8 @@ static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
        /* The incoming server widgets: */
        if(!self->entry_incomingserver)
                self->entry_incomingserver = gtk_entry_new ();
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL);
 
        if (self->caption_incoming)
          gtk_widget_destroy (self->caption_incoming);
@@ -613,6 +638,8 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        /* The outgoing server widgets: */
        if (!self->entry_outgoingserver)
                self->entry_outgoingserver = gtk_entry_new ();
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
        GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, 
                _("mcen_li_emailsetup_smtp"), self->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
        gtk_widget_show (self->entry_outgoingserver);
@@ -635,6 +662,8 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
        
        /* The username widgets: */     
        self->entry_outgoing_username = GTK_WIDGET (easysetup_validating_entry_new ());
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_username), HILDON_GTK_INPUT_MODE_FULL);
        self->caption_outgoing_username = create_caption_new_with_asterix (self, sizegroup, _("mail_fi_username"), 
                self->entry_outgoing_username, NULL, HILDON_CAPTION_MANDATORY);
        gtk_widget_show (self->entry_outgoing_username);
@@ -648,11 +677,15 @@ static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
                EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username));
        
        /* Set max length as in the UI spec:
-        * TODO: The UI spec seems to want us to show a dialog if we hit the maximum. */
+        * The UI spec seems to want us to show a dialog if we hit the maximum. */
        gtk_entry_set_max_length (GTK_ENTRY (self->entry_outgoing_username), 64);
-       
+       easysetup_validating_entry_set_max_func (EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username), 
+               on_entry_max, self);
+               
        /* The password widgets: */     
        self->entry_outgoing_password = gtk_entry_new ();
+       /* Auto-capitalization is the default, so let's turn it off: */
+       hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_outgoing_password), HILDON_GTK_INPUT_MODE_FULL);
        gtk_entry_set_visibility (GTK_ENTRY (self->entry_outgoing_password), FALSE);
        /* gtk_entry_set_invisible_char (GTK_ENTRY (self->entry_outgoing_password), '*'); */
        self->caption_outgoing_password = create_caption_new_with_asterix (self, sizegroup,