Changeset 67

Timestamp:

04/15/06 10:40:50 (3 years ago)

Author:

jordi

Message:

Added support for named destinations for PDF outlines.
Now the view shows the links sidebar and allows to go to where they point if you double click on them...

Location:

trunk

Files:

• src/IMainView.h (modified) (1 diff)
• src/MainPter.cxx (modified) (1 diff)
• src/PDFDocument.cxx (modified) (1 diff)
• src/gtk/MainView.cxx (modified) (12 diffs)
• src/gtk/MainView.h (modified) (3 diffs)
• tests/MainPterTest.cxx (modified) (1 diff)

trunk/src/IMainView.h

@@ -25 +25 @@
     class MainPter;
     class DocumentPage;
+    class DocumentOutline;
 
     ///

trunk/src/MainPter.cxx

@@ -101 +101 @@
         showSidebar = (NULL != m_Document->getOutline () &&
                        0 < m_Document->getOutline ()->getNumChildren () &&
-                       PageModeOutlines != m_Document->getPageMode ());
+                       PageModeOutlines == m_Document->getPageMode ());
 
         if ( canShowPage )

trunk/src/PDFDocument.cxx

@@ -246 +246 @@
             gint destination = 1;
             LinkAction *action = item->getAction ();
-            if ( NULL != action && action->isOk () && 
-                 actionGoTo == action->getKind () ) 
-            {
-                LinkDest *linkDestination = ((LinkGoTo *)action)->getDest ();
-                if ( linkDestination->isOk () )
+            if ( NULL != action && actionGoTo == action->getKind () &&
+                 action->isOk () )
+            {
+                LinkDest *linkDestination = NULL;
+                GooString *namedDest = ((LinkGoTo *)action)->getNamedDest ();
+                // getNamedDest() or getDest() will return NULL, just need to
+                // find which one.
+                if ( NULL != namedDest )
+                {
+                    linkDestination = m_Document->findDest (namedDest);
+                }
+                else
+                {
+                    linkDestination = ((LinkGoTo *)action)->getDest ();
+                }
+                if ( NULL != linkDestination && linkDestination->isOk () )
                 {
                     if ( linkDestination->isPageRef () )

trunk/src/gtk/MainView.cxx

@@ -21 +21 @@
 #include <gettext.h>
 #include <gtk/gtk.h>
-#include <IMainView.h>
-#include <MainPter.h>
-#include <DocumentPage.h>
+#include <epdfview.h>
 #include "StockIcons.h"
 #include "MainView.h"
@@ -45 +43 @@
 static void main_window_rotate_right_cb (GtkWidget *, gpointer);
 static void main_window_open_file_cb (GtkWidget *, gpointer);
+static void main_window_outline_cb (GtkTreeView *, GtkTreePath *, 
+                                    GtkTreeViewColumn *, gpointer);
 static void main_window_quit_cb (GtkWidget *, gpointer);
 static void main_window_zoom_fit_cb (GtkWidget *, gpointer);
@@ -134 +134 @@
     m_MainBox = gtk_vbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (m_MainWindow), m_MainBox);
+    gtk_widget_show (m_MainBox);
     // Generate menu and tool bars.
     createUIManager ();
@@ -142 +143 @@
     GtkWidget *menuBar = gtk_ui_manager_get_widget (m_UIManager, "/MenuBar");
     gtk_box_pack_start (GTK_BOX (m_MainBox), menuBar, FALSE, FALSE, 0);
+    gtk_widget_show (menuBar);
     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
+    gtk_widget_show (toolBar);
     // Add the current page tool item.
     createCurrentPage ();
     gtk_toolbar_insert (GTK_TOOLBAR (toolBar), m_CurrentPageToolItem,
                         CURRENT_PAGE_POS);
+    gtk_widget_show_all (GTK_WIDGET (m_CurrentPageToolItem));
     gtk_toolbar_insert (GTK_TOOLBAR (toolBar), gtk_separator_tool_item_new (),
                         CURRENT_PAGE_POS + 1);
     // Create the page view
-    createPageView ();
-    gtk_box_pack_start (GTK_BOX (m_MainBox), m_PageViewScroll, TRUE, TRUE, 0);
+    GtkWidget *pageViewPaned = createPageView ();
+    gtk_box_pack_start (GTK_BOX (m_MainBox), pageViewPaned, TRUE, TRUE, 0);
+    gtk_widget_show (pageViewPaned);
 
     // The status bar don't do anything, yet. But without the application
@@ -158 +163 @@
     GtkWidget *statusBar = gtk_statusbar_new ();
     gtk_box_pack_start (GTK_BOX (m_MainBox), statusBar, FALSE, FALSE, 0);
+    gtk_widget_show (statusBar);
 }
 
@@ -336 +342 @@
 void 
 MainView::show (void)
-{
-    gtk_widget_show_all (m_MainWindow);
+{    
+    gtk_widget_show (m_MainWindow);
     gtk_window_maximize (GTK_WINDOW (m_MainWindow));
 }
@@ -365 +371 @@
 }
 
+void
+MainView::showSidebar (gboolean show)
+{
+    if ( show )
+    {
+        gtk_widget_show_all (m_Sidebar);
+    }
+    else
+    {
+        gtk_widget_hide (m_Sidebar);
+    }
+}
+
 void 
 MainView::setTotalPages (gint pages)
@@ -402 +421 @@
 }
 
+void
+MainView::setOutline (DocumentOutline *outline)
+{
+    gtk_tree_store_clear (m_Outline);
+    setOutlineChildren (outline, NULL);
+}
+
 ////////////////////////////////////////////////////////////////
 // GTK+ Functions.
@@ -433 +459 @@
 /// @brief Creates the widget that will display the page.
 ///
-void
+/// Creates the image widget inside the scrolled window, but also creates
+/// the sidebar.
+///
+/// Put both the sidebar and the image to a HPaned container.
+///
+/// @return The HPaned where the sidebar and the scrolled window are.
+///
+GtkWidget *
 MainView::createPageView ()
 {
+    // Create the image view.
     m_PageViewScroll = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_PageViewScroll),
@@ -445 +479 @@
     gtk_scrolled_window_add_with_viewport (
             GTK_SCROLLED_WINDOW (m_PageViewScroll), m_PageView);
+
+    // Create the side bar, with the outline tree.
+    m_Outline = gtk_tree_store_new (3, G_TYPE_STRING, G_TYPE_INT, 
+                                       G_TYPE_POINTER);
+    GtkWidget *treeIndex = 
+        gtk_tree_view_new_with_model (GTK_TREE_MODEL (m_Outline));
+    gtk_widget_set_size_request (treeIndex, 200, -1);
+
+    GtkTreeViewColumn *column = gtk_tree_view_column_new ();
+    gtk_tree_view_column_set_expand (column, TRUE);
+    gtk_tree_view_column_set_title (column, _("Index"));
+    gtk_tree_view_append_column (GTK_TREE_VIEW (treeIndex), column);
+   
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        GValue ellipsizeMode = { 0, };
+        g_value_init (&ellipsizeMode, PANGO_TYPE_ELLIPSIZE_MODE);
+        g_value_set_enum (&ellipsizeMode, PANGO_ELLIPSIZE_END);
+        g_object_set_property (G_OBJECT (renderer),
+                               "ellipsize", &ellipsizeMode);
+        gtk_tree_view_column_pack_start (column, renderer, TRUE);
+        gtk_tree_view_column_set_attributes (column, renderer, "text", 0, NULL);
+    }
+            
+    {
+        GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+        gtk_tree_view_column_pack_end (column, renderer, FALSE);
+        gtk_tree_view_column_set_attributes (column, renderer, "text", 1, NULL);
+    }
+    // Set not selection for the tree index.
+    GtkTreeSelection *selection = 
+        gtk_tree_view_get_selection (GTK_TREE_VIEW (treeIndex));
+    gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
+    g_signal_connect (G_OBJECT (treeIndex), "row-activated",
+                      G_CALLBACK (main_window_outline_cb), m_Pter);
+
+    m_Sidebar = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_Sidebar),
+                                    GTK_POLICY_AUTOMATIC,
+                                    GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_Sidebar),
+                                         GTK_SHADOW_IN);
+    gtk_container_add (GTK_CONTAINER (m_Sidebar), treeIndex);
+
+
+    GtkWidget *hPaned = gtk_hpaned_new ();
+    gtk_paned_add1 (GTK_PANED (hPaned), m_Sidebar);
+    gtk_paned_add2 (GTK_PANED (hPaned), m_PageViewScroll);
+    gtk_widget_show_all (m_PageViewScroll);
+    gtk_widget_show (hPaned);
+
+    return hPaned;
 }
 
@@ -533 +619 @@
     g_list_foreach (iconList, (GFunc)g_object_unref, NULL);
     g_list_free (iconList);
+}
+
+
+void
+MainView::setOutlineChildren (DocumentOutline *outline, GtkTreeIter *rootIter)
+{
+    if ( NULL != outline )
+    {        
+        DocumentOutline *child = outline->getFirstChild ();
+        while (NULL != child)
+        {
+            GtkTreeIter childIter;            
+            gtk_tree_store_append (m_Outline, &childIter, rootIter);
+            gtk_tree_store_set (m_Outline, &childIter,
+                                0, child->getTitle (),
+                                1, child->getDestinationPage (),
+                                2, child,
+                                -1);
+            setOutlineChildren (child, &childIter);
+            child = outline->getNextChild ();
+        }
+    }
 }
 
@@ -690 +798 @@
 
 ///
+/// @brief The user selected an outline index item.
+///
+void
+main_window_outline_cb (GtkTreeView *treeIndex, GtkTreePath *treePath,
+                        GtkTreeViewColumn *column, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    GtkTreeModel *indexModel = gtk_tree_view_get_model (treeIndex);
+    GtkTreeIter iter;
+    if ( gtk_tree_model_get_iter (indexModel, &iter, treePath) )
+    {
+        gpointer outlineData;
+        gtk_tree_model_get (indexModel, &iter, 2, &outlineData, -1);
+        DocumentOutline *outline = (DocumentOutline *)outlineData;
+        MainPter *pter = (MainPter *)data;
+        pter->outlineActivated (outline);
+    }    
+}
+
+///
 /// @brief Called when the window is closed or Quit is activated.
 ///

trunk/src/gtk/MainView.h

@@ -49 +49 @@
             void showErrorMessage (const gchar *title, const gchar *body);
             void showPage (DocumentPage *page);
+            void showSidebar (gboolean show);
             void setTotalPages (gint pages);
             void setGoToPageText (const gchar *text);
@@ -54 +55 @@
             void getPageViewSize (gint *width, gint *height);
             void setTitle (const gchar *title);
+            void setOutline (DocumentOutline *outline);
 
         protected:
@@ -60 +62 @@
             GtkWidget *m_MainWindow; 
             GtkWidget *m_MainBox;
+            GtkTreeStore *m_Outline;
             GtkWidget *m_PageView;
             GtkWidget *m_PageViewScroll;
+            GtkWidget *m_Sidebar;
             gint m_TotalPages;
             GtkUIManager *m_UIManager;
 
             void createCurrentPage (void);
-            void createPageView (void);
+            GtkWidget *createPageView (void);
             void createUIManager (void);
             GdkPixbuf *getPixbufFromPage (DocumentPage *page);
             void setMainWindowIcon (void);
+            void setOutlineChildren (DocumentOutline *outline, 
+                                     GtkTreeIter *rootIter);
     };
 }

trunk/tests/MainPterTest.cxx

@@ -685 +685 @@
     child->setDestination (2);
     outline->addChild (child);
+    m_Document->setPageMode (PageModeOutlines);
     m_Document->setOutline (outline);    
     m_Document->setNumPages (4);