Changeset 201

Timestamp:

06/05/06 11:16:50 (2 years ago)

Author:

jordi

Message:

The main window now shows the current zoom level on the tool bar and is manipulable, so a custom zoom level can be specified (inside the 400%-5.12% margins.)

Files:

• trunk/src/IDocument.cxx (modified) (1 diff)
• trunk/src/IMainView.h (modified) (3 diffs)
• trunk/src/MainPter.cxx (modified) (10 diffs)
• trunk/src/MainPter.h (modified) (2 diffs)
• trunk/src/gtk/MainView.cxx (modified) (11 diffs)
• trunk/src/gtk/MainView.h (modified) (4 diffs)

trunk/src/IDocument.cxx

@@ -1245 +1245 @@
-IDocument::setZoom (gdouble zoom)
-{
-    
+
-    {
-        G_LOCK (JobRender);
-zoom
+CLAMP (zoom, ZOOM_OUT_MAX, ZOOM_IN_MAX)
-        refreshCache ();
-        G_UNLOCK (JobRender);

trunk/src/IMainView.h

@@ -267 +267 @@
-
-            ///
+            /// @brief Changes the sensitivity of the "Zoom" entry.
+            ///
+            /// The view must change the sensitivity (it's called enabled or
+            /// disabled on some toolkits) of the "Zoom" entry
+            /// on the toolbar.
+            ///
+            /// @param sensitive Set to TRUE if need to make sensitive (enable)
+            ///                  the entry or FALSE to insensitive (disable) it.
+            ///
+            virtual void sensitiveZoom (gboolean sensitive) = 0;
+
+            ///
-            /// @brief Changes the sensitivity of the "Zoom In" action.
-            ///
@@ -338 +350 @@
-            ///
-            virtual void setStatusBarText (const gchar *text) = 0;
+
+            ///
+            /// @brief Sets the current zoom text.
+            ///
+            /// The current zoom text is displayed on the tool bar and
+            /// the user can change it in order to specify a concrete
+            /// zoom level.
+            ///
+            /// @param text The text to show in the current zoom entry.
+            ///
+            virtual void setZoomText (const gchar *text) = 0;
-
-            ///
@@ -472 +495 @@
-            ///
-            virtual IPreferencesView *getPreferencesView (void) = 0;
+
+            ///
+            /// @brief Gets the text from the zoom entry.
+            ///
+            /// Gets the text inside the "Current Zoom" entry on the
+            /// tool bar.
+            ///
+            /// @return The text inside the "Current Zoom" entry.
+            ///
+            virtual const gchar *getZoomText (void) = 0;
-
-            ///

trunk/src/MainPter.cxx

@@ -118 +118 @@
-            view.setTitle (m_Document->getTitle ());
-        }
+        setZoomText (m_Document->getZoom ());
-        view.sensitiveFind (TRUE);
-        view.sensitiveGoToPage (TRUE);
@@ -124 +125 @@
-        view.sensitiveRotateLeft (TRUE);
-        view.sensitiveSave (TRUE);
+        view.sensitiveZoom (TRUE);
-        view.sensitiveZoomIn (TRUE);
-        view.sensitiveZoomOut (TRUE);
@@ -142 +144 @@
-    {
-        view.setTitle (_("PDF Viewer"));
+        setZoomText (1.0);
-        view.sensitiveFind (FALSE);
-        view.sensitiveGoToFirstPage (FALSE);
@@ -152 +155 @@
-        view.sensitiveRotateLeft (FALSE);
-        view.sensitiveSave (FALSE);
+        view.sensitiveZoom (FALSE);
-        view.sensitiveZoomIn (FALSE);
-        view.sensitiveZoomOut (FALSE);
@@ -191 +195 @@
-{
-    // Insensitive the open, reload, page navigation, zoom and rotate.
+    setZoomText (1.0);
-    IMainView &view = getView ();
-    view.sensitiveFind (FALSE);
@@ -202 +207 @@
-    view.sensitiveRotateLeft (FALSE);
-    view.sensitiveSave (FALSE);
+    view.sensitiveZoom (FALSE);
-    view.sensitiveZoomIn (FALSE);
-    view.sensitiveZoomOut (FALSE);
@@ -223 +229 @@
-    // Set the number of times we can try the password.
-    m_PasswordTries = 3;
+}
+
+///
+/// @brief Tells the view which text to show in the zoom entry.
+///
+/// @param zoom The current document's zoom value.
+///
+void
+MainPter::setZoomText (gdouble zoom)
+{
+    gchar *zoomText = g_strdup_printf ("%.3g%%", zoom * 100.0);
+    getView ().setZoomText (zoomText);
+    g_free (zoomText);
-}
-
@@ -541 +560 @@
-
-///
+/// @brief The user entered a zoom value.
+///
+void
+MainPter::zoomActivated ()
+{
+    IMainView &view = getView ();
+    const gchar *zoomText = view.getZoomText ();
+    if ( NULL != zoomText )
+    {
+        Config &config = Config::getConfig ();
+        config.setZoomToFit (FALSE);
+        config.setZoomToWidth (FALSE);
+
+        view.activeZoomFit (FALSE);
+        view.activeZoomWidth (FALSE);
+
+        gdouble zoom = atof (zoomText);
+        m_Document->setZoom (zoom / 100.0);
+    }
+}
+
+///
-/// @brief Performs the "Zoom Fit Best".
-///
@@ -591 +632 @@
-    view.activeZoomFit (FALSE);
-    view.activeZoomWidth (FALSE);
-
+
-    m_Document->zoomIn ();
-}
@@ -784 +825 @@
-{
-    IMainView &view = getView ();
+    // Show the new zoom.
+    setZoomText (zoom);
-    // Set the zoom sensitivity.
-    view.sensitiveZoomIn (m_Document->canZoomIn ());

trunk/src/MainPter.h

@@ -64 +64 @@
-            void showStatusbarActivated (gboolean show);
-            void showToolbarActivated (gboolean show);
+            void zoomActivated (void);
-            void zoomFitActivated (gboolean active);
-            void zoomInActivated (void);
@@ -97 +98 @@
-
-            void checkZoomSettings (void);
+            void setZoomText (gdouble zoom);
-            void zoomFit (void);
-            void zoomWidth (void);

trunk/src/gtk/MainView.cxx

@@ -32 +32 @@
-// Constants.
-static gint CURRENT_PAGE_POS = 5;
+static gint CURRENT_PAGE_WIDTH = 14;
+static gint CURRENT_ZOOM_POS = 8;
+static gint CURRENT_ZOOM_WIDTH = 7;
-
-// Enumerations.
@@ -63 +66 @@
-static void main_window_show_statusbar_cb (GtkToggleAction *, gpointer);
-static void main_window_show_toolbar_cb (GtkToggleAction *, gpointer);
+static void main_window_zoom_cb (GtkWidget *, gpointer);
-static void main_window_zoom_fit_cb (GtkToggleAction *, gpointer);
-static void main_window_zoom_in_cb (GtkWidget *, gpointer);
@@ -201 +205 @@
-                        CURRENT_PAGE_POS);
-    gtk_widget_show_all (GTK_WIDGET (m_CurrentPageToolItem));
-
-
+
+
+
+
+
+
+
+
-    // Create the page view
-    GtkWidget *pageViewPaned = createPageView ();
@@ -484 +494 @@
-
-void
+MainView::sensitiveZoom (gboolean sensitive)
+{
+    gtk_widget_set_sensitive (m_CurrentZoom, sensitive);
+}
+
+void
-MainView::sensitiveZoomIn (gboolean sensitive)
-{
@@ -604 +620 @@
-}
-
+const gchar *
+MainView::getZoomText (void)
+{
+    return gtk_entry_get_text (GTK_ENTRY (m_CurrentZoom));
+}
+
-void
-MainView::setStatusBarText (const gchar *text)
@@ -614 +636 @@
-        gtk_statusbar_push (GTK_STATUSBAR (m_StatusBar), contextId, text);
-    }
+}
+
+void
+MainView::setZoomText (const gchar *text)
+{
+    gtk_entry_set_text (GTK_ENTRY (m_CurrentZoom), text);
-}
-
@@ -692 +720 @@
-/// @brief Creates the "Current Page" widget that will be displayed on toolbar.
-///
-/// @return The tool item to add to the toolbar.
-///
-void
-MainView::createCurrentPage ()
@@ -705 +731 @@
-    gtk_entry_set_text (GTK_ENTRY (m_CurrentPage), _("0 of 0"));
-    gtk_entry_set_alignment (GTK_ENTRY (m_CurrentPage), 1.0f);
+    gtk_entry_set_width_chars (GTK_ENTRY (m_CurrentPage), CURRENT_PAGE_WIDTH);
-    g_signal_connect (G_OBJECT (m_CurrentPage), "activate",
-                      G_CALLBACK (main_window_go_to_page_cb), m_Pter);
@@ -711 +738 @@
-    m_CurrentPageToolItem = gtk_tool_item_new ();
-    gtk_container_add (GTK_CONTAINER (m_CurrentPageToolItem), hbox);
+}
+
+
+///
+/// @brief Creates the "Current Zoom" widget that will be displayed on toolbar.
+///
+void
+MainView::createCurrentZoom ()
+{
+    m_CurrentZoom = gtk_entry_new ();
+    gtk_entry_set_alignment (GTK_ENTRY (m_CurrentZoom), 1.0f);
+    gtk_entry_set_width_chars (GTK_ENTRY (m_CurrentZoom), CURRENT_ZOOM_WIDTH);
+    g_signal_connect (G_OBJECT (m_CurrentZoom), "activate",
+                      G_CALLBACK (main_window_zoom_cb), m_Pter);
+
+    m_CurrentZoomToolItem = gtk_tool_item_new ();
+    gtk_container_add (GTK_CONTAINER (m_CurrentZoomToolItem), m_CurrentZoom);
-}
-
@@ -800 +844 @@
-
-    GError *error = NULL;
- 
- 
+
+
-                                           &error) )
-    {
@@ -1169 +1213 @@
-
-///
+/// @brief The user tries to set a zoom.
+///
+void
+main_window_zoom_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+    pter->zoomActivated ();
+}
+
+///
-/// @brief The user tries to fit the document into the window.
-///

trunk/src/gtk/MainView.h

@@ -50 +50 @@
-            void sensitiveRotateRight (gboolean sensitive);
-            void sensitiveSave (gboolean sensitive);
+            void sensitiveZoom (gboolean sensitive);
-            void sensitiveZoomIn (gboolean sensitive);
-            void sensitiveZoomOut (gboolean sensitive);
@@ -61 +62 @@
-            void setGoToPageText (const gchar *text);
-            void setStatusBarText (const gchar *text);
+            void setZoomText (const gchar *text);
-            const gchar *getGoToPageText (void);
-            IFindView *getFindView (void);
-            IPageView *getPageView (void);
-            IPreferencesView *getPreferencesView (void);
+            const gchar *getZoomText (void);
-            void setTitle (const gchar *title);
-            void setOutline (DocumentOutline *outline);
@@ -73 +76 @@
-            GtkWidget *m_CurrentPage;
-            GtkToolItem *m_CurrentPageToolItem;
+            GtkWidget *m_CurrentZoom;
+            GtkToolItem *m_CurrentZoomToolItem;
-            FindView *m_FindView;
- 
+
-            GtkWidget *m_MainBox;
-            GtkTreeStore *m_Outline;
@@ -85 +90 @@
-
-            void createCurrentPage (void);
+            void createCurrentZoom (void);
-            GtkWidget *createPageView (void);
-            void createUIManager (void);