X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=280eedafbbfe7701142451185c3e68c9e282c380;hp=194f4d0fc52162eebff17a91bb48917f410c091d;hb=be0ca7f2e3995569e4553ab4d979325680e73050;hpb=4bdeb5032c190279409ac03af0527464bed1b354 diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c index 194f4d0..280eeda 100644 --- a/src/widgets/modest-window.c +++ b/src/widgets/modest-window.c @@ -31,22 +31,43 @@ #include "modest-window-priv.h" #include "modest-ui-actions.h" #include "modest-tny-platform-factory.h" +#include "modest-runtime.h" +#include "modest-window-mgr.h" +#include "modest-defs.h" +#include /* for strcmp */ +#include +#include +#include +#include +#include +#include +#include /* 'private'/'protected' functions */ static void modest_window_class_init (ModestWindowClass *klass); static void modest_window_init (ModestWindow *obj); static void modest_window_finalize (GObject *obj); +static void modest_window_dispose (GObject *obj); -static void modest_window_set_zoom_default (ModestWindow *window, - gdouble zoom); -static gdouble modest_window_get_zoom_default (ModestWindow *window); -static gboolean modest_window_zoom_plus_default (ModestWindow *window); -static gboolean modest_window_zoom_minus_default (ModestWindow *window); -static void modest_window_show_toolbar_default (ModestWindow *window, - gboolean show_toolbar); +static gdouble modest_window_get_zoom_default (ModestWindow *window); -static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data); +static gboolean modest_window_zoom_plus_default (ModestWindow *window); +static gboolean modest_window_zoom_minus_default (ModestWindow *window); + +static void modest_window_disconnect_signals_default (ModestWindow *self); + +static void modest_window_show_toolbar_default (ModestWindow *window, + gboolean show_toolbar); + +static void modest_window_set_zoom_default (ModestWindow *window, + gdouble zoom); + +static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data); +static void _make_zoom_buttons_grabeable (GtkWidget* widget); +static gboolean _modest_window_map_event (GtkWidget *widget, + GdkEvent *event, + gpointer userdata); /* list my signals */ enum { @@ -77,8 +98,12 @@ modest_window_get_type (void) (GInstanceInitFunc) modest_window_init, NULL }; -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON2 + parent_type = HILDON_TYPE_STACKABLE_WINDOW; +#else parent_type = HILDON_TYPE_WINDOW; +#endif #else parent_type = GTK_TYPE_WINDOW; #endif @@ -97,6 +122,7 @@ modest_window_class_init (ModestWindowClass *klass) gobject_class = (GObjectClass*) klass; parent_class = g_type_class_peek_parent (klass); + gobject_class->dispose = modest_window_dispose; gobject_class->finalize = modest_window_finalize; klass->set_zoom_func = modest_window_set_zoom_default; @@ -104,6 +130,7 @@ modest_window_class_init (ModestWindowClass *klass) klass->zoom_plus_func = modest_window_zoom_plus_default; klass->zoom_minus_func = modest_window_zoom_minus_default; klass->show_toolbar_func = modest_window_show_toolbar_default; + klass->disconnect_signals_func = modest_window_disconnect_signals_default; g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate)); } @@ -120,12 +147,18 @@ modest_window_init (ModestWindow *obj) priv->toolbar = NULL; priv->menubar = NULL; + priv->dimming_state = NULL; + priv->ui_dimming_enabled = TRUE; priv->active_account = NULL; + priv->active_mailbox = NULL; /* Connect signals */ g_signal_connect (G_OBJECT (obj), "key-press-event", G_CALLBACK (on_key_pressed), NULL); + g_signal_connect (G_OBJECT (obj), "map-event", + G_CALLBACK (_modest_window_map_event), + G_OBJECT (obj)); } static void @@ -135,18 +168,36 @@ modest_window_finalize (GObject *obj) priv = MODEST_WINDOW_GET_PRIVATE(obj); + if (priv->dimming_state != NULL) { + g_slice_free (DimmedState, priv->dimming_state); + priv->dimming_state = NULL; + } + + g_free (priv->active_account); + g_free (priv->active_mailbox); + + G_OBJECT_CLASS(parent_class)->finalize (obj); +} + +static void +modest_window_dispose (GObject *obj) +{ + ModestWindowPrivate *priv; + + priv = MODEST_WINDOW_GET_PRIVATE(obj); + + priv->ui_dimming_enabled = FALSE; + if (priv->ui_manager) { g_object_unref (G_OBJECT(priv->ui_manager)); priv->ui_manager = NULL; } if (priv->ui_dimming_manager) { + g_object_run_dispose (G_OBJECT (priv->ui_dimming_manager)); g_object_unref (G_OBJECT(priv->ui_dimming_manager)); priv->ui_dimming_manager = NULL; } - - g_free (priv->active_account); - - G_OBJECT_CLASS(parent_class)->finalize (obj); + G_OBJECT_CLASS(parent_class)->dispose (obj); } @@ -155,17 +206,32 @@ const gchar* modest_window_get_active_account (ModestWindow *self) { g_return_val_if_fail (self, NULL); - + //g_warning ("%s: %s", __FUNCTION__, MODEST_WINDOW_GET_PRIVATE(self)->active_account); return MODEST_WINDOW_GET_PRIVATE(self)->active_account; } void modest_window_set_active_account (ModestWindow *self, const gchar *active_account) { - ModestWindowPrivate *priv; + ModestWindowPrivate *priv; + g_return_if_fail (self); priv = MODEST_WINDOW_GET_PRIVATE(self); + //g_warning ("%s: %s", __FUNCTION__, active_account); + + /* only 'real' account should be set here; for example the email signature + * depends on the current account, so if you reply to a message in your + * archive, it should take the signature from the real active account, + * not the non-existing one from your mmc-pseudo-account + */ + if (active_account && ((strcmp (active_account, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) || + (strcmp (active_account, MODEST_MMC_ACCOUNT_ID) == 0))) { + g_warning ("%s: %s is not a valid active account", + __FUNCTION__, active_account); + return; + } + if (active_account == priv->active_account) return; else { @@ -176,6 +242,31 @@ modest_window_set_active_account (ModestWindow *self, const gchar *active_accoun } } +const gchar* +modest_window_get_active_mailbox (ModestWindow *self) +{ + g_return_val_if_fail (self, NULL); + return MODEST_WINDOW_GET_PRIVATE(self)->active_mailbox; +} + +void +modest_window_set_active_mailbox (ModestWindow *self, const gchar *active_mailbox) +{ + ModestWindowPrivate *priv; + + g_return_if_fail (self); + priv = MODEST_WINDOW_GET_PRIVATE(self); + + if (active_mailbox == priv->active_mailbox) + return; + else { + g_free (priv->active_mailbox); + priv->active_mailbox = NULL; + if (active_mailbox) + priv->active_mailbox = g_strdup (active_mailbox); + } +} + void modest_window_check_dimming_rules (ModestWindow *self) { @@ -184,7 +275,8 @@ modest_window_check_dimming_rules (ModestWindow *self) g_return_if_fail (MODEST_IS_WINDOW (self)); priv = MODEST_WINDOW_GET_PRIVATE(self); - modest_ui_dimming_manager_process_dimming_rules (priv->ui_dimming_manager); + if (priv->ui_dimming_enabled) + modest_ui_dimming_manager_process_dimming_rules (priv->ui_dimming_manager); } void @@ -196,7 +288,58 @@ modest_window_check_dimming_rules_group (ModestWindow *self, g_return_if_fail (MODEST_IS_WINDOW (self)); priv = MODEST_WINDOW_GET_PRIVATE(self); - modest_ui_dimming_manager_process_dimming_rules_group (priv->ui_dimming_manager, group_name); + if (priv->ui_dimming_enabled) + modest_ui_dimming_manager_process_dimming_rules_group (priv->ui_dimming_manager, group_name); +} + +void +modest_window_set_dimming_state (ModestWindow *window, + DimmedState *state) +{ + ModestWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_WINDOW (window)); + priv = MODEST_WINDOW_GET_PRIVATE(window); + + /* Free previous */ + if (priv->dimming_state != NULL) + g_slice_free (DimmedState, priv->dimming_state); + + /* Set new state */ + priv->dimming_state = state; +} + +const DimmedState * +modest_window_get_dimming_state (ModestWindow *window) +{ + ModestWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_WINDOW (window), NULL); + priv = MODEST_WINDOW_GET_PRIVATE(window); + + return priv->dimming_state; +} + +void +modest_window_disable_dimming (ModestWindow *self) +{ + ModestWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_WINDOW (self)); + priv = MODEST_WINDOW_GET_PRIVATE(self); + + priv->ui_dimming_enabled = FALSE; +} + +void +modest_window_enable_dimming (ModestWindow *self) +{ + ModestWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_WINDOW (self)); + priv = MODEST_WINDOW_GET_PRIVATE(self); + + priv->ui_dimming_enabled = TRUE; } GtkAction * @@ -263,6 +406,12 @@ modest_window_show_toolbar (ModestWindow *window, show_toolbar); } +void +modest_window_disconnect_signals (ModestWindow *window) +{ + MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window); +} + /* Default implementations */ @@ -302,7 +451,11 @@ modest_window_show_toolbar_default (ModestWindow *window, g_warning ("modest: You should implement %s", __FUNCTION__); } - +static void +modest_window_disconnect_signals_default (ModestWindow *self) +{ + g_warning ("modest: You should implement %s", __FUNCTION__); +} void modest_window_save_state (ModestWindow *window) @@ -317,17 +470,60 @@ on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data) { + ModestWindowMgr *mgr = NULL; + + mgr = modest_runtime_get_window_mgr (); + switch (event->keyval) { - case GDK_F6: + case GDK_F6: modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); - break; + return TRUE; +#ifdef MODEST_TOOLKIT_HILDON2 + case HILDON_HARDKEY_INCREASE: + modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self)); + return TRUE; + case HILDON_HARDKEY_DECREASE: + modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self)); + return TRUE; +#else case GDK_F7: modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self)); - break; + return TRUE; case GDK_F8: modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self)); + return TRUE; +#endif + case GDK_Escape: + if (modest_window_mgr_get_fullscreen_mode (mgr)) + modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); + else if (MODEST_IS_MSG_VIEW_WINDOW (self)) + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self)); break; } - return TRUE; + return FALSE; +} + +static gboolean +_modest_window_map_event (GtkWidget *widget, + GdkEvent *event, + gpointer userdata) +{ + _make_zoom_buttons_grabeable (GTK_WIDGET (widget)); + return FALSE; +} + +static void +_make_zoom_buttons_grabeable (GtkWidget* widget) +{ + GdkDisplay *display; + Atom atom; + unsigned long val = 1; + + display = gdk_drawable_get_display (widget->window); + atom = gdk_x11_get_xatom_by_name_for_display (display, "_HILDON_ZOOM_KEY_ATOM"); + XChangeProperty (GDK_DISPLAY_XDISPLAY (display), + GDK_WINDOW_XID (widget->window), atom, + XA_INTEGER, 32, PropModeReplace, + (unsigned char *) &val, 1); }