Changeset 99

Timestamp:

04/20/06 13:09:22 (2 years ago)

Author:

jordi

Message:

The MainPter? now resizes the page shown if the zoom to width or zoom to fit, that now are toggle actions, are activated. The view also tells to the presenter when the scroll window has resized, so it can calculate the new page.

Files:

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

trunk/src/IMainView.h

@@ -42 +42 @@
-            ///
-            virtual ~IMainView (void) {}
+
+            ///
+            /// @brief Actives or desactives the zoom to fit.
+            ///
+            /// The view must change the state of the zoom to fit option
+            /// to @a active.
+            ///
+            /// @param active TRUE if the option must be actived, FALSE
+            ///               otherwise.
+            ///
+            virtual void activeZoomFit (gboolean active) = 0;
+           
+            ///
+            /// @brief Actives or desactives the zoom to width.
+            ///
+            /// The view must change the state of the zoom to width option
+            /// to @a active.
+            ///
+            /// @param active TRUE if the option must be actived, FALSE
+            ///               otherwise.
+            ///
+            virtual void activeZoomWidth (gboolean active) = 0;
-           
-            ///

trunk/src/MainPter.cxx

@@ -96 +96 @@
-        view.sensitiveZoomFit (TRUE);
-        view.sensitiveZoomWidth (TRUE);
+        view.activeZoomFit (Config::getConfig ().zoomToFit ());
+        view.activeZoomWidth (Config::getConfig ().zoomToWidth ());
-        view.setTotalPages (m_Document->getNumPages ());
-
@@ -289 +291 @@
-
-///
+/// @brief The page view has been resized.
+///
+/// @param width The new with of the page view.
+/// @param height The new height of the page view.
+///
+void
+MainPter::pageViewResized (gint width, gint height)
+{
+    static gint lastWidth = -1;
+    static gint lastHeight = -1;
+
+    if ( !m_Document->isLoaded() || 
+         ( lastWidth == width && lastHeight == height) )
+    {
+        return;
+    }
+    
+    lastWidth = width;
+    lastHeight = height;
+    
+    Config &config = Config::getConfig ();
+
+    if ( config.zoomToFit () )
+    {
+        m_Document->zoomToFit (width, height);
+        showPage ();
+    }
+    else if ( config.zoomToWidth () )
+    {
+        m_Document->zoomToWidth (width);
+        showPage ();
+    }
+}
+
+///
-/// @brief The "Reload" was activated.
-///
@@ -339 +376 @@
-/// @brief The "Zoom Fit Best" was activated.
-///
-
-
+
+
+
+
-{
-    g_assert ( NULL != m_Document && "Tried to zoom fit a NULL document.");
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -359 +406 @@
-    g_assert ( NULL != m_Document && "Tried to zoom in a NULL document.");
-
+    Config &config = Config::getConfig ();
+    config.setZoomToFit (FALSE);
+    config.setZoomToWidth (FALSE);
+
+    IMainView &view = getView ();
+    view.activeZoomFit (FALSE);
+    view.activeZoomWidth (FALSE);
+    
-    m_Document->zoomIn ();
-    showPage ();
@@ -371 +426 @@
-    g_assert ( NULL != m_Document && "Tried to zoom out a NULL document.");
-
+    Config &config = Config::getConfig ();
+    config.setZoomToFit (FALSE);
+    config.setZoomToWidth (FALSE);
+
+    IMainView &view = getView ();
+    view.activeZoomFit (FALSE);
+    view.activeZoomWidth (FALSE);
+    
-    m_Document->zoomOut ();
-    showPage ();
@@ -378 +441 @@
-/// @brief The "Zoom Fit Width" was activated.
-///
-
-
+
+
+
+
-{
-    g_assert ( NULL != m_Document && "Tried to zoom width a NULL document.");
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/src/MainPter.h

@@ -54 +54 @@
-            void openFileActivated (void);
-            void outlineActivated (DocumentOutline *outline);
+            void pageViewResized (gint width, gint height);
-            void reloadActivated (void);
-            void rotateLeftActivated (void);
-            void rotateRightActivated (void);
-void
+gboolean active
-            void zoomInActivated (void);
-            void zoomOutActivated (void);
-void
+gboolean active
-
-        protected:

trunk/src/gtk/MainView.cxx

@@ -46 +46 @@
-static void main_window_open_file_cb (GtkWidget *, gpointer);
-static void main_window_outline_cb (GtkTreeSelection *, gpointer);
+static void main_window_page_view_resized_cb (GtkWidget *, GtkAllocation *, 
+                                              gpointer);
-static void main_window_quit_cb (GtkWidget *, gpointer);
-static void main_window_show_sidebar_cb (GtkToggleAction *, gpointer);
-static void main_window_show_statusbar_cb (GtkToggleAction *, gpointer);
-static void main_window_show_toolbar_cb (GtkToggleAction *, gpointer);
-Widget
+ToggleAction
-static void main_window_zoom_in_cb (GtkWidget *, gpointer);
-static void main_window_zoom_out_cb (GtkWidget *, gpointer);
-Widget
+ToggleAction
-
-// The actions for menus and toolbars.
@@ -83 +85 @@
-      G_CALLBACK (main_window_zoom_out_cb) },
-    
-    { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL,
-      N_("Make the current document fill the window"), 
-      G_CALLBACK (main_window_zoom_fit_cb) },
-
-    { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
-      N_("Make the current document fill the window width"), 
-      G_CALLBACK (main_window_zoom_width_cb) },
-
-    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, 
-      N_("Rotate the document 90 degrees clockwise"), 
@@ -130 +124 @@
-    { "ShowSideBar", NULL, N_("Show O_utline"), NULL,
-      N_("Show or hide the document's outline"),
-
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -190 +193 @@
-}
-
+void
+MainView::activeZoomFit (gboolean active)
+{
+    GtkAction *zoomFit = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active);
+}
+
+void
+MainView::activeZoomWidth (gboolean active)
+{
+    GtkAction *zoomWidth = 
+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
+    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
+}
-
-gchar *
@@ -513 +531 @@
-                                    GTK_POLICY_AUTOMATIC,
-                                    GTK_POLICY_AUTOMATIC);
+    // When resizing.
+    g_signal_connect (G_OBJECT (m_PageViewScroll), "size-allocate",
+                      G_CALLBACK (main_window_page_view_resized_cb), m_Pter);
+    // The actual image,
-    m_PageView = gtk_image_new  ();
-    gtk_misc_set_padding (GTK_MISC (m_PageView), 
@@ -586 +608 @@
-    gtk_action_group_add_toggle_actions (actionGroup, g_ToggleEntries,
-                                         G_N_ELEMENTS (g_ToggleEntries),
-this
+m_Pter
-    m_UIManager = gtk_ui_manager_new ();
-    gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
@@ -919 +941 @@
-    }
-}
+
+///
+/// @brief The page view has been resized.
+static void
+main_window_page_view_resized_cb (GtkWidget *widget, GtkAllocation *allocation,
+                                  gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    gint scrollSize = SCROLLBARS_SIZE + PAGE_VIEW_PADDING * 2;
+    gint width = allocation->width - scrollSize;
+    gint height = allocation->height - scrollSize;
+    MainPter *pter = (MainPter *)data;
+    pter->pageViewResized (width, height);
+}
+
-///
-/// @brief Called when the window is closed or Quit is activated.
@@ -936 +974 @@
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-
-
+//
+//
-}
-
@@ -948 +986 @@
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-
-
+//
+//
-}
-
@@ -960 +998 @@
-    g_assert ( NULL != data && "The data parameter is NULL.");
-
-
-
+//
+//
-}
-
@@ -968 +1006 @@
-///
-void
-Widget *widget
-
-
-
-
-
+ToggleAction *action
+
+
+
+
+gtk_toggle_action_get_active (action)
-}
-
@@ -1004 +1042 @@
-///
-void
-Widget *widget
-
-
-
-
-
-
+ToggleAction *action
+
+
+
+
+gtk_toggle_action_get_active (action)
+

trunk/src/gtk/MainView.h

@@ -31 +31 @@
-            MainView (MainPter *pter);
-            ~MainView ();
-
+
+
+
-            gchar *openFileDialog (const gchar *lastFolder);
-            gchar *promptPasswordDialog (void);

trunk/tests/DumbMainView.cxx

@@ -53 +53 @@
-    m_TimesShownPassword = 0;
-    m_TotalPages = 0;
+    m_ZoomToFit = FALSE;
+    m_ZoomToWidth = FALSE;
-}
-
@@ -64 +66 @@
-}
-            
+void 
+DumbMainView::activeZoomFit (gboolean active)
+{
+    m_ZoomToFit = active;
+}
+
+void 
+DumbMainView::activeZoomWidth (gboolean active)
+{
+    m_ZoomToWidth = active;
+}
+            
-gchar *
-DumbMainView::openFileDialog (const gchar *lastFolder)
@@ -348 +362 @@
-{
-    return m_ShownSidebar;
+}
+
+gboolean
+DumbMainView::isZoomToFitActive ()
+{
+    return m_ZoomToFit;
+}
+
+gboolean
+DumbMainView::isZoomToWidthActive ()
+{
+    return m_ZoomToWidth;
-}
-

trunk/tests/DumbMainView.h

@@ -28 +28 @@
-            ~DumbMainView ();
-
+            void activeZoomFit (gboolean active);
+            void activeZoomWidth (gboolean active);
-            gchar *openFileDialog (const gchar *lastFolder);
-            gchar *promptPasswordDialog (void);
@@ -75 +77 @@
-            gboolean isSensitiveZoomWidth (void);
-            gboolean isShownSidebar (void);
+            gboolean isZoomToFitActive (void);
+            gboolean isZoomToWidthActive (void);
-            void setOpenFileName (const gchar *fileName);
-            void setPassword (const gchar *password);
@@ -105 +109 @@
-            gchar *m_Title;
-            gint m_TotalPages;
+            gboolean m_ZoomToFit;
+            gboolean m_ZoomToWidth;
-    };
-}

trunk/tests/MainPterTest.cxx

@@ -559 +559 @@
-    m_MainPter->openFileActivated ();
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
-
-    // OK, now try to zoom width. Since rotation is 0
-    // the zoom level should be 75/100 = 0.75
-
-hasImagePageView
-!
+TRUE
+isZoomToWidthActive
+
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+
+    // Now change the view size. We do this calling the main presenter's
+    // function instead of the view, because the view here don't have anything
+    // to do.
+    // The new zoom should be 50/100 = 0.5
+    m_MainPter->pageViewResized (50, 50);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.5, m_Document->getZoom (), 0.0001);
+    
+    m_MainPter->pageViewResized (75, 50);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+
+    // If we desactive the zoom to width, no resizing changes the
+    // zoom.
+    m_MainPter->zoomWidthActivated (FALSE);
+    CPPUNIT_ASSERT (!m_View->isZoomToWidthActive ());
+    m_MainPter->pageViewResized (50, 50);
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+    m_MainPter->pageViewResized (100, 50);
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.75, m_Document->getZoom (), 0.0001);
+
+    // Now rotate and try again.
+    m_MainPter->rotateRightActivated (); 
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());    
+    // Since rotation is now 90 the zoom level should be 75/250 = 0.3
+    m_MainPter->zoomWidthActivated (TRUE);
+    CPPUNIT_ASSERT (m_View->isZoomToWidthActive ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    // Resizing. 50/250 = 0.2
+    m_MainPter->pageViewResized (50, 50);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+
+    // Changing any of the zoom in or zoom out features should make the 
+    // zoom to width not being active.
+    m_MainPter->zoomInActivated ();
+    CPPUNIT_ASSERT (!m_View->isZoomToWidthActive ());
+    m_MainPter->zoomWidthActivated (TRUE);
+    m_MainPter->zoomOutActivated ();
+    CPPUNIT_ASSERT (!m_View->isZoomToWidthActive ());
+}
+
+///
+/// @brief Tests page's zoom to fit
+///
+void
+MainPterTest::pageZoomFit ()
+{
+    m_View->setOpenFileName ("/tmp/test.pdf");
+    m_MainPter->openFileActivated ();
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, m_Document->getZoom (), 0.0001);
+
+    // OK, now try to zoom to fit. Since rotation is 0
+    // the zoom level should be 50/250 = 0.2
+    m_MainPter->zoomFitActivated (TRUE);
+    CPPUNIT_ASSERT (m_View->isZoomToFitActive ());
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+
+    // Resizing the view size. 100/250 = 0.4
+    m_MainPter->pageViewResized (100, 100);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.4, m_Document->getZoom (), 0.0001);
+    m_MainPter->pageViewResized (100, 50);
+    CPPUNIT_ASSERT (m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+
+    // Desactivating the zoom to fit.
+    m_MainPter->zoomFitActivated (FALSE);
+    CPPUNIT_ASSERT (!m_View->isZoomToFitActive ());
+    m_MainPter->pageViewResized (100, 100);
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
+    m_MainPter->pageViewResized (100, 50);
+    CPPUNIT_ASSERT (!m_View->hasImagePageView ());
+    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.2, m_Document->getZoom (), 0.0001);
-
-    // Now rotate and try again.
@@ -575 +656 @@
-    
-    // Since rotation is now 90 the zoom level should be 75/250 = 0.3
-
+
+
-    CPPUNIT_ASSERT_DOUBLES_EQUAL (0.3, m_Document->getZoom (), 0.0001);
-    CPPUNIT_ASSERT (m_View->hasImagePageView ());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -626 +690 @@
-    m_MainPter->goToNextPageActivated ();
-    m_MainPter->rotateRightActivated (); 
-
+TRUE
-    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
-    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
@@ -662 +726 @@
-    m_MainPter->goToNextPageActivated ();
-    m_MainPter->rotateRightActivated (); 
-
+TRUE
-    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
-    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ()); 
@@ -702 +766 @@
-    m_MainPter->goToNextPageActivated ();
-    m_MainPter->rotateRightActivated (); 
-
+TRUE
-    CPPUNIT_ASSERT_EQUAL (2, m_View->getCurrentPage ()); 
-    CPPUNIT_ASSERT_EQUAL (90, m_Document->getRotation ());