#include <config.h>
#endif /*HAVE_CONFIG_H*/
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#include <hildon-widgets/hildon-banner.h>
-#else
-#include <hildon/hildon-caption.h>
-#include <hildon/hildon-number-editor.h>
-#include <hildon/hildon-banner.h>
-#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
+#include <modest-hildon-includes.h>
+#include <modest-maemo-utils.h>
#include <glib/gi18n.h>
#include <string.h>
#include "maemo/modest-maemo-global-settings-dialog.h"
#include "widgets/modest-ui-constants.h"
#include <tny-account-store.h>
-#include <tny-maemo-conic-device.h>
+
#define MSG_SIZE_MAX_VAL 5000
#define MSG_SIZE_DEF_VAL 1000
HildonNumberEditorErrorType type,
gpointer user_data);
+static void on_size_notify (HildonNumberEditor *editor,
+ GParamSpec *arg1,
+ gpointer user_data);
+
static void on_auto_update_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
{
/* grab the focus to the default element in the current page */
GtkWidget *selected_page = NULL, *focus_item = NULL;
- ModestGlobalSettingsDialogPrivate *ppriv;
- ModestMaemoGlobalSettingsDialogPrivate *priv;
SwitchPageHelper *helper;
- priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
- ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
-
selected_page = gtk_notebook_get_nth_page (notebook, page_num);
focus_item = GTK_WIDGET(g_object_get_data (G_OBJECT(selected_page), DEFAULT_FOCUS_WIDGET));
if (!focus_item) {
ppriv->updating_page = create_updating_page (self);
ppriv->composing_page = create_composing_page (self);
-
+
+ /* Add the buttons: */
+ gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL);
+
/* Set the default focusable widgets */
g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,
(gpointer)ppriv->auto_update);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
+ gtk_window_set_default_size (GTK_WINDOW (self), 700, 300);
+
g_signal_connect (G_OBJECT (self), "key-press-event",
G_CALLBACK (on_inner_tabs_key_pressed), self);
priv->switch_handler = g_signal_connect (G_OBJECT(ppriv->notebook), "switch-page",
/* Set first page */
gtk_notebook_set_current_page (GTK_NOTEBOOK (ppriv->notebook), 0);
+
+ hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_options_dialog",
+ modest_maemo_utils_get_osso_context());
}
static void
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
if (priv->switch_handler && ppriv->notebook) {
- /* TODO: This causes a g_warning:
- modest[13409]: GLIB WARNING ** GLib-GObject - invalid unclassed pointer in cast to `GObject'
- modest[13409]: GLIB WARNING ** GLib-GObject - instance with invalid (NULL) class pointer
- modest[13409]: GLIB CRITICAL ** GLib-GObject - g_signal_handler_disconnect: assertion `G_TYPE_CHECK_INSTANCE (instance)' failed
- */
- g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);
+ /* TODO: This causes a g_warning and a valgrind mem error: */
+ /* g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);*/
priv->switch_handler = 0;
}
return GTK_WIDGET(g_object_new(MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, NULL));
}
-
/*
* Creates the updating page
*/
GtkWidget *vbox, *vbox_update, *vbox_limit, *caption;
GtkSizeGroup *size_group;
ModestGlobalSettingsDialogPrivate *ppriv;
+ GtkWidget *scrollwin = NULL;
+ GtkAdjustment *focus_adjustment = NULL;
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
+ scrollwin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
+ g_signal_connect (ppriv->size_limit, "notify", G_CALLBACK (on_size_notify), self);
caption = hildon_caption_new (size_group,
_("mcen_fi_advsetup_sizelimit"),
- ppriv->size_limit,
+ ppriv->size_limit,
NULL,
HILDON_CAPTION_MANDATORY);
gtk_box_pack_start (GTK_BOX (vbox_limit), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
/* Add to vbox */
gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), vbox);
+ focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), focus_adjustment);
+ gtk_widget_show (scrollwin);
- return vbox;
+ return scrollwin;
}
/*
HILDON_CAPTION_MANDATORY);
gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- /* Reply */
- ppriv->include_reply = gtk_check_button_new ();
- caption = hildon_caption_new (size_group,
- _("mcen_va_options_include_original_inreply"),
- ppriv->include_reply,
- NULL,
- HILDON_CAPTION_MANDATORY);
- gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-
return vbox;
}
return TRUE;
}
+static void
+on_size_notify (HildonNumberEditor *editor,
+ GParamSpec *arg1,
+ gpointer user_data)
+{
+ ModestMaemoGlobalSettingsDialog *dialog = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG (user_data);
+ gint value = hildon_number_editor_get_value (editor);
+
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0);
+}
+
static ModestConnectedVia
current_connection (void)
{
- TnyAccountStore *account_store = NULL;
- TnyDevice *device = NULL;
- ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
-
- account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
- device = tny_account_store_get_device (account_store);
-
- if (!tny_device_is_online (device))
- return MODEST_CONNECTED_VIA_ANY;
-
- /* Get iap id */
- const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
- if (iap_id) {
- ConIcIap *iap = tny_maemo_conic_device_get_iap (
- TNY_MAEMO_CONIC_DEVICE (device), iap_id);
- const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
- if (bearer_type) {
- if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC))
- retval = MODEST_CONNECTED_VIA_WLAN;
- else
- retval = MODEST_CONNECTED_VIA_ANY;
- }
-
- g_object_unref (iap);
- }
-
- g_object_unref (device);
-
- return retval;
+ return modest_platform_get_current_connection ();
}
static gboolean
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
- if (widget == user_data) {
+ if (widget == ppriv->notebook) {
if (event->keyval == GDK_Right) {
gtk_notebook_next_page (GTK_NOTEBOOK (ppriv->notebook));
retval = TRUE;
projects / modest / blobdiff