X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-header-view.c;h=85d5f786b23202ff0419e1c50898ac8feb5680eb;hp=f75e9b34ac845c1fed5d5209bb97481343c38339;hb=b93b64adaaf2947f8b35889981af6ad96b18fd31;hpb=cb02c84129626cc87c88381ad9996bca8fb1cec1 diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index f75e9b3..85d5f78 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -46,20 +46,25 @@ static void modest_header_view_class_init (ModestHeaderViewClass *klass); static void modest_header_view_init (ModestHeaderView *obj); static void modest_header_view_finalize (GObject *obj); -static gboolean on_header_clicked (GtkWidget *widget, +static gboolean on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data); -static gint cmp_rows (GtkTreeModel *tree_model, - GtkTreeIter *iter1, - GtkTreeIter *iter2, - gpointer user_data); +static gint cmp_rows (GtkTreeModel *tree_model, + GtkTreeIter *iter1, + GtkTreeIter *iter2, + gpointer user_data); -static void on_selection_changed (GtkTreeSelection *sel, - gpointer user_data); +static void on_selection_changed (GtkTreeSelection *sel, + gpointer user_data); + +static void setup_drag_and_drop (GtkTreeView *self); -static void setup_drag_and_drop (GtkTreeView *self); +static GtkTreePath * get_selected_row (GtkTreeView *self, GtkTreeModel **model); +static gboolean on_focus_in (GtkWidget *sef, + GdkEventFocus *event, + gpointer user_data); typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate; struct _ModestHeaderViewPrivate { @@ -215,8 +220,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) { GtkTreeModel *sortable; GtkTreeViewColumn *column=NULL; + GtkTreeSelection *selection = NULL; GtkCellRenderer *renderer_msgtype,*renderer_header, - *renderer_attach; + *renderer_attach, *renderer_comptact_flag, + *renderer_compact_date; ModestHeaderViewPrivate *priv; const GList *cursor; @@ -226,9 +233,20 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) renderer_msgtype = gtk_cell_renderer_pixbuf_new (); renderer_attach = gtk_cell_renderer_pixbuf_new (); renderer_header = gtk_cell_renderer_text_new (); + renderer_comptact_flag = gtk_cell_renderer_pixbuf_new (); + renderer_compact_date = gtk_cell_renderer_text_new (); + + g_object_set(G_OBJECT(renderer_header), + "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + g_object_set(G_OBJECT(renderer_compact_date), + "xalign", 1.0, + NULL); remove_all_columns (self); + 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)); /* Add new columns */ @@ -278,6 +296,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) GINT_TO_POINTER(FALSE)); break; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG: + column = get_new_column (_("F"), renderer_comptact_flag, FALSE, + TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, + FALSE, + (GtkTreeCellDataFunc)_modest_header_view_compact_flag_cell_data, + NULL); + gtk_tree_view_column_set_fixed_width (column, 45); + break; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN: column = get_new_column (_("Header"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, @@ -311,7 +338,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) GINT_TO_POINTER(TRUE)); break; - case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: + case MODEST_HEADER_VIEW_COLUMN_SENT_DATE: column = get_new_column (_("Sent"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, TRUE, @@ -319,6 +346,23 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) GINT_TO_POINTER(FALSE)); break; + case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE: + column = get_new_column (_("Received"), renderer_compact_date, FALSE, + TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, + TRUE, + (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data, + GINT_TO_POINTER(TRUE)); + gtk_tree_view_column_set_fixed_width (column, 130); + break; + + case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE: + column = get_new_column (_("Sent"), renderer_compact_date, FALSE, + TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, + TRUE, + (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data, + GINT_TO_POINTER(FALSE)); + gtk_tree_view_column_set_fixed_width (column, 130); + break; case MODEST_HEADER_VIEW_COLUMN_SIZE: column = get_new_column (_("Size"), renderer_header, TRUE, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, @@ -326,6 +370,13 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns) (GtkTreeCellDataFunc)_modest_header_view_size_cell_data, NULL); break; + case MODEST_HEADER_VIEW_COLUMN_STATUS: + column = get_new_column (_("Status"), renderer_compact_date, TRUE, + TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, + FALSE, + (GtkTreeCellDataFunc)_modest_header_view_status_cell_data, + NULL); + break; default: g_return_val_if_reached(FALSE); @@ -422,6 +473,9 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style) g_signal_connect (self, "button-press-event", G_CALLBACK(on_header_clicked), NULL); + + g_signal_connect (self, "focus-in-event", + G_CALLBACK(on_focus_in), NULL); return GTK_WIDGET(self); } @@ -475,7 +529,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) static void scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) { -#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ +#ifdef MODEST_PLATFORM_GNOME GtkTreePath *selected_path; GtkTreePath *start, *end; @@ -500,7 +554,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up) gtk_tree_path_free (start); gtk_tree_path_free (end); -#endif /* MODEST_PLATFORM_ID */ +#endif /* MODEST_PLATFORM_GNOME */ } @@ -510,14 +564,22 @@ modest_header_view_select_next (ModestHeaderView *self) GtkTreeSelection *sel; GtkTreeIter iter; GtkTreeModel *model; + GtkTreePath *path; sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - if (gtk_tree_selection_get_selected (sel, &model, &iter)) { + path = get_selected_row (GTK_TREE_VIEW(self), &model); + if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { + /* Unselect previous path */ + gtk_tree_selection_unselect_path (sel, path); + + /* Move path down and selects new one */ if (gtk_tree_model_iter_next (model, &iter)) { gtk_tree_selection_select_iter (sel, &iter); scroll_to_selected (self, &iter, FALSE); } + gtk_tree_path_free(path); } + } void @@ -529,8 +591,10 @@ modest_header_view_select_prev (ModestHeaderView *self) GtkTreePath *path; sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - if (gtk_tree_selection_get_selected (sel, &model, &iter)) { - path = gtk_tree_model_get_path (model, &iter); + path = get_selected_row (GTK_TREE_VIEW(self), &model); + if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) { + /* Unselect previous path */ + gtk_tree_selection_unselect_path (sel, path); /* Move path up */ if (gtk_tree_path_prev (path)) { @@ -619,14 +683,6 @@ modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); - /* Clean monitors */ - g_mutex_lock (priv->monitor_lock); - if (priv->monitor) { - tny_folder_monitor_stop (priv->monitor); - g_object_unref (G_OBJECT (priv->monitor)); - } - g_mutex_unlock (priv->monitor_lock); - /* Set new model */ gtk_tree_view_set_model (header_view, model); @@ -639,35 +695,26 @@ modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model) } static void -on_refresh_folder (TnyFolder *folder, - gboolean cancelled, - GError **error, - gpointer user_data) +on_progress_changed (ModestMailOperation *mail_op, + ModestHeaderView *self) { GtkTreeModel *sortable; - ModestHeaderView *self; ModestHeaderViewPrivate *priv; GList *cols, *cursor; TnyList *headers; - if (cancelled) { -/* GtkTreeSelection *selection; */ - -/* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); */ -/* gtk_tree_selection_unselect_all (selection); */ - - g_warning ("Operation cancelled %s\n", (*error) ? (*error)->message : "unknown"); + if (!modest_mail_operation_is_finished (mail_op)) + return; + if (modest_mail_operation_get_error (mail_op)) return; - } - self = MODEST_HEADER_VIEW(user_data); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); headers = TNY_LIST (tny_gtk_header_list_model_new ()); tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), - folder, TRUE); + priv->folder, TRUE); sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); g_object_unref (G_OBJECT (headers)); @@ -691,33 +738,12 @@ on_refresh_folder (TnyFolder *folder, /* Add a folder observer */ g_mutex_lock (priv->monitor_lock); - priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder)); + priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (priv->folder)); tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); tny_folder_monitor_start (priv->monitor); g_mutex_unlock (priv->monitor_lock); } - -static void -on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg, - gint num, gint total, gpointer user_data) -{ - ModestHeaderView *self; - ModestHeaderViewPrivate *priv; - - self = MODEST_HEADER_VIEW(user_data); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - - /* FIXME: this is a hack ==> tinymail gives us this when - * it has nothing better to do */ - if (num == 1 && total == 100) - return; - - g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL], - 0, msg, num, total); -} - - TnyFolder* modest_header_view_get_folder (ModestHeaderView *self) { @@ -730,11 +756,60 @@ modest_header_view_get_folder (ModestHeaderView *self) return priv->folder; } +static void +modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder) +{ + TnyList *headers; + ModestHeaderViewPrivate *priv; + GList *cols, *cursor; + GtkTreeModel *sortable; + + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); + + headers = TNY_LIST (tny_gtk_header_list_model_new ()); + + tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers), + folder, FALSE); + + /* Add a folder observer */ + g_mutex_lock (priv->monitor_lock); + if (priv->monitor) { + tny_folder_monitor_stop (priv->monitor); + g_object_unref (G_OBJECT (priv->monitor)); + } + priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder)); + tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers)); + tny_folder_monitor_start (priv->monitor); + g_mutex_unlock (priv->monitor_lock); + + + sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers)); + g_object_unref (G_OBJECT (headers)); + + /* install our special sorting functions */ + cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); + while (cursor) { + gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data), + MODEST_HEADER_VIEW_COLUMN)); + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), + col_id, + (GtkTreeIterCompareFunc) cmp_rows, + cursor->data, NULL); + cursor = g_list_next(cursor); + } + g_list_free (cols); + + + /* Set new model */ + modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); + g_object_unref (G_OBJECT (sortable)); +} void modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) { ModestHeaderViewPrivate *priv; + priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); if (priv->folder) { @@ -743,31 +818,53 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder) } if (folder) { + ModestMailOperation *mail_op; + + modest_header_view_set_folder_intern (self, folder); + /* Pick my reference. Nothing to do with the mail operation */ priv->folder = g_object_ref (folder); - tny_folder_refresh_async (folder, - on_refresh_folder, - on_refresh_folder_status_update, - self); - - /* no message selected */ - g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, - NULL); + + /* no message selected */ + g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL); + + /* Create the mail operation */ + mail_op = modest_mail_operation_new (); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Register a mail operation observer */ + g_signal_connect (mail_op, "progress-changed", + G_CALLBACK (on_progress_changed), self); + + /* Refresh the folder asynchronously */ + modest_mail_operation_refresh_folder (mail_op, folder); + + /* Free */ + g_object_unref (mail_op); + } else { + g_mutex_lock (priv->monitor_lock); modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); + + if (priv->monitor) { + tny_folder_monitor_stop (priv->monitor); + g_object_unref (G_OBJECT (priv->monitor)); + priv->monitor = NULL; + } + g_mutex_unlock (priv->monitor_lock); } } static gboolean on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { - ModestHeaderView *self; - ModestHeaderViewPrivate *priv; + ModestHeaderView *self = NULL; + ModestHeaderViewPrivate *priv = NULL; + GtkTreePath *path = NULL; GtkTreeIter iter; - GtkTreeSelection *sel; - GtkTreeModel *model; + GtkTreeModel *model = NULL; TnyHeader *header; - /* ignore everything but doubleclick */ if (event->type != GDK_2BUTTON_PRESS) return FALSE; @@ -775,12 +872,10 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data) self = MODEST_HEADER_VIEW (widget); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW(self)); - - if (!gtk_tree_selection_get_selected (sel, &model, &iter)) - return FALSE; /* msg was _un_selected */ - + path = get_selected_row (GTK_TREE_VIEW(self), &model); + if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) + return FALSE; + /* get the first selected item */ gtk_tree_model_get (model, &iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, @@ -792,6 +887,7 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data) /* Free */ g_object_unref (G_OBJECT (header)); + gtk_tree_path_free(path); return TRUE; } @@ -802,6 +898,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) { GtkTreeModel *model; TnyHeader *header; + GtkTreePath *path = NULL; GtkTreeIter iter; ModestHeaderView *self; ModestHeaderViewPrivate *priv; @@ -811,8 +908,9 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) self = MODEST_HEADER_VIEW (user_data); priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); - - if (!gtk_tree_selection_get_selected (sel, &model, &iter)) + + path = get_selected_row (GTK_TREE_VIEW(self), &model); + if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) return; /* msg was _un_selected */ gtk_tree_model_get (model, &iter, @@ -825,6 +923,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) 0, header); g_object_unref (G_OBJECT (header)); + gtk_tree_path_free(path); } @@ -975,14 +1074,12 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time, gpointer data) { - GtkTreeSelection *selection; GtkTreeModel *model; GtkTreeIter iter; GtkTreePath *source_row; - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_get_selected (selection, &model, &iter); - source_row = gtk_tree_model_get_path (model, &iter); + + source_row = get_selected_row (GTK_TREE_VIEW(widget), &model); + if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return; switch (info) { case MODEST_HEADER_ROW: @@ -1024,3 +1121,93 @@ setup_drag_and_drop (GtkTreeView *self) g_signal_connect(G_OBJECT (self), "drag_data_get", G_CALLBACK(drag_data_get_cb), NULL); } + +static GtkTreePath * +get_selected_row (GtkTreeView *self, GtkTreeModel **model) +{ + GtkTreePath *path = NULL; + GtkTreeSelection *sel = NULL; + GList *rows = NULL; + + sel = gtk_tree_view_get_selection(self); + rows = gtk_tree_selection_get_selected_rows (sel, model); + + if ((rows == NULL) || (g_list_length(rows) != 1)) + goto frees; + + path = gtk_tree_path_copy(g_list_nth_data (rows, 0)); + + + /* Free */ + frees: + g_list_foreach(rows,(GFunc) gtk_tree_path_free, NULL); + g_list_free(rows); + + return path; +} + +/* + * This function moves the tree view scroll to the current selected + * row when the widget grabs the focus + */ +static gboolean +on_focus_in (GtkWidget *self, + GdkEventFocus *event, + gpointer user_data) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GList *selected = NULL; + GtkTreePath *selected_path = NULL; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!model) + return FALSE; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + /* If none selected yet, pick the first one */ + if (gtk_tree_selection_count_selected_rows (selection) == 0) { + GtkTreeIter iter; + GtkTreePath *path; + + /* Return if the model is empty */ + if (!gtk_tree_model_get_iter_first (model, &iter)) + return FALSE; + + path = gtk_tree_model_get_path (model, &iter); + gtk_tree_selection_select_path (selection, path); + gtk_tree_path_free (path); + } + + /* Need to get the all the rows because is selection multiple */ + selected = gtk_tree_selection_get_selected_rows (selection, &model); + selected_path = (GtkTreePath *) selected->data; + + /* Check if we need to scroll */ + #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */ + GtkTreePath *start_path = NULL; + GtkTreePath *end_path = NULL; + if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self), + &start_path, + &end_path)) { + + if ((gtk_tree_path_compare (start_path, selected_path) != -1) || + (gtk_tree_path_compare (end_path, selected_path) != 1)) { + + /* Scroll to first path */ + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), + selected_path, + NULL, + TRUE, + 0.5, + 0.0); + } + } + #endif /* GTK_CHECK_VERSION */ + + /* Frees */ + g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selected); + + return FALSE; +}