X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=1f607345e65910058ab44c4aad11a2dff1a172a4;hp=3136b8f39af4f2db900ba73799a1a7c582242822;hb=HEAD;hpb=8a049079293813a4b5848f5ede3e734a3f8baed1 diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c index 3136b8f..1f60734 100644 --- a/src/widgets/modest-window.c +++ b/src/widgets/modest-window.c @@ -36,6 +36,14 @@ #include "modest-defs.h" #include /* for strcmp */ #include +#include +#include +#include +#include +#include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#endif /* 'private'/'protected' functions */ static void modest_window_class_init (ModestWindowClass *klass); @@ -51,15 +59,36 @@ static gboolean modest_window_zoom_minus_default (ModestWindow *window); static void modest_window_disconnect_signals_default (ModestWindow *self); +static void modest_window_show_progress_default (ModestWindow *self, + gboolean show); + static void modest_window_show_toolbar_default (ModestWindow *window, gboolean show_toolbar); +static void modest_window_add_toolbar_default (ModestWindow *window, + GtkToolbar *toolbar); + +static void modest_window_add_to_menu_default (ModestWindow *self, + const gchar *label, + const gchar *accelerator, + ModestWindowMenuCallback callback, + ModestDimmingCallback dimming_callback); + +static void modest_window_add_item_to_menu_default (ModestWindow *self, + GtkWidget *item, + ModestDimmingCallback dimming_callback); + +static void modest_window_set_title_default (ModestWindow *window, + const gchar *title); + 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 modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar); /* list my signals */ enum { LAST_SIGNAL @@ -96,7 +125,7 @@ modest_window_get_type (void) parent_type = HILDON_TYPE_WINDOW; #endif #else - parent_type = GTK_TYPE_WINDOW; + parent_type = GTK_TYPE_VBOX; #endif my_type = g_type_register_static (parent_type, "ModestWindow", @@ -121,7 +150,13 @@ 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->add_toolbar_func = modest_window_add_toolbar_default; + klass->add_to_menu_func = modest_window_add_to_menu_default; + klass->add_item_to_menu_func = modest_window_add_item_to_menu_default; + klass->set_title_func = modest_window_set_title_default; klass->disconnect_signals_func = modest_window_disconnect_signals_default; + klass->show_progress_func = modest_window_show_progress_default; + klass->pack_toolbar_func = modest_window_pack_toolbar_not_implemented; g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate)); } @@ -134,13 +169,14 @@ modest_window_init (ModestWindow *obj) priv = MODEST_WINDOW_GET_PRIVATE(obj); priv->ui_manager = NULL; - priv->ui_dimming_manager = NULL; + priv->ui_dimming_manager = modest_ui_dimming_manager_new (); 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), @@ -161,6 +197,7 @@ modest_window_finalize (GObject *obj) } g_free (priv->active_account); + g_free (priv->active_mailbox); G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -168,7 +205,7 @@ modest_window_finalize (GObject *obj) static void modest_window_dispose (GObject *obj) { - ModestWindowPrivate *priv; + ModestWindowPrivate *priv; priv = MODEST_WINDOW_GET_PRIVATE(obj); @@ -179,9 +216,11 @@ modest_window_dispose (GObject *obj) 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_OBJECT_CLASS(parent_class)->dispose (obj); } @@ -227,6 +266,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) { @@ -367,11 +431,57 @@ modest_window_show_toolbar (ModestWindow *window, } void +modest_window_add_toolbar (ModestWindow *window, + GtkToolbar *toolbar) +{ + MODEST_WINDOW_GET_CLASS (window)->add_toolbar_func (window, + toolbar); +} + +void +modest_window_add_to_menu (ModestWindow *window, + const gchar *label, + const gchar *accelerator, + ModestWindowMenuCallback callback, + ModestDimmingCallback dimming_callback) +{ + MODEST_WINDOW_GET_CLASS (window)->add_to_menu_func (window, + label, + accelerator, + callback, + dimming_callback); +} + +void +modest_window_add_item_to_menu (ModestWindow *window, + GtkWidget *item, + ModestDimmingCallback dimming_callback) +{ + MODEST_WINDOW_GET_CLASS (window)->add_item_to_menu_func (window, + item, + dimming_callback); +} + +void +modest_window_set_title (ModestWindow *window, + const gchar *title) +{ + MODEST_WINDOW_GET_CLASS (window)->set_title_func (window, + title); +} + +void modest_window_disconnect_signals (ModestWindow *window) { MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window); } +void +modest_window_show_progress (ModestWindow *window, gboolean show) +{ + MODEST_WINDOW_GET_CLASS (window)->show_progress_func (window, show); +} + /* Default implementations */ @@ -412,11 +522,49 @@ modest_window_show_toolbar_default (ModestWindow *window, } static void +modest_window_add_toolbar_default (ModestWindow *window, + GtkToolbar *toolbar) +{ + g_warning ("modest: You should implement %s", __FUNCTION__); +} + +static void +modest_window_add_to_menu_default (ModestWindow *window, + const gchar *label, + const gchar *accelerator, + ModestWindowMenuCallback callback, + ModestDimmingCallback dimming_callback) +{ + g_warning ("modest: You should implement %s", __FUNCTION__); +} + +static void +modest_window_add_item_to_menu_default (ModestWindow *window, + GtkWidget *item, + ModestDimmingCallback dimming_callback) +{ + g_warning ("modest: You should implement %s", __FUNCTION__); +} + +static void +modest_window_set_title_default (ModestWindow *window, + const gchar *title) +{ + 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__); } +static void +modest_window_show_progress_default (ModestWindow *self, gboolean show) +{ + g_warning ("modest: You should implement %s", __FUNCTION__); +} + void modest_window_save_state (ModestWindow *window) { @@ -438,19 +586,64 @@ on_key_pressed (GtkWidget *self, case GDK_F6: modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); return TRUE; +#ifdef MODEST_TOOLKIT_HILDON2 + case HILDON_HARDKEY_INCREASE: + if (MODEST_IS_MSG_VIEW_WINDOW (self)) { + modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self)); + return TRUE; + } + break; + case HILDON_HARDKEY_DECREASE: + if (MODEST_IS_MSG_VIEW_WINDOW (self)) { + modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self)); + return TRUE; + } + break; +#else case GDK_F7: modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self)); 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)) + 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)) + return TRUE; + } else { +#ifdef MODEST_TOOLKIT_HILDON2 + if (MODEST_IS_MSG_VIEW_WINDOW (self)) { + modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self)); + return TRUE; + } +#else modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self)); + return TRUE; +#endif + } break; } - + return FALSE; } + +static void +modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + g_return_if_fail (MODEST_IS_WINDOW (self)); + + g_debug ("%s not implemented", __FUNCTION__); +} + +void +modest_window_pack_toolbar (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + g_return_if_fail (MODEST_IS_WINDOW (self)); + + MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar); +}