*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#endif
#include <string.h>
-#include <gtk/gtk.h>
+
#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include "ev-document-misc.h"
+#include "ev-document-thumbnails.h"
+#include "ev-job-scheduler.h"
#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"
+#include "ev-window.h"
#define THUMBNAIL_WIDTH 100
* limit its use */
#define MAX_ICON_VIEW_PAGE_COUNT 1500
+typedef struct _EvThumbsSize
+{
+ gint width;
+ gint height;
+} EvThumbsSize;
+
+typedef struct _EvThumbsSizeCache {
+ gboolean uniform;
+ gint uniform_width;
+ gint uniform_height;
+ EvThumbsSize *sizes;
+} EvThumbsSizeCache;
struct _EvSidebarThumbnailsPrivate {
GtkWidget *swindow;
GtkWidget *tree_view;
GtkAdjustment *vadjustment;
GtkListStore *list_store;
- GdkPixbuf *loading_icon;
+ GHashTable *loading_icons;
EvDocument *document;
- EvPageCache *page_cache;
+ EvDocumentModel *model;
+ EvThumbsSizeCache *size_cache;
gint n_pages, pages_done;
int rotation;
+ gboolean inverted_colors;
/* Visible pages */
gint start_page, end_page;
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);
-static void adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails);
+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 (EvSidebarPageInterface *iface);
+static const gchar* ev_sidebar_thumbnails_get_label (EvSidebarPage *sidebar_page);
+static void thumbnail_job_completed_callback (EvJobThumbnail *job,
+ EvSidebarThumbnails *sidebar_thumbnails);
+static void adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails);
G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails,
ev_sidebar_thumbnails,
#define EV_SIDEBAR_THUMBNAILS_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_THUMBNAILS, EvSidebarThumbnailsPrivate));
+/* Thumbnails dimensions cache */
+#define EV_THUMBNAILS_SIZE_CACHE_KEY "ev-thumbnails-size-cache"
+
+static EvThumbsSizeCache *
+ev_thumbnails_size_cache_new (EvDocument *document)
+{
+ EvThumbsSizeCache *cache;
+ EvRenderContext *rc = NULL;
+ gint i, n_pages;
+ EvThumbsSize *thumb_size;
+
+ cache = g_new0 (EvThumbsSizeCache, 1);
+
+ n_pages = ev_document_get_n_pages (document);
+
+ /* Assume all pages are the same size until proven otherwise */
+ cache->uniform = TRUE;
+
+ for (i = 0; i < n_pages; i++) {
+ EvPage *page;
+ gdouble page_width, page_height;
+ gint thumb_width = 0;
+ gint thumb_height = 0;
+
+ page = ev_document_get_page (document, i);
+
+ ev_document_get_page_size (document, i, &page_width, &page_height);
+
+ if (!rc) {
+ rc = ev_render_context_new (page, 0, (gdouble)THUMBNAIL_WIDTH / page_width);
+ } else {
+ ev_render_context_set_page (rc, page);
+ ev_render_context_set_scale (rc, (gdouble)THUMBNAIL_WIDTH / page_width);
+ }
+
+ ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (document),
+ rc, &thumb_width, &thumb_height);
+
+ if (i == 0) {
+ cache->uniform_width = thumb_width;
+ cache->uniform_height = thumb_height;
+ } else if (cache->uniform &&
+ (cache->uniform_width != thumb_width ||
+ cache->uniform_height != thumb_height)) {
+ /* It's a different thumbnail size. Backfill the array. */
+ int j;
+
+ cache->sizes = g_new0 (EvThumbsSize, n_pages);
+
+ for (j = 0; j < i; j++) {
+ thumb_size = &(cache->sizes[j]);
+ thumb_size->width = cache->uniform_width;
+ thumb_size->height = cache->uniform_height;
+ }
+ cache->uniform = FALSE;
+ }
+
+ if (! cache->uniform) {
+ thumb_size = &(cache->sizes[i]);
+
+ thumb_size->width = thumb_width;
+ thumb_size->height = thumb_height;
+ }
+
+ g_object_unref (page);
+ }
+
+ if (rc) {
+ g_object_unref (rc);
+ }
+
+ return cache;
+}
+
+static void
+ev_thumbnails_size_cache_get_size (EvThumbsSizeCache *cache,
+ gint page,
+ gint rotation,
+ gint *width,
+ gint *height)
+{
+ gint w, h;
+
+ if (cache->uniform) {
+ w = cache->uniform_width;
+ h = cache->uniform_height;
+ } else {
+ EvThumbsSize *thumb_size;
+
+ thumb_size = &(cache->sizes[page]);
+
+ w = thumb_size->width;
+ h = thumb_size->height;
+ }
+
+ if (rotation == 0 || rotation == 180) {
+ if (width) *width = w;
+ if (height) *height = h;
+ } else {
+ if (width) *width = h;
+ if (height) *height = w;
+ }
+}
+
+static void
+ev_thumbnails_size_cache_free (EvThumbsSizeCache *cache)
+{
+ if (cache->sizes) {
+ g_free (cache->sizes);
+ cache->sizes = NULL;
+ }
+
+ g_free (cache);
+}
+
+static EvThumbsSizeCache *
+ev_thumbnails_size_cache_get (EvDocument *document)
+{
+ EvThumbsSizeCache *cache;
+
+ cache = g_object_get_data (G_OBJECT (document), EV_THUMBNAILS_SIZE_CACHE_KEY);
+ if (!cache) {
+ cache = ev_thumbnails_size_cache_new (document);
+ g_object_set_data_full (G_OBJECT (document),
+ EV_THUMBNAILS_SIZE_CACHE_KEY,
+ cache,
+ (GDestroyNotify)ev_thumbnails_size_cache_free);
+ }
+
+ return cache;
+}
+
static void
ev_sidebar_thumbnails_dispose (GObject *object)
{
EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object);
- if (sidebar_thumbnails->priv->loading_icon) {
- g_object_unref (sidebar_thumbnails->priv->loading_icon);
- sidebar_thumbnails->priv->loading_icon = NULL;
+ if (sidebar_thumbnails->priv->loading_icons) {
+ g_hash_table_destroy (sidebar_thumbnails->priv->loading_icons);
+ sidebar_thumbnails->priv->loading_icons = NULL;
}
if (sidebar_thumbnails->priv->list_store) {
g_object_unref (sidebar_thumbnails->priv->list_store);
sidebar_thumbnails->priv->list_store = NULL;
}
-
+
G_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->dispose (object);
}
return ev_sidebar_thumbnails;
}
+static GdkPixbuf *
+ev_sidebar_thumbnails_get_loading_icon (EvSidebarThumbnails *sidebar_thumbnails,
+ gint width,
+ gint height)
+{
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+ GdkPixbuf *icon;
+ gchar *key;
+
+ key = g_strdup_printf ("%dx%d", width, height);
+ icon = g_hash_table_lookup (priv->loading_icons, key);
+ if (!icon) {
+ gboolean inverted_colors;
+
+ inverted_colors = ev_document_model_get_inverted_colors (priv->model);
+ icon = ev_document_misc_get_loading_thumbnail (width, height, inverted_colors);
+ g_hash_table_insert (priv->loading_icons, key, icon);
+ } else {
+ g_free (key);
+ }
+
+ return icon;
+}
+
static void
clear_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
GtkTreePath *path;
GtkTreeIter iter;
gboolean result;
+ gint prev_width = -1;
+ gint prev_height = -1;
g_assert (start_page <= end_page);
result && start_page <= end_page;
result = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->list_store), &iter), start_page ++) {
EvJobThumbnail *job;
+ GdkPixbuf *loading_icon = NULL;
+ gint width, height;
gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store),
&iter,
if (job) {
g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, sidebar_thumbnails);
- ev_job_queue_remove_job (EV_JOB (job));
+ ev_job_cancel (EV_JOB (job));
g_object_unref (job);
}
+ ev_thumbnails_size_cache_get_size (priv->size_cache, start_page,
+ priv->rotation,
+ &width, &height);
+ if (!loading_icon || (width != prev_width && height != prev_height)) {
+ loading_icon =
+ ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails,
+ width, height);
+ }
+
+ prev_width = width;
+ prev_height = height;
+
gtk_list_store_set (priv->list_store, &iter,
COLUMN_JOB, NULL,
COLUMN_THUMBNAIL_SET, FALSE,
- COLUMN_PIXBUF, priv->loading_icon,
+ COLUMN_PIXBUF, loading_icon,
-1);
}
gtk_tree_path_free (path);
gint page)
{
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
- gint width, height;
+ gdouble width;
- ev_page_cache_get_size (priv->page_cache,
- page, 0,
- 1.0, &width, &height);
-
- return (gdouble)THUMBNAIL_WIDTH / (gdouble)width;
+ ev_document_get_page_size (priv->document, page, &width, NULL);
+
+ return (gdouble)THUMBNAIL_WIDTH / width;
}
static void
job = ev_job_thumbnail_new (priv->document,
page, priv->rotation,
get_scale_for_page (sidebar_thumbnails, page));
- ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
+ ev_job_scheduler_push_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
g_object_set_data_full (G_OBJECT (job), "tree_iter",
gtk_tree_iter_copy (&iter),
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreePath *path = NULL;
GtkTreePath *path2 = NULL;
+ gdouble page_size;
+ gdouble value;
gint wy1;
gint wy2;
/* Widget is not currently visible */
- if (!GTK_WIDGET_MAPPED (sidebar_thumbnails))
+ if (!gtk_widget_get_mapped (GTK_WIDGET (sidebar_thumbnails)))
+ return;
+
+ page_size = gtk_adjustment_get_page_size (priv->vadjustment);
+
+ if (page_size == 0)
return;
+
+ value = gtk_adjustment_get_value (priv->vadjustment);
if (priv->tree_view) {
- if (! GTK_WIDGET_REALIZED (priv->tree_view))
+ if (! gtk_widget_get_realized (priv->tree_view))
return;
-#if GTK_CHECK_VERSION (2, 11, 3)
- gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
- 0, (int) priv->vadjustment->value,
- NULL, &wy1);
- gtk_tree_view_convert_widget_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
- 0, (int) (priv->vadjustment->value + priv->vadjustment->page_size),
- NULL, &wy2);
-#else
- 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);
-#endif /* GTK_CHECK_VERSION (2, 11, 3) */
-
+ gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+ 0, (int) value,
+ NULL, &wy1);
+ gtk_tree_view_convert_tree_to_bin_window_coords (GTK_TREE_VIEW (priv->tree_view),
+ 0, (int) (value + page_size),
+ NULL, &wy2);
gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (priv->tree_view),
1, wy1 + 1, &path,
NULL, NULL, NULL);
1, wy2 -1, &path2,
NULL, NULL, NULL);
} else if (priv->icon_view) {
- if (! GTK_WIDGET_REALIZED (priv->icon_view))
+ if (! gtk_widget_get_realized (priv->icon_view))
return;
if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
return;
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreeIter iter;
int i;
+ gint prev_width = -1;
+ gint prev_height = -1;
for (i = 0; i < sidebar_thumbnails->priv->n_pages; i++) {
- gchar *page_label;
- gchar *page_string;
+ gchar *page_label;
+ gchar *page_string;
+ GdkPixbuf *loading_icon = NULL;
+ gint width, height;
- page_label = ev_page_cache_get_page_label (priv->page_cache, i);
+ page_label = ev_document_get_page_label (priv->document, i);
page_string = g_markup_printf_escaped ("<i>%s</i>", page_label);
+ ev_thumbnails_size_cache_get_size (sidebar_thumbnails->priv->size_cache, i,
+ sidebar_thumbnails->priv->rotation,
+ &width, &height);
+ if (!loading_icon || (width != prev_width && height != prev_height)) {
+ loading_icon =
+ ev_sidebar_thumbnails_get_loading_icon (sidebar_thumbnails,
+ width, height);
+ }
+ prev_width = width;
+ prev_height = height;
+
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_PIXBUF, loading_icon,
COLUMN_THUMBNAIL_SET, FALSE,
-1);
g_free (page_label);
}
}
-
-static void
-ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
-{
- if (sidebar_thumbnails->priv->loading_icon)
- g_object_unref (sidebar_thumbnails->priv->loading_icon);
-
- if (sidebar_thumbnails->priv->document &&
- sidebar_thumbnails->priv->n_pages > 0) {
- gint width, height;
-
- /* We get the dimensions of the first page so that we can make a blank
- * icon. */
- ev_page_cache_get_thumbnail_size (sidebar_thumbnails->priv->page_cache, 0,
- sidebar_thumbnails->priv->rotation,
- &width, &height);
-
- sidebar_thumbnails->priv->loading_icon =
- ev_document_misc_get_thumbnail_frame (width, height, NULL);
- } else {
- sidebar_thumbnails->priv->loading_icon = NULL;
- }
-
-}
-
-static gboolean
-refresh (EvSidebarThumbnails *sidebar_thumbnails)
-{
- adjustment_changed_cb (sidebar_thumbnails);
- return FALSE;
-}
-
-void
-ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,
- int rotation)
-{
- sidebar_thumbnails->priv->rotation = rotation;
- ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
-
- if (sidebar_thumbnails->priv->document == NULL ||
- sidebar_thumbnails->priv->n_pages <= 0)
- return;
-
- ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
- ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
-
- /* Trigger a redraw */
- sidebar_thumbnails->priv->start_page = -1;
- sidebar_thumbnails->priv->end_page = -1;
- g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails);
-}
-
static void
ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
EvSidebarThumbnails *ev_sidebar_thumbnails)
page = gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free (path);
- ev_page_cache_set_current_page_history (priv->page_cache, page);
+ ev_document_model_set_page (priv->model, page);
}
static void
gtk_tree_path_free (path);
g_list_free (selected);
- ev_page_cache_set_current_page_history (priv->page_cache, page);
+ ev_document_model_set_page (priv->model, page);
}
static void
ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
{
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
- if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT)
- return FALSE;
- return TRUE;
+
+ return (ev_document_get_n_pages (priv->document) <= MAX_ICON_VIEW_PAGE_COUNT);
}
static void
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_signal_connect_data (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_signal_connect_swapped (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);
}
static void
-page_changed_cb (EvPageCache *page_cache,
- int page,
- EvSidebarThumbnails *sidebar)
+ev_sidebar_thumbnails_set_current_page (EvSidebarThumbnails *sidebar,
+ gint page)
{
GtkTreeView *tree_view;
GtkTreePath *path;
gtk_tree_path_free (path);
}
+static void
+page_changed_cb (EvSidebarThumbnails *sidebar,
+ gint old_page,
+ gint new_page)
+{
+ ev_sidebar_thumbnails_set_current_page (sidebar, new_page);
+}
+
+static gboolean
+refresh (EvSidebarThumbnails *sidebar_thumbnails)
+{
+ adjustment_changed_cb (sidebar_thumbnails);
+ return FALSE;
+}
+
+static void
+ev_sidebar_thumbnails_reload (EvSidebarThumbnails *sidebar_thumbnails)
+{
+ EvDocumentModel *model;
+
+ if (sidebar_thumbnails->priv->loading_icons)
+ g_hash_table_remove_all (sidebar_thumbnails->priv->loading_icons);
+
+ if (sidebar_thumbnails->priv->document == NULL ||
+ sidebar_thumbnails->priv->n_pages <= 0)
+ return;
+
+ model = sidebar_thumbnails->priv->model;
+
+ ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
+ ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
+
+ /* Trigger a redraw */
+ sidebar_thumbnails->priv->start_page = -1;
+ sidebar_thumbnails->priv->end_page = -1;
+ ev_sidebar_thumbnails_set_current_page (sidebar_thumbnails,
+ ev_document_model_get_page (model));
+ g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails);
+}
+
+static void
+ev_sidebar_thumbnails_rotation_changed_cb (EvDocumentModel *model,
+ GParamSpec *pspec,
+ EvSidebarThumbnails *sidebar_thumbnails)
+{
+ gint rotation = ev_document_model_get_rotation (model);
+
+ sidebar_thumbnails->priv->rotation = rotation;
+ ev_sidebar_thumbnails_reload (sidebar_thumbnails);
+}
+
+static void
+ev_sidebar_thumbnails_inverted_colors_changed_cb (EvDocumentModel *model,
+ GParamSpec *pspec,
+ EvSidebarThumbnails *sidebar_thumbnails)
+{
+ gboolean inverted_colors = ev_document_model_get_inverted_colors (model);
+
+ sidebar_thumbnails->priv->inverted_colors = inverted_colors;
+ ev_sidebar_thumbnails_reload (sidebar_thumbnails);
+}
+
static void
thumbnail_job_completed_callback (EvJobThumbnail *job,
EvSidebarThumbnails *sidebar_thumbnails)
GtkTreeIter *iter;
iter = (GtkTreeIter *) g_object_get_data (G_OBJECT (job), "tree_iter");
+ if (priv->inverted_colors)
+ ev_document_misc_invert_pixbuf (job->thumbnail);
gtk_list_store_set (priv->list_store,
iter,
COLUMN_PIXBUF, job->thumbnail,
}
static void
-ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page,
- EvDocument *document)
+ev_sidebar_thumbnails_document_changed_cb (EvDocumentModel *model,
+ GParamSpec *pspec,
+ EvSidebarThumbnails *sidebar_thumbnails)
{
- EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page);
-
+ EvDocument *document = ev_document_model_get_document (model);
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
- g_return_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document));
+ if (!EV_IS_DOCUMENT_THUMBNAILS (document) ||
+ ev_document_get_n_pages (document) <= 0 ||
+ !ev_document_check_dimensions (document)) {
+ return;
+ }
- priv->page_cache = ev_page_cache_get (document);
+ priv->size_cache = ev_thumbnails_size_cache_get (document);
priv->document = document;
- priv->n_pages = ev_page_cache_get_n_pages (priv->page_cache);
-
- ev_sidebar_thumbnails_set_loading_icon (sidebar_thumbnails);
+ priv->n_pages = ev_document_get_n_pages (document);
+ priv->rotation = ev_document_model_get_rotation (model);
+ priv->inverted_colors = ev_document_model_get_inverted_colors (model);
+ priv->loading_icons = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify)g_free,
+ (GDestroyNotify)g_object_unref);
ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
ev_sidebar_thumbnails_fill_model (sidebar_thumbnails);
}
/* Connect to the signal and trigger a fake callback */
- g_signal_connect (priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails);
+ g_signal_connect_swapped (priv->model, "page-changed",
+ G_CALLBACK (page_changed_cb),
+ sidebar_thumbnails);
+ g_signal_connect (priv->model, "notify::rotation",
+ G_CALLBACK (ev_sidebar_thumbnails_rotation_changed_cb),
+ sidebar_thumbnails);
+ g_signal_connect (priv->model, "notify::inverted-colors",
+ G_CALLBACK (ev_sidebar_thumbnails_inverted_colors_changed_cb),
+ sidebar_thumbnails);
sidebar_thumbnails->priv->start_page = -1;
sidebar_thumbnails->priv->end_page = -1;
- page_changed_cb (priv->page_cache,
- ev_page_cache_get_current_page (priv->page_cache),
- sidebar_thumbnails);
+ ev_sidebar_thumbnails_set_current_page (sidebar_thumbnails,
+ ev_document_model_get_page (model));
adjustment_changed_cb (sidebar_thumbnails);
}
+static void
+ev_sidebar_thumbnails_set_model (EvSidebarPage *sidebar_page,
+ EvDocumentModel *model)
+{
+ EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page);
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+
+ if (priv->model == model)
+ return;
+
+ priv->model = model;
+ g_signal_connect (model, "notify::document",
+ G_CALLBACK (ev_sidebar_thumbnails_document_changed_cb),
+ sidebar_page);
+}
+
static gboolean
ev_sidebar_thumbnails_clear_job (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
+ 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);
+ ev_job_cancel (job);
g_signal_handlers_disconnect_by_func (job, thumbnail_job_completed_callback, data);
g_object_unref (job);
}
}
static void
-ev_sidebar_thumbnails_page_iface_init (EvSidebarPageIface *iface)
+ev_sidebar_thumbnails_page_iface_init (EvSidebarPageInterface *iface)
{
iface->support_document = ev_sidebar_thumbnails_support_document;
- iface->set_document = ev_sidebar_thumbnails_set_document;
+ iface->set_model = ev_sidebar_thumbnails_set_model;
iface->get_label = ev_sidebar_thumbnails_get_label;
}
-