X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=26c51f8b9308509525814244f29edf0896a06b92;hp=739f7a1929edcde8be0eb35e91021560555d3049;hb=169f0a6ed724f1c98c5a35eea5742c092e8f5e8c;hpb=8085832c76f15fa6414c602d6aa472c2d10e05ec diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 739f7a1..26c51f8 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -87,9 +87,6 @@ struct _ModestHeaderWindowPrivate { GSList *sighandlers; gulong queue_change_handler; - /* Display state */ - osso_display_state_t display_state; - /* progress hint */ gboolean progress_hint; }; @@ -133,6 +130,9 @@ static void set_moveto_edit_mode (GtkButton *button, static gboolean on_expose_event(GtkTreeView *header_view, GdkEventExpose *event, gpointer user_data); +static gboolean on_map_event (GtkWidget *widget, + GdkEvent *event, + gpointer userdata); static void on_vertical_movement (HildonPannableArea *area, HildonMovementDirection direction, gdouble x, gdouble y, gpointer user_data); @@ -147,6 +147,10 @@ static void modest_header_window_show_toolbar (ModestWindow *window, static void modest_header_window_pack_toolbar (ModestHildon2Window *self, GtkPackType pack_type, GtkWidget *toolbar); +static void edit_mode_changed (ModestHeaderWindow *header_window, + gint edit_mode_id, + gboolean enabled, + ModestHeaderWindow *self); /* globals */ @@ -211,7 +215,6 @@ modest_header_window_init (ModestHeaderWindow *obj) priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); priv->sighandlers = NULL; - priv->display_state = OSSO_DISPLAY_ON; priv->header_view = NULL; priv->empty_view = NULL; @@ -305,6 +308,13 @@ connect_signals (ModestHeaderWindow *self) priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (self), + "map-event", + G_CALLBACK (on_map_event), + self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (priv->contents_view), "vertical-movement", G_CALLBACK (on_vertical_movement), @@ -318,27 +328,16 @@ connect_signals (ModestHeaderWindow *self) self); } -static void -osso_display_event_cb (osso_display_state_t state, - gpointer data) -{ - ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (data); - - priv->display_state = state; - - /* Stop blinking if the screen becomes on */ - if (priv->display_state == OSSO_DISPLAY_ON) - modest_platform_remove_new_mail_notifications (TRUE); -} - static GtkWidget * -create_header_view (ModestWindow *progress_window, TnyFolder *folder) +create_header_view (ModestWindow *self, TnyFolder *folder) { GtkWidget *header_view; header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, - TRUE, progress_window, NULL, NULL); + TRUE, self, NULL, NULL); + modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), + MODEST_HEADER_VIEW_FILTER_NONE); modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view), MODEST_CONF_HEADER_VIEW_KEY); @@ -392,6 +391,8 @@ modest_header_window_new (TnyFolder *folder) priv->empty_view = create_empty_view (); g_object_ref (priv->header_view); g_object_ref (priv->empty_view); + g_signal_connect (G_OBJECT (self), "edit-mode-changed", + G_CALLBACK (edit_mode_changed), (gpointer) self); setup_menu (self); priv->top_vbox = gtk_vbox_new (FALSE, 0); @@ -432,12 +433,6 @@ modest_header_window_new (TnyFolder *folder) g_free (folder_name); } - /* Listen for changes in the screen, we don't want to show a - led pattern when the display is on for example */ - osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), - osso_display_event_cb, - self); - /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, @@ -446,12 +441,12 @@ modest_header_window_new (TnyFolder *folder) /* setup edit modes */ modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE, - _("TODO: Select messages to delete"), _("TODO: Delete"), + _("mcen_ti_edit_delete"), _HL("wdgt_bd_delete"), GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_message)); modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE, - _("TODO: Select messages to move"), _("TODO: Move"), + _("mcen_ti_edit_move"), _HL("wdgt_bd_move"), GTK_TREE_VIEW (priv->header_view), GTK_SELECTION_MULTIPLE, EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); @@ -459,18 +454,6 @@ modest_header_window_new (TnyFolder *folder) return MODEST_WINDOW(self); } -gboolean -modest_header_window_screen_is_on (ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv = NULL; - - g_return_val_if_fail (MODEST_IS_HEADER_WINDOW(self), FALSE); - - priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - - return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; -} - ModestHeaderView * modest_header_window_get_header_view (ModestHeaderWindow *self) { @@ -487,25 +470,25 @@ static void setup_menu (ModestHeaderWindow *self) { g_return_if_fail (MODEST_IS_HEADER_WINDOW(self)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_moveto"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_messages"), NULL, APP_MENU_CALLBACK (set_moveto_edit_mode), - MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_delete"), - APP_MENU_CALLBACK (set_delete_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_messagedetails"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL, + APP_MENU_CALLBACK (set_delete_edit_mode), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_delete)); + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_folder_details"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_details), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sort"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_sort"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_sort), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_sort)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "n", APP_MENU_CALLBACK (modest_ui_actions_on_new_msg), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_send_receive), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL, APP_MENU_CALLBACK (modest_ui_actions_cancel_send), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); } @@ -717,6 +700,22 @@ on_expose_event(GtkTreeView *header_view, return FALSE; } +static gboolean +on_map_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + ModestHeaderWindow *self = (ModestHeaderWindow *) user_data; + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); + + if (priv->progress_hint) { + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); + } + return FALSE; +} + static gboolean set_toolbar_transfer_mode (ModestHeaderWindow *self) { @@ -886,3 +885,35 @@ modest_header_window_pack_toolbar (ModestHildon2Window *self, gtk_box_pack_end (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0); } } + +static void +edit_mode_changed (ModestHeaderWindow *header_window, + gint edit_mode_id, + gboolean enabled, + ModestHeaderWindow *self) +{ + ModestHeaderWindowPrivate *priv; + ModestHeaderViewFilter filter = MODEST_HEADER_VIEW_FILTER_NONE; + + g_return_if_fail (MODEST_IS_HEADER_WINDOW (self)); + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + switch (edit_mode_id) { + case EDIT_MODE_COMMAND_MOVE: + filter = MODEST_HEADER_VIEW_FILTER_MOVEABLE; + break; + case EDIT_MODE_COMMAND_DELETE: + filter = MODEST_HEADER_VIEW_FILTER_DELETABLE; + break; + case MODEST_HILDON2_WINDOW_EDIT_MODE_NONE: + filter = MODEST_HEADER_VIEW_FILTER_NONE; + break; + } + + if (enabled) + modest_header_view_set_filter (MODEST_HEADER_VIEW (priv->header_view), + filter); + else + modest_header_view_unset_filter (MODEST_HEADER_VIEW (priv->header_view), + filter); +}