/* state bar */
ContentsState contents_state;
- TnyFolder *folder;
-
/* autoscroll */
gboolean autoscroll;
/* signals */
GSList *sighandlers;
gulong queue_change_handler;
+ gulong sort_column_handler;
/* progress hint */
gboolean progress_hint;
/* sort button */
GtkWidget *sort_button;
+
+ /* CSM menu */
+ GtkWidget *csm_menu;
+ gdouble x_coord;
+ gdouble y_coord;
};
#define MODEST_HEADER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_HEADER_WINDOW, \
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,
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->current_store_account = NULL;
priv->sort_button = NULL;
priv->new_message_button = NULL;
-
+ priv->x_coord = 0;
+ priv->y_coord = 0;
+
modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
GTK_WINDOW(obj),
"applications_email_headerview");
modest_header_window_finalize (GObject *obj)
{
ModestHeaderWindowPrivate *priv;
+ TnyFolder *folder;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
- g_object_unref (priv->folder);
+ 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);
+ }
+
+ modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
+
g_object_unref (priv->header_view);
g_object_unref (priv->empty_view);
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;
modest_header_window_disconnect_signals (ModestWindow *self)
{
ModestHeaderWindowPrivate *priv;
+
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
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;
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 */
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),
"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);
+ /* 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);
+ }
}
static void
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);
+ }
+ }
+
+ 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);
+
+ if (g_signal_handler_is_connected (G_OBJECT (model),
+ priv->sort_column_handler)) {
+ g_signal_handler_disconnect (G_OBJECT (model),
+ priv->sort_column_handler);
+ 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 (!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);
+ 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);
+ 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_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(header_view),
MODEST_CONF_HEADER_VIEW_KEY);
+ /* Create CSM menu */
+ priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+ 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;
}
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),
- 0, 0,
+ HILDON_MARGIN_HALF, 0,
HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
/* We need to do this here to properly listen for mail
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);
+ 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);
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>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,
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);
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;
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));
const gchar *value = NULL;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+
+ /* 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,
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);
- }
+ delete_header ((GtkWindow *) user_data, header);
g_object_unref (header);
}
}
projects / modest / blobdiff