Changeset 233

Timestamp:

06/13/06 16:11:47 (2 years ago)

Author:

jordi

Message:

The JobPrint? now implements the new Resolution and ColorMode?.

Location:

trunk/src

Files:

• IPrintView.h (modified) (2 diffs)
• JobPrint.cxx (modified) (8 diffs)
• JobPrint.h (modified) (4 diffs)
• PrintPter.cxx (modified) (2 diffs)
• gtk/PrintView.cxx (modified) (2 diffs)
• gtk/PrintView.h (modified) (1 diff)

trunk/src/IPrintView.h

@@ -123 +123 @@
 
             ///
+            /// @brief Gets the currently selected color model.
+            ///
+            /// @return The value of the color model that is selected.
+            ///
+            virtual gchar *getColorModel (void) = 0;
+
+            ///
             /// @brief Gets the number of copies to do.
             ///
@@ -161 +168 @@
 
             ///
+            /// @brief Gets the currently selected resolution.
+            ///
+            /// @return The value of the resolution that is selected.
+            ///         This value is the @a value parameter of the
+            ///         addResolution() function.
+            ///
+            virtual gchar *getResolution (void) = 0;
+
+            ///
             /// @brief Gets the name of the currently selected printer.
             ///

trunk/src/JobPrint.cxx

@@ -33 +33 @@
 {
     m_Collate = FALSE;
+    m_ColorModel = NULL;
     m_CurrentPage = 1;
     m_Document = NULL;
@@ -45 +46 @@
     m_PageWidth = 0.1147f;
     m_PrinterName = NULL;
+    m_Resolution = NULL;
     m_TempFileName = NULL;
 }
@@ -55 +57 @@
     delete m_DocumentCopy;
     delete[] m_PageRange;
+    g_free (m_ColorModel);
     g_free (m_PageRangeString);
     g_free (m_PrinterName);
+    g_free (m_Resolution);
     g_free (m_TempFileName);
 }
@@ -66 +70 @@
 }
 
+const gchar *
+JobPrint::getColorModel ()
+{
+    return m_ColorModel;
+}
+
 guint
 JobPrint::getCurrentPage ()
@@ -126 +136 @@
 {
     return m_PrinterName;
+}
+
+const gchar *
+JobPrint::getResolution ()
+{
+    return m_Resolution;
 }
 
@@ -175 +191 @@
 
 void
+JobPrint::setColorModel (const gchar *colorModel)
+{
+    g_free (m_ColorModel);
+    m_ColorModel = g_strdup (colorModel);
+}
+
+void
 JobPrint::setCurrentPage (guint pageNumber)
 {
@@ -229 +252 @@
     m_PageWidth = pageWidth;
     m_PageHeight = pageHeight;
+}
+
+void
+JobPrint::setResolution (const gchar *resolution)
+{
+    g_free (m_Resolution);
+    m_Resolution = g_strdup (resolution);
 }
 
@@ -467 +497 @@
     }
     numOptions = cupsAddOption ("number-up", layout, numOptions, &options);
+    numOptions = cupsAddOption ("ColorModel", job->getColorModel (),
+                                numOptions, &options);
+    numOptions = cupsAddOption ("Resolution", job->getResolution (),
+                                numOptions, &options);
 
     cupsPrintFile (job->getPrinterName (), job->getTempFileName (),

trunk/src/JobPrint.h

@@ -64 +64 @@
 
             gboolean getCollate (void);
+            const gchar *getColorModel (void);
             IDocument &getDocument (void);
             guint getNumberOfCopies (void);
@@ -69 +70 @@
             PrintPageOrientation getPageOrientation (void);
             const gchar *getPrinterName (void);
+            const gchar *getResolution (void);
             const gchar *getTempFileName (void);
             virtual gboolean run (void);
             void setCollate (gboolean collate);
+            void setColorModel (const gchar *colorModel);
             void setDocument (IDocument *document);
             void setNumberOfCopies (guint copies);
@@ -80 +83 @@
             void setPageSize (gfloat pageWidth, gfloat pageHeight);
             void setPrinterName (const gchar *name);
+            void setResolution (const gchar *resolution);
             void setUpPrint (void);
 
         protected:
             gboolean m_Collate;
+            gchar *m_ColorModel;
             guint m_CurrentPage;
             IDocument *m_Document;
@@ -94 +99 @@
             gchar *m_PageRangeString;
             PrintPageSet m_PageSet;
+            gchar *m_Resolution;
             gfloat m_PageWidth;
             gchar *m_PrinterName;

trunk/src/PrintPter.cxx

@@ -113 +113 @@
         getPageSizeForPrinter (printerName, pageSizeName,
                                &pageWidth, &pageHeight);
-        g_free (pageSizeName);
         // Create the new print job.
         JobPrint *job = new JobPrint ();
@@ -148 +147 @@
         job->setPageOrientation (view.getPageOrientation ());
         job->setPageLayout (view.getPageLayout ());
+
+        gchar *colorModel = view.getColorModel ();
+        job->setColorModel (colorModel);
+        gchar *resolution = view.getResolution ();
+        job->setResolution (resolution);
 
         IJob::enqueue (job);

trunk/src/gtk/PrintView.cxx

@@ -177 +177 @@
 }
 
+gchar *
+PrintView::getColorModel ()
+{
+    gchar *colorModel = NULL;
+    getOptionFromComboBox (m_ColorModelView, &colorModel);
+    return colorModel;
+}
+
 PrintPageLayout
 PrintView::getPageLayout ()
@@ -205 +213 @@
     getOptionFromComboBox (m_PageSizeView, &pageSize);
     return pageSize;
+}
+
+gchar *
+PrintView::getResolution ()
+{
+    gchar *resolution = NULL;
+    getOptionFromComboBox (m_ResolutionView, &resolution);
+    return resolution;
 }
 

trunk/src/gtk/PrintView.h

@@ -42 +42 @@
             virtual void clearResolutionList (void);
             virtual guint getNumberOfCopies (void);
+            virtual gchar *getColorModel (void);
             virtual PrintPageLayout getPageLayout (void);
             virtual PrintPageOrientation getPageOrientation (void);
             virtual const gchar *getPageRange (void);
             virtual gchar *getPageSize (void);
+            virtual gchar *getResolution (void);
             virtual gchar *getSelectedPrinterName (void);
             virtual gboolean isCheckedCollate (void);