Updated Catalan translation by Gil Forcada.

[evince.git] / shell / ev-sidebar-thumbnails.c

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 6ed20a21753a020769684b7b6f654577ea50f6e0..325c1633ee147351ca95b2bf9b8b6286f47a7ebe 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -85,6 +85,7 @@ static void         ev_sidebar_thumbnails_set_document     (EvSidebarPage
 static const gchar* ev_sidebar_thumbnails_get_label        (EvSidebarPage       *sidebar_page);
 static void         thumbnail_job_completed_callback       (EvJobThumbnail      *job,
                                                            EvSidebarThumbnails *sidebar_thumbnails);
 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, 
 
 G_DEFINE_TYPE_EXTENDED (EvSidebarThumbnails, 
                         ev_sidebar_thumbnails, 


@@ -102,13 +103,13 @@ ev_sidebar_thumbnails_dispose (GObject *object)
 {
        EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object);
        
 {
        EvSidebarThumbnails *sidebar_thumbnails = EV_SIDEBAR_THUMBNAILS (object);
        

-       ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);

        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) {
        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) {

+               ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);

                g_object_unref (sidebar_thumbnails->priv->list_store);
                sidebar_thumbnails->priv->list_store = NULL;
        }
                g_object_unref (sidebar_thumbnails->priv->list_store);
                sidebar_thumbnails->priv->list_store = NULL;
        }


@@ -124,8 +125,7 @@ ev_sidebar_thumbnails_get_property (GObject    *object,
 {
        EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object);
 
 {
        EvSidebarThumbnails *sidebar = EV_SIDEBAR_THUMBNAILS (object);
 

-       switch (prop_id)
-       {
+       switch (prop_id) {

        case PROP_WIDGET:
                if (sidebar->priv->tree_view)
                        g_value_set_object (value, sidebar->priv->tree_view);
        case PROP_WIDGET:
                if (sidebar->priv->tree_view)
                        g_value_set_object (value, sidebar->priv->tree_view);


@@ -138,17 +138,32 @@ ev_sidebar_thumbnails_get_property (GObject    *object,
        }
 }
 
        }
 }
 

+static void
+ev_sidebar_thumbnails_map (GtkWidget *widget)
+{
+       EvSidebarThumbnails *sidebar;
+
+       sidebar = EV_SIDEBAR_THUMBNAILS (widget);
+
+       GTK_WIDGET_CLASS (ev_sidebar_thumbnails_parent_class)->map (widget);
+       
+       adjustment_changed_cb (sidebar);
+}
+

 static void
 ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnails_class)
 {
        GObjectClass *g_object_class;
        GtkObjectClass *gtk_object_class;
 static void
 ev_sidebar_thumbnails_class_init (EvSidebarThumbnailsClass *ev_sidebar_thumbnails_class)
 {
        GObjectClass *g_object_class;
        GtkObjectClass *gtk_object_class;

+       GtkWidgetClass *widget_class;

 
        g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class);
        gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class);
 
        g_object_class = G_OBJECT_CLASS (ev_sidebar_thumbnails_class);
        gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_thumbnails_class);

+       widget_class = GTK_WIDGET_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->dispose = ev_sidebar_thumbnails_dispose;
        g_object_class->get_property = ev_sidebar_thumbnails_get_property;

+       widget_class->map = ev_sidebar_thumbnails_map;

 
        g_object_class_override_property (g_object_class,
                                          PROP_WIDGET,
 
        g_object_class_override_property (g_object_class,
                                          PROP_WIDGET,


@@ -205,6 +220,20 @@ clear_range (EvSidebarThumbnails *sidebar_thumbnails,
        gtk_tree_path_free (path);
 }
 
        gtk_tree_path_free (path);
 }
 

+static gdouble
+get_scale_for_page (EvSidebarThumbnails *sidebar_thumbnails,
+                   gint                 page)
+{
+       EvSidebarThumbnailsPrivate *priv = sidebar_thumbnails->priv;
+       gint width, height;
+
+       ev_page_cache_get_size (priv->page_cache,
+                               page, priv->rotation,
+                               1.0, &width, &height);
+       
+       return (gdouble)THUMBNAIL_WIDTH / (gdouble)width;
+}
+

 static void
 add_range (EvSidebarThumbnails *sidebar_thumbnails,
           gint                 start_page,
 static void
 add_range (EvSidebarThumbnails *sidebar_thumbnails,
           gint                 start_page,


@@ -222,7 +251,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
        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 ++) {
        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;
+               EvJob *job;

                gboolean thumbnail_set;
 
                gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter,
                gboolean thumbnail_set;
 
                gtk_tree_model_get (GTK_TREE_MODEL (priv->list_store), &iter,


@@ -231,9 +260,14 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
                                    -1);
 
                if (job == NULL && !thumbnail_set) {
                                    -1);
 
                if (job == NULL && !thumbnail_set) {

-                       /* FIXME: Need rotation */
-                       job = (EvJobThumbnail *)ev_job_thumbnail_new (priv->document, page, priv->rotation, THUMBNAIL_WIDTH);
+                       EvRenderContext *rc;
+
+                       rc = ev_render_context_new (priv->rotation, page,
+                                                   get_scale_for_page (sidebar_thumbnails, page));
+                       job = ev_job_thumbnail_new (priv->document, rc);

                        ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);
                        ev_job_queue_add_job (EV_JOB (job), EV_JOB_PRIORITY_HIGH);

+                       g_object_unref (rc);
+                       

                        g_object_set_data_full (G_OBJECT (job), "tree_iter",
                                                gtk_tree_iter_copy (&iter),
                                                (GDestroyNotify) gtk_tree_iter_free);
                        g_object_set_data_full (G_OBJECT (job), "tree_iter",
                                                gtk_tree_iter_copy (&iter),
                                                (GDestroyNotify) gtk_tree_iter_free);


@@ -243,6 +277,7 @@ add_range (EvSidebarThumbnails *sidebar_thumbnails,
                        gtk_list_store_set (priv->list_store, &iter,
                                            COLUMN_JOB, job,
                                            -1);
                        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) {
                        /* The queue and the list own a ref to the job now */
                        g_object_unref (job);
                } else if (job) {


@@ -290,6 +325,10 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
        gint wy1;
        gint wy2;
 
        gint wy1;
        gint wy2;
 

+       /* Widget is not currently visible */
+       if (!GTK_WIDGET_MAPPED (sidebar_thumbnails))
+               return;
+       

        if (priv->tree_view) {
                if (! GTK_WIDGET_REALIZED (priv->tree_view))
                        return;
        if (priv->tree_view) {
                if (! GTK_WIDGET_REALIZED (priv->tree_view))
                        return;


@@ -307,14 +346,10 @@ adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
                                               1, wy2 -1, &path2,
                                               NULL, NULL, NULL);
        } else if (priv->icon_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;
                if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
                        return;
                if (! GTK_WIDGET_REALIZED (priv->icon_view))
                        return;
                if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (priv->icon_view), &path, &path2))
                        return;

-#else
-               g_assert_not_reached ();
-#endif

        } else {
                return;
        }
        } else {
                return;
        }


@@ -368,22 +403,37 @@ ev_sidebar_thumbnails_set_loading_icon (EvSidebarThumbnails *sidebar_thumbnails)
                g_object_unref (sidebar_thumbnails->priv->loading_icon);
 
        if (sidebar_thumbnails->priv->document) {
                g_object_unref (sidebar_thumbnails->priv->loading_icon);
 
        if (sidebar_thumbnails->priv->document) {

+               EvRenderContext *rc;
+
+               rc = ev_render_context_new (sidebar_thumbnails->priv->rotation, 0,
+                                           get_scale_for_page (sidebar_thumbnails, 0));
+

                /* 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 (sidebar_thumbnails->priv->document),
                /* 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 (sidebar_thumbnails->priv->document),

-                                                      0, THUMBNAIL_WIDTH, &width, &height);
+                                                      rc, &width, &height);

                ev_document_doc_mutex_unlock ();
                ev_document_doc_mutex_unlock ();

+               
+               g_object_unref (rc);
+               

                sidebar_thumbnails->priv->loading_icon =
                sidebar_thumbnails->priv->loading_icon =

-                       ev_document_misc_get_thumbnail_frame (width, height, sidebar_thumbnails->priv->rotation, NULL);
+                       ev_document_misc_get_thumbnail_frame (width, height, NULL);

        } else {
                sidebar_thumbnails->priv->loading_icon = 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,
 void
 ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,

-

                               int                  rotation)
 {
        sidebar_thumbnails->priv->rotation = rotation;
                               int                  rotation)
 {
        sidebar_thumbnails->priv->rotation = rotation;


@@ -398,7 +448,7 @@ ev_sidebar_thumbnails_refresh (EvSidebarThumbnails *sidebar_thumbnails,
        /* Trigger a redraw */
        sidebar_thumbnails->priv->start_page = 0;
        sidebar_thumbnails->priv->end_page = 0;
        /* Trigger a redraw */
        sidebar_thumbnails->priv->start_page = 0;
        sidebar_thumbnails->priv->end_page = 0;

-       adjustment_changed_cb (sidebar_thumbnails);
+       g_idle_add ((GSourceFunc)refresh, sidebar_thumbnails);

 }
 
 static void
 }
 
 static void


@@ -418,7 +468,7 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
        page = gtk_tree_path_get_indices (path)[0];
        gtk_tree_path_free (path);
 
        page = gtk_tree_path_get_indices (path)[0];
        gtk_tree_path_free (path);
 

-       ev_page_cache_set_current_page (priv->page_cache, page);
+       ev_page_cache_set_current_page_history (priv->page_cache, page);

 }
 
 static void
 }
 
 static void


@@ -443,7 +493,7 @@ ev_sidebar_icon_selection_changed (GtkIconView         *icon_view,
        gtk_tree_path_free (path);
        g_list_free (selected);
 
        gtk_tree_path_free (path);
        g_list_free (selected);
 

-       ev_page_cache_set_current_page (priv->page_cache, page);
+       ev_page_cache_set_current_page_history (priv->page_cache, page);

 }
 
 static void
 }
 
 static void


@@ -495,14 +545,10 @@ ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails)
 static gboolean
 ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
 {
 static gboolean
 ev_sidebar_thumbnails_use_icon_view (EvSidebarThumbnails *sidebar_thumbnails)
 {

-#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;
        return TRUE;
        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
-       return FALSE;
-#endif

 }
 
 static void
 }
 
 static void


@@ -552,11 +598,18 @@ page_changed_cb (EvPageCache         *page_cache,
                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) {
                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 
+
+               g_signal_handlers_block_by_func
+                       (sidebar->priv->icon_view,
+                        G_CALLBACK (ev_sidebar_icon_selection_changed), sidebar);
+

                gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path);
                gtk_icon_view_select_path (GTK_ICON_VIEW (sidebar->priv->icon_view), path);

+
+               g_signal_handlers_unblock_by_func
+                       (sidebar->priv->icon_view,
+                        G_CALLBACK (ev_sidebar_icon_selection_changed), sidebar);
+

                gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE);
                gtk_icon_view_set_cursor (GTK_ICON_VIEW (sidebar->priv->icon_view), path, NULL, FALSE);

-#endif

        }
 
        gtk_tree_path_free (path);
        }
 
        gtk_tree_path_free (path);


@@ -607,6 +660,8 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage   *sidebar_page,
                if (! priv->icon_view) {
                        ev_sidebar_init_icon_view (sidebar_thumbnails);
                        g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget");
                if (! priv->icon_view) {
                        ev_sidebar_init_icon_view (sidebar_thumbnails);
                        g_object_notify (G_OBJECT (sidebar_thumbnails), "main_widget");

+               } else {
+                       gtk_widget_queue_resize (priv->icon_view);

                }
        } else {
                if (priv->icon_view) {
                }
        } else {
                if (priv->icon_view) {