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=382a5a96930867859e3e41d68af486186489e534;hb=a92004b77fc73fe7ac2a781b5207249b2288b8c9;hp=88d70036abf4d717647ae094faf171f8f1b144ac;hpb=ddc0ad5b3bd75a640ba362cdccde7449654bae61;p=evince.git
diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 88d70036..382a5a96 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -32,6 +32,7 @@
#include "ev-sidebar-thumbnails.h"
#include "ev-document-thumbnails.h"
#include "ev-document-misc.h"
+#include "ev-window.h"
#include "ev-utils.h"
#define THUMBNAIL_WIDTH 75
@@ -56,8 +57,6 @@ enum {
NUM_COLUMNS
};
-static GtkVBoxClass *parent_class;
-
G_DEFINE_TYPE (EvSidebarThumbnails, ev_sidebar_thumbnails, GTK_TYPE_VBOX);
#define EV_SIDEBAR_THUMBNAILS_GET_PRIVATE(object) \
@@ -75,7 +74,7 @@ ev_sidebar_thumbnails_destroy (GtkObject *object)
priv->idle_id = 0;
}
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
+ GTK_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->destroy (object);
}
static void
@@ -87,8 +86,6 @@ 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);
- parent_class = g_type_class_peek_parent (ev_sidebar_thumbnails_class);
-
gtk_object_class->destroy = ev_sidebar_thumbnails_destroy;
g_type_class_add_private (g_object_class, sizeof (EvSidebarThumbnailsPrivate));
@@ -133,6 +130,7 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
EvSidebarThumbnails *ev_sidebar_thumbnails)
{
EvSidebarThumbnailsPrivate *priv;
+ GtkWidget *window;
GtkTreePath *path;
GtkTreeIter iter;
int page;
@@ -149,7 +147,11 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
gtk_tree_path_free (path);
- ev_document_set_page (priv->document, page);
+ 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);
+ }
}
static void
@@ -303,6 +305,30 @@ populate_thumbnails_idle (gpointer data)
return TRUE;
}
+void
+ev_sidebar_thumbnails_select_page (EvSidebarThumbnails *sidebar,
+ int page)
+{
+ 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);
+ }
+}
+
+
void
ev_sidebar_thumbnails_set_document (EvSidebarThumbnails *sidebar_thumbnails,
EvDocument *document)
@@ -330,11 +356,11 @@ ev_sidebar_thumbnails_set_document (EvSidebarThumbnails *sidebar_thumbnails,
/* We get the dimensions of the first doc so that we can make a blank
* icon. */
ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (priv->document),
- 0, THUMBNAIL_WIDTH, &width, &height);
+ 1, THUMBNAIL_WIDTH, &width, &height);
loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL);
- for (i = 0; i < n_pages; i++) {
- page = g_strdup_printf ("%d", i + 1);
+ 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,