#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.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"
-#include "maemo/easysetup/modest-easysetup-servertype-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-serversecurity-combo-box.h"
-#include "maemo/easysetup/modest-easysetup-secureauth-combo-box.h"
-#include "maemo/easysetup/modest-validating-entry.h"
+#include "modest-hildon-includes.h"
+
+#include "widgets/modest-serversecurity-combo-box.h"
+#include "widgets/modest-secureauth-combo-box.h"
+#include "widgets/modest-validating-entry.h"
#include "widgets/modest-retrieve-combo-box.h"
#include "widgets/modest-limit-retrieve-combo-box.h"
#include "modest-text-utils.h"
#include "modest-account-mgr-helpers.h" /* For modest_account_mgr_get_account_data(). */
#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
#include "maemo/modest-connection-specific-smtp-window.h"
+#include "maemo/modest-signature-editor-dialog.h"
+#include <maemo/modest-maemo-ui-constants.h>
#include <gconf/gconf-client.h>
#include <string.h> /* For strlen(). */
if (self->account_manager)
g_object_unref (G_OBJECT (self->account_manager));
+
+ if (self->specific_window)
+ gtk_widget_destroy (self->specific_window);
+
+ if (self->signature_dialog)
+ gtk_widget_destroy (self->signature_dialog);
G_OBJECT_CLASS (modest_account_settings_dialog_parent_class)->finalize (object);
}
static void
on_combo_outgoing_security_changed (GtkComboBox *widget, gpointer user_data);
+static void
+on_modified_combobox_changed (GtkComboBox *widget, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+static void
+on_modified_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+static void
+on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data)
+{
+ ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ self->modified = TRUE;
+}
+
+/* Set a modified boolean whenever the widget is changed,
+ * so we can check for it later.
+ */
+static void
+connect_for_modified (ModestAccountSettingsDialog *self, GtkWidget *widget)
+{
+ if (GTK_IS_ENTRY (widget)) {
+ g_signal_connect (G_OBJECT (widget), "changed",
+ G_CALLBACK (on_modified_entry_changed), self);
+ } else if (GTK_IS_COMBO_BOX (widget)) {
+ g_signal_connect (G_OBJECT (widget), "changed",
+ G_CALLBACK (on_modified_combobox_changed), self);
+ } else if (GTK_IS_TOGGLE_BUTTON (widget)) {
+ g_signal_connect (G_OBJECT (widget), "toggled",
+ G_CALLBACK (on_modified_checkbox_toggled), self);
+ }
+}
static void
on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
return caption;
}
+
+static void
+on_entry_max (ModestValidatingEntry *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)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (label);
/* Create a size group to be used by all captions.
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The description widgets: */
- self->entry_account_title = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
+ /* Do use auto-capitalization: */
+ hildon_gtk_entry_set_input_mode (GTK_ENTRY (self->entry_account_title),
+ HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
GtkWidget *caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_account_title"),
self->entry_account_title, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_account_title);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_account_title);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the account title,
list_prevent = g_list_append (list_prevent, ">");
list_prevent = g_list_append (list_prevent, "|");
list_prevent = g_list_append (list_prevent, "^");
- easysetup_validating_entry_set_unallowed_characters (
- EASYSETUP_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
+ modest_validating_entry_set_unallowed_characters (
+ MODEST_VALIDATING_ENTRY (self->entry_account_title), list_prevent);
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);
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_account_title),
+ on_entry_max, self);
/* The retrieve combobox: */
self->combo_retrieve = GTK_WIDGET (modest_retrieve_combo_box_new ());
caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_retrievetype"),
self->combo_retrieve, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->combo_retrieve);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->combo_retrieve);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The limit-retrieve combobox: */
caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_limit_retrieve"),
self->combo_limit_retrieve, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->combo_limit_retrieve);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->combo_limit_retrieve);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The leave-messages widgets: */
if(!self->checkbox_leave_messages)
- self->checkbox_leave_messages =
- gtk_check_button_new_with_label (_("mcen_fi_advsetup_leave_on_server"));
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_leave_messages, FALSE, FALSE, 2);
+ self->checkbox_leave_messages = gtk_check_button_new ();
+ caption = create_caption_new_with_asterix (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"),
+ self->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->checkbox_leave_messages);
-
+ connect_for_modified (self, self->checkbox_leave_messages);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
gtk_widget_show (GTK_WIDGET (box));
static void
on_button_signature (GtkButton *button, gpointer user_data)
{
+ ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
+ /* Create the window, if necessary: */
+ if (!(self->signature_dialog)) {
+ self->signature_dialog = GTK_WIDGET (modest_signature_editor_dialog_new ());
+
+ gboolean use_signature = FALSE;
+ gchar *signature = modest_account_mgr_get_signature(self->account_manager, self->account_name,
+ &use_signature);
+ const gchar* account_title = gtk_entry_get_text (GTK_ENTRY (self->entry_account_title));
+ modest_signature_editor_dialog_set_settings (
+ MODEST_SIGNATURE_EDITOR_DIALOG (self->signature_dialog),
+ use_signature, signature, account_title);
+ g_free (signature);
+ signature = NULL;
+ }
+
+ /* Show the window: */
+ gtk_window_set_transient_for (GTK_WINDOW (self->signature_dialog), GTK_WINDOW (self));
+ gtk_window_set_modal (GTK_WINDOW (self->signature_dialog), TRUE);
+ const gint response = gtk_dialog_run (GTK_DIALOG (self->signature_dialog));
+ gtk_widget_hide (self->signature_dialog);
+ if (response != GTK_RESPONSE_OK) {
+ /* Destroy the widget now, and its data: */
+ gtk_widget_destroy (self->signature_dialog);
+ self->signature_dialog = NULL;
+ }
+ else {
+ /* Mark modified, so we use the dialog's data later: */
+ self->modified = TRUE;
+ }
}
static GtkWidget*
create_page_user_details (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* 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.
GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
/* The name widgets: */
- self->entry_user_name = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_user_name = 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 (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);
+ modest_validating_entry_set_max_func (MODEST_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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_user_name);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the name,
GList *list_prevent = NULL;
list_prevent = g_list_append (list_prevent, "<");
list_prevent = g_list_append (list_prevent, ">");
- easysetup_validating_entry_set_unallowed_characters (
- EASYSETUP_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
+ modest_validating_entry_set_unallowed_characters (
+ MODEST_VALIDATING_ENTRY (self->entry_user_name), list_prevent);
g_list_free (list_prevent);
/* The username widgets: */
- self->entry_user_username = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->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 (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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_user_username);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- easysetup_validating_entry_set_unallowed_characters_whitespace (
- EASYSETUP_VALIDATING_ENTRY (self->entry_user_username));
+ modest_validating_entry_set_unallowed_characters_whitespace (
+ MODEST_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);
+ modest_validating_entry_set_max_func (MODEST_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,
_("mail_fi_password"), self->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_user_password);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_user_password);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The email address widgets: */
- self->entry_user_email = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->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 (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. */
gtk_widget_show (self->entry_user_email);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_user_email);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
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);
-
+ modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (self->entry_user_email),
+ on_entry_max, self);
/* Signature button: */
if (!self->button_signature)
- self->button_signature = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+ 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_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
g_signal_connect (G_OBJECT (self->button_signature), "clicked",
{
/* Fill the combo with appropriately titled choices for POP or IMAP. */
/* The choices are the same, but the titles are different, as in the UI spec. */
- easysetup_serversecurity_combo_box_fill (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
+ modest_serversecurity_combo_box_fill (
+ MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security), protocol);
}
static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* 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.
/* 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);
self->caption_incoming = create_caption_new_with_asterix (self, sizegroup,
"Incoming Server", self->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY);
gtk_widget_show (self->entry_incomingserver);
- gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_incomingserver);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_incoming);
/* The secure connection widgets: */
/* This will be filled by update_incoming_server_security_choices(). */
if (!self->combo_incoming_security)
- self->combo_incoming_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
+ self->combo_incoming_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
GtkWidget *caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
self->combo_incoming_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_incoming_security);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->combo_incoming_security);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Show a default port number when the security method changes, as per the UI spec: */
/* 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 (gtk_entry_new ());
+ 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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_incoming_port);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The secure authentication widgets: */
if(!self->checkbox_incoming_auth)
- self->checkbox_incoming_auth =
- gtk_check_button_new_with_label (_("mcen_li_emailsetup_secure_authentication"));
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_incoming_auth, FALSE, FALSE, 2);
+ self->checkbox_incoming_auth = gtk_check_button_new ();
+ caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
+ self->checkbox_incoming_auth, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->checkbox_incoming_auth);
+ connect_for_modified (self, self->checkbox_incoming_auth);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
gtk_widget_show (GTK_WIDGET (box));
/* Set the starting sensitivity: */
on_toggle_button_changed (button, widget);
}
-
-static void
-on_smtp_servers_window_hide (GtkWindow *window, gpointer user_data)
-{
- /* Destroy the window when it is closed: */
- gtk_widget_destroy (GTK_WIDGET (window));
-}
static void
on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data)
{
-
ModestAccountSettingsDialog * self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
- /* Show the window: */
- /* TODO: Retrieve the chosen settings,
- * so we can supply them when creating the connection somehow.
- */
- GtkWidget *window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
- gtk_window_set_transient_for (GTK_WINDOW (self), GTK_WINDOW (window));
- g_signal_connect (G_OBJECT (window), "hide",
- G_CALLBACK (on_smtp_servers_window_hide), self);
- gtk_widget_show (window);
+ /* Create the window if necessary: */
+ if (!(self->specific_window)) {
+ self->specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
+ modest_connection_specific_smtp_window_fill_with_connections (
+ MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (self->specific_window), self->account_manager,
+ self->account_name);
+ }
+
+ /* Show the window: */
+ gtk_window_set_transient_for (GTK_WINDOW (self->specific_window), GTK_WINDOW (self));
+ gtk_window_set_modal (GTK_WINDOW (self->specific_window), TRUE);
+ gtk_widget_show (self->specific_window);
}
static void
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
ModestProtocol protocol_security =
- easysetup_secureauth_combo_box_get_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
+ modest_secureauth_combo_box_get_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (self->combo_outgoing_auth));
const gboolean secureauth_used = protocol_security != MODEST_PROTOCOL_AUTH_NONE;
gtk_widget_set_sensitive (self->caption_outgoing_username, secureauth_used);
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
const gint port_number =
- easysetup_serversecurity_combo_box_get_active_serversecurity_port (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
+ modest_serversecurity_combo_box_get_active_serversecurity_port (
+ MODEST_SERVERSECURITY_COMBO_BOX (self->combo_outgoing_security));
if(port_number != 0) {
- gchar* str = g_strdup_printf ("%d", port_number);
- gtk_entry_set_text (GTK_ENTRY (self->entry_outgoing_port), str);
- g_free (str);
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (self->entry_outgoing_port), port_number);
}
}
ModestAccountSettingsDialog *self = MODEST_ACCOUNT_SETTINGS_DIALOG (user_data);
const gint port_number =
- easysetup_serversecurity_combo_box_get_active_serversecurity_port (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
+ modest_serversecurity_combo_box_get_active_serversecurity_port (
+ MODEST_SERVERSECURITY_COMBO_BOX (self->combo_incoming_security));
if(port_number != 0) {
- gchar* str = g_strdup_printf ("%d", port_number);
- gtk_entry_set_text (GTK_ENTRY (self->entry_incoming_port), str);
- g_free (str);
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (self->entry_incoming_port), port_number);
}
}
static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self)
{
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
/* 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.
/* 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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_outgoingserver);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* The secure authentication widgets: */
if (!self->combo_outgoing_auth)
- self->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
+ self->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
self->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_auth);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->combo_outgoing_auth);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Dim the outgoing username and password when no secure authentication is used, as per the UI spec: */
g_signal_connect (G_OBJECT (self->combo_outgoing_auth), "changed", (GCallback)on_combo_outgoing_auth_changed, self);
/* The username widgets: */
- self->entry_outgoing_username = GTK_WIDGET (easysetup_validating_entry_new ());
+ self->entry_outgoing_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 (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);
- gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_outgoing_username);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_username, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_outgoing_username);
/* Prevent the use of some characters in the username,
* as required by our UI specification: */
- easysetup_validating_entry_set_unallowed_characters_whitespace (
- EASYSETUP_VALIDATING_ENTRY (self->entry_outgoing_username));
+ modest_validating_entry_set_unallowed_characters_whitespace (
+ MODEST_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);
-
+ modest_validating_entry_set_max_func (MODEST_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,
_("mail_fi_password"), self->entry_outgoing_password, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->entry_outgoing_password);
- gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_outgoing_password);
+ gtk_box_pack_start (GTK_BOX (box), self->caption_outgoing_password, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (self->caption_outgoing_password);
/* The secure connection widgets: */
- /* This will be filled and set with easysetup_serversecurity_combo_box_fill()
- * and easysetup_serversecurity_combo_box_set_active_serversecurity().
+ /* This will be filled and set with modest_serversecurity_combo_box_fill()
+ * and modest_serversecurity_combo_box_set_active_serversecurity().
*/
if (!self->combo_outgoing_security)
- self->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
+ self->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
self->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->combo_outgoing_security);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->combo_outgoing_security);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Show a default port number when the security method changes, as per the UI spec: */
/* The port widgets: */
if (!self->entry_outgoing_port)
- self->entry_outgoing_port = GTK_WIDGET (gtk_entry_new ());
+ 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);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 2);
+ connect_for_modified (self, self->entry_outgoing_port);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
+ GtkWidget *separator = gtk_hseparator_new ();
+ gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
+ 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"));
+ self->checkbox_outgoing_smtp_specific = gtk_check_button_new ();
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->checkbox_outgoing_smtp_specific),
FALSE);
}
- gtk_box_pack_start (GTK_BOX (box), self->checkbox_outgoing_smtp_specific, FALSE, FALSE, 2);
+ caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"),
+ self->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (self->checkbox_outgoing_smtp_specific);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_widget_show (caption);
+ connect_for_modified (self, self->checkbox_outgoing_smtp_specific);
/* Connection-specific SMTP-Severs Edit button: */
if (!self->button_outgoing_smtp_servers)
- self->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_emailsetup_edit"));
+ 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_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (caption);
/* Only enable the button when the checkbox is checked: */
gboolean prevent_response = FALSE;
/* Warn about unsaved changes: */
- /* TODO: Actually detect whether changes were made. */
- if (response_id == GTK_RESPONSE_CANCEL) {
+ if (response_id == GTK_RESPONSE_CANCEL && self->modified) {
GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (GTK_WINDOW (self),
(GtkDialogFlags)0,
GTK_MESSAGE_INFO,
GtkDialog *dialog = GTK_DIALOG (self);
gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (notebook));
+ gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF);
gtk_widget_show (GTK_WIDGET (notebook));
/* Add the buttons: */
* to stop the default signal handler from closing the dialog.
*/
g_signal_connect (G_OBJECT (self), "response",
- G_CALLBACK (on_response), self);
+ G_CALLBACK (on_response), self);
+
+ self->modified = FALSE;
}
ModestAccountSettingsDialog*
gtk_entry_set_text( GTK_ENTRY (dialog->entry_incomingserver),
incoming_account->hostname ? incoming_account->hostname : "");
- const ModestProtocol secure_auth = modest_server_account_get_option_secure_auth(
+ const ModestProtocol secure_auth = modest_server_account_get_secure_auth(
dialog->account_manager, incoming_account->account_name);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth),
secure_auth == MODEST_PROTOCOL_AUTH_PASSWORD);
update_incoming_server_title (dialog, incoming_account->proto);
update_incoming_server_security_choices (dialog, incoming_account->proto);
- const ModestProtocol security = modest_server_account_data_get_option_security (incoming_account);
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security);
+ const ModestProtocol security = modest_server_account_get_security (
+ dialog->account_manager, incoming_account->account_name);
+ modest_serversecurity_combo_box_set_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security), security);
const gint port_num = modest_account_mgr_get_int (dialog->account_manager, incoming_account->account_name,
MODEST_ACCOUNT_PORT, TRUE /* server account */);
- gchar *port_str = g_strdup_printf ("%d", port_num);
- gtk_entry_set_text (GTK_ENTRY (dialog->entry_incoming_port), port_str);
- g_free (port_str);
-
- /* TODO:
- gchar *uri;
- ModestProtocol proto;
- gchar *password;
- time_t last_updated;
- GSList *options;
- */
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (dialog->entry_incoming_port), port_num);
}
outgoing_account->password ? outgoing_account->password : "");
/* Get the secure-auth setting: */
- const ModestProtocol secure_auth = modest_server_account_get_option_secure_auth(
+ const ModestProtocol secure_auth = modest_server_account_get_secure_auth(
dialog->account_manager, outgoing_account->account_name);
- easysetup_secureauth_combo_box_set_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth);
+ modest_secureauth_combo_box_set_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth), secure_auth);
on_combo_outgoing_auth_changed (GTK_COMBO_BOX (dialog->combo_outgoing_auth), dialog);
- easysetup_serversecurity_combo_box_fill (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto);
+ modest_serversecurity_combo_box_fill (
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), outgoing_account->proto);
/* Get the security setting: */
- const ModestProtocol security = modest_server_account_data_get_option_security (outgoing_account);
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security);
+ const ModestProtocol security = modest_server_account_get_security (
+ dialog->account_manager, outgoing_account->account_name);
+ modest_serversecurity_combo_box_set_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security), security);
const gint port_num = modest_account_mgr_get_int (dialog->account_manager, outgoing_account->account_name,
MODEST_ACCOUNT_PORT, TRUE /* server account */);
- gchar *port_str = g_strdup_printf ("%d", port_num);
- gtk_entry_set_text (GTK_ENTRY (dialog->entry_outgoing_port), port_str);
- g_free (port_str);
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port), port_num);
}
/* account_data->is_enabled, */
/* account_data->store_account->proto */
modest_account_mgr_free_account_data (dialog->account_manager, account_data);
+
+ /* Unset the modified flag so we can detect changes later: */
+ dialog->modified = FALSE;
}
static gboolean
MODEST_ACCOUNT_EMAIL, emailaddress, FALSE /* not server account */);
if (!test)
return FALSE;
+
+ /* Signature: */
+ if (dialog->signature_dialog) {
+ gboolean use_signature = FALSE;
+ gchar *signature = modest_signature_editor_dialog_get_settings (
+ MODEST_SIGNATURE_EDITOR_DIALOG (dialog->signature_dialog),
+ &use_signature);
+
+ modest_account_mgr_set_signature(dialog->account_manager, account_name,
+ signature, use_signature);
+ g_free (signature);
+ }
gchar *retrieve = modest_retrieve_combo_box_get_active_retrieve_conf (
MODEST_RETRIEVE_COMBO_BOX (dialog->combo_retrieve));
(GTK_TOGGLE_BUTTON (dialog->checkbox_incoming_auth))
? MODEST_PROTOCOL_AUTH_PASSWORD
: MODEST_PROTOCOL_AUTH_NONE;
- modest_server_account_set_option_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming);
+ modest_server_account_set_secure_auth (dialog->account_manager, incoming_account_name, protocol_authentication_incoming);
- const ModestProtocol protocol_security_incoming = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security));
- modest_server_account_set_option_security (dialog->account_manager, incoming_account_name, protocol_security_incoming);
+ const ModestProtocol protocol_security_incoming = modest_serversecurity_combo_box_get_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_incoming_security));
+ modest_server_account_set_security (dialog->account_manager, incoming_account_name, protocol_security_incoming);
/* port: */
- const gchar* port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_incoming_port));
- gint port_num = 0;
- if (port_str)
- port_num = atoi (port_str);
+ gint port_num = hildon_number_editor_get_value (
+ HILDON_NUMBER_EDITOR (dialog->entry_incoming_port));
modest_account_mgr_set_int (dialog->account_manager, incoming_account_name,
MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
if (!test)
return FALSE;
- const ModestProtocol protocol_security_outgoing = easysetup_serversecurity_combo_box_get_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security));
- modest_server_account_set_option_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing);
+ const ModestProtocol protocol_security_outgoing = modest_serversecurity_combo_box_get_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (dialog->combo_outgoing_security));
+ modest_server_account_set_security (dialog->account_manager, outgoing_account_name, protocol_security_outgoing);
- const ModestProtocol protocol_authentication_outgoing = easysetup_secureauth_combo_box_get_active_secureauth (
- EASYSETUP_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth));
- modest_server_account_set_option_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing);
+ const ModestProtocol protocol_authentication_outgoing = modest_secureauth_combo_box_get_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (dialog->combo_outgoing_auth));
+ modest_server_account_set_secure_auth (dialog->account_manager, outgoing_account_name, protocol_authentication_outgoing);
/* port: */
- port_str = gtk_entry_get_text (GTK_ENTRY (dialog->entry_outgoing_port));
- port_num = 0;
- if (port_str)
- port_num = atoi (port_str);
+ port_num = hildon_number_editor_get_value (
+ HILDON_NUMBER_EDITOR (dialog->entry_outgoing_port));
modest_account_mgr_set_int (dialog->account_manager, outgoing_account_name,
MODEST_ACCOUNT_PORT, port_num, TRUE /* server account */);
return FALSE;
}
- return TRUE;
+ /* Save connection-specific SMTP server accounts: */
+ if (dialog->specific_window)
+ return modest_connection_specific_smtp_window_save_server_accounts (
+ MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (dialog->specific_window), account_name);
+ else
+ return TRUE;
}
static gboolean entry_is_empty (GtkWidget *entry)
projects / modest / blobdiff