X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=eaf64714bef70b5d024ea272e568a6c7be585e49;hp=02df917ac45595fdb88e2b9fc192a8188eef29bf;hb=0b078b32b7b3ad15f40732e2c2e2423eac6b8c75;hpb=65d9c88eae7abd81bd94df270c41ab94df75d435 diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 02df917..eaf6471 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -28,9 +28,8 @@ */ #include -#include -#include #include +#include #include #include #include @@ -51,6 +50,7 @@ #include #include #include +#include typedef enum { CONTENTS_STATE_NONE = 0, @@ -70,12 +70,12 @@ struct _ModestHeaderWindowPrivate { GtkWidget *empty_view; GtkWidget *contents_view; GtkWidget *top_vbox; + GtkWidget *new_message_button; + GtkWidget *show_more_button; /* state bar */ ContentsState contents_state; - TnyFolder *folder; - /* autoscroll */ gboolean autoscroll; @@ -86,6 +86,8 @@ struct _ModestHeaderWindowPrivate { /* signals */ GSList *sighandlers; gulong queue_change_handler; + gulong sort_column_handler; + gulong notify_model; /* progress hint */ gboolean progress_hint; @@ -93,6 +95,14 @@ struct _ModestHeaderWindowPrivate { /* sort button */ GtkWidget *sort_button; + + /* CSM menu */ + GtkWidget *csm_menu; + gdouble x_coord; + gdouble y_coord; + + /* weak refs */ + GtkTreeModel *model_weak_ref; }; #define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_HEADER_WINDOW, \ @@ -102,18 +112,19 @@ struct _ModestHeaderWindowPrivate { static void modest_header_window_class_init (ModestHeaderWindowClass *klass); static void modest_header_window_init (ModestHeaderWindow *obj); static void modest_header_window_finalize (GObject *obj); +static void modest_header_window_dispose (GObject *obj); static void connect_signals (ModestHeaderWindow *self); static void modest_header_window_disconnect_signals (ModestWindow *self); static void setup_menu (ModestHeaderWindow *self); -static GtkWidget *create_empty_view (void); +static GtkWidget *create_empty_view (ModestWindow *self); static GtkWidget *create_header_view (ModestWindow *progress_window, TnyFolder *folder); static void update_view (ModestHeaderWindow *self, TnyFolderChange *change); -static void set_contents_state (ModestHeaderWindow *window, +static void set_contents_state (ModestHeaderWindow *window, ContentsState state); static void on_msg_count_changed (ModestHeaderView *header_view, @@ -157,15 +168,25 @@ 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); +static void on_header_view_model_destroyed (gpointer user_data, + GObject *model); +static gboolean on_key_press(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); +static void modest_header_window_show_more (GtkAction *action, ModestWindow *win); /* 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 @@ -205,6 +226,7 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_header_window_finalize; + gobject_class->dispose = modest_header_window_dispose; g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate)); @@ -220,34 +242,70 @@ modest_header_window_init (ModestHeaderWindow *obj) priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); priv->sighandlers = NULL; - + priv->header_view = NULL; priv->empty_view = NULL; priv->top_vbox = NULL; priv->contents_view = NULL; priv->contents_state = CONTENTS_STATE_NONE; - priv->folder = NULL; priv->updating_banner = NULL; priv->updating_banner_timeout = 0; priv->autoscroll = TRUE; priv->progress_hint = FALSE; priv->queue_change_handler = 0; + priv->sort_column_handler = 0; + priv->model_weak_ref = NULL; priv->current_store_account = NULL; priv->sort_button = NULL; - + priv->new_message_button = NULL; + priv->show_more_button = NULL; + priv->x_coord = 0; + priv->y_coord = 0; + priv->notify_model = 0; + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj), "applications_email_headerview"); } static void +modest_header_window_dispose (GObject *obj) +{ + ModestHeaderWindowPrivate *priv; + TnyFolder *folder; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); + + folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view); + if (folder) { + tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL); + g_object_unref (folder); + } + + G_OBJECT_CLASS(parent_class)->dispose (obj); +} + +static void modest_header_window_finalize (GObject *obj) { ModestHeaderWindowPrivate *priv; priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj); - g_object_unref (priv->folder); + if (priv->model_weak_ref) { + g_object_weak_unref ((GObject *) priv->model_weak_ref, + on_header_view_model_destroyed, + obj); + if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler); + } + on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref); + } + + modest_header_window_disconnect_signals (MODEST_WINDOW (obj)); + g_object_unref (priv->header_view); g_object_unref (priv->empty_view); @@ -256,10 +314,6 @@ modest_header_window_finalize (GObject *obj) priv->current_store_account = NULL; } - /* Sanity check: shouldn't be needed, the window mgr should - call this function before */ - modest_header_window_disconnect_signals (MODEST_WINDOW (obj)); - if (priv->updating_banner_timeout > 0) { g_source_remove (priv->updating_banner_timeout); priv->updating_banner_timeout = 0; @@ -276,12 +330,34 @@ static void modest_header_window_disconnect_signals (ModestWindow *self) { ModestHeaderWindowPrivate *priv; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); + if (g_signal_handler_is_connected ((GObject*) priv->header_view, priv->notify_model)) { + g_signal_handler_disconnect ((GObject*) priv->header_view, priv->notify_model); + priv->notify_model = 0; + } + if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), - priv->queue_change_handler)) + priv->queue_change_handler)) { g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), priv->queue_change_handler); + priv->queue_change_handler = 0; + } + + if (priv->header_view) { + GtkTreeModel *sortable; + + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)); + if (sortable) { + if (g_signal_handler_is_connected (G_OBJECT (sortable), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (sortable), + priv->sort_column_handler); + priv->sort_column_handler = 0; + } + } + } modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers); priv->sighandlers = NULL; @@ -290,11 +366,8 @@ modest_header_window_disconnect_signals (ModestWindow *self) static void connect_signals (ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv; - GtkTreeSortable *sortable; - - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); +{ + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); /* header view */ @@ -319,16 +392,6 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_expose_event), self); - sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER (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), @@ -348,38 +411,326 @@ connect_signals (ModestHeaderWindow *self) 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); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->show_more_button), + "clicked", + G_CALLBACK (modest_header_window_show_more), self); + + /* Delete using horizontal gesture */ + /* DISABLED because it's unreliabile */ + if (FALSE) { + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + (GObject *) priv->contents_view, + "horizontal-movement", + G_CALLBACK (on_horizontal_movement), + self); + } + + + g_signal_connect(G_OBJECT(self), "key-press-event", + G_CALLBACK(on_key_press), self); +} + +static void +folder_refreshed_cb (ModestMailOperation *mail_op, + TnyFolder *folder, + gpointer user_data) +{ + /* Update the view (folder could be empty) */ + update_view (MODEST_HEADER_WINDOW (user_data), NULL); +} + +static gboolean +tap_and_hold_query_cb (GtkWidget *header_view, + GdkEvent *event, + gpointer user_data) +{ + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + if (event->type == GDK_BUTTON_PRESS) { + TnyHeader *header; + + priv->x_coord = ((GdkEventButton*)event)->x; + priv->y_coord = ((GdkEventButton*)event)->y; + + /* Enable/Disable mark as (un)read */ + header = modest_header_view_get_header_at_pos ((ModestHeaderView *) header_view, + priv->x_coord, priv->y_coord); + if (header) { + GList *children; + GtkWidget *mark_read_item, *mark_unread_item; + + /* Show "mark as read" or "mark as unread" */ + children = gtk_container_get_children (GTK_CONTAINER (priv->csm_menu)); + mark_read_item = (GtkWidget *) g_list_nth_data (children, 1); + mark_unread_item = (GtkWidget *) g_list_nth_data (children, 2); + + if (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN) { + gtk_widget_show (mark_unread_item); + gtk_widget_hide (mark_read_item); + } else { + gtk_widget_show (mark_read_item); + gtk_widget_hide (mark_unread_item); + } + g_object_unref (header); + } else { + /* Do not show the CSM if there is no header below */ + return TRUE; + } + } + + return FALSE; +} + +static void +delete_header (GtkWindow *parent, + TnyHeader *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 (parent, 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 *) parent); + 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); + } +} + + +static void +on_delete_csm_activated (GtkMenuItem *item, + gpointer user_data) +{ + TnyHeader *header; + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view, + priv->x_coord, priv->y_coord); + if (header) { + delete_header ((GtkWindow *) self, header); + g_object_unref (header); + } +} + +static void +on_mark_read_csm_activated (GtkMenuItem *item, + gpointer user_data) +{ + TnyHeader *header; + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view, + priv->x_coord, priv->y_coord); + + if (header) { + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); + g_object_unref (header); + } +} + +static void +on_mark_unread_csm_activated (GtkMenuItem *item, + gpointer user_data) +{ + TnyHeader *header; + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + header = modest_header_view_get_header_at_pos ((ModestHeaderView *) priv->header_view, + priv->x_coord, priv->y_coord); + + if (header) { + tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN); + g_object_unref (header); + } +} + +static void +on_header_view_model_destroyed (gpointer user_data, + GObject *model) +{ + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + self = (ModestHeaderWindow *) user_data; + if (!GTK_IS_WIDGET (self)) + return; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + priv->model_weak_ref = NULL; + + priv->sort_column_handler = 0; +} + +static void +on_header_view_model_changed (GObject *gobject, + GParamSpec *arg1, + gpointer user_data) +{ + ModestHeaderWindow *self = (ModestHeaderWindow *) user_data; + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (gobject)); + + if (priv->model_weak_ref ) { + g_object_weak_unref ((GObject *) priv->model_weak_ref, + on_header_view_model_destroyed, + self); + if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler)) { + g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref), + priv->sort_column_handler); + } + on_header_view_model_destroyed (self, (GObject *) priv->model_weak_ref); + } + + if (!model) + return; + + /* Connect the signal. Listen to object destruction to disconnect it */ + priv->sort_column_handler = g_signal_connect ((GObject *) model, + "sort-column-changed", + G_CALLBACK (on_sort_column_changed), + self); + priv->model_weak_ref = model; + g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self); } static GtkWidget * create_header_view (ModestWindow *self, TnyFolder *folder) { GtkWidget *header_view; + GtkWidget *delete_item, *mark_read_item, *mark_unread_item; + ModestHeaderWindowPrivate *priv; header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); - modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder, - TRUE, self, NULL, NULL); - modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), + modest_header_view_set_show_latest (MODEST_HEADER_VIEW (header_view), 50); + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + priv->notify_model = g_signal_connect ((GObject*) header_view, "notify::model", + G_CALLBACK (on_header_view_model_changed), self); + + 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); + /* Create CSM menu */ + priv->csm_menu = gtk_menu_new (); + delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete")); + mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read")); + mark_unread_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_unread")); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), delete_item); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_read_item); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->csm_menu), mark_unread_item); + hildon_gtk_widget_set_theme_size (delete_item, MODEST_EDITABLE_SIZE); + hildon_gtk_widget_set_theme_size (mark_unread_item, MODEST_EDITABLE_SIZE); + hildon_gtk_widget_set_theme_size (mark_read_item, MODEST_EDITABLE_SIZE); + gtk_widget_show_all (priv->csm_menu); + + /* Connect signals */ + g_signal_connect ((GObject *) header_view, "tap-and-hold-query", + G_CALLBACK (tap_and_hold_query_cb), self); + g_signal_connect ((GObject *) delete_item, "activate", + G_CALLBACK (on_delete_csm_activated), self); + g_signal_connect ((GObject *) mark_read_item, "activate", + G_CALLBACK (on_mark_read_csm_activated), self); + g_signal_connect ((GObject *) mark_unread_item, "activate", + G_CALLBACK (on_mark_unread_csm_activated), self); + + /* Add tap&hold handling */ + gtk_widget_tap_and_hold_setup (header_view, priv->csm_menu, NULL, 0); + return header_view; } 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); + + 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 align; + return viewport; } static void @@ -395,7 +746,7 @@ on_vertical_movement (HildonPannableArea *area, ModestWindow * -modest_header_window_new (TnyFolder *folder, const gchar *account_name) +modest_header_window_new (TnyFolder *folder, const gchar *account_name, const gchar *mailbox) { ModestHeaderWindow *self = NULL; ModestHeaderWindowPrivate *priv = NULL; @@ -404,13 +755,19 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) 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); - 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), + HILDON_MARGIN_HALF, 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 @@ -422,7 +779,7 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) self); priv->header_view = create_header_view (MODEST_WINDOW (self), folder); - priv->empty_view = create_empty_view (); + 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 @@ -434,13 +791,33 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) 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 (MODEST_EDITABLE_SIZE, 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); + + priv->show_more_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_VERTICAL); + hildon_button_set_title (HILDON_BUTTON (priv->show_more_button), _("TODO: show more")); + + gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (action_area_box), priv->show_more_button, TRUE, TRUE, 0); + gtk_widget_show_all (priv->new_message_button); + gtk_widget_show_all (priv->show_more_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); @@ -448,10 +825,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) update_view (self, NULL); - /* Load previous osso state, for instance if we are being restored from - * hibernation: */ - modest_osso_load_state (); - /* Get device name */ modest_maemo_utils_get_device_name (); @@ -465,15 +838,6 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) g_object_unref (window_icon); } - /* Set window title */ - if (TNY_IS_FOLDER (folder)) { - gchar *folder_name; - - folder_name = modest_tny_folder_get_display_name (folder); - gtk_window_set_title (GTK_WINDOW (self), folder_name); - g_free (folder_name); - } - /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, @@ -494,9 +858,11 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) 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 = @@ -505,6 +871,26 @@ modest_header_window_new (TnyFolder *folder, const gchar *account_name) } 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); + update_progress_hint (self); update_sort_button (self); @@ -534,7 +920,12 @@ static void setup_menu (ModestHeaderWindow *self) 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, + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), + dngettext(GETTEXT_PACKAGE, + "mcen_me_move_message", + "mcen_me_move_messages", + 2), + 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, @@ -546,9 +937,11 @@ static void setup_menu (ModestHeaderWindow *self) 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); + g_signal_connect_after (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, @@ -567,10 +960,14 @@ update_view (ModestHeaderWindow *self, gboolean refilter = FALSE; gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; + TnyFolder *folder; g_return_if_fail (MODEST_IS_HEADER_WINDOW(self)); priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - g_return_if_fail (priv->folder); + + folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view); + if (!folder) + return; if (change != NULL) { TnyFolderChangeChanged changed; @@ -580,13 +977,14 @@ update_view (ModestHeaderWindow *self, if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0); else - folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0); + folder_empty = (((guint) tny_folder_get_all_count (folder)) == 0); if ((changed) & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) refilter = TRUE; } else { - folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0); + folder_empty = (((guint) tny_folder_get_all_count (folder)) == 0); } + g_object_unref (folder); /* Check if all messages are marked to be deleted */ all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW (priv->header_view)); @@ -824,6 +1222,8 @@ update_progress_hint (ModestHeaderWindow *self) if (has_active_operations (self)) { priv->progress_hint = TRUE; + } else { + priv->progress_hint = FALSE; } if (!priv->progress_hint && priv->current_store_account) { @@ -969,6 +1369,7 @@ edit_mode_changed (ModestHeaderWindow *header_window, 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); @@ -1003,9 +1404,13 @@ update_sort_button (ModestHeaderWindow *self) const gchar *value = NULL; priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); - sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model ( - GTK_TREE_VIEW (priv->header_view))))); + + /* This could happen as the first time the model is set the + header_view is still not assigned to priv->header_view */ + if (!priv->header_view) + return; + + 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)) { @@ -1059,3 +1464,87 @@ update_sort_button (ModestHeaderWindow *self) 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) { + delete_header ((GtkWindow *) user_data, header); + g_object_unref (header); + } +} + + +static gboolean +on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + ModestHeaderWindowPrivate *priv; + HildonPannableArea *pannable; + /* FIXME: set scroll_speed depends on for how long the key was pressed */ + gint scroll_speed = 3; + + if (event->type == GDK_KEY_RELEASE) + return FALSE; + + priv = MODEST_HEADER_WINDOW_GET_PRIVATE(user_data); + + pannable = HILDON_PANNABLE_AREA (priv->contents_view); + + switch (event->keyval) { + + case GDK_Up: + priv->autoscroll = FALSE; + modest_maemo_utils_scroll_pannable(pannable, 0, -scroll_speed); + break; + + case GDK_Down: + priv->autoscroll = FALSE; + modest_maemo_utils_scroll_pannable(pannable, 0, scroll_speed); + break; + } + + return FALSE; +} + +static void +modest_header_window_show_more (GtkAction *action, ModestWindow *win) +{ + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv = NULL; + + self = MODEST_HEADER_WINDOW (win); + priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + if (!priv->header_view) + return; + + if (modest_header_view_get_not_latest (MODEST_HEADER_VIEW (priv->header_view)) > 0) { + modest_header_view_set_show_latest (MODEST_HEADER_VIEW (priv->header_view), + modest_header_view_get_show_latest (MODEST_HEADER_VIEW (priv->header_view)) + 50); + } +}