Entries in security options get now the proper size

Set auto size for horizontal separators

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 9837883..aba6ec9 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -764,6 +764,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self,
 
        GtkWidget *separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT);
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_widget_show (separator);
 
        /* connection-specific checkbox: */
@@ -1056,6 +1057,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
                            FALSE, FALSE, 0);
 
        separator = gtk_hseparator_new ();
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_box_pack_start (GTK_BOX (priv->main_container), separator,
                            FALSE, FALSE, MODEST_MARGIN_DEFAULT);
        gtk_widget_show (separator);
@@ -1063,6 +1065,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
                            priv->page_incoming,
                            FALSE, FALSE, 0);
        separator = gtk_hseparator_new ();
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_box_pack_start (GTK_BOX (priv->main_container), separator,
                            FALSE, FALSE, MODEST_MARGIN_DEFAULT);
        gtk_widget_show (separator);

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 3b6ee8c..86300a5 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -172,11 +172,13 @@ create_incoming_security (ModestSecurityOptionsView* self,
 
        if (ppriv->full) {
                ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
-               entry_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                    value_size_group,
-                                                                    _("mcen_fi_emailsetup_port"),
-                                                                    FALSE,
-                                                                    ppriv->port_view);
+               entry_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mcen_fi_emailsetup_port"),
+                                                                           FALSE,
+                                                                           ppriv->port_view,
+                                                                           MODEST_EDITABLE_SIZE);
                /* Pack & show widgets */
                gtk_box_pack_start (GTK_BOX (self), entry_caption, FALSE, FALSE, 0);
                gtk_widget_show (ppriv->port_view);
@@ -285,11 +287,12 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                 HILDON_GTK_INPUT_MODE_FULL);
 
                user_label = g_strdup_printf("%s*", _("mail_fi_username"));
-               user_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                   value_size_group,
-                                                                   user_label,
-                                                                   FALSE,
-                                                                   ppriv->user_entry);
+               user_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                                  value_size_group,
+                                                                                  user_label,
+                                                                                  FALSE,
+                                                                                  ppriv->user_entry,
+                                                                                  MODEST_EDITABLE_SIZE);
                g_free (user_label);
        
                /* Prevent the use of some characters. Limit the max
@@ -309,18 +312,22 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                 HILDON_GTK_INPUT_MODE_INVISIBLE);
                gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE);
 
-               pwd_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                  value_size_group,
-                                                                  _("mail_fi_password"), 
-                                                                  FALSE,
-                                                                  ppriv->pwd_entry);
+               pwd_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mail_fi_password"),
+                                                                           FALSE,
+                                                                           ppriv->pwd_entry,
+                                                                           MODEST_EDITABLE_SIZE);
 
                ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
-               port_caption = modest_maemo_utils_create_captioned (title_size_group,
-                                                                   value_size_group,
-                                                                   _("mcen_fi_emailsetup_port"), 
-                                                                   FALSE,
-                                                                   ppriv->port_view);
+               port_caption =
+                       modest_maemo_utils_create_captioned_with_size_type (title_size_group,
+                                                                           value_size_group,
+                                                                           _("mcen_fi_emailsetup_port"),
+                                                                           FALSE,
+                                                                           ppriv->port_view,
+                                                                           MODEST_EDITABLE_SIZE);
        }
 
        /* Track changes in UI */