Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4240 → Rev 4241

/branches/Version13x/Scribus/scribus/page.h
40,12 → 40,12
public:
Page(const double x, const double y, const double b, const double h);
~Page();
const double xOffset();
const double yOffset();
const double width();
const double height();
const double initialWidth();
const double initialHeight();
double xOffset() const { return m_xOffset; }
double yOffset() const { return m_yOffset; }
double width() const { return m_width; }
double height() const { return m_height; }
double initialWidth() const { return m_initialWidth; }
double initialHeight() const { return m_initialHeight; }
void setXOffset(const double);
void setYOffset(const double);
void setWidth(const double);
62,10 → 62,9
int PageOri;
QValueList<double> XGuides;
QValueList<double> YGuides;
QPtrList<PageItem> FromMaster;
uint pageNr() const { return m_pageNr; }
void setPageNr(const int pageNr);
uint pageNr();
const QString& pageSectionNumber() const;
const QString& pageSectionNumber() const { return m_pageSectionNumber; }
void setPageSectionNumber(const QString&);
void addXGuide(double position);
void addYGuide(double position);
80,6 → 79,13
void setPageName(const QString& newName);
void restore(UndoState* state, bool isUndo);
 
// As a bit of a dirty hack, we declare this mutable so it can be altered
// even while the object is `const'. That's normally only for internal
// implementation, but in this case it at least lets us guarantee the rest
// of the object is unchanged in (eg) pdflib. This should be replaced with
// proper access methods later.
mutable QPtrList<PageItem> FromMaster;
 
private:
UndoManager * const undoManager;
void restorePageItemCreation(ItemState<PageItem*> *state, bool isUndo);
/branches/Version13x/Scribus/scribus/page.cpp
67,22 → 67,6
setUName(PageNam);
}
 
uint Page::pageNr()
{
return m_pageNr;
}
 
const QString& Page::pageSectionNumber() const
{
return m_pageSectionNumber;
}
 
void Page::setPageSectionNumber(const QString& newPageSectionNumber)
{
m_pageSectionNumber=newPageSectionNumber;
}
 
 
void Page::addXGuide(double position)
{
XGuides.append(position);
365,36 → 349,6
*/
}
 
const double Page::xOffset()
{
return m_xOffset;
}
 
const double Page::yOffset()
{
return m_yOffset;
}
 
const double Page::width()
{
return m_width;
}
 
const double Page::height()
{
return m_height;
}
 
const double Page::initialWidth()
{
return m_initialWidth;
}
 
const double Page::initialHeight()
{
return m_initialHeight;
}
 
void Page::setXOffset(const double newCanvasXOffset)
{
m_xOffset = newCanvasXOffset;
/branches/Version13x/Scribus/scribus/pdflib.cpp
1057,7 → 1057,7
return true;
}
 
void PDFlib::PDF_TemplatePage(Page* pag, bool )
void PDFlib::PDF_TemplatePage(const Page* pag, bool )
{
QString tmp;
ActPageP = pag;
1548,7 → 1548,7
}
}
 
void PDFlib::PDF_Begin_Page(Page* pag, QPixmap pm)
void PDFlib::PDF_Begin_Page(const Page* pag, QPixmap pm)
{
QString tmp;
ActPageP = pag;
1672,7 → 1672,7
ObjCounter++;
}
 
void PDFlib::PDF_ProcessPage(Page* pag, uint PNr, bool clip)
void PDFlib::PDF_ProcessPage(const Page* pag, uint PNr, bool clip)
{
QString tmp;
ActPageP = pag;
2122,7 → 2122,7
}
}
 
QString PDFlib::PDF_ProcessItem(PageItem* ite, Page* pag, uint PNr, bool embedded)
QString PDFlib::PDF_ProcessItem(PageItem* ite, const Page* pag, uint PNr, bool embedded)
{
QString tmp("");
int x = static_cast<int>(pag->xOffset());
2753,7 → 2753,7
}
 
// Return a PDF substring representing a PageItem's text
QString PDFlib::setTextSt(PageItem *ite, uint PNr, Page* pag)
QString PDFlib::setTextSt(PageItem *ite, uint PNr, const Page* pag)
{
QString tmp("");
QString tmp2("");
2883,7 → 2883,7
return tmp;
}
 
void PDFlib::setTextCh(PageItem *ite, uint PNr, uint d, QString &tmp, QString &tmp2, const ScText *hl, Page* pag)
void PDFlib::setTextCh(PageItem *ite, uint PNr, uint d, QString &tmp, QString &tmp2, const ScText *hl, const Page* pag)
{
QString FillColor = "";
QString StrokeColor = "";
/branches/Version13x/Scribus/scribus/pdflib.h
60,10 → 60,10
typedef QMap<uint, GlNamInd> GListeInd;
 
bool PDF_Begin_Doc(const QString& fn, PDFOptions *opts, SCFonts &AllFonts, QMap<QString,int> DocFonts, BookMView* vi);
void PDF_Begin_Page(Page* pag, QPixmap pm = 0);
void PDF_Begin_Page(const Page* pag, QPixmap pm = 0);
void PDF_End_Page();
void PDF_TemplatePage(Page* pag, bool clip = false);
void PDF_ProcessPage(Page* pag, uint PNr, bool clip = false);
void PDF_TemplatePage(const Page* pag, bool clip = false);
void PDF_ProcessPage(const Page* pag, uint PNr, bool clip = false);
void PDF_End_Doc(const QString& PrintPr = "", const QString& Name = "", int Components = 0);
void closeAndCleanup();
 
79,9 → 79,9
QString SetFarbe(const QString& farbe, int Shade);
QString putColor(const QString& color, int Shade, bool fill);
QString putColorUncached(const QString& color, int Shade, bool fill);
QString PDF_ProcessItem(PageItem* ite, Page* pag, uint PNr, bool embedded = false);
QString setTextSt(PageItem *ite, uint PNr, Page* pag);
void setTextCh(PageItem *ite, uint PNr, uint d, QString &tmp, QString &tmp2, const ScText * hl, Page* pag);
QString PDF_ProcessItem(PageItem* ite, const Page* pag, uint PNr, bool embedded = false);
QString setTextSt(PageItem *ite, uint PNr, const Page* pag);
void setTextCh(PageItem *ite, uint PNr, uint d, QString &tmp, QString &tmp2, const ScText * hl, const Page* pag);
 
// Provide a couple of PutDoc implementations to ease transition away from
// QString abuse and to provide fast paths for constant strings.
109,7 → 109,7
QMap<QString, GListeInd> GlyphsIdxOfFont;
QString Inhalt;
ScribusDoc * const doc;
Page* ActPageP;
const Page* ActPageP;
PDFOptions* Options;
BookMView* Bvie;
QFile Spool;