X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=3d192eabe75ee5e23490b5ed8d61814677219db6;hp=5b967bb38f4f543531d7b38fd7c871af7b88e01e;hb=c45f7efd716c1779f74ef6b78a507537828372a9;hpb=c04e24ad16b9a570a1152ec2c05c953fe39a3c3c diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c index 5b967bb..3d192ea 100644 --- a/src/maemo/modest-maemo-global-settings-dialog.c +++ b/src/maemo/modest-maemo-global-settings-dialog.c @@ -31,15 +31,8 @@ #include #endif /*HAVE_CONFIG_H*/ -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#include -#include -#else -#include -#include -#include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ +#include +#include #include #include @@ -55,7 +48,7 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include "widgets/modest-ui-constants.h" #include -#include + #define MSG_SIZE_MAX_VAL 5000 #define MSG_SIZE_DEF_VAL 1000 @@ -84,6 +77,10 @@ static gboolean on_range_error (HildonNumberEditor *editor, 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); @@ -151,8 +148,6 @@ typedef struct { static gboolean idle_select_default_focus (gpointer data) { - gdk_threads_enter (); - ModestGlobalSettingsDialogPrivate *ppriv; ModestMaemoGlobalSettingsDialogPrivate *priv; SwitchPageHelper *helper; @@ -164,13 +159,17 @@ idle_select_default_focus (gpointer data) /* Grab focus, we need to block in order to prevent a recursive call to this callback */ g_signal_handler_block (G_OBJECT (ppriv->notebook), priv->switch_handler); + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ gtk_widget_grab_focus (helper->focus_widget); - g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler); + gdk_threads_leave (); /* CHECKED */ + g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler); g_free (helper); - gdk_threads_leave (); - return FALSE; } @@ -180,13 +179,8 @@ on_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gp { /* 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) { @@ -218,7 +212,11 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self) 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); @@ -234,6 +232,8 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self) 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", @@ -244,6 +244,9 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self) /* 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 @@ -255,8 +258,9 @@ modest_maemo_global_settings_dialog_finalize (GObject *obj) priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj); ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj); - if (priv->switch_handler) { - g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler); + if (priv->switch_handler && ppriv->notebook) { + /* 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; } @@ -270,7 +274,6 @@ modest_maemo_global_settings_dialog_new (void) return GTK_WIDGET(g_object_new(MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, NULL)); } - /* * Creates the updating page */ @@ -280,8 +283,13 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) 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); @@ -342,9 +350,10 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) 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); @@ -360,8 +369,12 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) /* 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; } /* @@ -394,15 +407,6 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self) 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; } @@ -440,7 +444,7 @@ on_range_error (HildonNumberEditor *editor, #else case HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED: #endif - msg = g_strdup_printf (_("ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL); + msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL); new_val = MSG_SIZE_MAX_VAL; break; #ifdef MODEST_HAVE_HILDON0_WIDGETS @@ -448,7 +452,7 @@ on_range_error (HildonNumberEditor *editor, #else case HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED: #endif - msg = g_strdup_printf (_("ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL); + msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL); new_val = MSG_SIZE_MIN_VAL; break; #ifdef MODEST_HAVE_HILDON0_WIDGETS @@ -456,7 +460,7 @@ on_range_error (HildonNumberEditor *editor, #else case HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE: #endif - msg = g_strdup_printf (_("ckct_ib_set_a_value_within_range"), + msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"), MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL); /* FIXME: use the previous */ @@ -478,37 +482,21 @@ on_range_error (HildonNumberEditor *editor, 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; - TnyDevice *device; - 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 (!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 @@ -521,7 +509,7 @@ on_inner_tabs_key_pressed (GtkWidget *widget, 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;