Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 16730 → Rev 16731

/trunk/Scribus/scribus/scprintengine_gdi.h
26,7 → 26,7
 
void resetData(void);
 
typedef bool (ScPrintEngine_GDI::*PrintPageFunc) ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context );
typedef bool (ScPrintEngine_GDI::*PrintPageFunc) ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context );
 
/*! \brief Print selected pages to a printer or a file
\param doc the document whose pages are to be printer
48,7 → 48,7
\retval bool true on success
\author Jean Ghali
*/
bool printPage_GDI ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context );
bool printPage_GDI ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context );
/*! \brief Print a page to a PostScript printer using passthroughs
Print a page using PS drawing code and PS passthroughs ( works on PS printers only )
\param doc the document whose page is to be printed
59,7 → 59,7
\retval bool true on success
\author Jean Ghali
*/
bool printPage_PS ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context );
bool printPage_PS ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context );
/*! \brief Print a page separations to a PostScript printer using passthroughs
Print a page using PS drawing code and PS passthroughs ( works on PS printers only )
\param doc the document whose page is to be printed
70,7 → 70,7
\retval bool true on success
\author Jean Ghali
*/
bool printPage_PS_Sep ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context );
bool printPage_PS_Sep ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context );
/*! \brief Send a file to printer using PostScript Passthrough
Send a postscript file to a printer using ps passthrough ( works on PS printers only )
\param filePath the Postscript file path
136,7 → 136,7
\retval bool true on success
\author Jean Ghali
*/
bool gdiPrintPreview( ScribusDoc* doc, Page* page, QImage* image, PrintOptions& options, double scale = 1.0 );
bool gdiPrintPreview( ScribusDoc* doc, ScPage* page, QImage* image, PrintOptions& options, double scale = 1.0 );
 
/*! \brief Get the default printer name
\retval QString the default printer name on success or an empty string
/trunk/Scribus/scribus/scprintengine_gdi.cpp
24,26 → 24,25
#include <icm.h>
#endif
 
#include "util.h"
#include "util_ghostscript.h"
 
#include "commonstrings.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scprintengine_gdi.h"
#include "scpainterex_cairo.h"
 
#include "scpage.h"
#include "scpageoutput.h"
#include "scpaths.h"
#include "pslib.h"
#include "scribusview.h"
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribus.h"
#include "page.h"
 
#include "prefsfile.h"
#include "prefscontext.h"
#include "prefsmanager.h"
#include "util.h"
#include "util_ghostscript.h"
#include "ui/customfdialog.h"
#include "commonstrings.h"
#include "ui/multiprogressdialog.h"
#include "scpaths.h"
#include "pslib.h"
 
#include <cairo.h>
#include <cairo-win32.h>
139,7 → 138,7
return success;
}
 
bool ScPrintEngine_GDI::gdiPrintPreview( ScribusDoc* doc, Page* page, QImage* image, PrintOptions& options, double scale )
bool ScPrintEngine_GDI::gdiPrintPreview( ScribusDoc* doc, ScPage* page, QImage* image, PrintOptions& options, double scale )
{
bool success = true;
HCOLORSPACE hColorSpace = NULL;
210,7 → 209,7
bool success = true;
WCHAR docName[512];
DOCINFOW docInfo;
Page* docPage;
ScPage* docPage;
 
// Test printer for PostScript support and
// choose appropriate page printing function
287,7 → 286,7
return success;
}
 
bool ScPrintEngine_GDI::printPage_GDI ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context )
bool ScPrintEngine_GDI::printPage_GDI ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context )
{
int logPixelsX;
int logPixelsY;
424,7 → 423,7
return success;
}
 
bool ScPrintEngine_GDI::printPage_PS ( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* /*context*/ )
bool ScPrintEngine_GDI::printPage_PS ( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* /*context*/ )
{
bool succeed = false;
ColorList usedColors;
479,7 → 478,7
return succeed;
}
 
bool ScPrintEngine_GDI::printPage_PS_Sep( ScribusDoc* doc, Page* page, PrintOptions& options, HDC printerDC, cairo_t* context )
bool ScPrintEngine_GDI::printPage_PS_Sep( ScribusDoc* doc, ScPage* page, PrintOptions& options, HDC printerDC, cairo_t* context )
{
bool succeed = true;
QStringList separations;
/trunk/Scribus/scribus/ui/preview.cpp
551,7 → 551,7
if ( !postscriptPreview )
{
QImage image;
Page* page;
ScPage* page;
ScPrintEngine_GDI winPrint;
PrintOptions options;
page = doc->Pages->at( Seite );