Changeset 233 for trunk/src/JobPrint.cxx
- Timestamp:
- 06/13/06 16:11:47 (2 years ago)
- Files:
-
- 1 modified
-
trunk/src/JobPrint.cxx (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/JobPrint.cxx
r223 r233 33 33 { 34 34 m_Collate = FALSE; 35 m_ColorModel = NULL; 35 36 m_CurrentPage = 1; 36 37 m_Document = NULL; … … 45 46 m_PageWidth = 0.1147f; 46 47 m_PrinterName = NULL; 48 m_Resolution = NULL; 47 49 m_TempFileName = NULL; 48 50 } … … 55 57 delete m_DocumentCopy; 56 58 delete[] m_PageRange; 59 g_free (m_ColorModel); 57 60 g_free (m_PageRangeString); 58 61 g_free (m_PrinterName); 62 g_free (m_Resolution); 59 63 g_free (m_TempFileName); 60 64 } … … 66 70 } 67 71 72 const gchar * 73 JobPrint::getColorModel () 74 { 75 return m_ColorModel; 76 } 77 68 78 guint 69 79 JobPrint::getCurrentPage () … … 126 136 { 127 137 return m_PrinterName; 138 } 139 140 const gchar * 141 JobPrint::getResolution () 142 { 143 return m_Resolution; 128 144 } 129 145 … … 175 191 176 192 void 193 JobPrint::setColorModel (const gchar *colorModel) 194 { 195 g_free (m_ColorModel); 196 m_ColorModel = g_strdup (colorModel); 197 } 198 199 void 177 200 JobPrint::setCurrentPage (guint pageNumber) 178 201 { … … 229 252 m_PageWidth = pageWidth; 230 253 m_PageHeight = pageHeight; 254 } 255 256 void 257 JobPrint::setResolution (const gchar *resolution) 258 { 259 g_free (m_Resolution); 260 m_Resolution = g_strdup (resolution); 231 261 } 232 262 … … 467 497 } 468 498 numOptions = cupsAddOption ("number-up", layout, numOptions, &options); 499 numOptions = cupsAddOption ("ColorModel", job->getColorModel (), 500 numOptions, &options); 501 numOptions = cupsAddOption ("Resolution", job->getResolution (), 502 numOptions, &options); 469 503 470 504 cupsPrintFile (job->getPrinterName (), job->getTempFileName (),
