Changeset 223

Timestamp:

06/11/06 15:35:34 (2 years ago)

Author:

jordi

Message:

The JobPrint? class now actally prints the PostScript? file.

Files:

• trunk/src/JobPrint.cxx (modified) (5 diffs)
• trunk/src/JobPrint.h (modified) (2 diffs)

trunk/src/JobPrint.cxx

@@ -60 +60 @@
-}
-
+gboolean
+JobPrint::getCollate ()
+{
+    return m_Collate;
+}
+
-guint
-JobPrint::getCurrentPage ()
@@ -66 +72 @@
-}
-
+guint
+JobPrint::getNumberOfCopies ()
+{
+    return m_NumberOfCopies;
+}
+
-IDocument &
-JobPrint::getDocument ()
@@ -80 +92 @@
-}
-
+PrintPageLayout
+JobPrint::getPageLayout ()
+{
+    return m_PageLayout;
+}
+
+PrintPageOrientation
+JobPrint::getPageOrientation ()
+{
+    return m_PageOrientation;
+}
+
-const gchar *
-JobPrint::getPageRangeString ()
@@ -96 +120 @@
-{
-    return m_PageWidth;
+}
+
+const gchar *
+JobPrint::getPrinterName ()
+{
+    return m_PrinterName;
-}
-
@@ -396 +426 @@
-    JobPrint *job = (JobPrint *)data;
-    job->getDocument().outputPostscriptEnd ();
+
+    // Add Cups options.
+    cups_option_t *options;
+    gint numOptions = 0;
+
+    gchar *numCopies = g_strdup_printf ("%d", job->getNumberOfCopies ());
+    numOptions = cupsAddOption ("copies", numCopies, numOptions, &options);
+    g_free (numCopies);
+
+    gchar *collate = g_strdup (job->getCollate() ? "True" : "False");
+    numOptions = cupsAddOption ("Collate", collate, numOptions, &options);
+    g_free (collate);
+
+    gchar *orientation = NULL;
+    if ( PRINT_PAGE_ORIENTATION_LANDSCAPE == job->getPageOrientation () )
+    {
+        orientation = g_strdup_printf ("4");
+    }
+    else
+    {
+        orientation = g_strdup_printf ("3");
+    }
+    numOptions = cupsAddOption ("orientation-requested", orientation,
+                                 numOptions, &options);
+    g_free (orientation);
+
+    gchar *layout = NULL;
+    switch (job->getPageLayout ())
+    {
+        case PRINT_PAGE_LAYOUT_2IN1:
+            layout = g_strdup_printf ("%d", 2);
+            break;
+
+        case PRINT_PAGE_LAYOUT_4IN1:
+            layout = g_strdup_printf ("%d", 4);
+            break;
+
+        default:
+            layout = g_strdup_printf ("%d", 1);
+    }
+    numOptions = cupsAddOption ("number-up", layout, numOptions, &options);
+
+    cupsPrintFile (job->getPrinterName (), job->getTempFileName (),
+                   job->getDocument ().getFileName (), numOptions, options);
+
+    cupsFreeOptions (numOptions, options);
+
-    JOB_NOTIFIER_END ();
-

trunk/src/JobPrint.h

@@ -63 +63 @@
-            ~JobPrint (void);
-
+            gboolean getCollate (void);
-            IDocument &getDocument (void);
+            guint getNumberOfCopies (void);
+            PrintPageLayout getPageLayout (void);
+            PrintPageOrientation getPageOrientation (void);
+            const gchar *getPrinterName (void);
+            const gchar *getTempFileName (void);
-            virtual gboolean run (void);
-            void setCollate (gboolean collate);
@@ -97 +103 @@
-            PrintPageSet getPageSet (void);
-            gfloat getPageWidth (void);
-            const gchar *getTempFileName (void);
-            void setCurrentPage (guint pageNumber);
-            void setTempFileName (const gchar *fileName);