Changeset 218

Timestamp:

06/10/06 19:50:31 (2 years ago)

Author:

jordi

Message:

The page range sensitivity is also implemented as well as the callback function for it and the collate sensitivity and the tests for both.

Location:

trunk

Files:

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

trunk/src/IPrintView.h

@@ -70 +70 @@
 
             ///
+            /// @brief Check is the "All Pages" range option is selected.
+            ///
+            /// @return TRUE if the range's "All Pages" option is selected.
+            ///         FALSE otherwise.
+            ///
+            virtual gboolean isSelectedAllPagesRangeOption (void) = 0;
+
+            ///
             /// @brief Changes the sensitivity of the "Collate" option.
             ///

trunk/src/PrintPter.cxx

@@ -72 +72 @@
 
 void
+PrintPter::pageRangeOptionChanged ()
+{
+    IPrintView &view = getView ();
+    if ( view.isSelectedAllPagesRangeOption () )
+    {
+        view.sensitivePageRange (FALSE);
+    }
+    else
+    {
+        view.sensitivePageRange (TRUE);
+    }
+}
+
+void
 PrintPter::printActivated (void)
 {

trunk/src/PrintPter.h

@@ -36 +36 @@
             void cancelActivated (void);
             void numberOfCopiesChanged (void);
+            void pageRangeOptionChanged (void);
             void printActivated (void);
 

trunk/src/gtk/PrintView.cxx

@@ -34 +34 @@
 } printerListColumns;
 
+// Callbacks.
+static void print_view_number_of_copies_changed (GtkSpinButton *, gpointer);
+static void print_view_page_range_option_changed (GtkToggleButton *, gpointer);
+
 PrintView::PrintView (GtkWindow *parent):
     IPrintView ()
@@ -82 +86 @@
     IPrintView::setPresenter (pter);
 
+    // Connect signals.
+    g_signal_connect (G_OBJECT (m_NumberOfCopies), "value_changed",
+                      G_CALLBACK (print_view_number_of_copies_changed),
+                      pter);
+    g_signal_connect (G_OBJECT (m_AllPagesRangeOption), "toggled",
+                      G_CALLBACK (print_view_page_range_option_changed),
+                      pter);
+    g_signal_connect (G_OBJECT (m_CustomPagesRangeOption), "toggled",
+                      G_CALLBACK (print_view_page_range_option_changed),
+                      pter);
+
+    // Run the dialog.
     if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (m_PrintDialog)) )
     {
@@ -96 +112 @@
 {
     return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (m_NumberOfCopies));
+}
+
+gboolean
+PrintView::isSelectedAllPagesRangeOption ()
+{
+    return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m_AllPagesRangeOption));
 }
 
@@ -138 +160 @@
     gtk_table_set_col_spacings (GTK_TABLE (printRangeTable), 12);
     // Create the two radio buttons.
-    GtkWidget *allPagesRadio =
+    m_AllPagesRangeOption =
         gtk_radio_button_new_with_mnemonic (NULL, _("_All pages"));
-    GtkWidget *pageRangeRadio =
+    m_CustomPagesRangeOption =
         gtk_radio_button_new_with_mnemonic_from_widget (
-                GTK_RADIO_BUTTON (allPagesRadio), _("_Range:"));
+                GTK_RADIO_BUTTON (m_AllPagesRangeOption), _("_Range:"));
     m_PageRange = gtk_entry_new ();
-    gtk_table_attach_defaults (GTK_TABLE (printRangeTable), allPagesRadio,
+    gtk_table_attach_defaults (GTK_TABLE (printRangeTable),
+                               m_AllPagesRangeOption,
                                0, 2, 0, 1);
-    gtk_table_attach_defaults (GTK_TABLE (printRangeTable), pageRangeRadio,
+    gtk_table_attach_defaults (GTK_TABLE (printRangeTable),
+                               m_CustomPagesRangeOption,
                                0, 1, 1, 2);
     gtk_table_attach_defaults (GTK_TABLE (printRangeTable), m_PageRange,
@@ -200 +224 @@
     gtk_misc_set_alignment (GTK_MISC (numCopiesLabel), 1.0, 0.5);
     gtk_label_set_use_underline (GTK_LABEL (numCopiesLabel), TRUE);
-    GtkWidget *m_NumberOfCopies = gtk_spin_button_new_with_range (1, 999, 1);
+    m_NumberOfCopies = gtk_spin_button_new_with_range (1, 999, 1);
     gtk_label_set_mnemonic_widget (GTK_LABEL (numCopiesLabel),
                                    m_NumberOfCopies);
@@ -347 +371 @@
     return mainBox;
 }
+
+////////////////////////////////////////////////////////////////
+// Callbacks
+////////////////////////////////////////////////////////////////
+
+void
+print_view_number_of_copies_changed (GtkSpinButton *spin, gpointer data)
+{
+    g_assert (NULL != data && "The data parameter is NULL.");
+
+    PrintPter *pter = (PrintPter *)data;
+    pter->numberOfCopiesChanged ();
+}
+
+void
+print_view_page_range_option_changed (GtkToggleButton *button, gpointer data)
+{
+    g_assert (NULL != data && "The data parameter is NULL.");
+
+    PrintPter *pter = (PrintPter *)data;
+    pter->pageRangeOptionChanged ();
+}

trunk/src/gtk/PrintView.h

@@ -30 +30 @@
 
             virtual unsigned int getNumberOfCopies (void);
+            virtual gboolean isSelectedAllPagesRangeOption (void);
             virtual void sensitiveCollate (gboolean sensitive);
             virtual void sensitivePageRange (gboolean sensitive);
 
         protected:
+            GtkWidget *m_AllPagesRangeOption;
             GtkWidget *m_Collate;
+            GtkWidget *m_CustomPagesRangeOption;
             GtkWidget *m_NumberOfCopies;
             GtkWidget *m_PageRange;

trunk/tests/DumbPrintView.cxx

@@ -24 +24 @@
     IPrintView ()
 {
+    m_AllPagesRangeOptionSelected = TRUE;
     m_NumberOfCopies = 1;
     m_SensitiveCollate = TRUE;
@@ -37 +38 @@
 {
     return m_NumberOfCopies;
+}
+
+gboolean
+DumbPrintView::isSelectedAllPagesRangeOption ()
+{
+    return m_AllPagesRangeOptionSelected;
 }
 
@@ -68 +75 @@
 
 void
+DumbPrintView::selectAllPagesRangeOption ()
+{
+    m_AllPagesRangeOptionSelected = TRUE;
+}
+
+void
+DumbPrintView::selectCustomPagesRangeOption ()
+{
+    m_AllPagesRangeOptionSelected = FALSE;
+}
+
+void
 DumbPrintView::setNumberOfCopies (unsigned int copies)
 {

trunk/tests/DumbPrintView.h

@@ -28 +28 @@
 
             virtual unsigned int getNumberOfCopies (void);
+            virtual gboolean isSelectedAllPagesRangeOption (void);
             virtual void sensitiveCollate (gboolean sensitive);
             virtual void sensitivePageRange (gboolean sensitive);
@@ -34 +35 @@
             gboolean isSensitiveCollate (void);
             gboolean isSensitivePageRange (void);
+            void selectAllPagesRangeOption (void);
+            void selectCustomPagesRangeOption (void);
             void setNumberOfCopies (unsigned int copies);
 
         protected:
+            gboolean m_AllPagesRangeOptionSelected;
             gint m_NumberOfCopies;
             gboolean m_SensitiveCollate;

trunk/tests/PrintPterTest.cxx

@@ -97 +97 @@
     CPPUNIT_ASSERT ( m_View->isSensitiveCollate ());
 }
+
+///
+/// @brief Check "Page Range"'s sensitivity.
+///
+/// The page range entry is only sensitive when the "Range:" radio
+/// button is selected.
+///
+void
+PrintPterTest::pageRangeSensitivity ()
+{
+    m_View->selectAllPagesRangeOption ();
+    m_PrintPter->pageRangeOptionChanged ();
+    CPPUNIT_ASSERT ( !m_View->isSensitivePageRange ());
+
+    m_View->selectCustomPagesRangeOption ();
+    m_PrintPter->pageRangeOptionChanged ();
+    CPPUNIT_ASSERT ( m_View->isSensitivePageRange ());
+
+    m_View->selectAllPagesRangeOption ();
+    m_PrintPter->pageRangeOptionChanged ();
+    CPPUNIT_ASSERT ( !m_View->isSensitivePageRange ());
+
+    m_View->selectCustomPagesRangeOption ();
+    m_PrintPter->pageRangeOptionChanged ();
+    CPPUNIT_ASSERT ( m_View->isSensitivePageRange ());
+}

trunk/tests/PrintPterTest.h

@@ -28 +28 @@
         CPPUNIT_TEST (initialSensitivity);
         CPPUNIT_TEST (collateSensitivity);
+        CPPUNIT_TEST (pageRangeSensitivity);
         CPPUNIT_TEST_SUITE_END ();
 
@@ -36 +37 @@
             void initialSensitivity (void);
             void collateSensitivity (void);
+            void pageRangeSensitivity (void);
 
         protected: