#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;
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) {
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));
-
+
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)
/* 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,
+ 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);
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);
GtkWidget *pannable;
GtkWidget *separator;
GtkWidget *align;
+ 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,
- */
+ /* 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 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,
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);