Changeset 217

Timestamp:

06/10/06 19:13:25 (2 years ago)

Author:

jordi

Message:

Implemented the sensitivity of the Collate option.

Files:

• trunk/src/IPrintView.h (modified) (1 diff)
• trunk/src/PrintPter.cxx (modified) (1 diff)
• trunk/src/PrintPter.h (modified) (1 diff)
• trunk/src/gtk/PrintView.cxx (modified) (5 diffs)
• trunk/src/gtk/PrintView.h (modified) (1 diff)
• trunk/tests/DumbPrintView.cxx (modified) (3 diffs)
• trunk/tests/DumbPrintView.h (modified) (2 diffs)
• trunk/tests/PrintPterTest.cxx (modified) (1 diff)
• trunk/tests/PrintPterTest.h (modified) (2 diffs)

trunk/src/IPrintView.h

@@ -62 +62 @@
-
-            ///
+            /// @brief Gets the number of copies to do.
+            ///
+            /// @return The number of copies of the document to print. The
+            ///         range is between 1 and 999.
+            ///
+            virtual unsigned int getNumberOfCopies (void) = 0;
+
+            ///
-            /// @brief Changes the sensitivity of the "Collate" option.
-            ///

trunk/src/PrintPter.cxx

@@ -58 +58 @@
-
-void
+PrintPter::numberOfCopiesChanged (void)
+{
+    IPrintView &view = getView ();
+    if ( 1 == view.getNumberOfCopies () )
+    {
+        view.sensitiveCollate (FALSE);
+    }
+    else
+    {
+        view.sensitiveCollate (TRUE);
+    }
+}
+
+void
-PrintPter::printActivated (void)
-{

trunk/src/PrintPter.h

@@ -35 +35 @@
-
-            void cancelActivated (void);
+            void numberOfCopiesChanged (void);
-            void printActivated (void);
-

trunk/src/gtk/PrintView.cxx

@@ -90 +90 @@
-        pter->cancelActivated ();
-    }
+}
+
+unsigned int
+PrintView::getNumberOfCopies ()
+{
+    return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_NumberOfCopies));
+}
+
+void
+PrintView::sensitiveCollate (gboolean sensitive)
+{
+    gtk_widget_set_sensitive (m_Collate, sensitive);
+}
+
+void
+PrintView::sensitivePageRange (gboolean sensitive)
+{
+    gtk_widget_set_sensitive (m_PageRange, sensitive);
-}
-
@@ -125 +143 @@
-        gtk_radio_button_new_with_mnemonic_from_widget (
-                GTK_RADIO_BUTTON (allPagesRadio), _("_Range:"));
-GtkWidget *pageRangeEntry
+m_PageRange
-    gtk_table_attach_defaults (GTK_TABLE (printRangeTable), allPagesRadio,
-                               0, 2, 0, 1);
-    gtk_table_attach_defaults (GTK_TABLE (printRangeTable), pageRangeRadio,
-                               0, 1, 1, 2);
-pageRangeEntry
+m_PageRange
-                               1, 2, 1, 2);
-
@@ -161 +179 @@
-    gtk_box_pack_start_defaults (GTK_BOX (pageSetBox), evenPageSetRadio);
-
-
-    // Copies frame
-    GtkWidget *copiesLabel = gtk_label_new (_("<b>Copies</b>"));
@@ -183 +200 @@
-    gtk_misc_set_alignment (GTK_MISC (numCopiesLabel), 1.0, 0.5);
-    gtk_label_set_use_underline (GTK_LABEL (numCopiesLabel), TRUE);
-
-
+
+
+
-    // Create the collate check box.
-
-
+
-    gtk_table_attach (GTK_TABLE (copiesTable), numCopiesLabel,
-                      0, 1, 0, 1,
@@ -193 +210 @@
-                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
-                      0, 0);
-numCopiesSpin
+m_NumberOfCopies
-                               1, 2, 0, 1);
-collateCheck
+m_Collate
-                               1, 2, 1, 2);
-

trunk/src/gtk/PrintView.h

@@ -29 +29 @@
-            virtual void setPresenter (PrintPter *pter);
-
+            virtual unsigned int getNumberOfCopies (void);
+            virtual void sensitiveCollate (gboolean sensitive);
+            virtual void sensitivePageRange (gboolean sensitive);
+
-        protected:
+            GtkWidget *m_Collate;
+            GtkWidget *m_NumberOfCopies;
+            GtkWidget *m_PageRange;
-            GtkWidget *m_PrintDialog;
-            GtkTreeStore *m_PrinterList;

trunk/tests/DumbPrintView.cxx

@@ -24 +24 @@
-    IPrintView ()
-{
+    m_NumberOfCopies = 1;
-    m_SensitiveCollate = TRUE;
-    m_SensitivePageRange = TRUE;
@@ -30 +31 @@
-DumbPrintView::~DumbPrintView ()
-{
+}
+
+unsigned int
+DumbPrintView::getNumberOfCopies ()
+{
+    return m_NumberOfCopies;
-}
-
@@ -59 +66 @@
-    return m_SensitivePageRange;
-}
+
+void
+DumbPrintView::setNumberOfCopies (unsigned int copies)
+{
+    m_NumberOfCopies = copies;
+}

trunk/tests/DumbPrintView.h

@@ -27 +27 @@
-            virtual ~DumbPrintView (void);
-
+            virtual unsigned int getNumberOfCopies (void);
-            virtual void sensitiveCollate (gboolean sensitive);
-            virtual void sensitivePageRange (gboolean sensitive);
@@ -33 +34 @@
-            gboolean isSensitiveCollate (void);
-            gboolean isSensitivePageRange (void);
+            void setNumberOfCopies (unsigned int copies);
-
-        protected:
+            gint m_NumberOfCopies;
-            gboolean m_SensitiveCollate;
-            gboolean m_SensitivePageRange;

trunk/tests/PrintPterTest.cxx

@@ -67 +67 @@
-    CPPUNIT_ASSERT ( !m_View->isSensitiveCollate ());
-}
+
+///
+/// @brief Check "Collate"'s sensitivity.
+///
+/// The collate option is always sensitive unless the number
+/// of copies is 1.
+///
+void
+PrintPterTest::collateSensitivity ()
+{
+    m_View->setNumberOfCopies (1);
+    m_PrintPter->numberOfCopiesChanged ();
+    CPPUNIT_ASSERT ( !m_View->isSensitiveCollate ());
+
+    m_View->setNumberOfCopies (10);
+    m_PrintPter->numberOfCopiesChanged ();
+    CPPUNIT_ASSERT ( m_View->isSensitiveCollate ());
+
+    m_View->setNumberOfCopies (234);
+    m_PrintPter->numberOfCopiesChanged ();
+    CPPUNIT_ASSERT ( m_View->isSensitiveCollate ());
+
+    m_View->setNumberOfCopies (1);
+    m_PrintPter->numberOfCopiesChanged ();
+    CPPUNIT_ASSERT ( !m_View->isSensitiveCollate ());
+
+    m_View->setNumberOfCopies (32);
+    m_PrintPter->numberOfCopiesChanged ();
+    CPPUNIT_ASSERT ( m_View->isSensitiveCollate ());
+}

trunk/tests/PrintPterTest.h

@@ -27 +27 @@
-        CPPUNIT_TEST_SUITE (PrintPterTest);
-        CPPUNIT_TEST (initialSensitivity);
+        CPPUNIT_TEST (collateSensitivity);
-        CPPUNIT_TEST_SUITE_END ();
-
@@ -34 +35 @@
-
-            void initialSensitivity (void);
+            void collateSensitivity (void);
-
-        protected: