Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3938 → Rev 3939

/branches/Version13x/Scribus/scribus/pslib.h
23,7 → 23,7
#include <qfile.h>
#include <vector>
class ScribusDoc;
class ScribusView;
//class ScribusView;
#include "scribusapi.h"
#include "page.h"
#include "pageitem.h"
81,9 → 81,9
virtual void PS_TemplateEnd();
virtual void PS_UseTemplate(QString Name);
virtual void PS_ImageData(PageItem *c, QString fn, QString Name, QString Prof, bool UseEmbedded, bool UseProf);
virtual void CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, QStringList spots, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev);
virtual void CreatePS(ScribusDoc* Doc, /*ScribusView* view, */std::vector<int> &pageNs, bool sep, QString SepNam, QStringList spots, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev);
virtual void ProcessItem(ScribusDoc* Doc, Page* a, PageItem* c, uint PNr, bool sep, bool farb, bool ic, bool gcr, bool master, bool embedded = false);
virtual void ProcessPage(ScribusDoc* Doc, ScribusView* view, Page* a, uint PNr, bool sep = false, bool farb = true, bool ic = false, bool gcr = true);
virtual void ProcessPage(ScribusDoc* Doc, /*ScribusView* view,*/Page* a, uint PNr, bool sep = false, bool farb = true, bool ic = false, bool gcr = true);
virtual void putColor(QString color, int shade, bool fill);
virtual void SetClipPath(FPointArray *c, bool poly = true);
virtual void HandleGradient(PageItem *c, double w, double h, bool gcr);
/branches/Version13x/Scribus/scribus/selection.h
116,9 → 116,9
*/
uint count(int listNumber=GUISelection);
/**
*
* @param listNumber List to empty
* @return
* Check if the list specified is empty.
* @param listNumber List to check empty state
* @return
*/
bool isEmpty(int listNumber=GUISelection);
/**
/branches/Version13x/Scribus/scribus/preview.cpp
435,7 → 435,7
std::vector<int> pageNs;
pageNs.push_back(Seite+1);
QStringList spots;
dd->CreatePS(doc, view, pageNs, false, tr("All"), spots, true, false, false, false, EnableGCR->isChecked(), false);
dd->CreatePS(doc, /*view, */pageNs, false, tr("All"), spots, true, false, false, false, EnableGCR->isChecked(), false);
delete dd;
}
else
508,7 → 508,7
std::vector<int> pageNs;
pageNs.push_back(Seite+1);
QStringList spots;
dd->CreatePS(doc, view, pageNs, false, tr("All"), spots, true, false, false, false, EnableGCR->isChecked(), false);
dd->CreatePS(doc, /*view, */pageNs, false, tr("All"), spots, true, false, false, false, EnableGCR->isChecked(), false);
delete dd;
}
else
/branches/Version13x/Scribus/scribus/pageitem.h
41,7 → 41,7
class PageItem_Polygon;
class PageItem_PolyLine;
class PageItem_TextFrame;
class PageItem_PathText;
class PageItem_PathText;
 
struct CopyPasteBuffer;
/**
/branches/Version13x/Scribus/scribus/pageitem.cpp
98,7 → 98,6
PLineEnd(other.PLineEnd),
PLineJoin(other.PLineJoin),
NamedLStyle(other.NamedLStyle),
Select(other.Select),
Clip(other.Clip),
PoLine(other.PoLine),
ContourLine(other.ContourLine),
258,7 → 257,8
Ypos(other.Ypos),
Width(other.Width),
Height(other.Height),
Rot(other.Rot)
Rot(other.Rot),
Select(other.Select)
{
}
 
3650,4 → 3650,4
emit widthAndHeight(Width, Height);
emit rotation(Rot);
// TODO, add the rest
}
}
/branches/Version13x/Scribus/scribus/scribusview.cpp
7673,12 → 7673,10
//if (SelItem.count() != 0)
if (Doc->selection->count() != 0)
{
if (nr == -1)
//*(currItem) = SelItem.at(0);
*(currItem) = Doc->selection->itemAt(0);
else
//*(currItem) = SelItem.at(nr);
*(currItem) = Doc->selection->itemAt(nr);
int n=nr;
if (n == -1)
n=0;
*(currItem) = Doc->selection->itemAt(n);
return true;
}
else
7691,7 → 7689,7
void ScribusView::Deselect(bool prop)
{
//if (SelItem.count() != 0)
if (Doc->selection->count() != 0)
if (!Doc->selection->isEmpty())
{
PageItem* currItem;
//for (uint a = 0; a < SelItem.count(); ++a)
/branches/Version13x/Scribus/scribus/scribus.cpp
4001,7 → 4001,7
{
// Write the PS to a file
ScColor::UseProf = options->useICC;
dd->CreatePS(doc, view, options->pageNumbers, options->outputSeparations, options->separationName, options->allSeparations,
dd->CreatePS(doc, /*view, */options->pageNumbers, options->outputSeparations, options->separationName, options->allSeparations,
options->useColor, options->mirrorH, options->mirrorV, options->useICC, options->doGCR, options->setDevParam);
ScColor::UseProf = true;
if (options->PSLevel != 3)
6985,7 → 6985,7
if (dd != NULL)
{
if (dd->PS_set_file(fn))
dd->CreatePS(doc, view, pageNs, false, tr("All"), spots, true, false, false, true, prefsManager->appPrefs.GCRMode, false);
dd->CreatePS(doc, /*view, */pageNs, false, tr("All"), spots, true, false, false, true, prefsManager->appPrefs.GCRMode, false);
else
return_value = false;
delete dd;
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
458,7 → 458,7
if (PSfile)
{
QStringList spots;
dd->CreatePS(ScApp->doc, ScApp->view, pageNs, sep, SepName, spots, color, mirrorH, mirrorV, useICC, DoGCR, false);
dd->CreatePS(ScApp->doc, /*ScApp->view, */pageNs, sep, SepName, spots, color, mirrorH, mirrorV, useICC, DoGCR, false);
if (PSLevel != 3)
{
QString tmp;
/branches/Version13x/Scribus/scribus/pslib.cpp
26,8 → 26,9
#include "pslib.h"
#include "scconfig.h"
#include "pluginapi.h"
#include "prefsmanager.h"
#include "scribusdoc.h"
#include "scribusview.h"
//#include "scribusview.h"
#include "scfonts.h"
#include "scfontmetrics.h"
#include "selection.h"
959,7 → 960,7
PutDoc(i);
}
 
void PSLib::CreatePS(ScribusDoc* Doc, ScribusView* view, std::vector<int> &pageNs, bool sep, QString SepNam, QStringList spots, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev)
void PSLib::CreatePS(ScribusDoc* Doc, /*ScribusView* view, */std::vector<int> &pageNs, bool sep, QString SepNam, QStringList spots, bool farb, bool Hm, bool Vm, bool Ic, bool gcr, bool doDev)
{
uint a;
int sepac;
1081,7 → 1082,7
PS_begin_page(Doc->Pages->at(a)->width(), Doc->Pages->at(a)->height(), &Ma, true);
}
else
PS_begin_page(Doc->Pages->at(a)->width(), Doc->Pages->at(a)->height(), &Doc->Pages->at(a)->Margins, view->Prefs->ClipMargin);
PS_begin_page(Doc->Pages->at(a)->width(), Doc->Pages->at(a)->height(), &Doc->Pages->at(a)->Margins, PrefsManager::instance()->appPrefs.ClipMargin);
if (Hm)
{
PS_translate(Doc->Pages->at(a)->width(), 0);
1316,7 → 1317,7
}
}
}
ProcessPage(Doc, view, Doc->Pages->at(a), a+1, sep, farb, Ic, gcr);
ProcessPage(Doc, /*view, */Doc->Pages->at(a), a+1, sep, farb, Ic, gcr);
PS_end_page();
if (sep)
{
1838,7 → 1839,7
}
}
 
void PSLib::ProcessPage(ScribusDoc* Doc, ScribusView* view, Page* a, uint PNr, bool sep, bool farb, bool ic, bool gcr)
void PSLib::ProcessPage(ScribusDoc* Doc, /*ScribusView* view,*/Page* a, uint PNr, bool sep, bool farb, bool ic, bool gcr)
{
uint b;
int h, s, v, k;