GtkTreeModel *model,
const gchar *tny_folder_id);
+static gboolean modest_header_view_on_expose_event(
+ GtkTreeView *header_view,
+ GdkEventExpose *event,
+ gpointer user_data);
+
+typedef enum {
+ HEADER_VIEW_NON_EMPTY,
+ HEADER_VIEW_EMPTY,
+ HEADER_VIEW_INIT
+} HeaderViewStatus;
+
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
TnyFolder *folder;
gulong selection_changed_handler;
gulong acc_removed_handler;
- gboolean empty;
+ HeaderViewStatus status;
};
typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
priv->monitor = NULL;
priv->observers_lock = g_mutex_new ();
- priv->empty = TRUE;
+ priv->status = HEADER_VIEW_INIT;
priv->observer_list_lock = g_mutex_new();
priv->observer_list = NULL;
G_CALLBACK (on_account_removed),
self);
+ g_signal_connect (self, "expose-event",
+ G_CALLBACK(modest_header_view_on_expose_event),
+ NULL);
+
return GTK_WIDGET(self);
}
}
-/* gboolean */
-/* modest_header_view_is_empty (ModestHeaderView *self) */
-/* { */
-/* g_return_val_if_fail (self, FALSE); */
-/* return FALSE; /\* FIXME *\/ */
-/* } */
-
gboolean
modest_header_view_set_style (ModestHeaderView *self,
return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
}
+/* This is used to automatically select the first header if the user
+ * has not selected any header yet.
+ */
+static gboolean
+modest_header_view_on_expose_event(GtkTreeView *header_view,
+ GdkEventExpose *event,
+ gpointer user_data)
+{
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
+ GtkTreeIter tree_iter;
+
+ /* I'm invalidating this method because it causes an annoying
+ efect, the focus changes to the header view when selecting
+ a folder in the folder view because of this code and it
+ shouldn't. We need to find another way to set the passive
+ focus on it. Sergio. */
+ return FALSE;
+
+ model = gtk_tree_view_get_model(header_view);
+
+ 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))
+ gtk_tree_selection_select_iter(sel, &tree_iter);
+
+ return FALSE;
+}
+
/*
* This function sets a sortable model in the header view. It's just
* used for developing purposes, because it only does a
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) */
sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
g_object_unref (G_OBJECT (headers));
+ /* Init filter_row function to examine empty status */
+ priv->status = HEADER_VIEW_INIT;
+
/* Create a tree model filter to hide and show rows for cut operations */
filter_model = gtk_tree_model_filter_new (sortable, NULL);
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
/* 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);
+ /* 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);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
/* 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;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GList *selected_rows;
- 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__);
- }
+ /* Get selected rows */
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
- /* 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 */
+ modest_dnd_selection_data_set_paths (selection_data, selected_rows);
- gtk_tree_path_free (source_row);
+ /* Frees */
+ g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
}
/* 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
}
static void
-idle_notify_headers_count_changed_destroy (gpointer data)
-{
- HeadersCountChangedHelper *helper = NULL;
-
- g_return_if_fail (data != NULL);
- helper = (HeadersCountChangedHelper *) data;
-
- g_object_unref (helper->change);
- g_slice_free (HeadersCountChangedHelper, helper);
-}
-
-static gboolean
-idle_notify_headers_count_changed (gpointer data)
-{
- 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);
-
- folder = tny_folder_change_get_folder (helper->change);
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
-
- g_mutex_lock (priv->observers_lock);
-
- /* 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);
-
- return FALSE;
-}
-
-static void
folder_monitor_update (TnyFolderObserver *self,
TnyFolderChange *change)
{
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
priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
- return priv->empty;
+ return priv->status == HEADER_VIEW_EMPTY;
}
void
}
frees:
- priv->empty = priv->empty && !visible;
+ priv->status = ((gboolean) priv->status) && !visible;
/* Free */
if (header)
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
- priv->empty = TRUE;
-
/* 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