Use a GtkIconView in certain situations. That situation is that you're

Wed Jun  8 01:04:22 2005  Jonathan Blandford  <jrb@redhat.com>

        * shell/ev-sidebar-thumbnails.c: Use a GtkIconView in certain
        situations.  That situation is that you're using GTK+-HEAD with
        the patch at #306726 is applied, and you have a document with <
        1500 pages in it.  It's not quite as uniformly nice as the
        TreeView, but should be better in the long run.

        I'm pretty sure I guarded against breaking compilation with
        HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE gaurds, though it's possible
        I missed some.

        * shell/ev-window.c (ev_window_init): We don't have our tree/list
        widget yet, so I commented that code out
        enable_view_actions_for_widget() for now.  Need to figure this
        out.

        * shell/ev-page-action.c (match_selected_cb): emit the right
        signals.  Our cool C-l completion now works.

diff --git a/ChangeLog b/ChangeLog
index f9e6d9f958174394cfcce6efc3d4b6ef3d46c661..22326b8c83b0ff6567ed50faeb2d481846ad299f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Wed Jun  8 01:04:22 2005  Jonathan Blandford  <jrb@redhat.com>
+
+       * shell/ev-sidebar-thumbnails.c: Use a GtkIconView in certain
+       situations.  That situation is that you're using GTK+-HEAD with
+       the patch at #306726 is applied, and you have a document with <
+       1500 pages in it.  It's not quite as uniformly nice as the
+       TreeView, but should be better in the long run.
+
+       I'm pretty sure I guarded against breaking compilation with
+       HAVE_GTK_ICON_VIEW_GET_VISIBLE_RANGE gaurds, though it's possible
+       I missed some.
+
+       * shell/ev-window.c (ev_window_init): We don't have our tree/list
+       widget yet, so I commented that code out
+       enable_view_actions_for_widget() for now.  Need to figure this
+       out.
+
+       * shell/ev-page-action.c (match_selected_cb): emit the right
+       signals.  Our cool C-l completion now works.
+
 2005-06-08  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * backend/Makefile.am:

diff --git a/configure.ac b/configure.ac
index f958ab220cbdd6ed953253d4bc86e9fa48d2f0b3..106a8d1f8276f7b554f45e8ebeef793632625974 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,11 @@ else
 fi
 AC_SUBST(EVINCE_DISABLE_DEPRECATED)
 
+evince_save_LIBS=$LIBS
+LIBS="$LIBS $GTK_LIBS"
+AC_CHECK_FUNCS(gtk_icon_view_get_visible_range)
+LIBS=$evince_save_LIBS
+
 AM_GCONF_SOURCE_2
 
 AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no])

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 076dff162fdecec1b9086399f77e0df6c94833e5..5b45b31d898ed404ea0292e818e7934f9bdc3a32 100644 (file)
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -344,7 +344,7 @@ match_selected_cb (GtkEntryCompletion *completion,
                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                            -1);
 
-       g_signal_emit (proxy, signals[ACTIVATE_LINK], 0, link);
+       g_signal_emit (proxy, widget_signals[WIDGET_ACTIVATE_LINK], 0, link);
        
        return TRUE;
 }

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 5d228f355b94a4a8741228c13a4deac87892ed31..3a6eb0b598b491636661a159d58eb37fbb9e868e 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -40,10 +40,14 @@
 
 #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;
@@ -92,6 +96,7 @@ ev_sidebar_thumbnails_dispose (GObject *object)
        
        ev_sidebar_thumbnails_clear_model (sidebar_thumbnails);
        g_object_unref (sidebar_thumbnails->priv->loading_icon);
+       g_object_unref (sidebar_thumbnails->priv->list_store);
 
        G_OBJECT_CLASS (ev_sidebar_thumbnails_parent_class)->dispose (object);
 }
@@ -243,28 +248,41 @@ static void
 adjustment_changed_cb (EvSidebarThumbnails *sidebar_thumbnails)
 {
        EvSidebarThumbnailsPrivate *priv;
-       GtkTreePath *path;
-       GtkTreePath *path2;
+       GtkTreePath *path = NULL;
+       GtkTreePath *path2 = NULL;
        gint wy1;
        gint wy2;
 
        priv = sidebar_thumbnails->priv = EV_SIDEBAR_THUMBNAILS_GET_PRIVATE (sidebar_thumbnails);
 
-       if (! GTK_WIDGET_REALIZED (priv->tree_view))
+       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_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);
        if (path == NULL)
                path = gtk_tree_path_new_first ();
        if (path2 == NULL)
@@ -302,23 +320,53 @@ ev_sidebar_tree_selection_changed (GtkTreeSelection *selection,
        ev_page_cache_set_current_page (page_cache, page);
 }
 
+static void
+ev_sidebar_icon_selection_changed (GtkIconView         *icon_view,
+                                  EvSidebarThumbnails *ev_sidebar_thumbnails)
+{
+       EvSidebarThumbnailsPrivate *priv;
+       EvPageCache *page_cache;
+       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;
+
+       /* 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);
+
+       page_cache = ev_page_cache_get (priv->document);
+       ev_page_cache_set_current_page (page_cache, page);
+}
+
 GtkWidget *
 ev_sidebar_thumbnails_get_treeview (EvSidebarThumbnails *sidebar)
 {
-       return sidebar->priv->tree_view;
+       if (sidebar->priv->tree_view)
+               return sidebar->priv->tree_view;
+       else
+               return sidebar->priv->icon_view;
 }
 
+
 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, EV_TYPE_JOB_THUMBNAIL);
+       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));
@@ -336,26 +384,73 @@ 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);
+       gtk_container_add (GTK_CONTAINER (priv->swindow), priv->tree_view);
+       gtk_widget_show (priv->tree_view);
+}
 
-       g_object_unref (priv->list_store);
+static void
+ev_sidebar_init_icon_view (EvSidebarThumbnails *ev_sidebar_thumbnails)
+{
+       EvSidebarThumbnailsPrivate *priv;
+
+       priv = ev_sidebar_thumbnails->priv;
+
+       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
+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)
+               return FALSE;
+       return TRUE;
+#else
+       return FALSE;
+#endif
+}
+
+static void
+ev_sidebar_thumbnails_init (EvSidebarThumbnails *ev_sidebar_thumbnails)
+{
+       EvSidebarThumbnailsPrivate *priv;
+
+       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,
+                                              EV_TYPE_JOB_THUMBNAIL);
 
-       swindow = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
+       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 (swindow),
+       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->swindow),
                                             GTK_SHADOW_IN);
-       priv->vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (swindow));
+       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 (swindow), "size-allocate",
+       g_signal_connect_swapped (G_OBJECT (priv->swindow), "size-allocate",
                                  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_box_pack_start (GTK_BOX (ev_sidebar_thumbnails), priv->swindow, TRUE, TRUE, 0);
 
-       gtk_widget_show_all (swindow);
+       /* Put it all together */
+       gtk_widget_show_all (priv->swindow);
 }
 
 static void
@@ -363,12 +458,23 @@ page_changed_cb (EvPageCache         *page_cache,
                 int                  page,
                 EvSidebarThumbnails *sidebar)
 {
-       GtkTreeView *tree_view = GTK_TREE_VIEW (sidebar->priv->tree_view);
+       GtkTreeView *tree_view;
        GtkTreePath *path;
 
        path = gtk_tree_path_new_from_indices (page, -1);
-       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);
+
+       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);
 }
 
@@ -438,6 +544,27 @@ ev_sidebar_thumbnails_set_document (EvSidebarPage  *sidebar_page,
                g_free (page_string);
        }
 
+
+       /* 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);
+       } 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);
+       }
+
+
        /* Connect to the signal and trigger a fake callback */
        g_signal_connect (page_cache, "page-changed", G_CALLBACK (page_changed_cb), sidebar_thumbnails);
        adjustment_changed_cb (sidebar_thumbnails);

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 577ee4c90932bd1df311e0ae3cd24442566eb6d7..f3c7a46e39c9630d77d766aeb6ef1b8e274f9a2d 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2951,7 +2951,7 @@ ev_window_init (EvWindow *ev_window)
        sidebar_widget = ev_sidebar_thumbnails_new ();
        tree_view = ev_sidebar_thumbnails_get_treeview
                        (EV_SIDEBAR_THUMBNAILS (sidebar_widget));
-       enable_view_actions_for_widget (ev_window, tree_view);
+       //enable_view_actions_for_widget (ev_window, tree_view);
        gtk_widget_show (sidebar_widget);
        ev_sidebar_add_page (EV_SIDEBAR (ev_window->priv->sidebar),
                             sidebar_widget);