static void on_selection_changed (GtkTreeSelection *sel,
gpointer user_data);
-static void setup_drag_and_drop (GtkTreeView *self);
+static gboolean on_button_press_event (GtkWidget * self, GdkEventButton * event,
+ gpointer userdata);
+
+static gboolean on_button_release_event(GtkWidget * self, GdkEventButton * event,
+ gpointer userdata);
+
+static void setup_drag_and_drop (GtkWidget *self);
+
+static void enable_drag_and_drop (GtkWidget *self);
+
+static void disable_drag_and_drop (GtkWidget *self);
static GtkTreePath * get_selected_row (GtkTreeView *self, GtkTreeModel **model);
GdkEventFocus *event,
gpointer user_data);
+static gboolean on_focus_out (GtkWidget *self,
+ GdkEventFocus *event,
+ gpointer user_data);
+
static void folder_monitor_update (TnyFolderObserver *self,
TnyFolderChange *change);
gulong acc_removed_handler;
HeaderViewStatus status;
+ GList *drag_begin_cached_selected_rows;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
HEADER_ACTIVATED_SIGNAL,
ITEM_NOT_FOUND_SIGNAL,
MSG_COUNT_CHANGED_SIGNAL,
+ UPDATING_MSG_LIST_SIGNAL,
LAST_SIGNAL
};
NULL, NULL,
modest_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+
+ signals[UPDATING_MSG_LIST_SIGNAL] =
+ g_signal_new ("updating-msg-list",
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestHeaderViewClass, updating_msg_list),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
}
static void
}
}
- setup_drag_and_drop (GTK_TREE_VIEW (obj));
+ setup_drag_and_drop (GTK_WIDGET(obj));
}
static void
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
modest_header_view_set_style (self, style);
-/* modest_header_view_set_folder (self, NULL, NULL, NULL); */
gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
g_signal_connect (self, "focus-in-event",
G_CALLBACK(on_focus_in), NULL);
+ g_signal_connect (self, "focus-out-event",
+ G_CALLBACK(on_focus_out), NULL);
+
+ g_signal_connect (self, "button-press-event",
+ G_CALLBACK(on_button_press_event), NULL);
+ g_signal_connect (self, "button-release-event",
+ G_CALLBACK(on_button_release_event), NULL);
priv->acc_removed_handler = g_signal_connect (modest_runtime_get_account_store (),
"account_removed",
}
/* This is used to automatically select the first header if the user
- * has not selected any header yet. Fixes NB#58917.
+ * has not selected any header yet.
*/
-static gboolean modest_header_view_on_expose_event(
- GtkTreeView *header_view,
- GdkEventExpose *event,
- gpointer user_data)
+static gboolean
+modest_header_view_on_expose_event(GtkTreeView *header_view,
+ GdkEventExpose *event,
+ gpointer user_data)
{
GtkTreeSelection *sel;
GtkTreeModel *model;
sel = gtk_tree_view_get_selection(header_view);
if(!gtk_tree_selection_count_selected_rows(sel))
- if (gtk_tree_model_get_iter_first(model, &tree_iter))
+ if (gtk_tree_model_get_iter_first(model, &tree_iter)) {
+ /* Prevent the widget from getting the focus
+ when selecting the first item */
+ g_object_set(header_view, "can-focus", FALSE, NULL);
gtk_tree_selection_select_iter(sel, &tree_iter);
+ g_object_set(header_view, "can-focus", TRUE, NULL);
+ }
return FALSE;
}
headers = TNY_LIST (tny_gtk_header_list_model_new ());
tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
- folder, FALSE);
+ folder, FALSE, NULL, NULL, NULL);
/* Add IDLE observer (monitor) and another folder observer for
new messages (self) */
/* Restore sort column id */
if (cols) {
type = modest_tny_folder_guess_folder_type (folder);
+ if (type == TNY_FOLDER_TYPE_INVALID)
+ g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+
sort_colid = modest_header_view_get_sort_column_id (self, type);
sort_type = modest_header_view_get_sort_type (self, type);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
/* Sort tree model */
type = modest_tny_folder_guess_folder_type (priv->folder);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+ if (type == TNY_FOLDER_TYPE_INVALID)
+ g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+ else {
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
sort_colid,
sort_type);
- /* Store new sort parameters */
- modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
-
- /* Save GConf parameters */
-/* modest_widget_memory_save (modest_runtime_get_conf(), */
-/* G_OBJECT(self), "header-view"); */
-
+ /* Store new sort parameters */
+ modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
+ }
}
void
tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (info->header_view));
g_mutex_unlock (priv->observers_lock);
+ /* Notify the observers that the update is over */
+ g_signal_emit (G_OBJECT (info->header_view),
+ signals[UPDATING_MSG_LIST_SIGNAL], 0, FALSE, NULL);
+
/* Frees */
g_free (info);
}
gpointer user_data)
{
ModestHeaderViewPrivate *priv;
- ModestWindowMgr *mgr = NULL;
- GObject *source = NULL;
SetFolderHelper *info;
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ ModestWindow *main_win;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+ FALSE); /* don't create */
+ if (!main_win) {
+ g_warning ("%s: BUG: no main window", __FUNCTION__);
+ return;
+ }
+
if (priv->folder) {
g_mutex_lock (priv->observers_lock);
tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (self));
ModestMailOperation *mail_op = NULL;
GtkTreeSelection *selection;
- /* Get main window to use it as source of mail operation */
- mgr = modest_runtime_get_window_mgr ();
- source = G_OBJECT (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
-
/* Set folder in the model */
modest_header_view_set_folder_intern (self, folder);
-
+
/* Pick my reference. Nothing to do with the mail operation */
priv->folder = g_object_ref (folder);
- /* no message selected */
+ /* Clear the selection if exists */
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+ gtk_tree_selection_unselect_all(selection);
g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
+ /* Notify the observers that the update begins */
+ g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL],
+ 0, TRUE, NULL);
+
+ /* create the helper */
info = g_malloc0 (sizeof(SetFolderHelper));
info->header_view = self;
info->cb = callback;
info->user_data = user_data;
- /* bug 57631: Clear the selection if exists */
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
- gtk_tree_selection_unselect_all(selection);
-
/* Create the mail operation (source will be the parent widget) */
- mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, source);
+ mail_op = modest_mail_operation_new (G_OBJECT(main_win));
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
modest_header_view_notify_observers(self, NULL, NULL);
g_mutex_unlock (priv->observers_lock);
+
+ /* Notify the observers that the update is over */
+ g_signal_emit (G_OBJECT (self), signals[UPDATING_MSG_LIST_SIGNAL],
+ 0, FALSE, NULL);
}
}
static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2)
{
- p1 = p1 & TNY_HEADER_FLAG_PRIORITY;
- p2 = p2 & TNY_HEADER_FLAG_PRIORITY;
- if (p1 == 0)
- p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
- if (p2 == 0)
- p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
- return p1 - p2;
+
+ /* HH, LL, NN */
+ if (p1 == p2)
+ return 0;
+
+ /* HL HN */
+ if (p1 == TNY_HEADER_FLAG_HIGH_PRIORITY)
+ return 1;
+
+ /* LH LN */
+ if (p1 == TNY_HEADER_FLAG_LOW_PRIORITY)
+ return -1;
+
+ /* NH */
+ if ((p1 == TNY_HEADER_FLAG_NORMAL_PRIORITY) && (p2 == TNY_HEADER_FLAG_HIGH_PRIORITY))
+ return -1;
+
+ /* NL */
+ return 1;
+
}
static gint
return cmp ? cmp : t1 - t2;
- case TNY_HEADER_FLAG_PRIORITY:
- gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ case TNY_HEADER_FLAG_PRIORITY_MASK: {
+ TnyHeader *header1 = NULL, *header2 = NULL;
+
+ gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header1,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
- gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
/* This is for making priority values respect the intuitive sort relationship
- * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */
- cmp = compare_priorities (val1, val2);
+ * as HIGH is 01, LOW is 10, and NORMAL is 00 */
- return cmp ? cmp : t1 - t2;
+ if (header1 && header2) {
+ cmp = compare_priorities (tny_header_get_priority (header1),
+ tny_header_get_priority (header2));
+ g_object_unref (header1);
+ g_object_unref (header2);
+
+ return cmp ? cmp : t1 - t2;
+ }
+ return t1 - t2;
+ }
default:
return &iter1 - &iter2; /* oughhhh */
}
/* Drag and drop stuff */
static void
-drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
+drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
GtkSelectionData *selection_data,
- guint info, guint time, gpointer data)
+ guint info,
+ guint time,
+ gpointer data)
{
- GtkTreeModel *model = NULL;
- GtkTreeIter iter;
- GtkTreePath *source_row = NULL;
-/* GtkTreeSelection *sel = NULL;*/
-
- source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
-
- if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
+ ModestHeaderView *self = NULL;
+ ModestHeaderViewPrivate *priv = NULL;
- switch (info) {
- case MODEST_HEADER_ROW:
- gtk_tree_set_row_drag_data (selection_data, model, source_row);
- break;
- case MODEST_MSG: {
- TnyHeader *hdr = NULL;
- gtk_tree_model_get (model, &iter,
- TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr,
- -1);
- if (hdr) {
- g_object_unref (G_OBJECT(hdr));
- }
- break;
- }
- default:
- g_message ("%s: default switch case.", __FUNCTION__);
- }
+ self = MODEST_HEADER_VIEW (widget);
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- /* commenting out the next, fixes NB#62963 */
-#if 0
- /* Set focus on next header */
- sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (widget));
- gtk_tree_path_next (source_row);
- gtk_tree_selection_select_path (sel, source_row);
+ /* Set the data. Do not use the current selection because it
+ could be different than the selection at the beginning of
+ the d&d */
+ modest_dnd_selection_data_set_paths (selection_data,
+ priv->drag_begin_cached_selected_rows);
+}
- gtk_tree_path_free (source_row);
-#endif
+/**
+ * We're caching the selected rows at the beginning because the
+ * selection could change between drag-begin and drag-data-get, for
+ * example if we have a set of rows already selected, and then we
+ * click in one of them (without SHIFT key pressed) and begin a drag,
+ * the selection at that moment contains all the selected lines, but
+ * after dropping the selection, the release event provokes that only
+ * the row used to begin the drag is selected, so at the end the
+ * drag&drop affects only one rows instead of all the selected ones.
+ *
+ */
+static void
+drag_begin_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gpointer data)
+{
+ ModestHeaderView *self = NULL;
+ ModestHeaderViewPrivate *priv = NULL;
+ GtkTreeSelection *selection;
+
+ self = MODEST_HEADER_VIEW (widget);
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+ priv->drag_begin_cached_selected_rows =
+ gtk_tree_selection_get_selected_rows (selection, NULL);
+}
+
+/**
+ * We use the drag-end signal to clear the cached selection, we use
+ * this because this allways happens, whether or not the d&d was a
+ * success
+ */
+static void
+drag_end_cb (GtkWidget *widget,
+ GdkDragContext *dc,
+ gpointer data)
+{
+ ModestHeaderView *self = NULL;
+ ModestHeaderViewPrivate *priv = NULL;
+
+ self = MODEST_HEADER_VIEW (widget);
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ /* Free cached data */
+ g_list_foreach (priv->drag_begin_cached_selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (priv->drag_begin_cached_selected_rows);
+ priv->drag_begin_cached_selected_rows = NULL;
}
/* Header view drag types */
const GtkTargetEntry header_view_drag_types[] = {
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW },
- { "text/uri-list", 0, MODEST_MSG },
+ { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
};
static void
-setup_drag_and_drop (GtkTreeView *self)
+enable_drag_and_drop (GtkWidget *self)
{
- gtk_drag_source_set (GTK_WIDGET (self),
- GDK_BUTTON1_MASK,
+ gtk_drag_source_set (self, GDK_BUTTON1_MASK,
header_view_drag_types,
G_N_ELEMENTS (header_view_drag_types),
GDK_ACTION_MOVE | GDK_ACTION_COPY);
+}
+static void
+disable_drag_and_drop (GtkWidget *self)
+{
+ gtk_drag_source_unset (self);
+}
+
+static void
+setup_drag_and_drop (GtkWidget *self)
+{
+ enable_drag_and_drop(self);
g_signal_connect(G_OBJECT (self), "drag_data_get",
G_CALLBACK(drag_data_get_cb), NULL);
+
+ g_signal_connect(G_OBJECT (self), "drag_begin",
+ G_CALLBACK(drag_begin_cb), NULL);
+
+ g_signal_connect(G_OBJECT (self), "drag_end",
+ G_CALLBACK(drag_end_cb), NULL);
}
static GtkTreePath *
return FALSE;
}
-static void
-idle_notify_headers_count_changed_destroy (gpointer data)
+static gboolean
+on_focus_out (GtkWidget *self,
+ GdkEventFocus *event,
+ gpointer user_data)
{
- HeadersCountChangedHelper *helper = NULL;
- g_return_if_fail (data != NULL);
- helper = (HeadersCountChangedHelper *) data;
-
- g_object_unref (helper->change);
- g_slice_free (HeadersCountChangedHelper, helper);
+ if (!gtk_widget_is_focus (self)) {
+ GtkTreeSelection *selection = NULL;
+ GList *selected_rows = NULL;
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ if (gtk_tree_selection_count_selected_rows (selection) > 1) {
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
+ g_signal_handlers_block_by_func (selection, on_selection_changed, self);
+ gtk_tree_selection_unselect_all (selection);
+ gtk_tree_selection_select_path (selection, (GtkTreePath *) selected_rows->data);
+ g_signal_handlers_unblock_by_func (selection, on_selection_changed, self);
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
+ }
+ }
+ return FALSE;
}
static gboolean
-idle_notify_headers_count_changed (gpointer data)
+on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
{
- TnyFolder *folder = NULL;
- ModestHeaderViewPrivate *priv = NULL;
- HeadersCountChangedHelper *helper = NULL;
-
- g_return_val_if_fail (data != NULL, FALSE);
- helper = (HeadersCountChangedHelper *) data;
- g_return_val_if_fail (MODEST_IS_HEADER_VIEW(helper->self), FALSE);
- g_return_val_if_fail (TNY_FOLDER_CHANGE(helper->change), FALSE);
+ enable_drag_and_drop(self);
+ return FALSE;
+}
- folder = tny_folder_change_get_folder (helper->change);
+static gboolean
+on_button_press_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
+{
+ GtkTreeSelection *selection = NULL;
+ GtkTreePath *path = NULL;
+ gboolean already_selected = FALSE;
- priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(self), event->x, event->y, &path, NULL, NULL, NULL)) {
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+ already_selected = gtk_tree_selection_path_is_selected (selection, path);
+ }
- g_mutex_lock (priv->observers_lock);
+ /* Enable drag and drop onlly if the user clicks on a row that
+ it's already selected. If not, let him select items using
+ the pointer */
+ if (!already_selected) {
+ disable_drag_and_drop(self);
+ }
- /* Emit signal to evaluate how headers changes affects to the window view */
- g_signal_emit (G_OBJECT(helper->self),
- signals[MSG_COUNT_CHANGED_SIGNAL],
- 0, folder, helper->change);
-
- /* Added or removed headers, so data stored on cliboard are invalid */
- if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
- modest_email_clipboard_clear (priv->clipboard);
-
- g_mutex_unlock (priv->observers_lock);
+ if (path != NULL) {
+ gtk_tree_path_free(path);
+ }
return FALSE;
}
{
ModestHeaderViewPrivate *priv = NULL;
TnyFolderChangeChanged changed;
- HeadersCountChangedHelper *helper = NULL;
+ TnyFolder *folder = NULL;
changed = tny_folder_change_get_changed (change);
view has changed before this call to the observer
happens */
priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
- if (tny_folder_change_get_folder (change) != priv->folder)
- return;
+ folder = tny_folder_change_get_folder (change);
+ if (folder != priv->folder)
+ goto frees;
/* Check folder count */
if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
(changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
- helper = g_slice_new0 (HeadersCountChangedHelper);
- helper->self = MODEST_HEADER_VIEW(self);
- helper->change = g_object_ref(change);
+
+ g_mutex_lock (priv->observers_lock);
+
+ /* Emit signal to evaluate how headers changes affects
+ to the window view */
+ g_signal_emit (G_OBJECT(self),
+ signals[MSG_COUNT_CHANGED_SIGNAL],
+ 0, folder, change);
- g_idle_add_full (G_PRIORITY_DEFAULT,
- idle_notify_headers_count_changed,
- helper,
- idle_notify_headers_count_changed_destroy);
+ /* Added or removed headers, so data stored on cliboard are invalid */
+ if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
+ modest_email_clipboard_clear (priv->clipboard);
+
+ g_mutex_unlock (priv->observers_lock);
}
+
+ /* Free */
+ frees:
+ if (folder != NULL)
+ g_object_unref (folder);
}
gboolean
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
- priv->status = HEADER_VIEW_EMPTY;
-
/* Hide cut headers */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_FILTER (model))
+ if (GTK_IS_TREE_MODEL_FILTER (model)) {
+ priv->status = 0;
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ }
}
/*
if (TNY_IS_TRANSPORT_ACCOUNT (account))
return;
- g_print ("--------------------- HEADER ---------------\n");
-
priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
if (priv->folder) {
g_mutex_unlock(priv->observer_list_lock);
}
-void modest_header_view_remove_observer(
- ModestHeaderView *header_view,
- ModestHeaderViewObserver *observer)
+void
+modest_header_view_remove_observer(ModestHeaderView *header_view,
+ ModestHeaderViewObserver *observer)
{
ModestHeaderViewPrivate *priv = NULL;
g_mutex_unlock(priv->observer_list_lock);
}
-static void modest_header_view_notify_observers(
- ModestHeaderView *header_view,
- GtkTreeModel *model,
- const gchar *tny_folder_id)
+static void
+modest_header_view_notify_observers(ModestHeaderView *header_view,
+ GtkTreeModel *model,
+ const gchar *tny_folder_id)
{
ModestHeaderViewPrivate *priv = NULL;
GSList *iter;
projects / modest / blobdiff