#include <tny-list.h>
#include <tny-simple-list.h>
#include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
#include <string.h>
#include <modest-header-view.h>
GtkTreeIter *iter,
gpointer data);
-static void on_selection_changed (GtkTreeSelection *sel,
+static void on_selection_changed (GtkTreeSelection *sel,
gpointer user_data);
static void setup_drag_and_drop (GtkTreeView *self);
ModestEmailClipboard *clipboard;
/* Filter tree model */
- gchar **hidding_ids;
- guint n_selected;
+ gchar **hidding_ids;
+ guint n_selected;
gint sort_colid[2][TNY_FOLDER_TYPE_NUM];
gint sort_type[2][TNY_FOLDER_TYPE_NUM];
-
+ gulong selection_changed_handler;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
g_object_set (G_OBJECT (renderer_subject),
- "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
NULL);
g_object_set (G_OBJECT (renderer_recpt),
- "ellipsize", PANGO_ELLIPSIZE_END,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
NULL);
g_object_set(G_OBJECT(renderer_compact_date_or_status),
- "xalign", 1.0,
+ "xalign", 1.0, "yalign", 0.0,
NULL);
+ g_object_set (G_OBJECT (renderer_priority),
+ "yalign", 1.0, NULL);
+ g_object_set (G_OBJECT (renderer_attach),
+ "yalign", 0.0, NULL);
gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-/* sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */
tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
priv->clipboard = modest_runtime_get_email_clipboard ();
priv->hidding_ids = NULL;
priv->n_selected = 0;
+ priv->selection_changed_handler = 0;
/* Sort parameters */
for (j=0; j < 2; j++) {
self = MODEST_HEADER_VIEW(obj);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ if (priv->selection_changed_handler) {
+ g_signal_handler_disconnect (self, priv->selection_changed_handler);
+ priv->selection_changed_handler = 0;
+ }
+
g_mutex_lock (priv->observers_lock);
if (priv->monitor) {
tny_folder_monitor_stop (priv->monitor);
TRUE); /* alternating row colors */
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
- g_signal_connect (sel, "changed",
- G_CALLBACK(on_selection_changed), self);
+ priv->selection_changed_handler =
+ g_signal_connect_after (sel, "changed",
+ G_CALLBACK(on_selection_changed), self);
g_signal_connect (self, "row-activated",
G_CALLBACK (on_header_row_activated), NULL);
} SetFolderHelper;
static void
-folder_refreshed_cb (const GObject *obj,
+folder_refreshed_cb (ModestMailOperation *mail_op,
TnyFolder *folder,
gpointer user_data)
{
/* User callback */
if (info->cb)
- info->cb (obj, folder, info->user_data);
+ info->cb (mail_op, folder, info->user_data);
/* Start the folder count changes observer. We do not need it
before the refresh. Note that the monitor could still be
if (folder) {
ModestMailOperation *mail_op = NULL;
+ GtkTreeSelection *selection;
/* Get main window to use it as source of mail operation */
mgr = modest_runtime_get_window_mgr ();
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);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
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;
g_message ("%s: default switch case.", __FUNCTION__);
}
+ /* 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);
+
gtk_tree_path_free (source_row);
}
g_mutex_lock (priv->observers_lock);
/* Emit signal to evaluate how headers changes affects to the window view */
- gdk_threads_enter ();
g_signal_emit (G_OBJECT(helper->self),
signals[MSG_COUNT_CHANGED_SIGNAL],
0, folder, helper->change);
- gdk_threads_leave ();
/* Added or removed headers, so data stored on cliboard are invalid */
if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
/* Check folder count */
if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
- (changed & TNY_FOLDER_CHANGE_CHANGED_REMOVED_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);
modest_header_view_cut_selection (ModestHeaderView *header_view)
{
ModestHeaderViewPrivate *priv = NULL;
- GtkTreeModel *model = NULL;
const gchar **hidding = NULL;
guint i, n_selected;
priv->hidding_ids[i] = g_strdup(hidding[i]);
/* Hide cut headers */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_FILTER (model))
- gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ modest_header_view_refilter (header_view);
}
g_free(priv->hidding_ids);
}
}
+
+void
+modest_header_view_refilter (ModestHeaderView *header_view)
+{
+ GtkTreeModel *model;
+
+ g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+
+ /* Hide cut headers */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+ if (GTK_IS_TREE_MODEL_FILTER (model))
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+/**
+ * Protected method, selects a row pointed by path
+ **/
+void
+_modest_header_view_select_from_path (ModestHeaderView *self,
+ GtkTreePath *path)
+{
+ GtkTreeSelection *selection = NULL;
+ ModestHeaderViewPrivate *priv;
+
+ g_return_if_fail (MODEST_HEADER_VIEW (self));
+ g_return_if_fail (path != NULL);
+
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+
+ /* Unselect previous selection */
+ gtk_tree_selection_unselect_all (selection);
+
+ /* Select new path*/
+ gtk_tree_selection_select_path (selection, path);
+}
projects / modest / blobdiff