#include <gtk/gtknotebook.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhseparator.h>
#include "modest-runtime.h"
#include "widgets/modest-global-settings-dialog-priv.h"
#include "modest-selector-picker.h"
#include "widgets/modest-ui-constants.h"
#include "modest-text-utils.h"
#include <tny-account-store.h>
+#include <modest-account-mgr-helpers.h>
#define MSG_SIZE_MAX_VAL 5000
static void on_auto_update_clicked (GtkButton *button,
gpointer user_data);
static void update_sensitive (ModestGlobalSettingsDialog *dialog);
+static ModestPairList * get_accounts_list (void);
typedef struct _ModestMaemoGlobalSettingsDialogPrivate ModestMaemoGlobalSettingsDialogPrivate;
struct _ModestMaemoGlobalSettingsDialogPrivate {
GtkSizeGroup *value_size_group;
ModestGlobalSettingsDialogPrivate *ppriv;
GtkWidget *pannable;
+ ModestMaemoGlobalSettingsDialogPrivate *priv;
+ priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
- vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+ vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
- vbox_update = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+ vbox_update = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
ppriv->update_interval);
gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->update_interval, FALSE, FALSE, MODEST_MARGIN_HALF);
+ /* Default account selector */
+ ppriv->accounts_list = get_accounts_list ();
+ ppriv->default_account_selector = modest_selector_picker_new (MODEST_EDITABLE_SIZE,
+ HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+ ppriv->accounts_list,
+ g_str_equal);
+ if (ppriv->accounts_list == NULL) {
+ gtk_widget_set_sensitive (GTK_WIDGET (ppriv->default_account_selector), FALSE);
+ } else {
+ gchar *default_account;
+
+ default_account = modest_account_mgr_get_default_account (
+ modest_runtime_get_account_mgr ());
+ if (default_account) {
+ modest_selector_picker_set_active_id (
+ MODEST_SELECTOR_PICKER (ppriv->default_account_selector),
+ default_account);
+ g_free (default_account);
+ }
+ }
+ modest_maemo_utils_set_vbutton_layout (title_size_group,
+ _("mcen_ti_default_account"),
+ ppriv->default_account_selector);
+ gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->default_account_selector,
+ FALSE, FALSE, MODEST_MARGIN_HALF);
+
/* Add to vbox */
gtk_box_pack_start (GTK_BOX (vbox), vbox_update, FALSE, FALSE, MODEST_MARGIN_HALF);
- /* Separator */
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, MODEST_MARGIN_HALF);
-
g_object_unref (title_size_group);
g_object_unref (value_size_group);
/* Limits */
- vbox_limit = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
+ vbox_limit = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF);
title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
value_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show_all (vbox_limit);
- /* Separator */
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, MODEST_MARGIN_HALF);
-
/* Note: This ModestPairList* must exist for as long as the picker
* that uses it, because the ModestSelectorPicker uses the ID opaquely,
* so it can't know how to manage its memory. */
return modest_platform_get_current_connection ();
}
+static ModestPairList *
+get_accounts_list (void)
+{
+ GSList *list = NULL;
+ GSList *cursor, *account_names;
+ ModestAccountMgr *account_mgr;
+
+ account_mgr = modest_runtime_get_account_mgr ();
+
+ cursor = account_names = modest_account_mgr_account_names (account_mgr, TRUE /*only enabled*/);
+ while (cursor) {
+ gchar *account_name;
+ ModestAccountSettings *settings;
+ ModestServerAccountSettings *store_settings;
+
+ account_name = (gchar*)cursor->data;
+
+ settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
+ g_printerr ("modest: failed to get account data for %s\n", account_name);
+ continue;
+ }
+ store_settings = modest_account_settings_get_store_settings (settings);
+
+ /* don't display accounts without stores */
+ if (modest_server_account_settings_get_account_name (store_settings) != NULL) {
+
+ if (modest_account_settings_get_enabled (settings)) {
+ ModestPair *pair;
+
+ pair = modest_pair_new (
+ g_strdup (account_name),
+ g_strdup (modest_account_settings_get_display_name (settings)),
+ FALSE);
+ list = g_slist_prepend (list, pair);
+ }
+ }
+
+ g_object_unref (store_settings);
+ g_object_unref (settings);
+ cursor = cursor->next;
+ }
+
+ return (ModestPairList *) g_slist_reverse (list);
+}
priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
priv->notebook = gtk_notebook_new ();
+ priv->default_account_selector = NULL;
+ priv->accounts_list = NULL;
/* Connect to the dialog's response signal: */
g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self);
modest_pair_list_free (priv->connect_via_list);
modest_pair_list_free (priv->update_interval_list);
modest_pair_list_free (priv->msg_format_list);
+ modest_pair_list_free (priv->accounts_list);
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
#ifdef MODEST_TOOLKIT_HILDON2
id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->connect_via));
state->auto_update = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auto_update));
+ state->default_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->default_account_selector));
#else
id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->connect_via));
state->auto_update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auto_update));
+ state->default_account = NULL;
#endif
state->connect_via = *id;
#ifndef MODEST_TOOLKIT_GTK
RETURN_FALSE_ON_ERROR(error);
modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, current_state.prefer_formatted_text, NULL);
RETURN_FALSE_ON_ERROR(error);
+ if (current_state.default_account &&
+ (!priv->initial_state.default_account ||
+ strcmp (current_state.default_account, priv->initial_state.default_account)!= 0)) {
+ modest_account_mgr_set_default_account (modest_runtime_get_account_mgr (),
+ current_state.default_account);
+ }
/* Apply changes */
if (priv->initial_state.auto_update != current_state.auto_update ||
priv->initial_state.connect_via != current_state.connect_via ||
priv->initial_state.update_interval != current_state.update_interval) {
-
+
TnyAccountStore *account_store;
TnyDevice *device;
-
+
if (!current_state.auto_update) {
modest_platform_set_update_interval (0);
/* To avoid a new indentation level */
goto exit;
}
-
+
account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
device = tny_account_store_get_device (account_store);
-
+
if (tny_device_is_online (device)) {
/* If connected via any then set update interval */
if (current_state.connect_via == MODEST_CONNECTED_VIA_ANY) {
}
g_object_unref (device);
}
-
+
exit:
return TRUE;
}
initial_state.update_interval != current_state.update_interval ||
initial_state.size_limit != current_state.size_limit ||
initial_state.play_sound != current_state.play_sound ||
- initial_state.prefer_formatted_text != current_state.prefer_formatted_text)
+ initial_state.prefer_formatted_text != current_state.prefer_formatted_text ||
+ (current_state.default_account &&
+ (!initial_state.default_account ||
+ strcmp (current_state.default_account, initial_state.default_account)!= 0)))
return TRUE;
else
return FALSE;