Appended "*" to some missing mandatory fields in easysetup dialog

[modest] / src / widgets / modest-default-account-settings-dialog.c

diff --git a/src/widgets/modest-default-account-settings-dialog.c b/src/widgets/modest-default-account-settings-dialog.c
index a46d288..6c5c802 100644 (file)
--- a/src/widgets/modest-default-account-settings-dialog.c
+++ b/src/widgets/modest-default-account-settings-dialog.c
@@ -194,11 +194,13 @@ set_modified (ModestDefaultAccountSettingsDialog *self, gboolean modified)
        priv->modified = modified;
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static void
 on_modified_picker_changed (GtkWidget *widget, gpointer user_data)
 {
        set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE);
 }
+#endif
 
 static void
 on_modified_entry_changed (GtkEditable *editable, gpointer user_data)
@@ -293,7 +295,7 @@ on_entry_invalid_account_title_character (ModestValidatingEntry *self, const gch
        gchar *tmp, *msg;
                        
        tmp = g_strndup (account_title_forbidden_chars, ACCOUNT_TITLE_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
 
        modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
 
@@ -307,7 +309,7 @@ on_entry_invalid_fullname_character (ModestValidatingEntry *self, const gchar* c
        gchar *tmp, *msg;
                        
        tmp = g_strndup (user_name_forbidden_chars, USER_NAME_FORBIDDEN_CHARS_LENGTH);
-       msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+       msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
 
        modest_platform_information_banner (GTK_WIDGET (self), NULL, msg);
 
@@ -320,7 +322,7 @@ static void
 on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 {
        modest_platform_information_banner (GTK_WIDGET (self), NULL, 
-                                           _CS("ckdg_ib_maximum_characters_reached"));
+                                           _CS_MAXIMUM_CHARACTERS_REACHED);
 }
 
 static GtkWidget*
@@ -490,6 +492,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self,
 {
        ModestDefaultAccountSettingsDialogPrivate *priv;
        GtkWidget *box;
+       gchar *tmp;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
 
@@ -535,9 +538,11 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self,
 #ifdef MAEMO_CHANGES
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
 #endif
+       tmp = g_strconcat (_("mail_fi_username"), "*", NULL);
        caption = create_captioned (self, title_sizegroup, value_sizegroup,
-                                   _("mail_fi_username"), FALSE,
+                                   tmp, FALSE,
                                    priv->entry_user_username);
+       g_free (tmp);
        gtk_widget_show (priv->entry_user_username);
        connect_for_modified (self, priv->entry_user_username);
        gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
@@ -579,8 +584,10 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self,
 #ifdef MAEMO_CHANGES
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
 #endif
+       tmp = g_strconcat (_("mcen_li_emailsetup_email_address"), "*", NULL);
        caption = create_captioned (self, title_sizegroup, value_sizegroup,
-                                   _("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email);
+                                   tmp, FALSE, priv->entry_user_email);
+       g_free (tmp);
        gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */
        gtk_widget_show (priv->entry_user_email);
        connect_for_modified (self, priv->entry_user_email);
@@ -596,7 +603,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self,
        /* Delete button: */
        if (!priv->button_delete)
                priv->button_delete = gtk_dialog_add_button (GTK_DIALOG (self),
-                                                            _HL("wdgt_bd_delete"),
+                                                            _HL_DELETE,
                                                             RESPONSE_DELETE_DUMMY);
 
        /* Signature button: */
@@ -754,7 +761,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self,
 #ifdef MAEMO_CHANGES
        hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
 #endif
-       smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
+       smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "*\n<small>(SMTP)</small>", NULL);
        GtkWidget *caption = create_captioned (self, security_title_sizegroup, security_value_sizegroup,
                                               smtp_caption_label, TRUE, priv->entry_outgoingserver);
        g_free (smtp_caption_label);
@@ -1035,6 +1042,10 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self);
 
+#ifndef MODEST_TOOLKIT_HILDON2
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+#endif
+
        priv->incoming_security = NULL;
        priv->outgoing_security = NULL;
 
@@ -1112,7 +1123,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
        gtk_widget_show (GTK_WIDGET (scrollable));
         
     /* Add the buttons: */
-       gtk_dialog_add_button (GTK_DIALOG(self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK);
+       gtk_dialog_add_button (GTK_DIALOG(self), _HL_SAVE, GTK_RESPONSE_OK);
 
     gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);