Changeset 227

Timestamp:

06/12/06 16:40:59 (2 years ago)

Author:

jordi

Message:

The MainView? now has a separate widget for the current page number and the total page number, as requested in bug #37 closed in this revision.

Location:

trunk

Files:

• src/IMainView.h (modified) (2 diffs)
• src/MainPter.cxx (modified) (3 diffs)
• src/gtk/MainView.cxx (modified) (5 diffs)
• src/gtk/MainView.h (modified) (3 diffs)
• tests/DumbMainView.cxx (modified) (6 diffs)
• tests/DumbMainView.h (modified) (4 diffs)
• tests/MainPterTest.cxx (modified) (2 diffs)
• tests/PrintPterTest.cxx (modified) (3 diffs)
• tests/PrintPterTest.h (modified) (1 diff)

trunk/src/IMainView.h

@@ -356 +356 @@
 
             ///
+            /// @brief Sets the text for the number of pages.
+            ///
+            /// The view displays the number of pages separately
+            /// of the current page. This function should set the
+            /// text to display in this separate control.
+            ///
+            /// @param text The text to set as the number of pages.
+            ///
+            virtual void setNumberOfPagesText (const gchar *text) = 0;
+
+            ///
             /// @brief Sets the text of the status bar.
             ///
@@ -436 +447 @@
             ///
             virtual void showToolbar (gboolean show) = 0;
-
-            ///
-            /// @brief Gives the number of pages that the document has.
-            ///
-            /// The view should keep a the number of total pages and show it
-            /// to the user.
-            ///
-            /// @param pages The total number of pages the document has.
-            ///
-            virtual void setTotalPages (gint pages) = 0;
 
             ///

trunk/src/MainPter.cxx

@@ -137 +137 @@
         view.activeZoomFit (config.zoomToFit ());
         view.activeZoomWidth (config.zoomToWidth ());
-        view.setTotalPages (m_Document->getNumPages ());
 #if defined (HAVE_CUPS)
         view.sensitivePrint (TRUE);
@@ -376 +375 @@
         gint newPageNum = m_Document->getCurrentPageNum ();
         gint totalPages = m_Document->getNumPages ();
-        gchar *goToPageText = g_strdup_printf (_("%d of %d"), 
-                                               newPageNum, totalPages);
+        gchar *goToPageText = g_strdup_printf ("%d", newPageNum);
         getView ().setGoToPageText (goToPageText);
         g_free (goToPageText);
+        gchar *totalPagesText = g_strdup_printf (_("of %d"), totalPages);
+        getView ().setNumberOfPagesText (totalPagesText);
+        g_free (totalPagesText);
     }
 }
@@ -845 +846 @@
     // Set the text for the current page.
     gint totalPages = m_Document->getNumPages ();
-    gchar *goToPageText = g_strdup_printf (_("%d of %d"), pageNum, totalPages);
+    gchar *goToPageText = g_strdup_printf ("%d", pageNum);
     view.setGoToPageText (goToPageText);
     g_free (goToPageText);
+    gchar *totalPagesText = g_strdup_printf(_("of %d"), totalPages);
+    view.setNumberOfPagesText (totalPagesText);
+    g_free (totalPagesText);
 
     // Set the page navigation sensitivity.

trunk/src/gtk/MainView.cxx

@@ -35 +35 @@
 // Constants.
 static gint CURRENT_PAGE_POS = 5;
-static gint CURRENT_PAGE_WIDTH = 14;
+static gint CURRENT_PAGE_WIDTH = 5;
 static gint CURRENT_ZOOM_POS = 8;
 static gint CURRENT_ZOOM_WIDTH = 6;
 
 // Enumerations.
-static enum
+enum indexColumns
 {
     outlineTitleColumn,
@@ -46 +46 @@
     outlineDataColumn,
     outlineNumColumns
-} indexColumns;
+};
 
 // Forward declarations.
@@ -625 +625 @@
 }
 
-void 
-MainView::setTotalPages (gint pages)
-{
-    m_TotalPages = pages;
-}
-
-void 
+void
+MainView::setNumberOfPagesText (const gchar *text)
+{
+    gtk_label_set_text (GTK_LABEL (m_NumberOfPages), text);
+}
+
+void
 MainView::setGoToPageText (const gchar *text)
 {
@@ -756 +756 @@
     GtkWidget *hbox = gtk_hbox_new (FALSE, 3);
 
-    GtkWidget *pageLabel= gtk_label_new (_("Page"));
+    GtkWidget *pageLabel = gtk_label_new (_("Page"));
     gtk_box_pack_start (GTK_BOX (hbox), pageLabel, FALSE, FALSE, 0);
 
     m_CurrentPage = gtk_entry_new ();
-    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), _("0 of 0"));
+    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), "0");
     gtk_entry_set_alignment (GTK_ENTRY (m_CurrentPage), 1.0f);
     gtk_entry_set_width_chars (GTK_ENTRY (m_CurrentPage), CURRENT_PAGE_WIDTH);
@@ -766 +766 @@
                       G_CALLBACK (main_window_go_to_page_cb), m_Pter);
     gtk_box_pack_start (GTK_BOX (hbox), m_CurrentPage, TRUE, TRUE, 0);
+    m_NumberOfPages = gtk_label_new (_("of 0"));
+    gtk_misc_set_alignment (GTK_MISC (m_NumberOfPages), 0.0f, 0.5f);
+    gtk_box_pack_start (GTK_BOX (hbox), m_NumberOfPages, FALSE, FALSE, 0);
 
     m_CurrentPageToolItem = gtk_tool_item_new ();

trunk/src/gtk/MainView.h

@@ -62 +62 @@
             void showIndex (gboolean show);
             void setCursor (ViewCursor cursorType);
-            void setTotalPages (gint pages);
+            void setNumberOfPagesText (const gchar *text);
             void setGoToPageText (const gchar *text);
             void setStatusBarText (const gchar *text);
@@ -87 +87 @@
             GtkWidget *m_MainWindow;
             GtkWidget *m_MainBox;
+            GtkWidget *m_NumberOfPages;
             GtkTreeStore *m_Outline;
             PageView *m_PageView;
@@ -92 +93 @@
             GtkWidget *m_StatusBar;
             GtkWidget *m_TreeIndex;
-            gint m_TotalPages;
             GtkUIManager *m_UIManager;
 

trunk/tests/DumbMainView.cxx

@@ -34 +34 @@
     m_CurrentPage = 0;
     m_FindView = new DumbFindView ();
+    m_NumberOfPages = g_strdup ("of 0");
     m_GoToPageText = g_strdup ("");
     m_OpenFileName = g_strdup ("");
@@ -65 +66 @@
     m_Title = g_strdup ("");
     m_TimesShownPassword = 0;
-    m_TotalPages = 0;
     m_ZoomText = g_strdup ("");
     m_ZoomToFit = FALSE;
@@ -76 +76 @@
     delete m_PageView;
     g_free (m_GoToPageText);
+    g_free (m_NumberOfPages);
     g_free (m_LastOpenFileFolder);
     g_free (m_LastSaveFileFolder);
@@ -200 +201 @@
 }
 
-void 
+void
 DumbMainView::sensitiveRotateLeft (gboolean sensitive)
 {
@@ -266 +267 @@
 
 void
-DumbMainView::setTotalPages (gint pages)
-{
-    m_TotalPages = pages;
+DumbMainView::setNumberOfPagesText (const gchar *text)
+{
+    g_free (m_NumberOfPages);
+    m_NumberOfPages = g_strdup (text);
 }
 
@@ -367 +369 @@
 {
     return m_Outline;
-}
-
-gint
-DumbMainView::getTotalPages ()
-{
-    return m_TotalPages;
 }
 

trunk/tests/DumbMainView.h

@@ -63 +63 @@
             const gchar *getGoToPageText (void);
             void setCursor (ViewCursor cursorType);
-            void setTotalPages (gint pages);
-            void setGoToPageText (const char *text);
+            void setNumberOfPagesText (const gchar *text);
+            void setGoToPageText (const gchar *text);
             void setTitle (const gchar *title);
             void setOutline (DocumentOutline *outline);
@@ -82 +82 @@
             DocumentOutline *getOutline (void);
             const gchar *getTitle (void);
-            gint getTotalPages (void);
             gboolean isShown (void);
             gboolean isSensitiveFind (void);
@@ -113 +112 @@
             gint m_CurrentPage;
             DumbFindView *m_FindView;
+            gchar *m_NumberOfPages;
             gchar *m_GoToPageText;
             gchar *m_LastOpenFileFolder;
@@ -144 +144 @@
             gint m_TimesShownPassword;
             gchar *m_Title;
-            gint m_TotalPages;
             gchar *m_ZoomText;
             gboolean m_ZoomToFit;

trunk/tests/MainPterTest.cxx

@@ -454 +454 @@
     m_MainPter->openFileActivated ();
     m_MainPter->waitForFileLoaded ();
-    // Check that sets the correct number of pages and the current page.
-    CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
+    // Check that sets the correct current page.
     CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ());
     // Going to the next page should make all actions sensitive.
@@ -523 +522 @@
     m_MainPter->openFileActivated ();
     m_MainPter->waitForFileLoaded ();
-    // Check that sets the correct number of pages and the current page.
-    CPPUNIT_ASSERT_EQUAL (4, m_View->getTotalPages ());
+    // Check that sets the correct current page.
     CPPUNIT_ASSERT_EQUAL (1, m_View->getCurrentPage ());
 

trunk/tests/PrintPterTest.cxx

@@ -17 +17 @@
 
 #include <epdfview.h>
+#include "DumbDocument.h"
 #include "DumbPrintView.h"
 #include "PrintPterTest.h"
@@ -32 +33 @@
 {
     Config::loadFile (FALSE);
-    m_PrintPter = new PrintPter ();
+    m_Document = new DumbDocument ();
+    m_PrintPter = new PrintPter (m_Document);
     m_View = new DumbPrintView ();
     m_PrintPter->setView (m_View);
@@ -52 +54 @@
         m_View = NULL;
     }
+    delete m_Document;
 }
 

trunk/tests/PrintPterTest.h

@@ -40 +40 @@
 
         protected:
+            DumbDocument *m_Document;
             PrintPter *m_PrintPter;
             DumbPrintView *m_View;