X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=1f607345e65910058ab44c4aad11a2dff1a172a4;hp=952ac9e6bbf75c715c1fffffabf9da5dc1a58bde;hb=HEAD;hpb=c9ebde2e9ed7427556fc91072302ed138b9c000a diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c index 952ac9e..1f60734 100644 --- a/src/widgets/modest-window.c +++ b/src/widgets/modest-window.c @@ -74,6 +74,10 @@ static void modest_window_add_to_menu_default (ModestWindow *self, 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); @@ -81,11 +85,10 @@ 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); +static void modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar); /* list my signals */ enum { LAST_SIGNAL @@ -122,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", @@ -149,9 +152,11 @@ modest_window_class_init (ModestWindowClass *klass) 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)); } @@ -164,7 +169,7 @@ 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; @@ -177,9 +182,6 @@ modest_window_init (ModestWindow *obj) 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 @@ -441,7 +443,7 @@ modest_window_add_to_menu (ModestWindow *window, const gchar *label, const gchar *accelerator, ModestWindowMenuCallback callback, - ModestDimmingCallback dimming_callback); + ModestDimmingCallback dimming_callback) { MODEST_WINDOW_GET_CLASS (window)->add_to_menu_func (window, label, @@ -451,6 +453,16 @@ modest_window_add_to_menu (ModestWindow *window, } 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) { @@ -521,7 +533,15 @@ modest_window_add_to_menu_default (ModestWindow *window, const gchar *label, const gchar *accelerator, ModestWindowMenuCallback callback, - ModestDimmingCallback dimming_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__); } @@ -567,12 +587,18 @@ on_key_pressed (GtkWidget *self, modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self)); 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; + 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)); @@ -582,36 +608,42 @@ on_key_pressed (GtkWidget *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 gboolean -_modest_window_map_event (GtkWidget *widget, - GdkEvent *event, - gpointer userdata) +static void +modest_window_pack_toolbar_not_implemented (ModestWindow *self, + GtkPackType pack_type, + GtkWidget *toolbar) { - _make_zoom_buttons_grabeable (GTK_WIDGET (widget)); - return FALSE; + g_return_if_fail (MODEST_IS_WINDOW (self)); + + g_debug ("%s not implemented", __FUNCTION__); } -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); +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); }