X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=a07d99976b31e2da2afa1e7115f40015141e15f5;hp=d592e400e009d8d4289f78683175845f1d5b72d5;hb=71919402fd8e79d021347e16496038c8e54320cd;hpb=e374da56f67092cecb1572dd4bee2ca34e0bc04c diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index d592e40..a07d999 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,8 +50,9 @@ #include #include #include -#include "modest-ui-dimming-rules.h" -#include "modest-ui-dimming-manager.h" +#include +#include +#include typedef enum { CONTENTS_STATE_NONE = 0, @@ -60,7 +61,6 @@ typedef enum { } ContentsState; typedef enum { - EDIT_MODE_COMMAND_NONE = 0, EDIT_MODE_COMMAND_MOVE = 1, EDIT_MODE_COMMAND_DELETE = 2, } EditModeCommand; @@ -72,12 +72,10 @@ struct _ModestHeaderWindowPrivate { GtkWidget *empty_view; GtkWidget *contents_view; GtkWidget *top_vbox; - GtkWidget *edit_toolbar; + GtkWidget *new_message_button; /* state bar */ ContentsState contents_state; - gboolean edit_mode; - EditModeCommand edit_command; TnyFolder *folder; @@ -92,11 +90,12 @@ struct _ModestHeaderWindowPrivate { GSList *sighandlers; gulong queue_change_handler; - /* Display state */ - osso_display_state_t display_state; - /* progress hint */ gboolean progress_hint; + gchar *current_store_account; + + /* sort button */ + GtkWidget *sort_button; }; #define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_HEADER_WINDOW, \ @@ -110,19 +109,8 @@ static void modest_header_window_finalize (GObject *obj); static void connect_signals (ModestHeaderWindow *self); static void modest_header_window_disconnect_signals (ModestWindow *self); -static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); -static gboolean modest_header_window_toggle_menu (HildonWindow *window, - guint button, - guint32 time); -static void add_to_menu (ModestHeaderWindow *self, - HildonAppMenu *menu, - gchar *label, - GCallback callback, - ModestDimmingRulesGroup *group, - GCallback dimming_callback); -static void setup_menu (ModestHeaderWindow *self, - ModestDimmingRulesGroup *group); -static GtkWidget *create_empty_view (void); +static void setup_menu (ModestHeaderWindow *self); +static GtkWidget *create_empty_view (ModestWindow *self); static GtkWidget *create_header_view (ModestWindow *progress_window, TnyFolder *folder); @@ -142,12 +130,6 @@ static void on_header_activated (ModestHeaderView *header_view, static void on_updating_msg_list (ModestHeaderView *header_view, gboolean starting, gpointer user_data); -static void set_edit_mode (ModestHeaderWindow *self, - EditModeCommand command); -static void edit_toolbar_button_clicked (HildonEditToolbar *toolbar, - ModestHeaderWindow *self); -static void edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar, - ModestHeaderWindow *self); static void set_delete_edit_mode (GtkButton *button, ModestHeaderWindow *self); static void set_moveto_edit_mode (GtkButton *button, @@ -155,26 +137,42 @@ 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); -static void set_progress_hint (ModestHeaderWindow *self, - gboolean enabled); static void on_queue_changed (ModestMailOperationQueue *queue, ModestMailOperation *mail_op, ModestMailOperationQueueNotification type, ModestHeaderWindow *self); -static void modest_header_window_show_toolbar (ModestWindow *window, - gboolean show_toolbar); - +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); +static void on_progress_list_changed (ModestWindowMgr *mgr, + ModestHeaderWindow *self); +static void update_progress_hint (ModestHeaderWindow *self); +static void on_sort_column_changed (GtkTreeSortable *treesortable, + gpointer user_data); +static void update_sort_button (ModestHeaderWindow *self); +static void on_horizontal_movement (HildonPannableArea *hildonpannable, + gint direction, + gdouble initial_x, + gdouble initial_y, + gpointer user_data); /* globals */ static GtkWindowClass *parent_class = NULL; #define EMPTYVIEW_XALIGN 0.5 -#define EMPTYVIEW_YALIGN 0.0 +#define EMPTYVIEW_YALIGN 0.5 #define EMPTYVIEW_XSPACE 1.0 -#define EMPTYVIEW_YSPACE 0.0 +#define EMPTYVIEW_YSPACE 1.0 @@ -197,7 +195,7 @@ modest_header_window_get_type (void) (GInstanceInitFunc) modest_header_window_init, NULL }; - my_type = g_type_register_static (MODEST_TYPE_WINDOW, + my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW, "ModestHeaderWindow", &my_info, 0); } @@ -210,19 +208,15 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass) GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; - HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass; + ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_header_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate)); - hildon_window_class->toggle_menu = modest_header_window_toggle_menu; - - modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented; - modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented; - modest_window_class->show_toolbar_func = modest_header_window_show_toolbar; modest_window_class->disconnect_signals_func = modest_header_window_disconnect_signals; + modest_hildon2_window_class->pack_toolbar_func = modest_header_window_pack_toolbar; } static void @@ -233,14 +227,10 @@ 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; priv->top_vbox = NULL; - priv->edit_mode = FALSE; - priv->edit_command = EDIT_MODE_COMMAND_NONE; - priv->edit_toolbar = NULL; priv->contents_view = NULL; priv->contents_state = CONTENTS_STATE_NONE; priv->folder = NULL; @@ -249,6 +239,9 @@ modest_header_window_init (ModestHeaderWindow *obj) priv->autoscroll = TRUE; priv->progress_hint = FALSE; priv->queue_change_handler = 0; + priv->current_store_account = NULL; + priv->sort_button = NULL; + priv->new_message_button = NULL; modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj), @@ -262,9 +255,14 @@ modest_header_window_finalize (GObject *obj) priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); + g_object_unref (priv->folder); g_object_unref (priv->header_view); g_object_unref (priv->empty_view); - g_object_unref (priv->folder); + + if (priv->current_store_account) { + g_free (priv->current_store_account); + priv->current_store_account = NULL; + } /* Sanity check: shouldn't be needed, the window mgr should call this function before */ @@ -284,8 +282,8 @@ modest_header_window_finalize (GObject *obj) static void modest_header_window_disconnect_signals (ModestWindow *self) -{ - ModestHeaderWindowPrivate *priv; +{ + ModestHeaderWindowPrivate *priv; priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), @@ -302,6 +300,7 @@ static void connect_signals (ModestHeaderWindow *self) { ModestHeaderWindowPrivate *priv; + GtkTreeSortable *sortable; priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); @@ -328,6 +327,22 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_expose_event), self); + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (sortable), + "sort-column-changed", + G_CALLBACK (on_sort_column_changed), + 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), @@ -336,34 +351,44 @@ connect_signals (ModestHeaderWindow *self) self); /* Mail Operation Queue */ - priv->queue_change_handler = - g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), - "queue-changed", - G_CALLBACK (on_queue_changed), - self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_window_mgr ()), + "progress-list-changed", + G_CALLBACK (on_progress_list_changed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->new_message_button), + "clicked", + G_CALLBACK (modest_ui_actions_on_new_msg), self); + + /* Pannable area */ + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + (GObject *) priv->contents_view, + "horizontal-movement", + G_CALLBACK (on_horizontal_movement), + self); } -static void -osso_display_event_cb (osso_display_state_t state, - gpointer data) +static void +folder_refreshed_cb (ModestMailOperation *mail_op, + TnyFolder *folder, + gpointer user_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); + /* Update the view (folder could be empty) */ + update_view (MODEST_HEADER_WINDOW (user_data), NULL); } 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); + modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, + TRUE, self, folder_refreshed_cb, self); + 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); @@ -371,19 +396,49 @@ create_header_view (ModestWindow *progress_window, TnyFolder *folder) } static GtkWidget * -create_empty_view (void) +create_empty_view (ModestWindow *self) { + GtkWidget *viewport = NULL; GtkWidget *label = NULL; GtkWidget *align = NULL; + GtkWidget *vbox = NULL; + GtkWidget *button = NULL; + GdkPixbuf *new_message_pixbuf; + + vbox = gtk_vbox_new (0, FALSE); align = gtk_alignment_new(EMPTYVIEW_XALIGN, EMPTYVIEW_YALIGN, EMPTYVIEW_XSPACE, EMPTYVIEW_YSPACE); label = gtk_label_new (_("mcen_ia_nomessages")); + hildon_helper_set_logical_font (label, "LargeSystemFont"); + gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); gtk_widget_show (label); gtk_widget_show (align); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); gtk_container_add (GTK_CONTAINER (align), label); + gtk_box_pack_end (GTK_BOX (vbox), align, TRUE, TRUE, 0); + + button = hildon_button_new (MODEST_EDITABLE_SIZE, + HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + + hildon_button_set_title (HILDON_BUTTON (button), _("mcen_ti_new_message")); + new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG); + hildon_button_set_image (HILDON_BUTTON (button), + gtk_image_new_from_pixbuf (new_message_pixbuf)); + g_object_unref (new_message_pixbuf); + gtk_widget_show_all (button); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - return align; + gtk_widget_show (vbox); + + g_signal_connect (button, + "clicked", + G_CALLBACK (modest_ui_actions_on_new_msg), self); + + viewport = gtk_viewport_new ((GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0), + (GtkAdjustment *) gtk_adjustment_new (0, 0, 0, 0, 0, 0)); + gtk_container_add (GTK_CONTAINER (viewport), vbox); + + return viewport; } static void @@ -399,40 +454,75 @@ on_vertical_movement (HildonPannableArea *area, ModestWindow * -modest_header_window_new (TnyFolder *folder) +modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox) { ModestHeaderWindow *self = NULL; ModestHeaderWindowPrivate *priv = NULL; HildonProgram *app; GdkPixbuf *window_icon; - ModestWindowPrivate *parent_priv = NULL; - ModestDimmingRulesGroup *menu_rules_group = NULL; + ModestAccountMgr *mgr; + ModestAccountSettings *settings = NULL; + ModestServerAccountSettings *store_settings = NULL; + GtkWidget *action_area_box; + GdkPixbuf *new_message_pixbuf; + GtkWidget *alignment; + gchar *account_display_name = NULL; self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL)); priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); - parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - - parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new(); - menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); priv->folder = g_object_ref (folder); priv->contents_view = hildon_pannable_area_new (); + alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), + 0, 0, + HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE); + + /* We need to do this here to properly listen for mail + operations because create_header_view launches a mail + operation */ + priv->queue_change_handler = + g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + "queue-changed", + G_CALLBACK (on_queue_changed), + self); priv->header_view = create_header_view (MODEST_WINDOW (self), folder); - priv->empty_view = create_empty_view (); - g_object_ref (priv->header_view); - g_object_ref (priv->empty_view); - setup_menu (self, menu_rules_group); - - modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); - g_object_unref (menu_rules_group); + priv->empty_view = create_empty_view (MODEST_WINDOW (self)); + + /* Transform the floating reference in a "hard" reference. We + need to do this because the widgets could be added/removed + to containers many times so we always need to keep a + reference. It could happen also that some widget is never + added to any container */ + g_object_ref_sink (priv->header_view); + g_object_ref_sink (priv->empty_view); + + g_signal_connect (G_OBJECT (self), "edit-mode-changed", + G_CALLBACK (edit_mode_changed), (gpointer) self); + + action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->header_view)); + priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + + hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message")); + new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG); + hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf)); + g_object_unref (new_message_pixbuf); + + gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0); + gtk_widget_show_all (priv->new_message_button); + hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), TRUE); + + setup_menu (self); priv->top_vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_end (GTK_BOX (priv->top_vbox), priv->contents_view, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (alignment), priv->contents_view); + gtk_box_pack_end (GTK_BOX (priv->top_vbox), alignment, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (self), priv->top_vbox); + gtk_widget_show (alignment); gtk_widget_show (priv->contents_view); gtk_widget_show (priv->top_vbox); @@ -449,7 +539,7 @@ modest_header_window_new (TnyFolder *folder) app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); - + /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG); if (window_icon) { @@ -457,41 +547,64 @@ modest_header_window_new (TnyFolder *folder) g_object_unref (window_icon); } - /* 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, * so that the UI is not visible for non-menu D-Bus activation. */ - return MODEST_WINDOW(self); -} - -static gboolean -on_zoom_minus_plus_not_implemented (ModestWindow *window) -{ - g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (window), FALSE); - - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); - return FALSE; - -} + /* setup edit modes */ + modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_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, + _("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)); + + + modest_window_set_active_account (MODEST_WINDOW (self), account_name); + modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox); + mgr = modest_runtime_get_account_mgr (); + settings = modest_account_mgr_load_account_settings (mgr, account_name); + if (settings) { + account_display_name = g_strdup (modest_account_settings_get_display_name (settings)); + store_settings = modest_account_settings_get_store_settings (settings); + if (store_settings) { + priv->current_store_account = + g_strdup (modest_server_account_settings_get_account_name (store_settings)); + g_object_unref (store_settings); + } + g_object_unref (settings); + } + /* Set window title */ + if (TNY_IS_FOLDER (folder)) { + gchar *folder_name; + + if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_INBOX) { + const gchar *box_name; + box_name = mailbox; + if (box_name == NULL || box_name[0] == '\0') { + box_name = account_display_name; + } + folder_name = g_strconcat (_("mcen_me_folder_inbox"), " - ", box_name, NULL); + } else { + folder_name = modest_tny_folder_get_display_name (folder); + } + + gtk_window_set_title (GTK_WINDOW (self), folder_name); + g_free (folder_name); + } + g_free (account_display_name); -gboolean -modest_header_window_screen_is_on (ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv = NULL; - g_return_val_if_fail (MODEST_IS_HEADER_WINDOW(self), FALSE); + update_progress_hint (self); + update_sort_button (self); - priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - - return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; + return MODEST_WINDOW(self); } ModestHeaderView * @@ -506,73 +619,43 @@ modest_header_window_get_header_view (ModestHeaderWindow *self) return MODEST_HEADER_VIEW (priv->header_view); } -static void add_to_menu (ModestHeaderWindow *self, - HildonAppMenu *menu, - gchar *label, - GCallback callback, - ModestDimmingRulesGroup *dimming_group, - GCallback dimming_callback) -{ - GtkWidget *button; - - button = gtk_button_new_with_label (label); - g_signal_connect_after (G_OBJECT (button), "clicked", - callback, (gpointer) self); - modest_dimming_rules_group_add_widget_rule (dimming_group, - button, - dimming_callback, - MODEST_WINDOW (self)); - hildon_app_menu_append (menu, GTK_BUTTON (button)); -} - -static void setup_menu (ModestHeaderWindow *self, ModestDimmingRulesGroup *group) +static void setup_menu (ModestHeaderWindow *self) { - ModestHeaderWindowPrivate *priv = NULL; - GtkWidget *app_menu; + ModestHeaderWindowPrivate *priv; g_return_if_fail (MODEST_IS_HEADER_WINDOW(self)); - priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - app_menu = hildon_app_menu_new (); - - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_moveto"), - G_CALLBACK (set_moveto_edit_mode), - group, G_CALLBACK (modest_ui_dimming_rules_on_delete)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_delete"), - G_CALLBACK (set_delete_edit_mode), - group, G_CALLBACK (modest_ui_dimming_rules_on_move_to)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_messagedetails"), - G_CALLBACK (modest_ui_actions_on_details), - group, G_CALLBACK (modest_ui_dimming_rules_on_details)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sort"), - G_CALLBACK (modest_ui_actions_on_sort), - group, G_CALLBACK (modest_ui_dimming_rules_on_sort)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"), - G_CALLBACK (modest_ui_actions_on_new_msg), - group, G_CALLBACK (modest_ui_dimming_rules_on_new_msg)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"), - G_CALLBACK (modest_ui_actions_on_send_receive), - group, G_CALLBACK (modest_ui_dimming_rules_on_send_receive)); - add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"), - G_CALLBACK (modest_ui_actions_cancel_send), - group, G_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); - - hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), - HILDON_APP_MENU (app_menu)); + 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_move_messages"), NULL, + APP_MENU_CALLBACK (set_moveto_edit_mode), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to)); + 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)); + priv->sort_button = hildon_button_new (MODEST_EDITABLE_SIZE, + HILDON_BUTTON_ARRANGEMENT_VERTICAL); + hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort")); + g_signal_connect (G_OBJECT (priv->sort_button), "clicked", + G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self); + hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER); + hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5); + modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (priv->sort_button), + modest_ui_dimming_rules_on_sort); + 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"), NULL, + APP_MENU_CALLBACK (modest_ui_actions_cancel_send), + MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); } -static gboolean -modest_header_window_toggle_menu (HildonWindow *window, - guint button, - guint32 time) -{ - modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); - - return HILDON_WINDOW_CLASS (parent_class)->toggle_menu (window, button, time); -} - - static void update_view (ModestHeaderWindow *self, TnyFolderChange *change) @@ -651,7 +734,6 @@ set_contents_state (ModestHeaderWindow *self, break; } priv->contents_state = state; - } static void @@ -659,9 +741,9 @@ on_msg_count_changed (ModestHeaderView *header_view, TnyFolder *folder, TnyFolderChange *change, ModestHeaderWindow *header_window) -{ +{ g_return_if_fail (MODEST_IS_HEADER_WINDOW (header_window)); - + update_view (MODEST_HEADER_WINDOW (header_window), change); } @@ -751,111 +833,17 @@ on_updating_msg_list (ModestHeaderView *header_view, } static void -set_edit_mode (ModestHeaderWindow *self, - EditModeCommand command) -{ - ModestHeaderWindowPrivate *priv; - - priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - if (priv->edit_toolbar) { - gtk_widget_destroy (priv->edit_toolbar); - priv->edit_toolbar = NULL; - } - - if (command == EDIT_MODE_COMMAND_NONE) { - if (priv->edit_mode) { - priv->edit_mode = FALSE; - priv->edit_command = command; - g_object_set (G_OBJECT (priv->header_view), - "hildon-ui-mode", HILDON_UI_MODE_NORMAL, - NULL); - gtk_widget_queue_resize (priv->header_view); - gtk_window_unfullscreen (GTK_WINDOW (self)); - } - } else { - if (!priv->edit_mode) { - GtkTreeSelection *selection; - - g_object_set (G_OBJECT (priv->header_view), - "hildon-ui-mode", HILDON_UI_MODE_EDIT, - NULL); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->header_view)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - gtk_tree_selection_unselect_all (selection); - - priv->edit_mode = TRUE; - priv->edit_command = command; - - /* Setup toolbar */ - priv->edit_toolbar = hildon_edit_toolbar_new (); - switch (command) { - case EDIT_MODE_COMMAND_DELETE: - hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), - _("TODO: Select messages to delete")); - hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), - _("TODO: Delete")); - break; - case EDIT_MODE_COMMAND_MOVE: - hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), - _("TODO: Select messages to move")); - hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar), - _("TODO: Move")); - break; - case EDIT_MODE_COMMAND_NONE: - g_assert ("Shouldn't reach"); - } - gtk_box_pack_start (GTK_BOX (priv->top_vbox), priv->edit_toolbar, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked", - G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self); - g_signal_connect (G_OBJECT (priv->edit_toolbar), "arrow-clicked", - G_CALLBACK (edit_toolbar_arrow_clicked), (gpointer) self); - gtk_widget_show (priv->edit_toolbar); - - gtk_widget_queue_resize (priv->header_view); - gtk_window_fullscreen (GTK_WINDOW (self)); - } - } -} - -static void -edit_toolbar_button_clicked (HildonEditToolbar *toolbar, - ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - - switch (priv->edit_command) { - case EDIT_MODE_COMMAND_DELETE: - if (modest_ui_actions_on_edit_mode_delete_message (MODEST_WINDOW (self))) - set_edit_mode (self, EDIT_MODE_COMMAND_NONE); - break; - case EDIT_MODE_COMMAND_MOVE: - modest_ui_actions_on_move_to (NULL, MODEST_WINDOW (self)); - set_edit_mode (self, EDIT_MODE_COMMAND_NONE); - break; - case EDIT_MODE_COMMAND_NONE: - g_assert_not_reached (); - } -} - -static void -edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar, - ModestHeaderWindow *self) -{ - set_edit_mode (self, EDIT_MODE_COMMAND_NONE); -} - -static void set_delete_edit_mode (GtkButton *button, ModestHeaderWindow *self) { - set_edit_mode (self, EDIT_MODE_COMMAND_DELETE); + modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_DELETE); } static void set_moveto_edit_mode (GtkButton *button, ModestHeaderWindow *self) { - set_edit_mode (self, EDIT_MODE_COMMAND_MOVE); + modest_hildon2_window_set_edit_mode (MODEST_HILDON2_WINDOW (self), EDIT_MODE_COMMAND_MOVE); } static gboolean @@ -874,66 +862,91 @@ on_expose_event(GtkTreeView *header_view, return FALSE; } -static gboolean -set_toolbar_transfer_mode (ModestHeaderWindow *self) +static gboolean +on_map_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) { - ModestHeaderWindowPrivate *priv = NULL; - - g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); + ModestHeaderWindow *self = (ModestHeaderWindow *) user_data; + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); + g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); - set_progress_hint (self, TRUE); - + if (priv->progress_hint) { + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE); + } return FALSE; } -static void -set_progress_hint (ModestHeaderWindow *self, - gboolean enabled) +static void +on_progress_list_changed (ModestWindowMgr *mgr, + ModestHeaderWindow *self) { - ModestWindowPrivate *parent_priv; - ModestHeaderWindowPrivate *priv; + update_progress_hint (self); +} - g_return_if_fail (MODEST_IS_HEADER_WINDOW (self)); +static gboolean +has_active_operations (ModestHeaderWindow *self) +{ + GSList *operations = NULL, *node; + ModestMailOperationQueue *queue; + gboolean has_active = FALSE; - parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); - - /* Sets current progress hint */ - priv->progress_hint = enabled; + queue = modest_runtime_get_mail_operation_queue (); + operations = modest_mail_operation_queue_get_by_source (queue, G_OBJECT (self)); - if (GTK_WIDGET_VISIBLE (self)) { - hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), enabled?1:0); + for (node = operations; node != NULL; node = g_slist_next (node)) { + if (!modest_mail_operation_is_finished (MODEST_MAIL_OPERATION (node->data))) { + has_active = TRUE; + break; + } + } + + if (operations) { + g_slist_foreach (operations, (GFunc) g_object_unref, NULL); + g_slist_free (operations); } + return has_active; } -gboolean -modest_header_window_toolbar_on_transfer_mode (ModestHeaderWindow *self) +static void +update_progress_hint (ModestHeaderWindow *self) { - ModestHeaderWindowPrivate *priv= NULL; + ModestHeaderWindowPrivate *priv; - g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - return priv->progress_hint; + priv->progress_hint = FALSE; + + if (has_active_operations (self)) { + priv->progress_hint = TRUE; + } else { + priv->progress_hint = FALSE; + } + + if (!priv->progress_hint && priv->current_store_account) { + priv->progress_hint = + modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (), + priv->current_store_account); + } + + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); + + if (GTK_WIDGET_VISIBLE (self)) { + hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0); + } } -static void -modest_header_window_show_toolbar (ModestWindow *self, - gboolean show_toolbar) +gboolean +modest_header_window_toolbar_on_transfer_mode (ModestHeaderWindow *self) { - ModestHeaderWindowPrivate *priv = NULL; - ModestWindowPrivate *parent_priv; + ModestHeaderWindowPrivate *priv= NULL; - parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); + g_return_val_if_fail (MODEST_IS_HEADER_WINDOW (self), FALSE); + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - if (modest_header_window_transfer_mode_enabled (MODEST_HEADER_WINDOW (self))) - set_progress_hint (MODEST_HEADER_WINDOW (self), TRUE); - else - set_progress_hint (MODEST_HEADER_WINDOW (self), FALSE); + return priv->progress_hint; } gboolean @@ -959,7 +972,7 @@ on_mail_operation_started (ModestMailOperation *mail_op, op_type = modest_mail_operation_get_type_operation (mail_op); source = modest_mail_operation_get_source(mail_op); if (G_OBJECT (self) == source) { - set_toolbar_transfer_mode(self); + update_progress_hint (self); } g_object_unref (source); } @@ -969,16 +982,13 @@ on_mail_operation_finished (ModestMailOperation *mail_op, gpointer user_data) { ModestHeaderWindow *self; - ModestMailOperationTypeOperation op_type; - + self = MODEST_HEADER_WINDOW (user_data); - op_type = modest_mail_operation_get_type_operation (mail_op); - - /* If no more operations are being observed, NORMAL mode is enabled again */ - if (modest_mail_operation_queue_num_elements (modest_runtime_get_mail_operation_queue ()) == 0) { - set_progress_hint (self, FALSE); - } - + + /* Don't disable the progress hint if there are more pending + operations from this window */ + update_progress_hint (self); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); } @@ -1016,3 +1026,196 @@ on_queue_changed (ModestMailOperationQueue *queue, "operation-finished"); } } + +static void +modest_header_window_pack_toolbar (ModestHildon2Window *self, + GtkPackType pack_type, + GtkWidget *toolbar) +{ + ModestHeaderWindowPrivate *priv; + + g_return_if_fail (MODEST_IS_HEADER_WINDOW (self)); + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + if (pack_type == GTK_PACK_START) { + gtk_box_pack_start (GTK_BOX (priv->top_vbox), toolbar, FALSE, FALSE, 0); + } else { + 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; + } + + hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->header_view), !enabled); + if (enabled) { + modest_header_view_set_filter (MODEST_HEADER_VIEW (priv->header_view), + filter); + } else { + GtkTreeSelection *sel; + + /* Unselect all. This will prevent us from keeping a + reference to a TnyObject that we don't want to + have */ + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->header_view)); + gtk_tree_selection_unselect_all (sel); + + modest_header_view_unset_filter (MODEST_HEADER_VIEW (priv->header_view), + filter); + } +} + +static void +on_sort_column_changed (GtkTreeSortable *treesortable, + gpointer user_data) +{ + update_sort_button (MODEST_HEADER_WINDOW (user_data)); +} + +static void +update_sort_button (ModestHeaderWindow *self) +{ + ModestHeaderWindowPrivate *priv; + GtkTreeSortable *sortable; + gint current_sort_colid = -1; + GtkSortType current_sort_type; + const gchar *value = NULL; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); + + if (!gtk_tree_sortable_get_sort_column_id (sortable, + ¤t_sort_colid, ¤t_sort_type)) { + value = _("mcen_li_sort_sender_date_newest"); + } else { + switch (current_sort_colid) { + case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN: + { + GList *cols = NULL; + cols = modest_header_view_get_columns (MODEST_HEADER_VIEW (priv->header_view)); + if (cols != NULL) { + gpointer flags_sort_type_pointer; + flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), + MODEST_HEADER_VIEW_FLAG_SORT); + if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK) + value = _("mcen_li_sort_priority"); + else + value = _("mcen_li_sort_attachment"); + g_list_free(cols); + } + } + break; + case TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN: + case TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN: + if (current_sort_type == GTK_SORT_ASCENDING) + value = _("mcen_li_sort_sender_recipient_az"); + else + value = _("mcen_li_sort_sender_recipient_za"); + break; + case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN: + case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN: + if (current_sort_type == GTK_SORT_ASCENDING) + value = _("mcen_li_sort_date_oldest"); + else + value = _("mcen_li_sort_date_newest"); + break; + case TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN: + if (current_sort_type == GTK_SORT_ASCENDING) + value = _("mcen_li_sort_subject_az"); + else + value = _("mcen_li_sort_subject_za"); + break; + case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN: + if (current_sort_type == GTK_SORT_ASCENDING) + value = _("mcen_li_sort_size_smallest"); + else + value = _("mcen_li_sort_size_largest"); + break; + } + } + + hildon_button_set_value (HILDON_BUTTON (priv->sort_button), value?value:""); +} + +static void +on_horizontal_movement (HildonPannableArea *hildonpannable, + gint direction, + gdouble initial_x, + gdouble initial_y, + gpointer user_data) +{ + ModestHeaderWindowPrivate *priv; + gint dest_x, dest_y; + TnyHeader *header; + + /* Ignore right to left movement */ + if (direction == HILDON_MOVEMENT_LEFT) + return; + + /* Get the header to delete */ + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (user_data); + + /* Get tree view coordinates */ + if (!gtk_widget_translate_coordinates ((GtkWidget *) hildonpannable, + priv->header_view, + initial_x, + initial_y, + &dest_x, + &dest_y)) + return; + + header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view, + dest_x, dest_y); + if (header) { + gint response; + gchar *subject, *msg; + + subject = tny_header_dup_subject (header); + if (!subject) + subject = g_strdup (_("mail_va_no_subject")); + + msg = g_strdup_printf (ngettext("emev_nc_delete_message", "emev_nc_delete_messages", 1), + subject); + g_free (subject); + + /* Confirmation dialog */ + response = modest_platform_run_confirmation_dialog ((GtkWindow *) user_data, msg); + g_free (msg); + + if (response == GTK_RESPONSE_OK) { + ModestMailOperation *mail_op; + TnyList *header_list; + + header_list = tny_simple_list_new (); + tny_list_append (header_list, (GObject *) header); + mail_op = modest_mail_operation_new ((GObject *) user_data); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_remove_msgs (mail_op, header_list, FALSE); + g_object_unref (mail_op); + g_object_unref (header_list); + } + g_object_unref (header); + } +}