-/* connection-specific-smtp-window.c */
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include "modest-connection-specific-smtp-edit-window.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 "widgets/modest-ui-constants.h"
+#include "modest-hildon-includes.h"
+#include "modest-runtime.h"
+
+#include "widgets/modest-serversecurity-combo-box.h"
+#include "widgets/modest-secureauth-combo-box.h"
+#include "widgets/modest-validating-entry.h"
+#include <modest-account-mgr-helpers.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtkvbox.h>
#include <glib/gi18n.h>
-G_DEFINE_TYPE (ModestConnectionSpecificSmtpEditWindow, modest_connection_specific_smtp_edit_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (ModestConnectionSpecificSmtpEditWindow, modest_connection_specific_smtp_edit_window, GTK_TYPE_DIALOG);
#define CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW, ModestConnectionSpecificSmtpEditWindowPrivate))
GtkWidget *button_ok;
GtkWidget *button_cancel;
+
+ gboolean is_dirty;
};
static void
};
static void
-on_button_edit (GtkButton *button, gpointer user_data)
+on_change(GtkWidget* widget, ModestConnectionSpecificSmtpEditWindow *self)
{
-
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ priv->is_dirty = TRUE;
}
static void
-on_button_cancel (GtkButton *button, gpointer user_data)
+on_combo_security_changed (GtkComboBox *widget, gpointer user_data)
{
- ModestConnectionSpecificSmtpEditWindow *self = MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data);
+ ModestConnectionSpecificSmtpEditWindow *self =
+ MODEST_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW (user_data);
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+
+ on_change(GTK_WIDGET(widget), self);
+
+ const gint port_number =
+ modest_serversecurity_combo_box_get_active_serversecurity_port (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
- /* Hide the window.
- * The code that showed it will respond to the hide signal. */
- gtk_widget_hide (GTK_WIDGET (self));
+ if(port_number != 0) {
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (priv->entry_port), port_number);
+ }
}
static void
modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEditWindow *self)
{
- ModestConnectionSpecificSmtpEditWindowPrivate *priv = CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self);
- GtkWidget *box = gtk_vbox_new (FALSE, 2);
+ GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */
+ gtk_box_set_spacing (GTK_BOX (box), MODEST_MARGIN_NONE);
+ gtk_container_set_border_width (GTK_CONTAINER (box), 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 (!priv->entry_outgoingserver)
priv->entry_outgoingserver = gtk_entry_new ();
+ /* 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);
+ g_signal_connect(G_OBJECT(priv->entry_outgoingserver), "changed", G_CALLBACK(on_change), self);
+
GtkWidget *caption = hildon_caption_new (sizegroup,
_("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (priv->entry_outgoingserver);
- 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);
/* The secure authentication widgets: */
if (!priv->combo_outgoing_auth)
- priv->combo_outgoing_auth = GTK_WIDGET (easysetup_secureauth_combo_box_new ());
+ priv->combo_outgoing_auth = GTK_WIDGET (modest_secureauth_combo_box_new ());
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_authentication"),
priv->combo_outgoing_auth, NULL, HILDON_CAPTION_OPTIONAL);
+ g_signal_connect (G_OBJECT (priv->combo_outgoing_auth), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->combo_outgoing_auth);
- 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);
/* The username widgets: */
- priv->entry_user_username = GTK_WIDGET (easysetup_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);
caption = hildon_caption_new (sizegroup, _("mail_fi_username"),
priv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY);
+ g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->entry_user_username);
- 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);
/* 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 (priv->entry_user_username));
+ modest_validating_entry_set_unallowed_characters_whitespace (
+ MODEST_VALIDATING_ENTRY (priv->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 password widgets: */
priv->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 (priv->entry_user_password),
+ HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE);
/* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */
caption = hildon_caption_new (sizegroup,
_("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL);
+ g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->entry_user_password);
- 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);
/* The secure connection widgets: */
if (!priv->combo_outgoing_security)
- priv->combo_outgoing_security = GTK_WIDGET (easysetup_serversecurity_combo_box_new ());
- easysetup_serversecurity_combo_box_fill (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
- easysetup_serversecurity_combo_box_set_active_serversecurity (
- EASYSETUP_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_SECURITY_NONE);
+ priv->combo_outgoing_security = GTK_WIDGET (modest_serversecurity_combo_box_new ());
+ modest_serversecurity_combo_box_fill (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_TRANSPORT_SMTP);
+ modest_serversecurity_combo_box_set_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), MODEST_PROTOCOL_CONNECTION_NORMAL);
caption = hildon_caption_new (sizegroup, _("mcen_li_emailsetup_secure_connection"),
priv->combo_outgoing_security, NULL, HILDON_CAPTION_OPTIONAL);
gtk_widget_show (priv->combo_outgoing_security);
- 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);
/* The port number widgets: */
if (!priv->entry_port)
- priv->entry_port = gtk_entry_new ();
+ priv->entry_port = GTK_WIDGET (hildon_number_editor_new (0, 65535));
caption = hildon_caption_new (sizegroup,
_("mcen_li_emailsetup_smtp"), priv->entry_port, NULL, HILDON_CAPTION_OPTIONAL);
+ g_signal_connect(G_OBJECT(priv->entry_port), "changed", G_CALLBACK(on_change), self);
gtk_widget_show (priv->entry_port);
- 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);
+ /* Show a default port number when the security method changes, as per the UI spec: */
+ g_signal_connect (G_OBJECT (priv->combo_outgoing_security), "changed", (GCallback)on_combo_security_changed, self);
+ on_combo_security_changed (GTK_COMBO_BOX (priv->combo_outgoing_security), self);
+
/* Add the buttons: */
- GtkWidget *hbox = gtk_hbox_new (FALSE, 2);
- gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 2);
- gtk_widget_show (hbox);
-
- GtkWidget *button_edit = gtk_button_new_from_stock (GTK_STOCK_EDIT);
- gtk_box_pack_start (GTK_BOX (hbox), button_edit, TRUE, FALSE, 2);
- gtk_widget_show (button_edit);
- g_signal_connect (G_OBJECT (button_edit), "clicked",
- G_CALLBACK (on_button_edit), self);
-
- GtkWidget *button_cancel = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
- gtk_box_pack_start (GTK_BOX (hbox), button_cancel, TRUE, FALSE, 2);
- gtk_widget_show (button_cancel);
- g_signal_connect (G_OBJECT (button_edit), "clicked",
- G_CALLBACK (on_button_cancel), self);
+ gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+
+ priv->is_dirty = FALSE;
gtk_widget_show (box);
+
+
+ /* When this window is shown, hibernation should not be possible,
+ * because there is no sensible way to save the state: */
+ modest_window_mgr_prevent_hibernation_while_window_is_shown (
+ modest_runtime_get_window_mgr (), GTK_WINDOW (self));
}
ModestConnectionSpecificSmtpEditWindow*
return g_object_new (MODEST_TYPE_CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW, NULL);
}
+void
+modest_connection_specific_smtp_edit_window_set_connection (
+ ModestConnectionSpecificSmtpEditWindow *window, const gchar* iap_id, const gchar* iap_name,
+ const ModestServerAccountData *data)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+
+ /* This causes a warning because of the %s in the translation, but not in the original string: */
+ gchar* title = g_strdup_printf (_("mcen_ti_connection_connection_name"), iap_name);
+ gtk_window_set_title (GTK_WINDOW (window), title);
+ g_free (title);
+
+ if (data)
+ {
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_outgoingserver), data->hostname);
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_username), data->username);
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_password), data->password);
+
+ modest_serversecurity_combo_box_set_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security), data->security);
+
+ modest_secureauth_combo_box_set_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth), data->secure_auth);
+
+ /* port: */
+ hildon_number_editor_set_value (
+ HILDON_NUMBER_EDITOR (priv->entry_port), data->port);
+
+
+ /* This will cause changed signals so we set dirty back to FALSE */
+ priv->is_dirty = FALSE;
+ }
+}
+
+/*
+ * The result must be freed with modest_account_mgr_free_server_account_data(). */
+ModestServerAccountData*
+modest_connection_specific_smtp_edit_window_get_settings (
+ ModestConnectionSpecificSmtpEditWindow *window,
+ ModestAccountMgr *account_manager)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+
+ /* Use g_slice_new0(), because that's what modest_account_mgr_free_server_account_data()
+ * expects us to use. */
+ ModestServerAccountData *result = g_slice_new0 (ModestServerAccountData);
+
+ result->hostname = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_outgoingserver)));
+ result->username = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username)));
+ result->password = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->entry_user_password)));
+
+ result->security = modest_serversecurity_combo_box_get_active_serversecurity (
+ MODEST_SERVERSECURITY_COMBO_BOX (priv->combo_outgoing_security));
+
+ result->secure_auth = modest_secureauth_combo_box_get_active_secureauth (
+ MODEST_SECUREAUTH_COMBO_BOX (priv->combo_outgoing_auth));
+
+ /* port: */
+ result->port = hildon_number_editor_get_value (
+ HILDON_NUMBER_EDITOR (priv->entry_port));
+
+ return result;
+}
+
+gboolean modest_connection_specific_smtp_edit_window_is_dirty(
+ ModestConnectionSpecificSmtpEditWindow *window)
+{
+ ModestConnectionSpecificSmtpEditWindowPrivate *priv =
+ CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (window);
+
+ return priv->is_dirty;
+}
projects / modest / blobdiff