*/
#include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
#include <string.h>
#include "widgets/modest-global-settings-dialog.h"
#include "widgets/modest-global-settings-dialog-priv.h"
#include "modest-tny-msg.h"
#include "modest-platform.h"
#ifdef MODEST_TOOLKIT_HILDON2
-#include "hildon2/modest-selector-picker.h"
#include "modest-hildon-includes.h"
-#else
-#include "widgets/modest-combo-box.h"
-#endif
-#ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-number-editor.h>
-#else
#include <hildon/hildon-number-editor.h>
-#endif /*MODEST_HILDON_API = 0*/
#endif
/* include other impl specific header files */
static void on_response (GtkDialog *dialog,
gint arg1,
gpointer user_data);
-static void get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
+static gboolean on_delete_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data);
+
+static void get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
ModestGlobalSettingsState *state);
static ModestConnectedVia current_connection_default (void);
+static gboolean modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog *self);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
(GInstanceInitFunc) modest_global_settings_dialog_init,
NULL
};
-#ifdef MODEST_TOOLKIT_HILDON2
- my_type = g_type_register_static (HILDON_TYPE_DIALOG,
- "ModestGlobalSettingsDialog",
- &my_info, 0);
-#else
my_type = g_type_register_static (GTK_TYPE_DIALOG,
"ModestGlobalSettingsDialog",
&my_info, 0);
-#endif
}
return my_type;
}
g_type_class_add_private (gobject_class, sizeof(ModestGlobalSettingsDialogPrivate));
klass->current_connection_func = current_connection_default;
+ klass->save_settings_func = modest_global_settings_dialog_save_settings_default;
}
static void
priv->default_account_selector = NULL;
priv->accounts_list = NULL;
- /* Connect to the dialog's response signal: */
+ /* Connect to the dialog's "response" and "delete-event" signals */
g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self);
+ g_signal_connect (G_OBJECT (self), "delete-event", G_CALLBACK (on_delete_event), self);
/* Set title */
gtk_window_set_title (GTK_WINDOW (self), _("mcen_ti_options"));
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);
}
{
GSList *list = NULL;
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_5_MIN,
- _("mcen_va_options_updateinterval_5min"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_5_MIN,
+ _("mcen_va_options_updateinterval_5min"),
+ &list);
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_10_MIN,
+ _("mcen_va_options_updateinterval_10min"),
&list);
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_10_MIN,
- _("mcen_va_options_updateinterval_10min"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_15_MIN,
+ _("mcen_va_options_updateinterval_15min"),
&list);
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_15_MIN,
- _("mcen_va_options_updateinterval_15min"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_30_MIN,
+ _("mcen_va_options_updateinterval_30min"),
&list);
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_30_MIN,
- _("mcen_va_options_updateinterval_30min"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_1_HOUR,
+ _("mcen_va_options_updateinterval_1h"),
&list);
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_1_HOUR,
- _("mcen_va_options_updateinterval_1h"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_2_HOUR,
+ _("mcen_va_options_updateinterval_2h"),
&list);
- add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_2_HOUR,
- _("mcen_va_options_updateinterval_2h"),
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_4_HOUR,
+ _("mcen_va_options_updateinterval_4h"),
&list);
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_8_HOUR,
+ _("mcen_va_options_updateinterval_8h"),
+ &list);
+ add_to_modest_pair_list (MODEST_UPDATE_INTERVAL_24_HOUR,
+ _("mcen_va_options_updateinterval_24h"),
+ &list);
+
return (ModestPairList *) g_slist_reverse (list);
}
return (ModestPairList *) g_slist_reverse (list);
}
-void
-_modest_global_settings_dialog_load_conf (ModestGlobalSettingsDialog *self)
-{
- ModestConf *conf;
- gboolean checked;
- gint combo_id, value;
- GError *error = NULL;
- ModestGlobalSettingsDialogPrivate *priv;
-
- priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
- conf = modest_runtime_get_conf ();
-
- /* Autoupdate */
- checked = modest_conf_get_bool (conf, MODEST_CONF_AUTO_UPDATE, &error);
- if (error) {
- g_clear_error (&error);
- error = NULL;
- checked = FALSE;
- }
-#ifdef MODEST_TOOLKIT_HILDON2
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->auto_update), checked);
-#else
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->auto_update), checked);
-#endif
- priv->initial_state.auto_update = checked;
-
- /* Connected by */
- combo_id = modest_conf_get_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, &error);
- if (error) {
- g_error_free (error);
- error = NULL;
- combo_id = MODEST_CONNECTED_VIA_WLAN_OR_WIMAX;
- }
-#ifdef MODEST_TOOLKIT_HILDON2
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->connect_via),
- (gpointer) &combo_id);
-#else
- modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->connect_via),
- (gpointer) &combo_id);
-#endif
- priv->initial_state.connect_via = combo_id;
-
- /* Emit toggled to update the visibility of connect_by caption */
-#ifndef MODEST_TOOLKIT_HILDON2
- gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (priv->auto_update));
-#endif
-
- /* Update interval */
- combo_id = modest_conf_get_int (conf, MODEST_CONF_UPDATE_INTERVAL, &error);
- if (error) {
- g_error_free (error);
- error = NULL;
- combo_id = MODEST_UPDATE_INTERVAL_15_MIN;
- }
-#ifdef MODEST_TOOLKIT_HILDON2
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->update_interval),
- (gpointer) &combo_id);
-#else
- modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->update_interval),
- (gpointer) &combo_id);
-#endif
- priv->initial_state.update_interval = combo_id;
-
- /* Size limit */
- value = modest_conf_get_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, &error);
- if (error) {
- g_error_free (error);
- error = NULL;
- value = 1000;
- }
- /* It's better to do this in the subclasses, but it's just one
- line, so we'll leave it here for the moment */
-#ifndef MODEST_TOOLKIT_GTK
- hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (priv->size_limit), value);
-#else
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->size_limit), value);
-#endif
- priv->initial_state.size_limit = value;
-
- /* Play sound */
- checked = modest_conf_get_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, &error);
- if (error) {
- g_error_free (error);
- error = NULL;
- checked = FALSE;
- }
-#ifndef MODEST_TOOLKIT_HILDON2
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->play_sound), checked);
-#endif
- priv->initial_state.play_sound = checked;
-
- /* Msg format */
- checked = modest_conf_get_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, &error);
- if (error) {
- g_error_free (error);
- error = NULL;
- combo_id = MODEST_FILE_FORMAT_FORMATTED_TEXT;
- }
- combo_id = (checked) ? MODEST_FILE_FORMAT_FORMATTED_TEXT : MODEST_FILE_FORMAT_PLAIN_TEXT;
-#ifdef MODEST_TOOLKIT_HILDON2
- modest_selector_picker_set_active_id (MODEST_SELECTOR_PICKER (priv->msg_format),
- (gpointer) &combo_id);
-#else
- modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->msg_format),
- (gpointer) &combo_id);
-#endif
- priv->initial_state.prefer_formatted_text = checked;
-}
-
-static void
-get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
- ModestGlobalSettingsState *state)
+static void
+get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
+ ModestGlobalSettingsState *state)
{
gint *id;
/* Get values from UI */
-#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->notifications = modest_togglable_get_active (priv->notifications);
+ state->add_to_contacts = modest_togglable_get_active (priv->add_to_contacts);
+ state->auto_update = modest_togglable_get_active (priv->auto_update);
+ id = modest_selector_get_active_id (priv->connect_via);
+ state->default_account = modest_selector_get_active_id (priv->default_account_selector);
state->connect_via = *id;
-#ifndef MODEST_TOOLKIT_GTK
- state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
-#else
- state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit));
-#endif
-#ifdef MODEST_TOOLKIT_HILDON2
- id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->update_interval));
-#else
- id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->update_interval));
-#endif
+ id = modest_selector_get_active_id (priv->update_interval);
state->update_interval = *id;
-#ifdef MODEST_TOOLKIT_HILDON2
- id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->msg_format));
+ id = modest_selector_get_active_id (priv->msg_format);
state->play_sound = priv->initial_state.play_sound;
-#else
- state->play_sound = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->play_sound));
- id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->msg_format));
-#endif
state->prefer_formatted_text = (*id == MODEST_FILE_FORMAT_FORMATTED_TEXT) ? TRUE : FALSE;
}
-gboolean
-_modest_global_settings_dialog_save_conf (ModestGlobalSettingsDialog *self)
+static gboolean
+modest_global_settings_dialog_save_settings_default (ModestGlobalSettingsDialog *self)
{
ModestConf *conf;
- ModestGlobalSettingsState current_state;
+ ModestGlobalSettingsState current_state = {0,};
GError *error = NULL;
ModestGlobalSettingsDialogPrivate *priv;
get_current_settings (priv, ¤t_state);
/* Save configuration */
+ modest_conf_set_bool (conf, MODEST_CONF_NOTIFICATIONS, current_state.notifications, &error);
+ RETURN_FALSE_ON_ERROR(error);
+ modest_conf_set_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, current_state.add_to_contacts, &error);
+ RETURN_FALSE_ON_ERROR(error);
modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, current_state.auto_update, &error);
RETURN_FALSE_ON_ERROR(error);
modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, current_state.connect_via, NULL);
RETURN_FALSE_ON_ERROR(error);
modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, current_state.update_interval, NULL);
RETURN_FALSE_ON_ERROR(error);
- modest_conf_set_int (conf, MODEST_CONF_MSG_SIZE_LIMIT, current_state.size_limit, NULL);
- RETURN_FALSE_ON_ERROR(error);
modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, current_state.play_sound, NULL);
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 ||
+ (!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 ||
+ 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;
selected the same connect_via
method than the one already used by
the device */
- ModestConnectedVia connect_via =
+ ModestConnectedVia connect_via =
MODEST_GLOBAL_SETTINGS_DIALOG_GET_CLASS(self)->current_connection_func ();
if (current_state.connect_via == connect_via)
ModestGlobalSettingsState current_state)
{
if (initial_state.auto_update != current_state.auto_update ||
+ initial_state.notifications != current_state.notifications ||
+ initial_state.add_to_contacts != current_state.add_to_contacts ||
initial_state.connect_via != current_state.connect_via ||
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 ||
(current_state.default_account &&
return FALSE;
}
+static gboolean
+on_delete_event (GtkWidget *widget,
+ GdkEvent *event,
+ gpointer user_data)
+{
+ ModestGlobalSettingsDialogPrivate *priv;
+ ModestGlobalSettingsState current_state;
+
+ priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
+
+ /* If settings changed, them the response method already asked
+ the user, because it's always executed before (see
+ GtkDialog code). If it's not then simply close */
+ get_current_settings (priv, ¤t_state);
+ return settings_changed (priv->initial_state, current_state);
+}
+
static void
on_response (GtkDialog *dialog,
gint arg1,
gpointer user_data)
{
ModestGlobalSettingsDialogPrivate *priv;
- ModestGlobalSettingsState current_state;
- gboolean changed;
+ ModestGlobalSettingsState current_state = {0,};
+ gboolean changed = FALSE;
priv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
if (changed) {
gboolean saved;
- saved = _modest_global_settings_dialog_save_conf (MODEST_GLOBAL_SETTINGS_DIALOG (dialog));
+ saved = modest_global_settings_dialog_save_settings (MODEST_GLOBAL_SETTINGS_DIALOG (dialog));
if (saved) {
modest_platform_information_banner (NULL, NULL,
_("mcen_ib_advsetup_settings_saved"));
} else {
if (changed) {
gint response;
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (user_data),
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (user_data),
_("imum_nc_wizard_confirm_lose_changes"));
/* Do not close if the user Cancels */
- if (response == GTK_RESPONSE_CANCEL)
+ if (response != GTK_RESPONSE_OK)
g_signal_stop_emission_by_name (user_data, "response");
}
}
}
-static ModestConnectedVia
+static ModestConnectedVia
current_connection_default (void)
{
g_warning ("You must implement %s", __FUNCTION__);
g_return_val_if_reached (MODEST_CONNECTED_VIA_ANY);
}
+
+gboolean
+modest_global_settings_dialog_save_settings (ModestGlobalSettingsDialog *self)
+{
+ g_return_val_if_fail (MODEST_IS_GLOBAL_SETTINGS_DIALOG (self), FALSE);
+
+ return MODEST_GLOBAL_SETTINGS_DIALOG_GET_CLASS(self)->save_settings_func (self);
+}
projects / modest / blobdiff