X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=acf9d909df461984e97ac044501db7f34a694be6;hp=40b0a97abf3d02008845f9fecc696888840f0167;hb=f6d386ff93e929092ba105385a29d760aeba9ff7;hpb=3219862f2cd830d128d9b046881439671b1dd70c diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c index 40b0a97..acf9d90 100644 --- a/src/widgets/modest-window.c +++ b/src/widgets/modest-window.c @@ -31,21 +31,32 @@ #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 /* '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_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); /* list my signals */ @@ -77,7 +88,7 @@ modest_window_get_type (void) (GInstanceInitFunc) modest_window_init, NULL }; -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK parent_type = HILDON_TYPE_WINDOW; #else parent_type = GTK_TYPE_WINDOW; @@ -104,6 +115,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,6 +132,8 @@ modest_window_init (ModestWindow *obj) priv->toolbar = NULL; priv->menubar = NULL; + priv->dimming_state = NULL; + priv->ui_dimming_enabled = TRUE; priv->active_account = NULL; /* Connect signals */ @@ -155,17 +169,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 { @@ -184,7 +213,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 +226,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 +344,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 +389,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,6 +408,10 @@ 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: modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); @@ -328,7 +423,10 @@ on_key_pressed (GtkWidget *self, modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self)); return TRUE; case GDK_Escape: - modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); + 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; }