#include "modest-account-mgr.h"
#include "modest-secureauth-picker.h"
#include "widgets/modest-validating-entry.h"
-#include "modest-retrieve-picker.h"
-#include "modest-limit-retrieve-picker.h"
#include "modest-text-utils.h"
#include "modest-account-mgr.h"
#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
GtkWidget *page_account_details;
GtkWidget *entry_account_title;
- GtkWidget *retrieve_picker;
- GtkWidget *limit_retrieve_picker;
GtkWidget *checkbox_leave_messages;
GtkWidget *page_user_details;
GtkWidget *entry_user_username;
GtkWidget *entry_user_password;
GtkWidget *entry_user_email;
-/* GtkWidget *entry_incoming_port; */
GtkWidget *button_signature;
GtkWidget *button_delete;
static gboolean
save_configuration (ModestDefaultAccountSettingsDialog *dialog);
+static void on_missing_mandatory_data (ModestSecurityOptionsView *security_view,
+ gboolean missing,
+ gpointer user_data);
+
static const gchar * null_means_empty (const gchar * str);
static const gchar *
GtkWidget *result;
- result = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
- label_text, use_markup, control);
+ result = modest_maemo_utils_create_captioned_with_size_type (title_sizegroup, value_sizegroup,
+ label_text, use_markup, control,
+ MODEST_EDITABLE_SIZE);
/* Connect to the appropriate changed signal for the widget,
* so we can ask for the prev/next buttons to be enabled/disabled appropriately:
}
static GtkWidget*
-create_page_account_details (ModestDefaultAccountSettingsDialog *self)
+create_page_account_details (ModestDefaultAccountSettingsDialog *self,
+ GtkSizeGroup *title_sizegroup,
+ GtkSizeGroup *value_sizegroup)
{
ModestDefaultAccountSettingsDialogPrivate *priv;
- GtkWidget *box;
- GtkSizeGroup* title_sizegroup;
- GtkSizeGroup* value_sizegroup;
- GtkWidget *hbox;
+ GtkWidget *box, *hbox, *caption;
+ gchar *tmp = NULL;
priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
+
/* The description widgets: */
priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
/* Do use auto-capitalization: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_account_title),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
- GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
- _("mcen_fi_account_title"), FALSE,
- priv->entry_account_title);
+ tmp = g_strconcat (_("mcen_fi_account_title"), "*", NULL);
+ caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ tmp, FALSE,
+ priv->entry_account_title);
+ g_free (tmp);
gtk_widget_show (priv->entry_account_title);
connect_for_modified (self, priv->entry_account_title);
gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
-
+
/* Prevent the use of some characters in the account title,
* as required by our UI specification: */
GList *list_prevent = NULL;
on_entry_max, self);
hbox = gtk_hbox_new (TRUE, 0);
- /* The retrieve picker: */
- priv->retrieve_picker = GTK_WIDGET (modest_retrieve_picker_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL));
- modest_maemo_utils_set_vbutton_layout (title_sizegroup,
- _("mcen_fi_advsetup_retrievetype"), priv->retrieve_picker);
-
- gtk_widget_show (priv->retrieve_picker);
- connect_for_modified (self, priv->retrieve_picker);
- gtk_box_pack_start (GTK_BOX (hbox), priv->retrieve_picker, TRUE, TRUE, 0);
-
- /* The limit-retrieve picker: */
- priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new (MODEST_EDITABLE_SIZE,
- HILDON_BUTTON_ARRANGEMENT_VERTICAL));
- modest_maemo_utils_set_vbutton_layout (value_sizegroup,
- _("mcen_fi_advsetup_limit_retrieve"),
- priv->limit_retrieve_picker);
- gtk_widget_show (priv->limit_retrieve_picker);
- connect_for_modified (self, priv->limit_retrieve_picker);
- gtk_box_pack_start (GTK_BOX (hbox), priv->limit_retrieve_picker, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
- gtk_widget_show (hbox);
/* The leave-messages widgets: */
if(!priv->checkbox_leave_messages) {
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, 0);
gtk_widget_show (priv->checkbox_leave_messages);
- g_object_unref (title_sizegroup);
- g_object_unref (value_sizegroup);
-
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
}
static GtkWidget*
-create_page_user_details (ModestDefaultAccountSettingsDialog *self)
+create_page_user_details (ModestDefaultAccountSettingsDialog *self,
+ GtkSizeGroup *title_sizegroup,
+ GtkSizeGroup *value_sizegroup)
{
ModestDefaultAccountSettingsDialogPrivate *priv;
GtkWidget *box;
- GtkSizeGroup* title_sizegroup;
- GtkSizeGroup* value_sizegroup;
+ gchar *tmp;
priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The name widgets: */
priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
priv->entry_user_username = GTK_WIDGET (modest_validating_entry_new ());
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL);
+ 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);
priv->entry_user_email = GTK_WIDGET (modest_validating_entry_new ());
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL);
+ 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);
RESPONSE_SIGNATURE_DUMMY);
gtk_widget_show (priv->button_signature);
- g_object_unref (title_sizegroup);
- g_object_unref (value_sizegroup);
-
gtk_widget_show (GTK_WIDGET (box));
return GTK_WIDGET (box);
g_free (incomingserver_title);
}
-static GtkWidget*
-create_page_incoming (ModestDefaultAccountSettingsDialog *self)
+/* The size groups passed as arguments are only used by the security settings */
+static GtkWidget*
+create_page_incoming (ModestDefaultAccountSettingsDialog *self,
+ GtkSizeGroup *security_title_sizegroup,
+ GtkSizeGroup *security_value_sizegroup)
{
ModestDefaultAccountSettingsDialogPrivate *priv;
GtkWidget *box;
- GtkSizeGroup *title_sizegroup;
- GtkSizeGroup *value_sizegroup;
priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
- box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
- /* Create a size group to be used by all captions.
- * Note that HildonCaption does not create a default size group if we do not specify one.
- * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
- title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
+ box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
+
/* The incoming server widgets: */
if(!priv->entry_incomingserver)
priv->entry_incomingserver = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
if (priv->caption_incoming)
gtk_widget_destroy (priv->caption_incoming);
-
+
/* The caption title will be updated in update_incoming_server_title().
* so this default text will never be seen: */
/* (Note: Changing the title seems pointless. murrayc) */
- priv->caption_incoming = create_captioned (self, title_sizegroup, value_sizegroup,
+ priv->caption_incoming = create_captioned (self, security_title_sizegroup, security_value_sizegroup,
"Incoming Server", FALSE, priv->entry_incomingserver);
gtk_widget_show (priv->entry_incomingserver);
connect_for_modified (self, priv->entry_incomingserver);
gtk_widget_show (priv->caption_incoming);
/* Incoming security widgets */
- priv->incoming_security =
+ priv->incoming_security =
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING,
- TRUE, title_sizegroup, value_sizegroup);
- gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
+ TRUE, security_title_sizegroup,
+ security_value_sizegroup);
+ gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
FALSE, FALSE, 0);
gtk_widget_show (priv->incoming_security);
-
- g_object_unref (title_sizegroup);
- g_object_unref (value_sizegroup);
gtk_widget_show (GTK_WIDGET (box));
-
+ g_signal_connect (priv->incoming_security, "missing-mandatory-data",
+ G_CALLBACK (on_missing_mandatory_data), self);
+
return GTK_WIDGET (box);
}
!missing);
}
-static GtkWidget*
-create_page_outgoing (ModestDefaultAccountSettingsDialog *self)
+static GtkWidget*
+create_page_outgoing (ModestDefaultAccountSettingsDialog *self,
+ GtkSizeGroup *security_title_sizegroup,
+ GtkSizeGroup *security_value_sizegroup)
{
ModestDefaultAccountSettingsDialogPrivate *priv;
gchar *smtp_caption_label;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
-
- /* Create a size group to be used by all captions.
- * Note that HildonCaption does not create a default size group if we do not specify one.
- * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */
- GtkSizeGroup *title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- GtkSizeGroup *value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The outgoing server widgets: */
if (!priv->entry_outgoingserver)
hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
/* Auto-capitalization is the default, so let's turn it off: */
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL);
- smtp_caption_label = g_strconcat (_("mcen_li_emailsetup_smtp"), "\n<small>(SMTP)</small>", NULL);
- GtkWidget *caption = create_captioned (self, title_sizegroup, value_sizegroup,
+ 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);
gtk_widget_show (priv->entry_outgoingserver);
/* Outgoing security widgets */
priv->outgoing_security =
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING,
- TRUE, title_sizegroup, value_sizegroup);
+ TRUE, security_title_sizegroup,
+ security_value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security,
FALSE, FALSE, 0);
gtk_widget_show (priv->outgoing_security);
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: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
GTK_BUTTON (priv->checkbox_outgoing_smtp_specific));
- g_object_unref (title_sizegroup);
- g_object_unref (value_sizegroup);
-
g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
G_CALLBACK (on_button_outgoing_smtp_servers), self);
return GTK_WIDGET (box);
}
-
+
static gboolean
check_data (ModestDefaultAccountSettingsDialog *self)
{
account_title = get_entered_account_title (self);
if (!account_title)
return FALSE; /* Should be prevented already anyway. */
-
- if (strcmp(account_title, priv->original_account_title) != 0) {
+
+ if (g_strcmp0 (account_title, priv->original_account_title) != 0) {
gboolean name_in_use;
/* Check the changed title: */
name_in_use = modest_account_mgr_account_with_display_name_exists (priv->account_manager,
account_title);
-
+
if (name_in_use) {
/* Warn the user via a dialog: */
modest_platform_information_banner(NULL, NULL, _("mail_ib_account_name_already_existing"));
-
+
g_free (account_title);
return FALSE;
}
}
-
+
g_free (account_title);
account_title = NULL;
if ((!email_address) || (strlen(email_address) == 0)) {
return FALSE;
}
-
+
if (!modest_text_utils_validate_email_address (email_address, NULL)) {
/* Warn the user via a dialog: */
modest_platform_information_banner (NULL, NULL, _("mcen_ib_invalid_email"));
GtkWidget *pannable;
GtkWidget *separator;
GtkWidget *align;
+ GtkSizeGroup* account_title_sizegroup;
+ GtkSizeGroup* account_value_sizegroup;
+ GtkSizeGroup *sec_title_sizegroup, *sec_value_sizegroup;
priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self);
priv->account_manager = modest_runtime_get_account_mgr ();
g_assert (priv->account_manager);
g_object_ref (priv->account_manager);
-
+
priv->protocol_authentication_incoming = MODEST_PROTOCOLS_AUTH_PASSWORD;
- /* Create the common pages,
- */
- priv->page_account_details = create_page_account_details (self);
- priv->page_user_details = create_page_user_details (self);
- priv->page_incoming = create_page_incoming (self);
- priv->page_outgoing = create_page_outgoing (self);
+ /* Create the common pages */
+ account_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ account_value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ priv->page_account_details = create_page_account_details (self, account_title_sizegroup, account_value_sizegroup);
+ priv->page_user_details = create_page_user_details (self, account_title_sizegroup, account_value_sizegroup);
+ g_object_unref (account_title_sizegroup);
+ g_object_unref (account_value_sizegroup);
+
+ /* Create size groups for security settings */
+ sec_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ sec_value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+ /* Create incoming and outgoing "pages" */
+ priv->page_incoming = create_page_incoming (self, sec_title_sizegroup, sec_value_sizegroup);
+ priv->page_outgoing = create_page_outgoing (self, sec_title_sizegroup, sec_value_sizegroup);
+ g_object_unref (sec_title_sizegroup);
+ g_object_unref (sec_value_sizegroup);
+
/* Add the notebook pages: */
gtk_box_pack_start (GTK_BOX (priv->main_container),
priv->page_account_details,
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);
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);
null_means_empty (modest_account_settings_get_fullname (settings)));
gtk_entry_set_text( GTK_ENTRY (priv->entry_user_email),
null_means_empty (modest_account_settings_get_email_address (settings)));
- modest_limit_retrieve_picker_set_active_limit_retrieve (
- MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker),
- modest_account_settings_get_retrieve_limit (settings));
hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages),
modest_account_settings_get_leave_messages_on_server (settings));
gchar *proto_name, *title;
ModestProtocolType incoming_protocol;
- modest_retrieve_picker_fill (MODEST_RETRIEVE_PICKER (priv->retrieve_picker), modest_server_account_settings_get_protocol (incoming_account));
- modest_retrieve_picker_set_active_retrieve_conf (MODEST_RETRIEVE_PICKER (priv->retrieve_picker),
- modest_account_settings_get_retrieve_type (settings));
-
if (!modest_protocol_registry_protocol_type_has_leave_on_server (protocol_registry,
modest_server_account_settings_get_protocol (incoming_account))) {
gtk_widget_hide (priv->checkbox_leave_messages);
const gchar* emailaddress;
ModestServerAccountSettings *store_settings;
ModestServerAccountSettings *transport_settings;
- ModestAccountRetrieveType retrieve_type;
- gint retrieve_limit;
gboolean leave_on_server;
const gchar* hostname;
const gchar* username;
modest_account_settings_set_use_signature (priv->settings, use_signature);
modest_account_settings_set_signature (priv->settings, signature);
}
-
- retrieve_type = modest_retrieve_picker_get_active_retrieve_conf (
- MODEST_RETRIEVE_PICKER (priv->retrieve_picker));
- modest_account_settings_set_retrieve_type (priv->settings, retrieve_type);
-
- retrieve_limit = modest_limit_retrieve_picker_get_active_limit_retrieve (
- MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker));
- modest_account_settings_set_retrieve_limit (priv->settings, retrieve_limit);
-
+
leave_on_server = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages));
modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server);
projects / modest / blobdiff