X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar-thumbnails.c;h=93f4150483b0859266ee5dc5e3196d3a9fb71464;hb=6c9c79f7cd5e86a5d90231f6b2f7ed2db9b7886f;hp=b4622f6ebb9523d0975cfedf98226f87346bc3f0;hpb=f06e050d41051f1ea95b40981aee32ef8e0b0bae;p=evince.git diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index b4622f6e..93f41504 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -28,54 +28,105 @@ #include #include +#include +#include "ev-sidebar-page.h" #include "ev-sidebar-thumbnails.h" #include "ev-document-thumbnails.h" #include "ev-document-misc.h" +#include "ev-job-queue.h" #include "ev-window.h" #include "ev-utils.h" #define THUMBNAIL_WIDTH 100 -/* Amount of time we devote to each iteration of the idle, in microseconds */ -#define IDLE_WORK_LENGTH 5000 +/* The IconView doesn't scale nearly as well as the TreeView, so we arbitrarily + * limit its use */ +#define MAX_ICON_VIEW_PAGE_COUNT 1500 + struct _EvSidebarThumbnailsPrivate { + GtkWidget *swindow; + GtkWidget *icon_view; GtkWidget *tree_view; GtkAdjustment *vadjustment; GtkListStore *list_store; + GdkPixbuf *loading_icon; EvDocument *document; + EvPageCache *page_cache; + + gint n_pages, pages_done; - guint idle_id; - gint current_page, n_pages, pages_done; - GtkTreeIter current_page_iter; + /* Visible pages */ + gint start_page, end_page; }; enum { COLUMN_PAGE_STRING, COLUMN_PIXBUF, COLUMN_THUMBNAIL_SET, + COLUMN_JOB, NUM_COLUMNS }; -G_DEFINE_TYPE (EvSidebarThumbnails, ev_sidebar_thumbnails, GTK_TYPE_VBOX); +enum { + PROP_0, + PROP_WIDGET, +}; + +static void ev_sidebar_thumbnails_clear_model (EvSidebarThumbnails *sidebar); +static gboolean ev_sidebar_thumbnails_support_document (EvSidebarPage *sidebar_page, + EvDocument *document); +static void ev_sidebar_thumbnails_page_iface_init (EvSidebarPageIface *iface); +static void ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, + EvDocument *document); +static const gchar* ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page); +static void thumbnail_job_completed_callback (EvJobThumbnail *job, + EvSidebarThumbnails *sidebar_thumbnails); + +G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, + ev_sidebar_thumbnails, + GTK_TYPE_VBOX, + 0, + G_IMPLEMENT_INTERFACE (EV_TYPE_SIDEBAR_PAGE, + ev_sidebar_thumbnails_page_iface_init)) #define EV_SIDEBAR_THUMBNAILS_GET_PRIVATE(object) \ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_THUMBNAILS, EvSidebarThumbnailsPrivate)); + static void -ev_sidebar_thumbnails_destroy (GtkObject *object) +ev_sidebar_thumbnails_dispose (GObject *object) { - EvSidebarThumbnails *ev_sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object); - EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv; + EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object); + + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); + g_object_unref (sidebar_thumbnails->priv->loading_icon); + g_object_unref (sidebar_thumbnails->priv->list_store); - if (priv->idle_id != 0) { - g_source_remove (priv->idle_id); + G_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->dispose (object); +} - priv->idle_id = 0; +static void +ev_sidebar_thumbnails_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object); + + switch (prop_id) + { + case PROP_WIDGET: + if (sidebar->priv->tree_view) + g_value_set_object (value, sidebar->priv->tree_view); + else + g_value_set_object (value, sidebar->priv->icon_view); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; } - - GTK_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->destroy (object); } static void @@ -87,87 +138,277 @@ ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnail g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class); gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class); - gtk_object_class->destroy = ev_sidebar_thumbnails_destroy; + g_object_class->dispose = ev_sidebar_thumbnails_dispose; + g_object_class->get_property = ev_sidebar_thumbnails_get_property; + + g_object_class_override_property (g_object_class, + PROP_WIDGET, + "main-widget"); g_type_class_add_private (g_object_class, sizeof (EvSidebarThumbnailsPrivate)); +} +GtkWidget * +ev_sidebar_thumbnails_new (void) +{ + GtkWidget *ev_sidebar_thumbnails; + + ev_sidebar_thumbnails = g_object_new (EV_TYPE_SIDEBAR_THUMBNAILS, NULL); + + return ev_sidebar_thumbnails; } static void -adjustment_changed_cb (GtkAdjustment *adjustment, - EvSidebarThumbnails *ev_sidebar_thumbnails) +clear_range (EvSidebarThumbnails *sidebar_thumbnails, + gint start_page, + gint end_page) { - EvSidebarThumbnailsPrivate *priv; + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; GtkTreePath *path; GtkTreeIter iter; - int page; - gboolean thumbnail_set; + gboolean result; - priv = ev_sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (ev_sidebar_thumbnails); + g_assert (start_page <= end_page); + + path = gtk_tree_path_new_from_indices (start_page, -1); + for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path); + result && start_page <= end_page; + result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), start_page ++) { + EvJobThumbnail *job; + + gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), + &iter, + COLUMN_JOB, &job, + -1); + + if (job) { + g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, sidebar_thumbnails); + ev_job_queue_remove_job (EV_JOB (job)); + g_object_unref (job); + } + + gtk_list_store_set (priv->list_store, &iter, + COLUMN_JOB, NULL, + COLUMN_THUMBNAIL_SET, FALSE, + COLUMN_PIXBUF, priv->loading_icon, + -1); + } + gtk_tree_path_free (path); +} + +static void +add_range (EvSidebarThumbnails *sidebar_thumbnails, + gint start_page, + gint end_page) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + GtkTreePath *path; + GtkTreeIter iter; + gboolean result; + gint page = start_page; + + g_assert (start_page <= end_page); + + path = gtk_tree_path_new_from_indices (start_page, -1); + for (result = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), &iter, path); + result && page <= end_page; + result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), page ++) { + EvJobThumbnail *job; + gboolean thumbnail_set; + + gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter, + COLUMN_JOB, &job, + COLUMN_THUMBNAIL_SET, &thumbnail_set, + -1); + + if (job == NULL && !thumbnail_set) { + job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH); + ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH); + g_object_set_data_full (G_OBJECT (job), "tree_iter", + gtk_tree_iter_copy (&iter), + (GDestroyNotify) gtk_tree_iter_free); + g_signal_connect (job, "finished", + G_CALLBACK (thumbnail_job_completed_callback), + sidebar_thumbnails); + gtk_list_store_set (priv->list_store, &iter, + COLUMN_JOB, job, + -1); + /* The queue and the list own a ref to the job now */ + g_object_unref (job); + } else if (job) { + g_object_unref (job); + } + } + gtk_tree_path_free (path); +} - gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view), - 1, 1, &path, - NULL, NULL, NULL); - if (!path) +/* This modifies start */ +static void +update_visible_range (EvSidebarThumbnails *sidebar_thumbnails, + gint start_page, + gint end_page) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + int old_start_page, old_end_page; + + old_start_page = priv->start_page; + old_end_page = priv->end_page; + + if (start_page == old_start_page && + end_page == old_end_page) return; - page = gtk_tree_path_get_indices (path)[0] + 1; - if (page == priv->current_page) + /* Clear the areas we no longer display */ + if (old_start_page < start_page) + clear_range (sidebar_thumbnails, old_start_page, MIN (start_page - 1, old_end_page)); + + if (old_end_page > end_page) + clear_range (sidebar_thumbnails, MAX (end_page + 1, old_start_page), old_end_page); + + add_range (sidebar_thumbnails, start_page, end_page); + + priv->start_page = start_page; + priv->end_page = end_page; +} + +static void +adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + GtkTreePath *path = NULL; + GtkTreePath *path2 = NULL; + gint wy1; + gint wy2; + + if (priv->tree_view) { + if (! GTK_WIDGET_REALIZED (priv->tree_view)) + return; + + gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) priv->vadjustment->value, + NULL, &wy1); + gtk_tree_view_tree_to_widget_coords (GTK_TREE_VIEW (priv->tree_view), + 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size), + NULL, &wy2); + gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view), + 1, wy1 + 1, &path, + NULL, NULL, NULL); + gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view), + 1, wy2 -1, &path2, + NULL, NULL, NULL); + } else if (priv->icon_view) { +#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE + if (! GTK_WIDGET_REALIZED (priv->icon_view)) + return; + gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2); +#else + g_assert_not_reached (); +#endif + } else { return; - gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->list_store), - &iter, path); - gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter, - COLUMN_THUMBNAIL_SET, &thumbnail_set, - -1); - if (!thumbnail_set) { - priv->current_page = page; - priv->current_page_iter = iter; - } + + if (path == NULL) + path = gtk_tree_path_new_first (); + if (path2 == NULL) + path2 = gtk_tree_path_new_from_indices (priv->n_pages, + -1); + update_visible_range (sidebar_thumbnails, + gtk_tree_path_get_indices (path)[0], + gtk_tree_path_get_indices (path2)[0]); + + gtk_tree_path_free (path); + gtk_tree_path_free (path2); +} + +static void +ev_sidebar_thumbnails_fill_model (EvSidebarThumbnails *sidebar_thumbnails) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + GtkTreeIter iter; + int i; + + for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) { + gchar *page_label; + gchar *page_string; + + page_label = ev_page_cache_get_page_label (priv->page_cache, i); + page_string = g_markup_printf_escaped ("%s", page_label); + + gtk_list_store_append (priv->list_store, &iter); + gtk_list_store_set (priv->list_store, &iter, + COLUMN_PAGE_STRING, page_string, + COLUMN_PIXBUF, priv->loading_icon, + COLUMN_THUMBNAIL_SET, FALSE, + -1); + g_free (page_label); + g_free (page_string); + } +} + +void +ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails) +{ + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); + ev_sidebar_thumbnails_fill_model (sidebar_thumbnails); + adjustment_changed_cb (sidebar_thumbnails); } static void ev_sidebar_tree_selection_changed (GtkTreeSelection *selection, EvSidebarThumbnails *ev_sidebar_thumbnails) { - EvSidebarThumbnailsPrivate *priv; - GtkWidget *window; + EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv; GtkTreePath *path; GtkTreeIter iter; int page; - priv = ev_sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (ev_sidebar_thumbnails); - if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) return; - + path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->list_store), &iter); + page = gtk_tree_path_get_indices (path)[0]; + gtk_tree_path_free (path); - page = gtk_tree_path_get_indices (path)[0] + 1; + ev_page_cache_set_current_page (priv->page_cache, page); +} + +static void +ev_sidebar_icon_selection_changed (GtkIconView *icon_view, + EvSidebarThumbnails *ev_sidebar_thumbnails) +{ + EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv; + GtkTreePath *path; + GList *selected; + int page; + + selected = gtk_icon_view_get_selected_items (icon_view); + if (selected == NULL) + return; + + /* We don't handle or expect multiple selection. */ + g_assert (selected->next == NULL); + + path = selected->data; + page = gtk_tree_path_get_indices (path)[0]; gtk_tree_path_free (path); + g_list_free (selected); - window = gtk_widget_get_ancestor (GTK_WIDGET (ev_sidebar_thumbnails), - EV_TYPE_WINDOW); - if (window && ev_document_get_page (priv->document) != page) { - ev_window_open_page (EV_WINDOW (window), page); - } + ev_page_cache_set_current_page (priv->page_cache, page); } static void -ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails) +ev_sidebar_init_tree_view (EvSidebarThumbnails *ev_sidebar_thumbnails) { - GtkWidget *swindow; EvSidebarThumbnailsPrivate *priv; - GtkCellRenderer *renderer; GtkTreeSelection *selection; + GtkCellRenderer *renderer; - priv = ev_sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (ev_sidebar_thumbnails); - - priv->list_store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN); + priv = ev_sidebar_thumbnails->priv; priv->tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->list_store)); - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view)); g_signal_connect (selection, "changed", G_CALLBACK (ev_sidebar_tree_selection_changed), ev_sidebar_thumbnails); @@ -183,163 +424,118 @@ ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails) gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (priv->tree_view), -1, NULL, gtk_cell_renderer_text_new (), "markup", 0, NULL); - - g_object_unref (priv->list_store); - - swindow = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swindow), - GTK_SHADOW_IN); - priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (swindow)); - g_signal_connect (G_OBJECT (priv->vadjustment), "value-changed", - G_CALLBACK (adjustment_changed_cb), - ev_sidebar_thumbnails); - gtk_container_add (GTK_CONTAINER (swindow), priv->tree_view); - gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), swindow, TRUE, TRUE, 0); - - gtk_widget_show_all (swindow); + gtk_container_add (GTK_CONTAINER (priv->swindow), priv->tree_view); + gtk_widget_show (priv->tree_view); } -GtkWidget * -ev_sidebar_thumbnails_new (void) +static void +ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails) { - GtkWidget *ev_sidebar_thumbnails; + EvSidebarThumbnailsPrivate *priv; - ev_sidebar_thumbnails = g_object_new (EV_TYPE_SIDEBAR_THUMBNAILS, NULL); + priv = ev_sidebar_thumbnails->priv; - return ev_sidebar_thumbnails; + priv->icon_view = gtk_icon_view_new_with_model (GTK_TREE_MODEL (priv->list_store)); + gtk_icon_view_set_markup_column (GTK_ICON_VIEW (priv->icon_view), 0); + gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (priv->icon_view), 1); + g_signal_connect (priv->icon_view, "selection-changed", + G_CALLBACK (ev_sidebar_icon_selection_changed), ev_sidebar_thumbnails); + + gtk_container_add (GTK_CONTAINER (priv->swindow), priv->icon_view); + gtk_widget_show (priv->icon_view); } static gboolean -do_one_iteration (EvSidebarThumbnails *ev_sidebar_thumbnails) +ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails) { - EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv; - GdkPixbuf *pixbuf; - gboolean thumbnail_set; - - gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), - &(priv->current_page_iter), - COLUMN_THUMBNAIL_SET, &thumbnail_set, - -1); - if (!thumbnail_set) { - pixbuf = ev_document_thumbnails_get_thumbnail - (EV_DOCUMENT_THUMBNAILS (priv->document), - priv->current_page, THUMBNAIL_WIDTH, TRUE); - - gtk_list_store_set (priv->list_store, - &(priv->current_page_iter), - COLUMN_PIXBUF, pixbuf, - COLUMN_THUMBNAIL_SET, TRUE, - -1); - - g_object_unref (pixbuf); - priv->pages_done ++; - } - - priv->current_page++; - - if (priv->current_page > priv->n_pages) { - priv->current_page = 1; - gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->list_store), - &(priv->current_page_iter)); - } else { - gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), - &(priv->current_page_iter)); - } - - if (priv->pages_done == priv->n_pages) +#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT) return FALSE; - else - return TRUE; + return TRUE; +#else + return FALSE; +#endif } -static gboolean -populate_thumbnails_idle (gpointer data) +static void +ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails) { - GTimer *timer; - int i; - gdouble time_elapsed = 0; - - EvSidebarThumbnails *ev_sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (data); - EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv; - -#if PROFILE_THUMB == 1 - static GTimer *total_timer; - static gboolean first_time = TRUE; - - if (first_time) { - total_timer = g_timer_new (); - first_time = FALSE; - g_timer_start (total_timer); - } -#endif + EvSidebarThumbnailsPrivate *priv; - /* undo the thumbnailing idle and handler */ - if (priv->pages_done == priv->n_pages) { - priv->idle_id = 0; - g_signal_handlers_disconnect_by_func (priv->vadjustment, - adjustment_changed_cb, - ev_sidebar_thumbnails); -#if PROFILE_THUMB == 1 - time_elapsed = g_timer_elapsed (total_timer, NULL); - g_timer_destroy (total_timer); - g_print ("%d rows done in %f seconds\n", - gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->list_store), NULL), - time_elapsed); -#endif - return FALSE; - } + priv = ev_sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (ev_sidebar_thumbnails); - timer = g_timer_new (); - i = 0; - g_timer_start (timer); - while (do_one_iteration (ev_sidebar_thumbnails)) { - i++; - time_elapsed = g_timer_elapsed (timer, NULL); - if (time_elapsed > IDLE_WORK_LENGTH/1000000) - break; - } - g_timer_destroy (timer); -#if PROFILE_THUMB == 2 - g_print ("%d rows done this idle in %f seconds\n", i, time_elapsed); -#endif + priv->list_store = gtk_list_store_new (NUM_COLUMNS, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + G_TYPE_BOOLEAN, + EV_TYPE_JOB_THUMBNAIL); - return TRUE; + priv->swindow = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->swindow), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->swindow), + GTK_SHADOW_IN); + priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->swindow)); + g_signal_connect_data (G_OBJECT (priv->vadjustment), "value-changed", + G_CALLBACK (adjustment_changed_cb), + ev_sidebar_thumbnails, NULL, + G_CONNECT_SWAPPED | G_CONNECT_AFTER); + g_signal_connect_swapped (G_OBJECT (priv->swindow), "size-allocate", + G_CALLBACK (adjustment_changed_cb), + ev_sidebar_thumbnails); + gtk_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), priv->swindow, TRUE, TRUE, 0); + + /* Put it all together */ + gtk_widget_show_all (priv->swindow); } -void -ev_sidebar_thumbnails_select_page (EvSidebarThumbnails *sidebar, - int page) +static void +page_changed_cb (EvPageCache *page_cache, + int page, + EvSidebarThumbnails *sidebar) { + GtkTreeView *tree_view; GtkTreePath *path; - GtkTreeSelection *selection; - - /* if the EvSidebar's document can't provide thumbnails */ - if (sidebar->priv->document == NULL) - return; - path = gtk_tree_path_new_from_indices (page - 1, -1); - selection = gtk_tree_view_get_selection - (GTK_TREE_VIEW (sidebar->priv->tree_view)); - - if (path) { - gtk_tree_selection_select_path (selection, path); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (sidebar->priv->tree_view), - path, NULL, FALSE, 0.0, 0.0); - gtk_tree_path_free (path); + path = gtk_tree_path_new_from_indices (page, -1); + + if (sidebar->priv->tree_view) { + tree_view = GTK_TREE_VIEW (sidebar->priv->tree_view); + gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); + gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0); + } else if (sidebar->priv->icon_view) { + /* Guard against gtk-2.6 */ +#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE + gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path); + gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE); +#endif } + + gtk_tree_path_free (path); } +static void +thumbnail_job_completed_callback (EvJobThumbnail *job, + EvSidebarThumbnails *sidebar_thumbnails) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + GtkTreeIter *iter; + + iter = (GtkTreeIter *) g_object_get_data (G_OBJECT (job), "tree_iter"); + gtk_list_store_set (priv->list_store, + iter, + COLUMN_PIXBUF, job->thumbnail, + COLUMN_THUMBNAIL_SET, TRUE, + COLUMN_JOB, NULL, + -1); +} -void -ev_sidebar_thumbnails_set_document (EvSidebarThumbnails *sidebar_thumbnails, +static void +ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page, EvDocument *document) { - GdkPixbuf *loading_icon; - gint i, n_pages; - GtkTreeIter iter; - gchar *page; + EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page); gint width = THUMBNAIL_WIDTH; gint height = THUMBNAIL_WIDTH; @@ -347,38 +543,99 @@ ev_sidebar_thumbnails_set_document (EvSidebarThumbnails *sidebar_thumbnails, g_return_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document)); - if (priv->idle_id != 0) { - g_source_remove (priv->idle_id); - } - n_pages = ev_document_get_n_pages (document); - + priv->page_cache = ev_page_cache_get (document); priv->document = document; - priv->idle_id = g_idle_add (populate_thumbnails_idle, sidebar_thumbnails); - priv->n_pages = n_pages; + priv->n_pages = ev_page_cache_get_n_pages (priv->page_cache); /* We get the dimensions of the first doc so that we can make a blank * icon. */ + ev_document_doc_mutex_lock (); ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (priv->document), - 1, THUMBNAIL_WIDTH, &width, &height); - loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL); + 0, THUMBNAIL_WIDTH, &width, &height); + ev_document_doc_mutex_unlock (); + + if (priv->loading_icon) + g_object_unref (priv->loading_icon); + priv->loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL); + + ev_sidebar_thumbnails_clear_model (sidebar_thumbnails); + ev_sidebar_thumbnails_fill_model (sidebar_thumbnails); + + /* Create the view widget, and remove the old one, if needed */ + if (ev_sidebar_thumbnails_use_icon_view (sidebar_thumbnails)) { + if (priv->tree_view) { + gtk_container_remove (GTK_CONTAINER (priv->swindow), priv->tree_view); + priv->tree_view = NULL; + } + + if (! priv->icon_view) { + ev_sidebar_init_icon_view (sidebar_thumbnails); + g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget"); + } + } else { + if (priv->icon_view) { + gtk_container_remove (GTK_CONTAINER (priv->swindow), priv->icon_view); + priv->icon_view = NULL; + } + + if (! priv->tree_view) { + ev_sidebar_init_tree_view (sidebar_thumbnails); + g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget"); + } + } - gtk_list_store_clear (priv->list_store); + /* Connect to the signal and trigger a fake callback */ + g_signal_connect (priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails); + adjustment_changed_cb (sidebar_thumbnails); +} - for (i = 1; i <= n_pages; i++) { - page = g_strdup_printf ("%d", i); - gtk_list_store_append (priv->list_store, &iter); - gtk_list_store_set (priv->list_store, &iter, - COLUMN_PAGE_STRING, page, - COLUMN_PIXBUF, loading_icon, - COLUMN_THUMBNAIL_SET, FALSE, - -1); - g_free (page); - } +static gboolean +ev_sidebar_thumbnails_clear_job (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + EvJob *job; + + gtk_tree_model_get (model, iter, COLUMN_JOB, &job, -1); + + if (job != NULL) { + ev_job_queue_remove_job (job); + g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data); + g_object_unref (job); + } + + return FALSE; +} - g_object_unref (loading_icon); - gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->list_store), - &(priv->current_page_iter)); - priv->current_page = 1; - priv->pages_done = 0; +static void +ev_sidebar_thumbnails_clear_model (EvSidebarThumbnails *sidebar_thumbnails) +{ + EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv; + + gtk_tree_model_foreach (GTK_TREE_MODEL (priv->list_store), ev_sidebar_thumbnails_clear_job, sidebar_thumbnails); + gtk_list_store_clear (priv->list_store); +} + +static gboolean +ev_sidebar_thumbnails_support_document (EvSidebarPage *sidebar_page, + EvDocument *document) +{ + return (EV_IS_DOCUMENT_THUMBNAILS (document) && + (ev_document_get_n_pages (document) > 1)); +} + +static const gchar* +ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page) +{ + return _("Thumbnails"); +} + +static void +ev_sidebar_thumbnails_page_iface_init (EvSidebarPageIface *iface) +{ + iface->support_document = ev_sidebar_thumbnails_support_document; + iface->set_document = ev_sidebar_thumbnails_set_document; + iface->get_label = ev_sidebar_thumbnails_get_label; }