Changeset 212

Timestamp:

06/10/06 11:43:58 (2 years ago)

Author:

jordi

Message:

Added the action to print to the main menu and made its sensitivity to work.

Files:

• trunk/data/Makefile.am (modified) (2 diffs)
• trunk/data/epdfview-ui-print.xml (added)
• trunk/data/epdfview-ui.xml (modified) (1 diff)
• trunk/src/IMainView.h (modified) (1 diff)
• trunk/src/MainPter.cxx (modified) (3 diffs)
• trunk/src/gtk/MainView.cxx (modified) (8 diffs)
• trunk/src/gtk/MainView.h (modified) (1 diff)
• trunk/src/gtk/PageView.cxx (modified) (1 diff)
• trunk/tests/DumbMainView.cxx (modified) (3 diffs)
• trunk/tests/DumbMainView.h (modified) (4 diffs)
• trunk/tests/MainPterTest.cxx (modified) (8 diffs)

trunk/data/Makefile.am

@@ -6 +6 @@
-    stock_find_next_24.png  \
-    stock_find_previous_24.png  \
-   
+
-    stock_rotate-270.png    \
-    stock_zoom-page-width.png   \
-
+
+
-    epdfview.desktop
-
@@ -25 +26 @@
-uidir = $(pkgdatadir)/ui
-ui_DATA =   \
-
+
+
-
-desktopdir = $(datadir)/applications

trunk/data/epdfview-ui.xml

@@ -5 +5 @@
-      <menuitem name="ReloadFile" action="ReloadFile"/>
-      <menuitem name="SaveFile" action="SaveFile"/>
+      <placeholder name="PrintPlaceHolder"/>
-      <separator/>
-      <menuitem name="Quit" action="Quit"/>

trunk/src/IMainView.h

@@ -201 +201 @@
-            virtual void sensitiveGoToPreviousPage (gboolean sensitive) = 0;
-
+#if defined (HAVE_CUPS)
+            ///
+            /// @brief Changes the sensitivity of the "Print" action.
+            ///
+            /// The view must change the sensitivity (it's called enabled or
+            /// disabled on some toolkits) of the "Print" action
+            /// (both on the menu and the toolbar or any other place).
+            ///
+            /// @param sensitive Set to TRUE if need to make the action
+            ///                  sensitive (enable) or FALSE to
+            ///                  insensitive (disable) it.
+            ///
+            virtual void sensitivePrint (gboolean sensitive) = 0;
+#endif // HAVE_CUPS
+
-            ///
-            /// @brief Changes the sensitivity of the "Open" action.

trunk/src/MainPter.cxx

@@ -138 +138 @@
-        view.activeZoomWidth (config.zoomToWidth ());
-        view.setTotalPages (m_Document->getNumPages ());
+#if defined (HAVE_CUPS)
+        view.sensitivePrint (TRUE);
+#endif // HAVE_CUPS
-
-        checkZoomSettings ();
@@ -166 +169 @@
-        view.sensitiveZoomWidth (FALSE);
-        showSidebar = FALSE;
+#if defined (HAVE_CUPS)
+        view.sensitivePrint (FALSE);
+#endif // HAVE_CUPS
-    }
-
@@ -218 +224 @@
-    view.sensitiveZoomWidth (FALSE);
-    view.sensitiveOpen (FALSE);
+#if defined (HAVE_CUPS)
+    view.sensitivePrint (FALSE);
+#endif // HAVE_CUPS
-    // Show the text on the status bar.
-    gchar *statusText = NULL;

trunk/src/gtk/MainView.cxx

@@ -72 +72 @@
-static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
-
+#if defined (HAVE_CUPS)
+static void main_window_print_cb (GtkWidget *, gpointer);
+#endif // HAVE_CUPS
+
-// The actions for menus and toolbars.
-static const GtkActionEntry g_NormalEntries[] = 
@@ -92 +96 @@
-      N_("Save a copy of the current document"),
-      G_CALLBACK (main_window_save_file_cb) },
+
+#if defined (HAVE_CUPS)
+    { "Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
+      N_("Print the current document"),
+      G_CALLBACK (main_window_print_cb) },
+#endif // HAVE_CUPS
-
-    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
@@ -238 +248 @@
-MainView::activeZoomFit (gboolean active)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
-    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active);
@@ -426 +436 @@
-MainView::sensitiveGoToLastPage (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToLastPage");
-    gtk_action_set_sensitive (goToLastPage, sensitive);
@@ -434 +444 @@
-MainView::sensitiveGoToNextPage (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToNextPage");
-    gtk_action_set_sensitive (goToNextPage, sensitive);
@@ -453 +463 @@
-}
-
- 
+
-MainView::sensitiveOpen (gboolean sensitive)
-{
- 
+
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/OpenFile");
-    gtk_action_set_sensitive (open, sensitive);
-}
+
+#if defined (HAVE_CUPS)
+void
+MainView::sensitivePrint (gboolean sensitive)
+{
+    GtkAction *print = gtk_ui_manager_get_action (m_UIManager,
+            "/MenuBar/FileMenu/PrintPlaceHolder/Print");
+    gtk_action_set_sensitive (print, sensitive);
+}
+#endif // HAVE_CUPS
-
-void 
@@ -852 +872 @@
-        exit (EXIT_FAILURE);
-    }
+
+#if defined (HAVE_CUPS)
+    if ( !gtk_ui_manager_add_ui_from_file (m_UIManager,
+                                           DATADIR"/ui/epdfview-ui-print.xml",
+                                           &error) )
+    {
+        g_critical (_("Error building UI manager: %s\n"), error->message);
+        g_error_free (error);
+        exit (EXIT_FAILURE);
+    }
+#endif // HAVE_CUPS
-
-    // Set the previous and next pages tool items important, so they will
@@ -1155 +1186 @@
-}
-
+#if defined (HAVE_CUPS)
+///
+///
+/// @brief The user wants to print the current document.
+///
+void
+main_window_print_cb (GtkWidget *widget, gpointer data)
+{
+    g_assert ( NULL != data && "The data parameter is NULL.");
+
+    MainPter *pter = (MainPter *)data;
+}
+#endif // HAVE_CUPS
+
-///
-/// @brief Called when the window is closed or Quit is activated.

trunk/src/gtk/MainView.h

@@ -47 +47 @@
-            void sensitiveReload (gboolean sensitive);
-            void sensitiveOpen (gboolean sensitive);
+#if defined (HAVE_CUPS)
+            void sensitivePrint (gboolean sensitive);
+#endif // HAVE_CUPS
-            void sensitiveRotateLeft (gboolean sensitive);
-            void sensitiveRotateRight (gboolean sensitive);

trunk/src/gtk/PageView.cxx

@@ -371 +371 @@
-    // get the current widget size and the current image size to know
-    // how many widget space is being used for padding.
+    gint horizontalPadding = PAGE_VIEW_PADDING;
+    gint verticalPadding = PAGE_VIEW_PADDING;
-    GdkPixbuf *page = gtk_image_get_pixbuf (GTK_IMAGE (m_PageImage));
-
-
-
-
+
+
+
+
+
+
+
-
-    *pageX = widgetX - horizontalPadding + (gint)getHorizontalScroll ();

trunk/tests/DumbMainView.cxx

@@ -46 +46 @@
-    m_SensitiveGoToPage = TRUE;
-    m_SensitiveGoToPreviousPage = TRUE;
+    m_SensitivePrint = TRUE;
-    m_SensitiveReload = TRUE;
-    m_SensitiveRotateLeft = TRUE;
@@ -177 +178 @@
-
-void
+DumbMainView::sensitivePrint (gboolean sensitive)
+{
+    m_SensitivePrint = sensitive;
+}
+
+void
-DumbMainView::sensitiveReload (gboolean sensitive)
-{
@@ -397 +404 @@
-{
-    return m_SensitiveGoToPreviousPage;
+}
+
+gboolean
+DumbMainView::isSensitivePrint ()
+{
+    return m_SensitivePrint;
-}
-

trunk/tests/DumbMainView.h

@@ -19 +19 @@
-#define __DUMB_MAIN_VIEW_H__
-
- 
+
-{
-    // Forward declarations.
-    class DumbFindView;
-    class DumbPageView;
-
+
-    class DumbMainView: public IMainView
-    {
@@ -48 +48 @@
-            void sensitiveGoToPreviousPage (gboolean sensitive);
-            void sensitiveOpen (gboolean sensitive);
+            void sensitivePrint (gboolean sensitive);
-            void sensitiveReload (gboolean sensitive);
-            void sensitiveRotateLeft (gboolean sensitive);
@@ -86 +87 @@
-            gboolean isSensitiveGoToPage (void);
-            gboolean isSensitiveGoToPreviousPage (void);
+            gboolean isSensitivePrint (void);
-            gboolean isSensitiveReload (void);
-            gboolean isSensitiveRotateLeft (void);
@@ -122 +124 @@
-            gboolean m_SensitiveGoToPage;
-            gboolean m_SensitiveGoToPreviousPage;
+            gboolean m_SensitivePrint;
-            gboolean m_SensitiveReload;
-            gboolean m_SensitiveRotateLeft;

trunk/tests/MainPterTest.cxx

@@ -93 +93 @@
-    CPPUNIT_ASSERT (m_View->isShownToolbar ());
-    CPPUNIT_ASSERT (m_View->isShownStatusbar ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (!m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -127 +130 @@
-    CPPUNIT_ASSERT (m_View->isSensitiveZoomWidth ());
-    CPPUNIT_ASSERT (!m_View->isShownIndex ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-
-    // Now try a document with a title.
@@ -149 +155 @@
-    CPPUNIT_ASSERT (m_View->isSensitiveZoomWidth ());
-    CPPUNIT_ASSERT (!m_View->isShownIndex ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -179 +188 @@
-    CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
-    CPPUNIT_ASSERT (!m_View->shownError ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (!m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -213 +225 @@
-    CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
-    CPPUNIT_ASSERT (m_View->shownError ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (!m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -248 +263 @@
-    CPPUNIT_ASSERT (!m_View->isSensitiveZoomWidth ());
-    CPPUNIT_ASSERT (!m_View->shownError ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (!m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -284 +302 @@
-    CPPUNIT_ASSERT (m_View->shownError ());
-    CPPUNIT_ASSERT_EQUAL (3, m_View->countTimesShownPasswordPrompt ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (!m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-
@@ -319 +340 @@
-    CPPUNIT_ASSERT (!m_View->shownError ());
-    CPPUNIT_ASSERT_EQUAL (1, m_View->countTimesShownPasswordPrompt ());
+#if defined (HAVE_CUPS)
+    CPPUNIT_ASSERT (m_View->isSensitivePrint ());
+#endif // HAVE_CUPS
-}
-