X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-sidebar-thumbnails.c;h=362ef48028d53ccf669ee6232b8f7259aa69dd0f;hb=65c06150e05948eb7b056b0ec5cb9c364b652cfe;hp=3a6eb0b598b491636661a159d58eb37fbb9e868e;hpb=d2222e0879e7bd247bec339105bc2c057907b9b5;p=evince.git
diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 3a6eb0b5..362ef480 100644
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -53,6 +53,7 @@ struct _EvSidebarThumbnailsPrivate {
GtkListStore *list_store;
GdkPixbuf *loading_icon;
EvDocument *document;
+ EvPageCache *page_cache;
gint n_pages, pages_done;
@@ -68,6 +69,11 @@ enum {
NUM_COLUMNS
};
+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);
@@ -95,12 +101,41 @@ ev_sidebar_thumbnails_dispose (GObject *object)
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 (sidebar_thumbnails->priv->loading_icon) {
+ g_object_unref (sidebar_thumbnails->priv->loading_icon);
+ sidebar_thumbnails->priv->loading_icon = 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);
}
+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;
+ }
+}
+
static void
ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnails_class)
{
@@ -111,6 +146,11 @@ ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnail
gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class);
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));
}
@@ -130,13 +170,11 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
gint end_page)
{
- EvSidebarThumbnailsPrivate *priv;
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreePath *path;
GtkTreeIter iter;
gboolean result;
- priv = sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (sidebar_thumbnails);
-
g_assert (start_page <= end_page);
path = gtk_tree_path_new_from_indices (start_page, -1);
@@ -170,14 +208,12 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
gint end_page)
{
- EvSidebarThumbnailsPrivate *priv;
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreePath *path;
GtkTreeIter iter;
gboolean result;
gint page = start_page;
- priv = sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (sidebar_thumbnails);
-
g_assert (start_page <= end_page);
path = gtk_tree_path_new_from_indices (start_page, -1);
@@ -193,7 +229,8 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
-1);
if (job == NULL && !thumbnail_set) {
- job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, THUMBNAIL_WIDTH);
+ /* FIXME: Need rotation */
+ job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, 0, 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),
@@ -219,11 +256,9 @@ update_visible_range (EvSidebarThumbnails *sidebar_thumbnails,
gint start_page,
gint end_page)
{
- EvSidebarThumbnailsPrivate *priv;
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
int old_start_page, old_end_page;
- priv = sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (sidebar_thumbnails);
-
old_start_page = priv->start_page;
old_end_page = priv->end_page;
@@ -247,14 +282,12 @@ update_visible_range (EvSidebarThumbnails *sidebar_thumbnails,
static void
adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
{
- EvSidebarThumbnailsPrivate *priv;
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
GtkTreePath *path = NULL;
GtkTreePath *path2 = NULL;
gint wy1;
gint wy2;
- priv = sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (sidebar_thumbnails);
-
if (priv->tree_view) {
if (! GTK_WIDGET_REALIZED (priv->tree_view))
return;
@@ -275,7 +308,8 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
#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);
+ if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
+ return;
#else
g_assert_not_reached ();
#endif
@@ -296,18 +330,48 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
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;
- EvPageCache *page_cache;
+ 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;
@@ -316,22 +380,18 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
page = gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free (path);
- page_cache = ev_page_cache_get (priv->document);
- ev_page_cache_set_current_page (page_cache, page);
+ 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;
- EvPageCache *page_cache;
+ EvSidebarThumbnailsPrivate *priv = ev_sidebar_thumbnails->priv;
GtkTreePath *path;
GList *selected;
int page;
- priv = ev_sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (ev_sidebar_thumbnails);
-
selected = gtk_icon_view_get_selected_items (icon_view);
if (selected == NULL)
return;
@@ -345,20 +405,9 @@ ev_sidebar_icon_selection_changed (GtkIconView *icon_view,
gtk_tree_path_free (path);
g_list_free (selected);
- page_cache = ev_page_cache_get (priv->document);
- ev_page_cache_set_current_page (page_cache, page);
+ ev_page_cache_set_current_page (priv->page_cache, page);
}
-GtkWidget *
-ev_sidebar_thumbnails_get_treeview (EvSidebarThumbnails *sidebar)
-{
- if (sidebar->priv->tree_view)
- return sidebar->priv->tree_view;
- else
- return sidebar->priv->icon_view;
-}
-
-
static void
ev_sidebar_init_tree_view (EvSidebarThumbnails *ev_sidebar_thumbnails)
{
@@ -409,11 +458,8 @@ static gboolean
ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
{
#ifdef HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE
- EvPageCache *page_cache;
-
- page_cache = ev_page_cache_get (sidebar_thumbnails->priv->document);
-
- if (ev_page_cache_get_n_pages (page_cache) > MAX_ICON_VIEW_PAGE_COUNT)
+ EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+ if (ev_page_cache_get_n_pages (priv->page_cache) > MAX_ICON_VIEW_PAGE_COUNT)
return FALSE;
return TRUE;
#else
@@ -499,21 +545,16 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page,
EvDocument *document)
{
EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (sidebar_page);
- gint i, n_pages;
- GtkTreeIter iter;
gint width = THUMBNAIL_WIDTH;
gint height = THUMBNAIL_WIDTH;
- EvPageCache *page_cache;
EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
g_return_if_fail (EV_IS_DOCUMENT_THUMBNAILS (document));
- page_cache = ev_page_cache_get (document);
- n_pages = ev_page_cache_get_n_pages (page_cache);
-
+ priv->page_cache = ev_page_cache_get (document);
priv->document = document;
- 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. */
@@ -527,23 +568,7 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page,
priv->loading_icon = ev_document_misc_get_thumbnail_frame (width, height, NULL);
ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
- for (i = 0; i < n_pages; i++) {
- gchar *page_label;
- gchar *page_string;
-
- page_label = ev_page_cache_get_page_label (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);
- }
-
+ 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)) {
@@ -552,21 +577,24 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage *sidebar_page,
priv->tree_view = NULL;
}
- if (! priv->icon_view)
+ 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)
+ if (! priv->tree_view) {
ev_sidebar_init_tree_view (sidebar_thumbnails);
+ g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget");
+ }
}
-
/* Connect to the signal and trigger a fake callback */
- g_signal_connect (page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails);
+ g_signal_connect (priv->page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails);
adjustment_changed_cb (sidebar_thumbnails);
}