/branches/Version13x/Scribus/scribus-api/scribus___scribusdoc_h.html |
---|
194,7 → 194,7 |
int ISize; |
QValueStack<int> Groups; |
int LayerNr; |
bool ScaleType; |
bool toolSettings.scaleType; |
bool AspectRatio; |
bool Locked; |
double Transparency; |
420,7 → 420,7 |
double RandRechts; |
bool DoppelSeiten; |
bool ErsteLinks; |
bool ScaleType; |
bool toolSettings.scaleType; |
bool AspectRatio; |
int MinWordLen; |
QString Language; |
554,7 → 554,7 |
int ShadePict; |
double ScaleX; |
double ScaleY; |
bool ScaleType; |
bool toolSettings.scaleType; |
bool AspectRatio; |
bool Before; |
int Einheit; |
/branches/Version13x/Scribus/scribus/polygonwidget.h |
---|
15,11 → 15,11 |
Q_OBJECT |
public: |
PolygonWidget(QWidget* parent, int PolyC, int PolyFd, double PolyF, bool PolyS, double PolyR); |
PolygonWidget(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR); |
~PolygonWidget() {}; |
double GetZeroFaktor(); |
double GetMaxFaktor(); |
void getValues(int* PolyC, int* PolyFd, double* PolyF, bool* PolyS, double* PolyR); |
void getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR); |
QLabel* Text1; |
QSpinBox* Ecken; |
/branches/Version13x/Scribus/scribus/fileloader.cpp |
---|
158,11 → 158,11 |
app->doc->guidesSettings.guidesShown = app->Prefs.guidesSettings.guidesShown; |
app->doc->guidesSettings.baseShown = app->Prefs.guidesSettings.baseShown; |
app->doc->guidesSettings.linkShown = app->Prefs.guidesSettings.linkShown; |
app->doc->PolyC = app->Prefs.PolyC; |
app->doc->PolyF = app->Prefs.PolyF; |
app->doc->PolyR = app->Prefs.PolyR; |
app->doc->PolyFd = app->Prefs.PolyFd; |
app->doc->PolyS = app->Prefs.PolyS; |
app->doc->toolSettings.polyC = app->Prefs.toolSettings.polyC; |
app->doc->toolSettings.polyF = app->Prefs.toolSettings.polyF; |
app->doc->toolSettings.polyR = app->Prefs.toolSettings.polyR; |
app->doc->toolSettings.polyFd = app->Prefs.toolSettings.polyFd; |
app->doc->toolSettings.polyS = app->Prefs.toolSettings.polyS; |
app->doc->AutoSave = app->Prefs.AutoSave; |
app->doc->AutoSaveTime = app->Prefs.AutoSaveTime; |
switch (FileType) |
260,7 → 260,7 |
doc->PageSpa=QStodouble(dc.attribute("ABSTSPALTEN")); |
doc->docUnitIndex = QStoInt(dc.attribute("UNITS","0")); |
DoFonts.clear(); |
doc->Dsize=qRound(QStodouble(dc.attribute("DSIZE")) * 10); |
doc->toolSettings.defSize=qRound(QStodouble(dc.attribute("DSIZE")) * 10); |
Defont=dc.attribute("DFONT"); |
if (!avail.find(Defont)) |
{ |
268,17 → 268,17 |
if (view->Prefs->GFontSub.contains(Defont)) |
Defont = view->Prefs->GFontSub[dd]; |
else |
Defont = view->Prefs->DefFont; |
Defont = view->Prefs->toolSettings.defFont; |
DoFonts[dd] = Defont; |
} |
else |
DoFonts[Defont] = Defont; |
fo = avail[Defont]->Font; |
fo.setPointSize(qRound(doc->Dsize / 10.0)); |
fo.setPointSize(qRound(doc->toolSettings.defSize / 10.0)); |
doc->AddFont(Defont, fo); |
doc->Dfont = Defont; |
doc->DCols=QStoInt(dc.attribute("DCOL", "1")); |
doc->DGap=QStodouble(dc.attribute("DGAP", "0.0")); |
doc->toolSettings.defFont = Defont; |
doc->toolSettings.dCols=QStoInt(dc.attribute("DCOL", "1")); |
doc->toolSettings.dGap=QStodouble(dc.attribute("DGAP", "0.0")); |
doc->DocAutor=dc.attribute("AUTHOR"); |
doc->DocComments=dc.attribute("COMMENTS"); |
doc->DocKeyWords=dc.attribute("KEYWORDS",""); |
337,11 → 337,11 |
doc->guidesSettings.baseShown = static_cast<bool>(QStoInt(dc.attribute("SHOWBASE", "0"))); |
doc->guidesSettings.showPic = static_cast<bool>(QStoInt(dc.attribute("SHOWPICT", "1"))); |
doc->guidesSettings.linkShown = static_cast<bool>(QStoInt(dc.attribute("SHOWLINK", "0"))); |
doc->PolyC = QStoInt(dc.attribute("POLYC", "4")); |
doc->PolyF = QStodouble(dc.attribute("POLYF", "0.5")); |
doc->PolyR = QStodouble(dc.attribute("POLYR", "0")); |
doc->PolyFd = QStoInt(dc.attribute("POLYFD", "0")); |
doc->PolyS = static_cast<bool>(QStoInt(dc.attribute("POLYS", "0"))); |
doc->toolSettings.polyC = QStoInt(dc.attribute("POLYC", "4")); |
doc->toolSettings.polyF = QStodouble(dc.attribute("POLYF", "0.5")); |
doc->toolSettings.polyR = QStodouble(dc.attribute("POLYR", "0")); |
doc->toolSettings.polyFd = QStoInt(dc.attribute("POLYFD", "0")); |
doc->toolSettings.polyS = static_cast<bool>(QStoInt(dc.attribute("POLYS", "0"))); |
doc->AutoSave = static_cast<bool>(QStoInt(dc.attribute("AutoSave","0"))); |
doc->AutoSaveTime = QStoInt(dc.attribute("AutoSaveTime","600000")); |
doc->ScratchBottom = QStodouble(dc.attribute("ScratchBottom", "20")); |
348,35 → 348,35 |
doc->ScratchLeft = QStodouble(dc.attribute("ScatchLeft", "100")); |
doc->ScratchRight = QStodouble(dc.attribute("ScratchRight", "100")); |
doc->ScratchTop = QStodouble(dc.attribute("ScratchTop", "20")); |
doc->DstartArrow = QStoInt(dc.attribute("StartArrow", "0")); |
doc->DendArrow = QStoInt(dc.attribute("EndArrow", "0")); |
doc->ScaleX = QStodouble(dc.attribute("PICTSCX","1")); |
doc->ScaleY = QStodouble(dc.attribute("PICTSCY","1")); |
doc->ScaleType = static_cast<bool>(QStoInt(dc.attribute("PSCALE", "1"))); |
doc->AspectRatio = static_cast<bool>(QStoInt(dc.attribute("PASPECT", "0"))); |
doc->toolSettings.dStartArrow = QStoInt(dc.attribute("StartArrow", "0")); |
doc->toolSettings.dEndArrow = QStoInt(dc.attribute("EndArrow", "0")); |
doc->toolSettings.scaleX = QStodouble(dc.attribute("PICTSCX","1")); |
doc->toolSettings.scaleY = QStodouble(dc.attribute("PICTSCY","1")); |
doc->toolSettings.scaleType = static_cast<bool>(QStoInt(dc.attribute("PSCALE", "1"))); |
doc->toolSettings.aspectRatio = static_cast<bool>(QStoInt(dc.attribute("PASPECT", "0"))); |
if (dc.hasAttribute("PEN")) |
doc->Dpen = dc.attribute("PEN"); |
doc->toolSettings.dPen = dc.attribute("PEN"); |
if (dc.hasAttribute("BRUSH")) |
doc->Dbrush = dc.attribute("BRUSH"); |
doc->toolSettings.dBrush = dc.attribute("BRUSH"); |
if (dc.hasAttribute("PENLINE")) |
doc->DpenLine = dc.attribute("PENLINE"); |
doc->toolSettings.dPenLine = dc.attribute("PENLINE"); |
if (dc.hasAttribute("PENTEXT")) |
doc->DpenText = dc.attribute("PENTEXT"); |
doc->toolSettings.dPenText = dc.attribute("PENTEXT"); |
if (dc.hasAttribute("StrokeText")) |
doc->DstrokeText = dc.attribute("StrokeText"); |
doc->DLineArt = static_cast<Qt::PenStyle>(QStoInt(dc.attribute("STIL"))); |
doc->DLstyleLine = static_cast<Qt::PenStyle>(QStoInt(dc.attribute("STILLINE"))); |
doc->Dwidth = QStodouble(dc.attribute("WIDTH", "1")); |
doc->DwidthLine = QStodouble(dc.attribute("WIDTHLINE", "1")); |
doc->Dshade2 = QStoInt(dc.attribute("PENSHADE", "100")); |
doc->DshadeLine = QStoInt(dc.attribute("LINESHADE", "100")); |
doc->Dshade = QStoInt(dc.attribute("BRUSHSHADE", "100")); |
doc->MagMin = QStoInt(dc.attribute("MAGMIN","10")); |
doc->MagMax = QStoInt(dc.attribute("MAGMAX","3200")); |
doc->MagStep = QStoInt(dc.attribute("MAGSTEP","25")); |
doc->toolSettings.dStrokeText = dc.attribute("StrokeText"); |
doc->toolSettings.dLineArt = static_cast<Qt::PenStyle>(QStoInt(dc.attribute("STIL"))); |
doc->toolSettings.dLstyleLine = static_cast<Qt::PenStyle>(QStoInt(dc.attribute("STILLINE"))); |
doc->toolSettings.dWidth = QStodouble(dc.attribute("WIDTH", "1")); |
doc->toolSettings.dWidthLine = QStodouble(dc.attribute("WIDTHLINE", "1")); |
doc->toolSettings.dShade2 = QStoInt(dc.attribute("PENSHADE", "100")); |
doc->toolSettings.dShadeLine = QStoInt(dc.attribute("LINESHADE", "100")); |
doc->toolSettings.dShade = QStoInt(dc.attribute("BRUSHSHADE", "100")); |
doc->toolSettings.magMin = QStoInt(dc.attribute("MAGMIN","10")); |
doc->toolSettings.magMax = QStoInt(dc.attribute("MAGMAX","3200")); |
doc->toolSettings.magStep = QStoInt(dc.attribute("MAGSTEP","25")); |
if (dc.hasAttribute("CPICT")) |
doc->DbrushPict = dc.attribute("CPICT"); |
doc->ShadePict = QStoInt(dc.attribute("PICTSHADE","100")); |
doc->toolSettings.dBrushPict = dc.attribute("CPICT"); |
doc->toolSettings.shadePict = QStoInt(dc.attribute("PICTSHADE","100")); |
if (dc.hasAttribute("PAGEC")) |
doc->papColor = QColor(dc.attribute("PAGEC")); |
if (dc.hasAttribute("MARGC")) |
419,9 → 419,9 |
vg.textAlignment = QStoInt(pg.attribute("ALIGN")); |
vg.gapBefore = QStodouble(pg.attribute("VOR","0")); |
vg.gapAfter = QStodouble(pg.attribute("NACH","0")); |
tmpf = pg.attribute("FONT", doc->Dfont); |
tmpf = pg.attribute("FONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(avail, tmpf, view->Prefs, doc); |
432,9 → 432,9 |
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0"))); |
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2")); |
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0")); |
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush); |
vg.FColor = pg.attribute("FCOLOR", doc->toolSettings.dBrush); |
vg.FShade = QStoInt(pg.attribute("FSHADE","100")); |
vg.SColor = pg.attribute("SCOLOR", doc->Dpen); |
vg.SColor = pg.attribute("SCOLOR", doc->toolSettings.dPen); |
vg.SShade = QStoInt(pg.attribute("SSHADE","100")); |
vg.BaseAdj = static_cast<bool>(QStoInt(pg.attribute("BASE","0"))); |
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0)) |
632,9 → 632,9 |
doc->OldBM = true; |
OB.BMnr = QStoInt(pg.attribute("BookNr","0")); |
OB.textAlignment = QStoInt(pg.attribute("ALIGN","0")); |
tmpf = pg.attribute("IFONT", doc->Dfont); |
tmpf = pg.attribute("IFONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(avail, tmpf, view->Prefs, doc); |
890,9 → 890,9 |
tmp2.replace(QRegExp("\r"), QChar(5)); |
tmp2.replace(QRegExp("\n"), QChar(5)); |
tmp2.replace(QRegExp("\t"), QChar(4)); |
tmpf = it->attribute("CFONT", doc->Dfont); |
tmpf = it->attribute("CFONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(Prefs->AvailFonts, tmpf, Prefs, doc); |
947,7 → 947,7 |
ReplacedFonts[fStr] = tmpf; |
} |
fo = avail[tmpf]->Font; |
fo.setPointSize(qRound(doc->Dsize / 10.0)); |
fo.setPointSize(qRound(doc->toolSettings.defSize / 10.0)); |
doc->AddFont(tmpf, fo); |
DoFonts[fStr] = tmpf; |
return tmpf; |
/branches/Version13x/Scribus/scribus/mpalette.h |
---|
223,7 → 223,7 |
MSpinBox* Height; |
MSpinBox* Rot; |
MSpinBox* RoundRect; |
MSpinBox* DGap; |
MSpinBox* dGap; |
MSpinBox* DTop; |
MSpinBox* DBottom; |
MSpinBox* DLeft; |
/branches/Version13x/Scribus/scribus/polygonwidget.cpp |
---|
10,11 → 10,11 |
extern QPointArray RegularPolygon(double w, double h, uint c, bool star, double factor, double rota); |
PolygonWidget::PolygonWidget(QWidget* parent, int PolyC, int PolyFd, double PolyF, bool PolyS, double PolyR) : QWidget( parent ) |
PolygonWidget::PolygonWidget(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR) : QWidget( parent ) |
{ |
Pre = new QPixmap(101, 101); |
Pre->fill(white); |
PFactor = PolyF; |
PFactor = polyF; |
PolygonPropsLayout = new QVBoxLayout( this, 10, 5, "PolygonPropsLayout"); |
Layout11 = new QHBoxLayout( 0, 0, 5, "Layout11"); |
Layout10 = new QVBoxLayout( 0, 0, 5, "Layout10"); |
22,7 → 22,7 |
Ecken = new QSpinBox( this, "Ecken" ); |
Ecken->setMaxValue( 999 ); |
Ecken->setMinValue( 3 ); |
Ecken->setValue(PolyC); |
Ecken->setValue(polyC); |
Text1 = new QLabel( Ecken, tr("Corn&ers:"), this, "Text1" ); |
Layout2->addWidget( Text1 ); |
Layout2->addWidget( Ecken ); |
35,7 → 35,7 |
Faktor2->setSuffix(" "); |
Faktor2->setMaxValue( 180 ); |
Faktor2->setMinValue( -180 ); |
Faktor2->setValue(static_cast<int>(PolyR)); |
Faktor2->setValue(static_cast<int>(polyR)); |
Text2_2 = new QLabel( Faktor2, tr("&Rotation:"), this, "Text2_2" ); |
Layout7_2->addWidget( Text2_2 ); |
Layout7_2->addWidget( Faktor2 ); |
43,7 → 43,7 |
Slider2 = new QSlider( this, "Slider1_2" ); |
Slider2->setMinValue( -180 ); |
Slider2->setMaxValue( 180 ); |
Slider2->setValue(static_cast<int>(PolyR)); |
Slider2->setValue(static_cast<int>(polyR)); |
Slider2->setOrientation( QSlider::Horizontal ); |
Slider2->setTickmarks( QSlider::Right ); |
Layout8_2->addWidget( Slider2 ); |
52,7 → 52,7 |
Konvex = new QCheckBox( this, "Konvex" ); |
Konvex->setText( tr( "Apply &Factor" ) ); |
Konvex->setChecked(PolyS); |
Konvex->setChecked(polyS); |
Layout10->addWidget( Konvex ); |
Layout9 = new QHBoxLayout( 0, 0, 5, "Layout9"); |
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
63,7 → 63,7 |
Faktor->setSuffix( tr( " %" ) ); |
Faktor->setMaxValue( 100 ); |
Faktor->setMinValue( -100 ); |
Faktor->setValue(PolyFd); |
Faktor->setValue(polyFd); |
Text2 = new QLabel( Faktor, tr("&Factor:"), this, "Text2" ); |
Layout7->addWidget( Text2 ); |
Layout7->addWidget( Faktor ); |
73,8 → 73,8 |
Slider1->setMaxValue( 100 ); |
Slider1->setOrientation( QSlider::Horizontal ); |
Slider1->setTickmarks( QSlider::Right ); |
Slider1->setValue(PolyFd); |
if (PolyFd == 0) |
Slider1->setValue(polyFd); |
if (polyFd == 0) |
Konvex->setChecked(false); |
Layout8->addWidget( Slider1 ); |
Layout9->addLayout( Layout8 ); |
111,13 → 111,13 |
connect(Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView())); |
} |
void PolygonWidget::getValues(int* PolyC, int* PolyFd, double* PolyF, bool* PolyS, double* PolyR) |
void PolygonWidget::getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR) |
{ |
*PolyC = Ecken->value(); |
*PolyF = PFactor; |
*PolyS = Konvex->isChecked(); |
*PolyFd = Slider1->value(); |
*PolyR = Faktor2->value(); |
*polyC = Ecken->value(); |
*polyF = PFactor; |
*polyS = Konvex->isChecked(); |
*polyFd = Slider1->value(); |
*polyR = Faktor2->value(); |
} |
void PolygonWidget::ValFromSpin2(int a) |
/branches/Version13x/Scribus/scribus/mpalette.cpp |
---|
386,12 → 386,12 |
DistanceLayout->addWidget( columnsLabel, 0, 0 ); |
DistanceLayout->addWidget( DCol, 0, 1 ); |
DGap = new MSpinBox( 0, 300, Distance, 1 ); |
DGap->setSuffix( ptSuffix ); |
dGap = new MSpinBox( 0, 300, Distance, 1 ); |
dGap->setSuffix( ptSuffix ); |
colgapLabel = new LabelButton( Distance, tr("&Gap:"), tr("&Width:")); |
colgapLabel->setBuddy(DGap); |
colgapLabel->setBuddy(dGap); |
DistanceLayout->addWidget( colgapLabel, 1, 0 ); |
DistanceLayout->addWidget( DGap, 1, 1 ); |
DistanceLayout->addWidget( dGap, 1, 1 ); |
DTop = new MSpinBox( 0, 300, Distance, 1 ); |
DTop->setSuffix( ptSuffix ); |
815,7 → 815,7 |
QToolTip::add( RoundRect, tr( "Set radius of corner rounding" ) ); |
QToolTip::add( DCol, tr( "Number of columns in text frame" ) ); |
QToolTip::add( colgapLabel, tr("Switches between Gap or Column width")); |
QToolTip::add( DGap, tr( "Distance between columns" ) ); |
QToolTip::add( dGap, tr( "Distance between columns" ) ); |
QToolTip::add( DTop, tr( "Distance of text from top of frame" ) ); |
QToolTip::add( DBottom, tr( "Distance of text from bottom of frame" ) ); |
QToolTip::add( DLeft, tr( "Distance of text from left of frame" ) ); |
871,7 → 871,7 |
connect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3())); |
connect(SCustom, SIGNAL(FormSel(int, int, double *)), this, SLOT(MakeIrre(int, int, double *))); |
connect(EditShape, SIGNAL(clicked()), this, SLOT(EditSh())); |
connect(DGap, SIGNAL(valueChanged(int)), this, SLOT(NewGap())); |
connect(dGap, SIGNAL(valueChanged(int)), this, SLOT(NewGap())); |
connect(DCol, SIGNAL(valueChanged(int)), this, SLOT(NewCols())); |
connect(DTop, SIGNAL(valueChanged(int)), this, SLOT(NewTDist())); |
connect(DLeft, SIGNAL(valueChanged(int)), this, SLOT(NewTDist())); |
1008,7 → 1008,7 |
ScaleX->setValues( 1, 3000, 10, 1); |
ScaleY->setValues( 1, 3000, 10, 1); |
DGap->setDecimals(10); |
dGap->setDecimals(10); |
DTop->setDecimals(10); |
DLeft->setDecimals(10); |
DBottom->setDecimals(10); |
1071,12 → 1071,12 |
LevelTxt->setText(tm.setNum(i->ItemNr)); |
DCol->setMaxValue(QMAX(qRound(i->Width / QMAX(i->ColGap, 10.0)), 1)); |
DCol->setMinValue(1); |
DGap->setMinValue(0); |
dGap->setMinValue(0); |
DCol->setValue(i->Cols); |
if (colgapLabel->getState()) |
{ |
DGap->setMaxValue(QMAX((i->Width / i->Cols - i->Extra - i->RExtra)*UmReFaktor, 0)); |
DGap->setValue(i->ColGap*UmReFaktor); |
dGap->setMaxValue(QMAX((i->Width / i->Cols - i->Extra - i->RExtra)*UmReFaktor, 0)); |
dGap->setValue(i->ColGap*UmReFaktor); |
} |
else |
{ |
1086,8 → 1086,8 |
else |
lineCorr = 0; |
double ColWidth = (i->Width - (i->ColGap * (i->Cols - 1)) - i->Extra - i->RExtra - lineCorr) / i->Cols; |
DGap->setMaxValue(QMAX((i->Width / i->Cols)*UmReFaktor, 0)); |
DGap->setValue(ColWidth*UmReFaktor); |
dGap->setMaxValue(QMAX((i->Width / i->Cols)*UmReFaktor, 0)); |
dGap->setValue(ColWidth*UmReFaktor); |
} |
DLeft->setValue(i->Extra*UmReFaktor); |
DTop->setValue(i->TExtra*UmReFaktor); |
1471,8 → 1471,8 |
double newH = Height->value() / old * UmReFaktor; |
double newLX = LXpos->value() / old * UmReFaktor; |
double newLY = LYpos->value() / old * UmReFaktor; |
double newG = DGap->value() / old * UmReFaktor; |
double newGM = DGap->maxValue() / old * UmReFaktor; |
double newG = dGap->value() / old * UmReFaktor; |
double newGM = dGap->maxValue() / old * UmReFaktor; |
double newDT = DTop->value() / old * UmReFaktor; |
double newDL = DLeft->value() / old * UmReFaktor; |
double newDB = DBottom->value() / old * UmReFaktor; |
1490,7 → 1490,7 |
Height->setSuffix( ein ); |
LXpos->setSuffix( ein ); |
LYpos->setSuffix( ein ); |
DGap->setSuffix( ein ); |
dGap->setSuffix( ein ); |
DLeft->setSuffix( ein ); |
DTop->setSuffix( ein ); |
DBottom->setSuffix( ein ); |
1514,9 → 1514,9 |
LYpos->setDecimals(xywhdecimals); |
LYpos->setMaxValue( maxXYWHVal ); |
DGap->setDecimals(distdecimals); |
DGap->setMaxValue(newGM); |
DGap->setValue(newG); |
dGap->setDecimals(distdecimals); |
dGap->setMaxValue(newGM); |
dGap->setValue(newG); |
DLeft->setDecimals(distdecimals); |
DLeft->setMaxValue( 300 ); |
1662,14 → 1662,14 |
bool tmp = HaveItem; |
HaveItem = false; |
DCol->setValue(r); |
DGap->setValue(g*UmReFaktor); |
dGap->setValue(g*UmReFaktor); |
if (tmp) |
{ |
DCol->setMaxValue(QMAX(qRound(CurItem->Width / QMAX(CurItem->ColGap, 10.0)), 1)); |
if (colgapLabel->getState()) |
{ |
DGap->setMaxValue(QMAX((CurItem->Width / CurItem->Cols - CurItem->Extra - CurItem->RExtra)*UmReFaktor, 0)); |
DGap->setValue(CurItem->ColGap*UmReFaktor); |
dGap->setMaxValue(QMAX((CurItem->Width / CurItem->Cols - CurItem->Extra - CurItem->RExtra)*UmReFaktor, 0)); |
dGap->setValue(CurItem->ColGap*UmReFaktor); |
} |
else |
{ |
1679,12 → 1679,12 |
else |
lineCorr = 0; |
double ColWidth = (CurItem->Width - (CurItem->ColGap * (CurItem->Cols - 1)) - CurItem->Extra - CurItem->RExtra - lineCorr) / CurItem->Cols; |
DGap->setMaxValue(QMAX((CurItem->Width / CurItem->Cols)*UmReFaktor, 0)); |
DGap->setValue(ColWidth*UmReFaktor); |
dGap->setMaxValue(QMAX((CurItem->Width / CurItem->Cols)*UmReFaktor, 0)); |
dGap->setValue(ColWidth*UmReFaktor); |
} |
} |
DCol->setMinValue(1); |
DGap->setMinValue(0); |
dGap->setMinValue(0); |
HaveItem = tmp; |
} |
2260,11 → 2260,11 |
if ((HaveDoc) && (HaveItem)) |
{ |
setCols(CurItem->Cols, CurItem->ColGap); |
QToolTip::remove(DGap); |
QToolTip::remove(dGap); |
if (colgapLabel->getState()) |
QToolTip::add( DGap, tr( "Distance between columns" ) ); |
QToolTip::add( dGap, tr( "Distance between columns" ) ); |
else |
QToolTip::add( DGap, tr( "Column width" ) ); |
QToolTip::add( dGap, tr( "Column width" ) ); |
} |
} |
2288,7 → 2288,7 |
if ((HaveDoc) && (HaveItem)) |
{ |
if (colgapLabel->getState()) |
CurItem->ColGap = DGap->value() / UmReFaktor; |
CurItem->ColGap = dGap->value() / UmReFaktor; |
else |
{ |
double lineCorr; |
2296,7 → 2296,7 |
lineCorr = CurItem->Pwidth; |
else |
lineCorr = 0; |
double newWidth = DGap->value() / UmReFaktor; |
double newWidth = dGap->value() / UmReFaktor; |
double newGap = QMAX(((CurItem->Width - CurItem->Extra - CurItem->RExtra - lineCorr) - (newWidth * CurItem->Cols)) / (CurItem->Cols - 1), 0); |
CurItem->ColGap = newGap; |
} |
/branches/Version13x/Scribus/scribus/werktoolb.cpp |
---|
106,9 → 106,9 |
void WerkToolB::GetPolyProps() |
{ |
PolygonProps* dia = new PolygonProps(this, ScApp->doc->PolyC, ScApp->doc->PolyFd, ScApp->doc->PolyF, ScApp->doc->PolyS, ScApp->doc->PolyR); |
PolygonProps* dia = new PolygonProps(this, ScApp->doc->toolSettings.polyC, ScApp->doc->toolSettings.polyFd, ScApp->doc->toolSettings.polyF, ScApp->doc->toolSettings.polyS, ScApp->doc->toolSettings.polyR); |
if (dia->exec()) |
dia->getValues(&ScApp->doc->PolyC, &ScApp->doc->PolyFd, &ScApp->doc->PolyF, &ScApp->doc->PolyS, &ScApp->doc->PolyR); |
dia->getValues(&ScApp->doc->toolSettings.polyC, &ScApp->doc->toolSettings.polyFd, &ScApp->doc->toolSettings.polyF, &ScApp->doc->toolSettings.polyS, &ScApp->doc->toolSettings.polyR); |
delete dia; |
} |
/branches/Version13x/Scribus/scribus/Makefile.am |
---|
1,13 → 1,13 |
bin_PROGRAMS = scribus |
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c filewatcher.cpp tabguides.cpp tabtypography.cpp arrowchooser.cpp polygonwidget.cpp prefsdialogbase.cpp fileloader.cpp gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp undomanager.cpp undostate.cpp undoobject.cpp undogui.cpp prefsfile.cpp prefscontext.cpp prefsreader.cpp prefstable.cpp measurements.cpp langmgr.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp units.cpp |
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c filewatcher.cpp tabguides.cpp tabtypography.cpp arrowchooser.cpp polygonwidget.cpp prefsdialogbase.cpp fileloader.cpp gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp undomanager.cpp undostate.cpp undoobject.cpp undogui.cpp measurements.cpp langmgr.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp units.cpp |
scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c filewatcher.cpp tabtools.cpp tabguides.cpp tabtypography.cpp arrowchooser.cpp polygonwidget.cpp prefsdialogbase.cpp fileloader.cpp gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp undomanager.cpp undostate.cpp undoobject.cpp undogui.cpp prefsfile.cpp prefscontext.cpp prefsreader.cpp prefstable.cpp measurements.cpp langmgr.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp units.cpp |
SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c filewatcher.cpp tabtools.cpp tabguides.cpp tabtypography.cpp arrowchooser.cpp polygonwidget.cpp prefsdialogbase.cpp fileloader.cpp gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp undomanager.cpp undostate.cpp undoobject.cpp undogui.cpp measurements.cpp langmgr.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp units.cpp |
INTERFACES = |
TRANSLATIONS = |
SUBDIRS = icons libabout libprefs plugins libpostscript libpdf profiles dicts templates po qm doc manpages |
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp color.h gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gtmeasure.cpp gtmeasure.h undomanager.cpp undomanager.h undostate.cpp undostate.h undoobject.cpp undoobject.h undogui.cpp undogui.h prefsfile.cpp prefsfile.h prefscontext.cpp prefscontext.h prefsreader.cpp prefsreader.h prefstable.cpp prefstable.h langmgr.h langmgr.cpp polygonwidget.cpp polygonwidget.h fileloader.cpp fileloader.h prefsdialogbase.cpp prefsdialogbase.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h tabguides.cpp tabguides.h tabtypography.cpp tabtypography.h arrowchooser.cpp arrowchooser.h filewatcher.cpp filewatcher.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt units.h units.cpp scribusstructs.h |
EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp color.h gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gtmeasure.cpp gtmeasure.h undomanager.cpp undomanager.h undostate.cpp undostate.h undoobject.cpp undoobject.h undogui.cpp undogui.h prefsfile.cpp prefsfile.h prefscontext.cpp prefscontext.h prefsreader.cpp prefsreader.h prefstable.cpp prefstable.h langmgr.h langmgr.cpp polygonwidget.cpp polygonwidget.h fileloader.cpp fileloader.h prefsdialogbase.cpp prefsdialogbase.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h tabtools.cpp tabtools.h tabguides.cpp tabguides.h tabtypography.cpp tabtypography.h arrowchooser.cpp arrowchooser.h filewatcher.cpp filewatcher.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt units.h units.cpp scribusstructs.h |
install-data-local: |
$(mkinstalldirs) $(prefix)/share/scribus/samples/ |
75,10 → 75,10 |
$(INSTALL_DATA) $(srcdir)/prefsfile.h $(prefix)/include/scribus/prefsfile.h |
$(INSTALL_DATA) $(srcdir)/prefscontext.h $(prefix)/include/scribus/prefscontext.h |
$(INSTALL_DATA) $(srcdir)/prefstable.h $(prefix)/include/scribus/prefstable.h |
$(INSTALL_DATA) $(srcdir)/prefstable.h $(prefix)/include/scribus/langmgr.h |
$(INSTALL_DATA) $(srcdir)/langmgr.h $(prefix)/include/scribus/langmgr.h |
$(INSTALL_DATA) $(srcdir)/missing.h $(prefix)/include/scribus/missing.h |
$(INSTALL_DATA) $(srcdir)/units.h $(prefix)/include/scribus/units.h |
$(INSTALL_DATA) $(srcdir)/units.h $(prefix)/include/scribus/scribusstructs.h |
$(INSTALL_DATA) $(srcdir)/scribusstructs.h $(prefix)/include/scribus/scribusstructs.h |
uninstall-local: |
-rm -f $(prefix)/share/scribus/samples/LoremIpsum.txt |
/branches/Version13x/Scribus/scribus/polyprops.h |
---|
12,9 → 12,9 |
Q_OBJECT |
public: |
PolygonProps(QWidget* parent, int PolyC, int PolyFd, double PolyF, bool PolyS, double PolyR); |
PolygonProps(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR); |
~PolygonProps() {}; |
void getValues(int* PolyC, int* PolyFd, double* PolyF, bool* PolyS, double* PolyR); |
void getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR); |
PolygonWidget* polyWidget; |
QPushButton* okButton; |
QPushButton* cancelButton; |
/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp |
---|
14,18 → 14,15 |
#include <qwmatrix.h> |
#include <cmath> |
#include "langmgr.h" |
#include "fontcombo.h" |
#include "polygonwidget.h" |
#include "arrowchooser.h" |
#include "tabtypography.h" |
#include "tabguides.h" |
#include "hysettings.h" |
#include "cmsprefs.h" |
#include "keymanager.h" |
#include "tabtools.h" |
using namespace std; |
extern QPixmap fontSamples(QString da, int s, QString ts, QColor back); |
extern QPixmap loadIcon(QString nam); |
extern bool CMSavail; |
extern ProfilesL InputProfiles; |
59,7 → 56,6 |
Preferences::Preferences( QWidget* parent, ApplicationPrefs *prefsData) : PrefsDialogBase( parent ) |
{ |
int decimals; |
fon = &prefsData->AvailFonts; |
ap = (ScribusApp*)parent; |
Umrech = 1.0; |
docUnitIndex = prefsData->docUnitIndex; |
336,404 → 332,7 |
addItem( tr("Guides"), loadIcon("guides.png"), tabGuides); |
tabTypo = new TabTypograpy( prefsWidgets, &prefsData->typographicSetttings, Umrech, ""); |
addItem( tr("Typography"), loadIcon("font.png"), tabTypo); |
tabTools = new QWidget( prefsWidgets, "tabTools" ); |
tabToolsLayout = new QHBoxLayout( tabTools, 11, 6, "tabToolsLayout"); |
buttonGroupTools = new QButtonGroup( tabTools, "buttonGroupTools" ); |
buttonGroupTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, buttonGroupTools->sizePolicy().hasHeightForWidth() ) ); |
buttonGroupTools->setExclusive( true ); |
buttonGroupTools->setRadioButtonExclusive( true ); |
buttonGroupTools->setColumnLayout(0, Qt::Vertical ); |
buttonGroupTools->layout()->setSpacing( 5 ); |
buttonGroupTools->layout()->setMargin( 5 ); |
buttonGroupTools->setTitle( QString::null ); |
buttonGroupToolsLayout = new QVBoxLayout( buttonGroupTools->layout() ); |
buttonGroupToolsLayout->setAlignment( Qt::AlignTop ); |
toolText = new QToolButton( buttonGroupTools, "toolText" ); |
toolText->setToggleButton( true ); |
toolText->setText( QString::null ); |
toolText->setIconSet( QIconSet( loadIcon("Text.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolText ); |
toolImage = new QToolButton( buttonGroupTools, "toolImage" ); |
toolImage->setToggleButton( true ); |
toolImage->setText( QString::null ); |
toolImage->setIconSet( QIconSet( loadIcon("Bild.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolImage ); |
toolShape = new QToolButton( buttonGroupTools, "toolShape" ); |
toolShape->setToggleButton( true ); |
toolShape->setText( QString::null ); |
toolShape->setIconSet( QIconSet( loadIcon("Rechtecke.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolShape); |
toolPoly = new QToolButton( buttonGroupTools, "toolPoly" ); |
toolPoly->setToggleButton( true ); |
toolPoly->setText( QString::null ); |
toolPoly->setIconSet( QIconSet( loadIcon("spline.png") ) ); |
buttonGroupToolsLayout->addWidget( toolPoly ); |
toolLine = new QToolButton( buttonGroupTools, "toolLine" ); |
toolLine->setToggleButton( true ); |
toolLine->setText( QString::null ); |
toolLine->setIconSet( QIconSet( loadIcon("Stift.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolLine ); |
toolZoom = new QToolButton( buttonGroupTools, "toolZoom" ); |
toolZoom->setToggleButton( true ); |
toolZoom->setText( QString::null ); |
toolZoom->setIconSet( QIconSet( loadIcon("Lupe.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolZoom ); |
tabToolsLayout->addWidget( buttonGroupTools ); |
subStackTools = new QWidgetStack( tabTools, "subStackTools" ); |
subStackTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)5, 0, 0, subStackTools->sizePolicy().hasHeightForWidth() ) ); |
subStackTools->setFrameShape( QWidgetStack::GroupBoxPanel ); |
subStackTools->setFrameShadow( QWidgetStack::Sunken ); |
subTabText = new QWidget( subStackTools, "subTabText" ); |
subTabTextLayout = new QGridLayout( subTabText, 1, 1, 11, 6, "subTabTextLayout"); |
fontComboText = new FontCombo(subTabText, prefsData); |
for (int fc=0; fc<fontComboText->count(); ++fc) |
{ |
if (fontComboText->text(fc) == prefsData->DefFont) |
{ |
fontComboText->setCurrentItem(fc); |
break; |
} |
} |
subTabTextLayout->addMultiCellWidget( fontComboText, 0, 0, 1, 3, Qt::AlignLeft ); |
textLabel1b = new QLabel( fontComboText, tr( "Font:" ), subTabText, "textLabel1b" ); |
subTabTextLayout->addWidget( textLabel1b, 0, 0 ); |
sizeComboText = new QComboBox( true, subTabText, "SizeCombo" ); |
sizeComboText->setEditable(false); |
QString ar_sizes[] = {" 7", " 9", "10", "11", "12", "14", "18", "24", "36", "48", "60", "72"}; |
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes); |
for (uint s = 0; s < f_size; ++s) |
sizeComboText->insertItem(ar_sizes[s] + tr(" pt")); |
for (int a = 0; a < sizeComboText->count(); ++a) |
{ |
if (sizeComboText->text(a).left(2).toInt() == prefsData->DefSize / 10) |
sizeComboText->setCurrentItem(a); |
} |
subTabTextLayout->addMultiCellWidget( sizeComboText, 1, 1, 1, 3, Qt::AlignLeft ); |
textLabel2b = new QLabel(sizeComboText, tr( "Size:" ), subTabText, "textLabel2b" ); |
subTabTextLayout->addWidget( textLabel2b, 1, 0 ); |
colorComboText = new QComboBox( true, subTabText, "colorComboText" ); |
colorComboText->setEditable(false); |
QPixmap pmT2; |
pmT2 = QPixmap(15, 15); |
ColorList::Iterator itc; |
colorComboText->insertItem( tr("None")); |
if (prefsData->DpenText == "None") |
colorComboText->setCurrentItem(colorComboText->count()-1); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pmT2.fill(prefsData->DColors[itc.key()].getRGBColor()); |
colorComboText->insertItem(pmT2, itc.key()); |
if (itc.key() == prefsData->DpenText) |
colorComboText->setCurrentItem(colorComboText->count()-1); |
} |
subTabTextLayout->addMultiCellWidget( colorComboText, 2, 2, 1, 3, Qt::AlignLeft ); |
textLabel3b = new QLabel(colorComboText, tr( "Fill Color:" ), subTabText, "textLabel3b" ); |
subTabTextLayout->addWidget( textLabel3b, 2, 0 ); |
colorComboStrokeText = new QComboBox( true, subTabText, "colorComboStrokeText" ); |
colorComboStrokeText->setEditable(false); |
colorComboStrokeText->insertItem( tr("None")); |
if (prefsData->DstrokeText == "None") |
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pmT2.fill(prefsData->DColors[itc.key()].getRGBColor()); |
colorComboStrokeText->insertItem(pmT2, itc.key()); |
if (itc.key() == prefsData->DstrokeText) |
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1); |
} |
subTabTextLayout->addMultiCellWidget( colorComboStrokeText, 3, 3, 1, 3, Qt::AlignLeft ); |
textLabel3b2 = new QLabel(colorComboStrokeText, tr( "Stroke Color:" ), subTabText, "textLabel3b2" ); |
subTabTextLayout->addWidget( textLabel3b2, 3, 0 ); |
columnsText = new QSpinBox( subTabText, "columnsText" ); |
columnsText->setMinValue( 1 ); |
columnsText->setMaxValue(100); |
columnsText->setValue(prefsData->DCols); |
subTabTextLayout->addWidget( columnsText, 4, 1, Qt::AlignLeft ); |
textLabel4b = new QLabel(columnsText, tr("Colu&mns:"), subTabText, "TextCol"); |
subTabTextLayout->addWidget( textLabel4b, 4, 0 ); |
gapText = new MSpinBox( 0, 200, subTabText, decimals ); |
gapText->setSuffix( tr( " pt" ) ); |
gapText->setValue(prefsData->DGap * Umrech); |
subTabTextLayout->addWidget( gapText, 4, 3, Qt::AlignLeft ); |
textLabel5b = new QLabel(gapText, tr("&Gap:"), subTabText, "TextCol"); |
subTabTextLayout->addWidget( textLabel5b, 4, 2 ); |
previewText = new QLabel( tr( "Woven silk pyjamas exchanged for blue quartz" ), subTabText, "previewText" ); |
previewText->setMaximumWidth(width()); |
previewText->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) ); |
previewText->setFrameShape(QFrame::Box); |
previewText->setPaletteBackgroundColor(paletteBackgroundColor()); |
subTabTextLayout->addMultiCellWidget( previewText, 5, 5, 0, 3 ); |
subStackTools->addWidget( subTabText, 0 ); |
subTabShape = new QWidget( subStackTools, "subTabShape" ); |
subTabShapeLayout = new QGridLayout( subTabShape, 1, 1, 11, 6, "subTabShapeLayout"); |
subTabShapeLayout->setAlignment( Qt::AlignTop ); |
colorComboLineShape = new QComboBox( true, subTabShape, "colorComboLineShape" ); |
colorComboLineShape->setEditable(false); |
colorComboLineShape->insertItem( tr("None")); |
if (prefsData->Dpen == "None") |
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1); |
QPixmap pm2S = QPixmap(15, 15); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pm2S.fill(prefsData->DColors[itc.key()].getRGBColor()); |
colorComboLineShape->insertItem(pm2S, itc.key()); |
if (itc.key() == prefsData->Dpen) |
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1); |
} |
subTabShapeLayout->addWidget( colorComboLineShape, 0, 1, Qt::AlignLeft ); |
textLabel7b = new QLabel( colorComboLineShape, tr( "&Line Color:" ), subTabShape, "textLabel7b" ); |
subTabShapeLayout->addWidget( textLabel7b, 0, 0 ); |
shadingLineShape = new QSpinBox( subTabShape, "shadingLineShape" ); |
shadingLineShape->setMaxValue( 100 ); |
shadingLineShape->setSuffix( tr( " %" ) ); |
shadingLineShape->setMinValue( 0 ); |
shadingLineShape->setValue(prefsData->Dshade2); |
subTabShapeLayout->addWidget( shadingLineShape, 1, 1, Qt::AlignLeft ); |
textLabel8b = new QLabel( shadingLineShape, tr( "&Shading:" ), subTabShape, "textLabel8b" ); |
subTabShapeLayout->addWidget( textLabel8b, 1, 0 ); |
comboFillShape = new QComboBox( true, subTabShape, "comboFillShape" ); |
comboFillShape->setEditable(false); |
comboFillShape->insertItem( tr("None")); |
if (prefsData->Dbrush == "None") |
comboFillShape->setCurrentItem(comboFillShape->count()-1); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pm2S.fill(prefsData->DColors[itc.key()].getRGBColor()); |
comboFillShape->insertItem(pm2S, itc.key()); |
if (itc.key() == prefsData->Dbrush) |
comboFillShape->setCurrentItem(comboFillShape->count()-1); |
} |
subTabShapeLayout->addWidget( comboFillShape, 2, 1, Qt::AlignLeft ); |
textLabel9b = new QLabel( comboFillShape, tr( "&Fill Color:" ), subTabShape, "textLabel9b" ); |
subTabShapeLayout->addWidget( textLabel9b, 2, 0 ); |
shadingFillShape = new QSpinBox( subTabShape, "shadingFillShape" ); |
shadingFillShape->setMaxValue( 100 ); |
shadingFillShape->setSuffix( tr( " %" ) ); |
shadingFillShape->setMinValue( 0 ); |
shadingFillShape->setValue(prefsData->Dshade); |
subTabShapeLayout->addWidget( shadingFillShape, 3, 1, Qt::AlignLeft ); |
textLabel10b = new QLabel( shadingFillShape, tr( "S&hading:" ), subTabShape, "textLabel10b" ); |
subTabShapeLayout->addWidget( textLabel10b, 3, 0 ); |
comboStyleShape = new LineCombo(subTabShape); |
comboStyleShape->setEditable(false); |
switch (prefsData->DLineArt) |
{ |
case SolidLine: |
comboStyleShape->setCurrentItem(0); |
break; |
case DashLine: |
comboStyleShape->setCurrentItem(1); |
break; |
case DotLine: |
comboStyleShape->setCurrentItem(2); |
break; |
case DashDotLine: |
comboStyleShape->setCurrentItem(3); |
break; |
case DashDotDotLine: |
comboStyleShape->setCurrentItem(4); |
break; |
default: |
comboStyleShape->setCurrentItem(0); |
break; |
} |
subTabShapeLayout->addWidget( comboStyleShape, 4, 1, Qt::AlignLeft ); |
textLabel11b = new QLabel( comboStyleShape, tr( "Line Style:" ), subTabShape, "textLabel11b" ); |
subTabShapeLayout->addWidget( textLabel11b, 4, 0 ); |
lineWidthShape = new MSpinBox( 0, 36, subTabShape, 1 ); |
lineWidthShape->setSuffix( tr( " pt" ) ); |
lineWidthShape->setValue(prefsData->Dwidth); |
subTabShapeLayout->addWidget( lineWidthShape, 5, 1, Qt::AlignLeft ); |
textLabel12b = new QLabel( lineWidthShape, tr( "Line &Width:" ), subTabShape, "TextLabel2_3_4" ); |
subTabShapeLayout->addWidget( textLabel12b, 5, 0 ); |
subStackTools->addWidget( subTabShape, 1 ); |
subTabLine = new QWidget( subStackTools, "subTabLine" ); |
subTabLineLayout = new QGridLayout( subTabLine, 1, 1, 11, 6, "subTabLineLayout"); |
subTabLineLayout->setAlignment( Qt::AlignTop ); |
colorComboLine = new QComboBox( true, subTabLine, "colorComboLine" ); |
colorComboLine->setEditable(false); |
QPixmap pm2L = QPixmap(15, 15); |
comboFillShape->insertItem( tr("None")); |
if (prefsData->DpenLine == "None") |
colorComboLine->setCurrentItem(colorComboLine->count()-1); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pm2L.fill(prefsData->DColors[itc.key()].getRGBColor()); |
colorComboLine->insertItem(pm2L, itc.key()); |
if (itc.key() == prefsData->DpenLine) |
colorComboLine->setCurrentItem(colorComboLine->count()-1); |
} |
subTabLineLayout->addMultiCellWidget( colorComboLine, 0, 0, 1, 2, Qt::AlignLeft ); |
textLabel13b = new QLabel(colorComboLine, tr("&Line Color:"), subTabLine, "textLabel13b" ); |
subTabLineLayout->addWidget( textLabel13b, 0, 0 ); |
shadingLine = new QSpinBox( subTabLine, "shadingLine" ); |
shadingLine->setMaxValue( 100 ); |
shadingLine->setValue(prefsData->DshadeLine); |
shadingLine->setSuffix( tr( " %" ) ); |
subTabLineLayout->addMultiCellWidget( shadingLine, 1, 1, 1, 2, Qt::AlignLeft ); |
textLabel14b = new QLabel(shadingLine, tr("&Shading:"), subTabLine, "textLabel14b" ); |
subTabLineLayout->addWidget( textLabel14b, 1, 0 ); |
comboStyleLine = new LineCombo(subTabLine); |
comboStyleLine->setEditable(false); |
switch (prefsData->DLstyleLine) |
{ |
case SolidLine: |
comboStyleLine->setCurrentItem(0); |
break; |
case DashLine: |
comboStyleLine->setCurrentItem(1); |
break; |
case DotLine: |
comboStyleLine->setCurrentItem(2); |
break; |
case DashDotLine: |
comboStyleLine->setCurrentItem(3); |
break; |
case DashDotDotLine: |
comboStyleLine->setCurrentItem(4); |
break; |
default: |
comboStyleLine->setCurrentItem(0); |
break; |
} |
subTabLineLayout->addMultiCellWidget( comboStyleLine, 2, 2, 1, 2, Qt::AlignLeft ); |
textLabel15b = new QLabel(subTabLine, tr("Line S&tyle:"), subTabLine, "textLabel15b" ); |
subTabLineLayout->addWidget( textLabel15b, 2, 0 ); |
startArrow = new ArrowChooser(subTabLine, true); |
subTabLineLayout->addWidget( startArrow, 4, 1 ); |
endArrow = new ArrowChooser(subTabLine, false); |
subTabLineLayout->addWidget( endArrow, 4, 2 ); |
startArrow->rebuildList(&prefsData->arrowStyles); |
endArrow->rebuildList(&prefsData->arrowStyles); |
startArrow->setCurrentItem(prefsData->DstartArrow); |
endArrow->setCurrentItem(prefsData->DendArrow); |
arrowText = new QLabel( tr( "Arrows:" ), subTabLine, "arrowText" ); |
subTabLineLayout->addMultiCellWidget( arrowText, 3, 4, 0, 0 ); |
startArrowText = new QLabel( startArrow, tr( "Start:" ), subTabLine, "startArrowText" ); |
subTabLineLayout->addWidget( startArrowText, 3, 1 ); |
endArrowText = new QLabel( endArrow, tr( "End:" ), subTabLine, "endArrowText" ); |
subTabLineLayout->addWidget( endArrowText, 3, 2 ); |
lineWidthLine = new MSpinBox( 1, 36, subTabLine, 1 ); |
lineWidthLine->setSuffix( tr( " pt" ) ); |
lineWidthLine->setValue(prefsData->DwidthLine); |
subTabLineLayout->addMultiCellWidget( lineWidthLine, 5, 5, 1, 2, Qt::AlignLeft ); |
textLabel16b = new QLabel(lineWidthLine, tr("Line &Width:"), subTabLine, "textLabel16b" ); |
subTabLineLayout->addWidget( textLabel16b, 5, 0 ); |
subStackTools->addWidget( subTabLine, 2 ); |
subTabImage = new QWidget( subStackTools, "subTabImage" ); |
subTabImageLayout = new QGridLayout( subTabImage, 1, 1, 11, 6, "subTabImageLayout"); |
subTabImageLayout->setAlignment( Qt::AlignTop ); |
buttonGroup3 = new QButtonGroup( subTabImage, "buttonGroup3" ); |
buttonGroup3->setCheckable( true ); |
buttonGroup3->setChecked( prefsData->ScaleType ); |
buttonGroup3->setColumnLayout(0, Qt::Vertical ); |
buttonGroup3->layout()->setSpacing( 6 ); |
buttonGroup3->layout()->setMargin( 11 ); |
buttonGroup3->setTitle( tr( "&Free Scaling" ) ); |
buttonGroup3Layout = new QGridLayout( buttonGroup3->layout() ); |
buttonGroup3Layout->setAlignment( Qt::AlignTop ); |
scalingHorizontal = new QSpinBox( buttonGroup3, "scalingHorizontal" ); |
scalingHorizontal->setMaxValue( 1000 ); |
scalingHorizontal->setMinValue( 1 ); |
scalingHorizontal->setValue(qRound(prefsData->ScaleX * 100)); |
scalingHorizontal->setSuffix( tr( " %" ) ); |
buttonGroup3Layout->addWidget( scalingHorizontal, 0, 1, Qt::AlignRight ); |
textLabel17b = new QLabel(scalingHorizontal, tr("&Horizontal Scaling:"), buttonGroup3, "textLabel17b" ); |
buttonGroup3Layout->addWidget( textLabel17b, 0, 0 ); |
scalingVertical = new QSpinBox( buttonGroup3, "scalingVertical" ); |
scalingVertical->setMaxValue( 1000 ); |
scalingVertical->setMinValue( 1 ); |
scalingVertical->setSuffix( tr( " %" ) ); |
scalingVertical->setValue(qRound(prefsData->ScaleY * 100)); |
buttonGroup3Layout->addWidget( scalingVertical, 1, 1, Qt::AlignRight ); |
textLabel18b = new QLabel(scalingVertical, tr( "&Vertical Scaling:" ), buttonGroup3, "textLabel18b" ); |
buttonGroup3Layout->addWidget( textLabel18b, 1, 0 ); |
chainButton = new LinkButton( buttonGroup3 ); |
chainButton->setToggleButton( true ); |
chainButton->setAutoRaise(true); |
buttonGroup3Layout->addMultiCellWidget( chainButton, 0, 1, 2, 2, Qt::AlignLeft ); |
subTabImageLayout->addMultiCellWidget( buttonGroup3, 0, 0, 0, 1 ); |
buttonGroup5 = new QButtonGroup( subTabImage, "buttonGroup5" ); |
buttonGroup5->setCheckable( true ); |
buttonGroup5->setChecked( !prefsData->ScaleType ); |
buttonGroup5->setColumnLayout(0, Qt::Vertical ); |
buttonGroup5->layout()->setSpacing( 6 ); |
buttonGroup5->layout()->setMargin( 11 ); |
buttonGroup5->setTitle( tr( "&Scale Picture to Frame Size" ) ); |
buttonGroup5Layout = new QHBoxLayout( buttonGroup5->layout() ); |
buttonGroup5Layout->setAlignment( Qt::AlignTop ); |
checkRatioImage = new QCheckBox( buttonGroup5, "checkRatioImage" ); |
checkRatioImage->setText( tr( "Keep Aspect &Ratio" ) ); |
checkRatioImage->setChecked(prefsData->AspectRatio); |
buttonGroup5Layout->addWidget( checkRatioImage ); |
subTabImageLayout->addMultiCellWidget( buttonGroup5, 1, 1, 0, 1 ); |
comboFillImage = new QComboBox( true, subTabImage, "comboFillImage" ); |
comboFillImage->setEditable(false); |
QPixmap pm2I = QPixmap(15, 15); |
comboFillImage->insertItem( tr("None")); |
if (prefsData->DbrushPict == "None") |
comboFillImage->setCurrentItem(comboFillImage->count()-1); |
for (itc = prefsData->DColors.begin(); itc != prefsData->DColors.end(); ++itc) |
{ |
pm2I.fill(prefsData->DColors[itc.key()].getRGBColor()); |
comboFillImage->insertItem(pm2I, itc.key()); |
if (itc.key() == prefsData->DbrushPict) |
comboFillImage->setCurrentItem(comboFillImage->count()-1); |
} |
subTabImageLayout->addWidget( comboFillImage, 2, 1, Qt::AlignLeft ); |
textLabel19b = new QLabel(comboFillImage, tr( "F&ill Color:" ), subTabImage, "textLabel19b" ); |
subTabImageLayout->addWidget( textLabel19b, 2, 0 ); |
shadingFillImage = new QSpinBox( subTabImage, "shadingFillImage" ); |
shadingFillImage->setMaxValue( 100 ); |
shadingFillImage->setValue( prefsData->ShadePict ); |
shadingFillImage->setSuffix( tr( " %" ) ); |
subTabImageLayout->addWidget( shadingFillImage, 3, 1, Qt::AlignLeft ); |
textLabel20b = new QLabel(shadingFillImage, tr( "S&hading:" ), subTabImage, "textLabel20b" ); |
subTabImageLayout->addWidget( textLabel20b, 3, 0 ); |
subStackTools->addWidget( subTabImage, 3 ); |
subTabPolygon = new QWidget( subStackTools, "subTabPolygon" ); |
subTabPolygonLayout = new QHBoxLayout( subTabPolygon, 11, 6, "subTabPolygonLayout"); |
subTabPolygonLayout->setAlignment( Qt::AlignTop ); |
polyWidget = new PolygonWidget(subTabPolygon, prefsData->PolyC, prefsData->PolyFd, prefsData->PolyF, prefsData->PolyS, prefsData->PolyR); |
subTabPolygonLayout->addWidget( polyWidget ); |
subStackTools->addWidget( subTabPolygon, 4 ); |
subTabZoom = new QWidget( subStackTools, "subTabZoom" ); |
subTabZoomLayout = new QGridLayout( subTabZoom, 1, 1, 11, 6, "subTabZoomLayout"); |
subTabZoomLayout->setAlignment( Qt::AlignTop ); |
minimumZoom = new QSpinBox( subTabZoom, "minimumZoom" ); |
minimumZoom->setMaxValue( 3200 ); |
minimumZoom->setMinValue( 10 ); |
minimumZoom->setValue(prefsData->MagMin); |
minimumZoom->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( minimumZoom, 0, 1, Qt::AlignLeft ); |
textLabel21b = new QLabel( minimumZoom, tr( "Mi&nimum:" ), subTabZoom, "textLabel21b" ); |
subTabZoomLayout->addWidget( textLabel21b, 0, 0); |
maximumZoom = new QSpinBox( subTabZoom, "maximumZoom" ); |
maximumZoom->setMaxValue( 3200 ); |
maximumZoom->setMinValue( 10 ); |
maximumZoom->setValue(prefsData->MagMax); |
maximumZoom->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( maximumZoom, 1, 1, Qt::AlignLeft ); |
textLabel22b = new QLabel( maximumZoom, tr( "Ma&ximum:" ), subTabZoom, "textLabel22b" ); |
subTabZoomLayout->addWidget( textLabel22b, 1, 0 ); |
zoomStep = new QSpinBox( subTabZoom, "zoomStep" ); |
zoomStep->setMaxValue( 200 ); |
zoomStep->setMinValue( 1 ); |
zoomStep->setLineStep( 25 ); |
zoomStep->setValue( prefsData->MagStep ); |
zoomStep->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( zoomStep, 2, 1, Qt::AlignLeft ); |
textLabel23b = new QLabel( zoomStep, tr( "&Stepping:" ), subTabZoom, "textLabel23b" ); |
subTabZoomLayout->addWidget( textLabel23b, 2, 0 ); |
subStackTools->addWidget( subTabZoom, 5 ); |
tabToolsLayout->addWidget( subStackTools ); |
tabTools = new TabTools( prefsWidgets, &prefsData->toolSettings, Umrech, "", 0); |
addItem( tr("Tools"), loadIcon("tools.png"), tabTools); |
tabHyphenator = new HySettings(prefsWidgets, &ap->LangTransl); |
1000,40 → 599,6 |
QToolTip::add( ASon, tr( "When enabled, Scribus saves a backup copy of your file with the .bak extension\neach time the time period elapses" ) ); |
QToolTip::add( ASTime, tr( "Time period between saving automatically" ) ); |
QToolTip::add( toolText, tr( "Text Frame Properties" ) ); |
QToolTip::add( toolImage, tr( "Picture Frame Properties" ) ); |
QToolTip::add( toolShape, tr( "Shape Drawing Properties" ) ); |
QToolTip::add( toolZoom, tr( "Magnification Level Defaults" ) ); |
QToolTip::add( toolLine, tr( "Line Drawing Properties" ) ); |
QToolTip::add( toolPoly, tr( "Polygon Drawing Properties" ) ); |
QToolTip::add( fontComboText, tr( "Font for new text frames" ) ); |
QToolTip::add( sizeComboText, tr( "Size of font for new text frames" ) ); |
QToolTip::add( colorComboText, tr( "Color of font" ) ); |
QToolTip::add( columnsText, tr( "Number of columns in a text frame" ) ); |
QToolTip::add( gapText, tr( "Gap between text frame columns" ) ); |
QToolTip::add( previewText, tr( "Sample of your font" ) ); |
QToolTip::add( buttonGroup3, tr( "Picture frames allow pictures to scale to any size" ) ); |
QToolTip::add( scalingHorizontal, tr( "Horizontal scaling of images" ) ); |
QToolTip::add( scalingVertical, tr( "Vertical scaling of images" ) ); |
QToolTip::add( chainButton, tr( "Keep horizontal and vertical scaling the same" ) ); |
QToolTip::add( buttonGroup5, tr( "Pictures in picture frames are scaled to the size of the frame" ) ); |
QToolTip::add( checkRatioImage, tr( "Automatically scaled pictures keep their original proportions" ) ); |
QToolTip::add( comboFillImage, tr( "Fill color of picture frames" ) ); |
QToolTip::add( shadingFillImage, tr( "Saturation of color of fill" ) ); |
QToolTip::add( colorComboLineShape, tr( "Line color of shapes" ) ); |
QToolTip::add( shadingLineShape, tr( "Saturation of color of lines" ) ); |
QToolTip::add( comboFillShape, tr( "Fill color of shapes" ) ); |
QToolTip::add( shadingFillShape, tr( "Saturation of color of fill" ) ); |
QToolTip::add( comboStyleShape, tr( "Line style of shapes" ) ); |
QToolTip::add( lineWidthShape, tr( "Line width of shapes" ) ); |
QToolTip::add( minimumZoom, tr( "Minimum magnification allowed" ) ); |
QToolTip::add( maximumZoom, tr( "Maximum magnification allowed" ) ); |
QToolTip::add( zoomStep, tr( "Change in magnification for each zoom operation" ) ); |
QToolTip::add( colorComboLine, tr( "Color of lines" ) ); |
QToolTip::add( shadingLine, tr( "Saturation of color" ) ); |
QToolTip::add( comboStyleLine, tr( "Style of lines" ) ); |
QToolTip::add( lineWidthLine, tr( "Width of lines" ) ); |
QToolTip::add( PreviewSize, tr( "Choose the size of the preview in the scrapbook palette" ) ); |
QToolTip::add( SaveAtQuit, tr( "Save the scrapbook contents everytime after a change" ) ); |
1058,19 → 623,6 |
connect( guiLangCombo, SIGNAL( activated( const QString & ) ), this, SLOT( setSelectedGUILang( const QString & ) ) ); |
connect(backColor, SIGNAL(clicked()), this, SLOT(changePaperColor())); |
connect(UnitCombo, SIGNAL(activated(int)), this, SLOT(unitChange())); |
connect(toolShape, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolPoly, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolImage, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolText, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolLine, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolZoom, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(fontComboText, SIGNAL(activated(int)), this, SLOT(setSample())); |
connect(sizeComboText, SIGNAL(activated(int)), this, SLOT(setSample())); |
connect(buttonGroup3, SIGNAL(clicked(int)), this, SLOT(changeImageScalingFree(int))); |
connect(buttonGroup5, SIGNAL(clicked(int)), this, SLOT(changeImageScalingRatio(int))); |
connect(chainButton, SIGNAL(clicked()), this, SLOT(toggleChain())); |
connect(scalingHorizontal, SIGNAL(valueChanged(int)), this, SLOT(hChange())); |
connect(scalingVertical, SIGNAL(valueChanged(int)), this, SLOT(vChange())); |
connect(pageWidth, SIGNAL(valueChanged(int)), this, SLOT(setPageWidth(int))); |
connect(pageHeight, SIGNAL(valueChanged(int)), this, SLOT(setPageHeight(int))); |
connect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int))); |
1091,8 → 643,6 |
pageHeight->setValue(prefsData->PageHoehe * Umrech); |
unitChange(); |
prefsWidgets->raiseWidget(0); |
toolText->setOn(true); |
setSample(); |
resize( minimumSizeHint() ); |
arrangeIcons(); |
clearWState( WState_Polished ); |
1173,105 → 723,6 |
} |
/*! |
\fn void Preferences::ToggleKette() |
\author Franz Schmid |
\date |
\brief Preferences (Tools, Image Frame), Sets Y Scale value from X Scale value when chain is toggled |
\param None |
\retval None |
*/ |
void Preferences::toggleChain() |
{ |
if (chainButton->isOn()) |
scalingVertical->setValue(scalingHorizontal->value()); |
} |
/*! |
\fn void Preferences::HChange() |
\author Franz Schmid |
\date |
\brief Preferences (Tools, Image Frame), Sets Y Scale value from X Scale value when X Scale value is changed |
\param None |
\retval None |
*/ |
void Preferences::hChange() |
{ |
if (chainButton->isOn()) |
scalingVertical->setValue(scalingHorizontal->value()); |
} |
/*! |
\fn void Preferences::vChange() |
\author Franz Schmid |
\date |
\brief Preferences (Tools, Image Frame). Sets X Scale value from Y Scale value when Y Scale value is changed |
\param None |
\retval None |
*/ |
void Preferences::vChange() |
{ |
if (chainButton->isOn()) |
scalingHorizontal->setValue(scalingVertical->value()); |
} |
void Preferences::changeImageScalingFree(int) |
{ |
if (buttonGroup3->isChecked()) |
buttonGroup5->setChecked(false); |
else |
buttonGroup5->setChecked(true); |
} |
void Preferences::changeImageScalingRatio(int) |
{ |
if (buttonGroup5->isChecked()) |
buttonGroup3->setChecked(false); |
else |
buttonGroup3->setChecked(true); |
} |
/*! |
\fn void Preferences::SetSample() |
\author Franz Schmid |
\date |
\brief Preferences (Tools, Text frame), Sets the sample text in selected font in text frame preferences |
\param None |
\retval None |
*/ |
void Preferences::setSample() |
{ |
QString ts = tr( "Woven silk pyjamas exchanged for blue quartz" ); |
QString da = (*fon)[fontComboText->currentText()]->Datei; |
int s = sizeComboText->currentText().left(2).toInt(); |
QPixmap pm = fontSamples(da, s, ts, paletteBackgroundColor()); |
previewText->setPixmap(pm); |
} |
/*! |
\fn void Preferences::SetTool() |
\author Franz Schmid |
\date |
\brief Preferences (Tools), Raises widget for selected Tool properties |
\param None |
\retval None |
*/ |
void Preferences::setTool() |
{ |
if (toolText == sender()) |
subStackTools->raiseWidget(0); |
if (toolShape == sender()) |
subStackTools->raiseWidget(1); |
if (toolLine == sender()) |
subStackTools->raiseWidget(2); |
if (toolImage == sender()) |
subStackTools->raiseWidget(3); |
if (toolPoly == sender()) |
subStackTools->raiseWidget(4); |
if (toolZoom == sender()) |
subStackTools->raiseWidget(5); |
} |
/*! |
\fn void Preferences::setDS() |
\author Franz Schmid |
\date |
1534,7 → 985,7 |
tabGuides->snapDistance->setSuffix(einh); |
tabTypo->baseGrid->setSuffix(einh); |
tabTypo->baseOffset->setSuffix(einh); |
gapText->setSuffix(einh); |
tabTools->gapText->setSuffix(einh); |
topScratch->setSuffix(einh); |
bottomScratch->setSuffix(einh); |
leftScratch->setSuffix(einh); |
1557,8 → 1008,8 |
tabTypo->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
tabTypo->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
tabTypo->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
topScratch->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
bottomScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
/branches/Version13x/Scribus/scribus/libprefs/prefs.h |
---|
22,20 → 22,15 |
#include "scribusstructs.h" |
#include "linecombo.h" |
#include "linkbutton.h" |
#include "scfonts.h" |
#include "mspinbox.h" |
#include "scribus.h" |
#include "prefsdialogbase.h" |
class FontCombo; |
class PolygonWidget; |
class ArrowChooser; |
class TabTypograpy; |
class HySettings; |
class CMSPrefs; |
class KeyManager; |
class TabGuides; |
class TabTools; |
#include "langmgr.h" |
99,78 → 94,7 |
QLabel* Linkss; |
QLabel* Rechtss; |
QWidget* tabTools; |
QButtonGroup* buttonGroupTools; |
QToolButton* toolShape; |
QToolButton* toolPoly; |
QToolButton* toolImage; |
QToolButton* toolText; |
QToolButton* toolLine; |
QToolButton* toolZoom; |
QWidgetStack* subStackTools; |
QWidget* subTabText; |
QLabel* textLabel3b; |
QLabel* textLabel3b2; |
QLabel* textLabel1b; |
QLabel* textLabel2b; |
QLabel* textLabel4b; |
QSpinBox* columnsText; |
QLabel* previewText; |
FontCombo* fontComboText; |
QComboBox* sizeComboText; |
QComboBox* colorComboText; |
QComboBox* colorComboStrokeText; |
QLabel* textLabel5b; |
MSpinBox* gapText; |
QWidget* subTabShape; |
QLabel* textLabel9b; |
QLabel* textLabel10b; |
MSpinBox* lineWidthShape; |
QLabel* textLabel12b; |
QLabel* textLabel11b; |
LineCombo* comboStyleShape; |
QSpinBox* shadingFillShape; |
QComboBox* comboFillShape; |
QSpinBox* shadingLineShape; |
QLabel* textLabel7b; |
QComboBox* colorComboLineShape; |
QLabel* textLabel8b; |
QWidget* subTabLine; |
MSpinBox* lineWidthLine; |
QSpinBox* shadingLine; |
QComboBox* colorComboLine; |
QLabel* textLabel13b; |
QLabel* textLabel14b; |
QLabel* textLabel15b; |
QLabel* textLabel16b; |
LineCombo* comboStyleLine; |
QWidget* subTabImage; |
QComboBox* comboFillImage; |
QLabel* textLabel19b; |
QSpinBox* shadingFillImage; |
QLabel* textLabel20b; |
QButtonGroup* buttonGroup3; |
QLabel* textLabel17b; |
QLabel* textLabel18b; |
QSpinBox* scalingHorizontal; |
QSpinBox* scalingVertical; |
LinkButton* chainButton; |
QButtonGroup* buttonGroup5; |
QCheckBox* checkRatioImage; |
QWidget* subTabPolygon; |
PolygonWidget* polyWidget; |
QWidget* subTabZoom; |
QLabel* textLabel21b; |
QSpinBox* minimumZoom; |
QLabel* textLabel22b; |
QLabel* textLabel23b; |
QSpinBox* maximumZoom; |
QSpinBox* zoomStep; |
ArrowChooser* startArrow; |
ArrowChooser* endArrow; |
QLabel* startArrowText; |
QLabel* endArrowText; |
QLabel* arrowText; |
TabTools* tabTools; |
HySettings* tabHyphenator; |
CMSPrefs* tabColorManagement; |
225,8 → 149,7 |
QGroupBox* groupPrint; |
QCheckBox* ClipMarg; |
QCheckBox* DoGCR; |
SCFonts *fon; // can't use a reference, and can't copy whole structure... |
double Umrech; |
double PFactor; |
double Pagebr; |
243,13 → 166,6 |
public slots: |
virtual void changePaperColor(); |
virtual void toggleChain(); |
virtual void hChange(); |
virtual void vChange(); |
virtual void changeImageScalingFree(int); |
virtual void changeImageScalingRatio(int); |
virtual void setSample(); |
virtual void setTool(); |
void changeDocs(); |
void changeProfs(); |
void changeScripts(); |
297,16 → 213,6 |
QHBoxLayout* pageBackgroundLayout; |
QHBoxLayout* groupScratchLayout; |
QGridLayout* Layout4s; |
QHBoxLayout* tabToolsLayout; |
QVBoxLayout* buttonGroupToolsLayout; |
QGridLayout* subTabTextLayout; |
QGridLayout* subTabShapeLayout; |
QGridLayout* subTabLineLayout; |
QGridLayout* subTabImageLayout; |
QGridLayout* buttonGroup3Layout; |
QHBoxLayout* buttonGroup5Layout; |
QHBoxLayout* subTabPolygonLayout; |
QGridLayout* subTabZoomLayout; |
private slots: |
void setSelectedGUILang( const QString &newLang ); |
/branches/Version13x/Scribus/scribus/reformdoc.cpp |
---|
3,30 → 3,25 |
#include <qtooltip.h> |
#include <qspinbox.h> |
#include <qcolordialog.h> |
#include "fontcombo.h" |
#include "polygonwidget.h" |
#include "arrowchooser.h" |
#include "tabtypography.h" |
#include "tabguides.h" |
#include "tabtools.h" |
#include "hysettings.h" |
#include "cmsprefs.h" |
#include "units.h" |
#include "mspinbox.h" |
#include "linecombo.h" |
#include "scribus.h" |
extern QPixmap loadIcon(QString nam); |
extern QPixmap fontSamples(QString da, int s, QString ts, QColor back); |
extern double UmReFaktor; |
extern bool CMSavail; |
extern ProfilesL InputProfiles; |
ReformDoc::ReformDoc( QWidget* parent, ScribusDoc* doc, ApplicationPrefs *prefsData ) : PrefsDialogBase( parent ) |
ReformDoc::ReformDoc( QWidget* parent, ScribusDoc* doc ) : PrefsDialogBase( parent ) |
{ |
einheit = doc->docUnitIndex; |
docc = doc; |
ap = (ScribusApp*)parent; |
fon = &prefsData->AvailFonts; |
Umrech = UmReFaktor; |
QString ein = unitGetSuffixFromIndex(doc->docUnitIndex); |
decimals = unitGetDecimalsFromIndex(doc->docUnitIndex); |
293,401 → 288,7 |
tabTypo = new TabTypograpy( prefsWidgets, &doc->typographicSetttings, UmReFaktor, ein); |
addItem( tr("Typography"), loadIcon("font.png"), tabTypo); |
tabTools = new QWidget( prefsWidgets, "tabTools" ); |
tabToolsLayout = new QHBoxLayout( tabTools, 11, 6, "tabToolsLayout"); |
buttonGroupTools = new QButtonGroup( tabTools, "buttonGroupTools" ); |
buttonGroupTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, buttonGroupTools->sizePolicy().hasHeightForWidth() ) ); |
buttonGroupTools->setExclusive( true ); |
buttonGroupTools->setRadioButtonExclusive( true ); |
buttonGroupTools->setColumnLayout(0, Qt::Vertical ); |
buttonGroupTools->layout()->setSpacing( 5 ); |
buttonGroupTools->layout()->setMargin( 5 ); |
buttonGroupTools->setTitle( QString::null ); |
buttonGroupToolsLayout = new QVBoxLayout( buttonGroupTools->layout() ); |
buttonGroupToolsLayout->setAlignment( Qt::AlignTop ); |
toolText = new QToolButton( buttonGroupTools, "toolText" ); |
toolText->setToggleButton( true ); |
toolText->setText( QString::null ); |
toolText->setIconSet( QIconSet( loadIcon("Text.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolText ); |
toolImage = new QToolButton( buttonGroupTools, "toolImage" ); |
toolImage->setToggleButton( true ); |
toolImage->setText( QString::null ); |
toolImage->setIconSet( QIconSet( loadIcon("Bild.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolImage ); |
toolShape = new QToolButton( buttonGroupTools, "toolShape" ); |
toolShape->setToggleButton( true ); |
toolShape->setText( QString::null ); |
toolShape->setIconSet( QIconSet( loadIcon("Rechtecke.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolShape); |
toolPoly = new QToolButton( buttonGroupTools, "toolPoly" ); |
toolPoly->setToggleButton( true ); |
toolPoly->setText( QString::null ); |
toolPoly->setIconSet( QIconSet( loadIcon("spline.png") ) ); |
buttonGroupToolsLayout->addWidget( toolPoly ); |
toolLine = new QToolButton( buttonGroupTools, "toolLine" ); |
toolLine->setToggleButton( true ); |
toolLine->setText( QString::null ); |
toolLine->setIconSet( QIconSet( loadIcon("Stift.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolLine ); |
toolZoom = new QToolButton( buttonGroupTools, "toolZoom" ); |
toolZoom->setToggleButton( true ); |
toolZoom->setText( QString::null ); |
toolZoom->setIconSet( QIconSet( loadIcon("Lupe.xpm") ) ); |
buttonGroupToolsLayout->addWidget( toolZoom ); |
tabToolsLayout->addWidget( buttonGroupTools ); |
subStackTools = new QWidgetStack( tabTools, "subStackTools" ); |
subStackTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)5, 0, 0, subStackTools->sizePolicy().hasHeightForWidth() ) ); |
subStackTools->setFrameShape( QWidgetStack::GroupBoxPanel ); |
subStackTools->setFrameShadow( QWidgetStack::Sunken ); |
subTabText = new QWidget( subStackTools, "subTabText" ); |
subTabTextLayout = new QGridLayout( subTabText, 1, 1, 11, 6, "subTabTextLayout"); |
fontComboText = new FontCombo(subTabText, prefsData); |
for (int fc=0; fc<fontComboText->count(); ++fc) |
{ |
if (fontComboText->text(fc) == doc->Dfont) |
{ |
fontComboText->setCurrentItem(fc); |
break; |
} |
} |
subTabTextLayout->addMultiCellWidget( fontComboText, 0, 0, 1, 3, Qt::AlignLeft ); |
textLabel1b = new QLabel( fontComboText, tr( "Font:" ), subTabText, "textLabel1b" ); |
subTabTextLayout->addWidget( textLabel1b, 0, 0 ); |
sizeComboText = new QComboBox( true, subTabText, "SizeCombo" ); |
sizeComboText->setEditable(false); |
QString ar_sizes[] = {" 7", " 9", "10", "11", "12", "14", "18", "24", "36", "48", "60", "72"}; |
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes); |
for (uint s = 0; s < f_size; ++s) |
sizeComboText->insertItem(ar_sizes[s] + tr(" pt")); |
for (int a = 0; a < sizeComboText->count(); ++a) |
{ |
if (sizeComboText->text(a).left(2).toInt() == doc->Dsize / 10) |
sizeComboText->setCurrentItem(a); |
} |
subTabTextLayout->addMultiCellWidget( sizeComboText, 1, 1, 1, 3, Qt::AlignLeft ); |
textLabel2b = new QLabel(sizeComboText, tr( "Size:" ), subTabText, "textLabel2b" ); |
subTabTextLayout->addWidget( textLabel2b, 1, 0 ); |
colorComboText = new QComboBox( true, subTabText, "colorComboText" ); |
colorComboText->setEditable(false); |
QPixmap pmT2; |
pmT2 = QPixmap(15, 15); |
ColorList::Iterator itc; |
colorComboText->insertItem( tr("None")); |
if (doc->DpenText == "None") |
colorComboText->setCurrentItem(colorComboText->count()-1); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pmT2.fill(doc->PageColors[itc.key()].getRGBColor()); |
colorComboText->insertItem(pmT2, itc.key()); |
if (itc.key() == doc->DpenText) |
colorComboText->setCurrentItem(colorComboText->count()-1); |
} |
subTabTextLayout->addMultiCellWidget( colorComboText, 2, 2, 1, 3, Qt::AlignLeft ); |
textLabel3b = new QLabel(colorComboText, tr( "Fill Color:" ), subTabText, "textLabel3b" ); |
subTabTextLayout->addWidget( textLabel3b, 2, 0 ); |
colorComboStrokeText = new QComboBox( true, subTabText, "colorComboStrokeText" ); |
colorComboStrokeText->setEditable(false); |
colorComboStrokeText->insertItem( tr("None")); |
if (doc->DstrokeText == "None") |
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pmT2.fill(doc->PageColors[itc.key()].getRGBColor()); |
colorComboStrokeText->insertItem(pmT2, itc.key()); |
if (itc.key() == doc->DstrokeText) |
colorComboStrokeText->setCurrentItem(colorComboStrokeText->count()-1); |
} |
subTabTextLayout->addMultiCellWidget( colorComboStrokeText, 3, 3, 1, 3, Qt::AlignLeft ); |
textLabel3b2 = new QLabel(colorComboStrokeText, tr( "Stroke Color:" ), subTabText, "textLabel3b2" ); |
subTabTextLayout->addWidget( textLabel3b2, 3, 0 ); |
columnsText = new QSpinBox( subTabText, "columnsText" ); |
columnsText->setMinValue( 1 ); |
columnsText->setMaxValue(100); |
columnsText->setValue(doc->DCols); |
subTabTextLayout->addWidget( columnsText, 4, 1, Qt::AlignLeft ); |
textLabel4b = new QLabel(columnsText, tr("Colu&mns:"), subTabText, "TextCol"); |
subTabTextLayout->addWidget( textLabel4b, 4, 0 ); |
gapText = new MSpinBox( 0, 200, subTabText, decimals ); |
gapText->setSuffix( tr( " pt" ) ); |
gapText->setValue(doc->DGap * UmReFaktor); |
subTabTextLayout->addWidget( gapText, 4, 3, Qt::AlignLeft ); |
textLabel5b = new QLabel(gapText, tr("&Gap:"), subTabText, "TextCol"); |
subTabTextLayout->addWidget( textLabel5b, 4, 2 ); |
previewText = new QLabel( tr( "Woven silk pyjamas exchanged for blue quartz" ), subTabText, "previewText" ); |
previewText->setMinimumSize( QSize( 280, 70 ) ); |
previewText->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) ); |
subTabTextLayout->addMultiCellWidget( previewText, 5, 5, 0, 3 ); |
subStackTools->addWidget( subTabText, 0 ); |
subTabShape = new QWidget( subStackTools, "subTabShape" ); |
subTabShapeLayout = new QGridLayout( subTabShape, 1, 1, 11, 6, "subTabShapeLayout"); |
subTabShapeLayout->setAlignment( Qt::AlignTop ); |
colorComboLineShape = new QComboBox( true, subTabShape, "colorComboLineShape" ); |
colorComboLineShape->setEditable(false); |
colorComboLineShape->insertItem( tr("None")); |
if (doc->Dpen == "None") |
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1); |
QPixmap pm2S = QPixmap(15, 15); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pm2S.fill(doc->PageColors[itc.key()].getRGBColor()); |
colorComboLineShape->insertItem(pm2S, itc.key()); |
if (itc.key() == doc->Dpen) |
colorComboLineShape->setCurrentItem(colorComboLineShape->count()-1); |
} |
subTabShapeLayout->addWidget( colorComboLineShape, 0, 1, Qt::AlignLeft ); |
textLabel7b = new QLabel( colorComboLineShape, tr( "&Line Color:" ), subTabShape, "textLabel7b" ); |
subTabShapeLayout->addWidget( textLabel7b, 0, 0 ); |
shadingLineShape = new QSpinBox( subTabShape, "shadingLineShape" ); |
shadingLineShape->setMaxValue( 100 ); |
shadingLineShape->setSuffix( tr( " %" ) ); |
shadingLineShape->setMinValue( 0 ); |
shadingLineShape->setValue(doc->Dshade2); |
subTabShapeLayout->addWidget( shadingLineShape, 1, 1, Qt::AlignLeft ); |
textLabel8b = new QLabel( shadingLineShape, tr( "&Shading:" ), subTabShape, "textLabel8b" ); |
subTabShapeLayout->addWidget( textLabel8b, 1, 0 ); |
comboFillShape = new QComboBox( true, subTabShape, "comboFillShape" ); |
comboFillShape->setEditable(false); |
comboFillShape->insertItem( tr("None")); |
if (doc->Dbrush == "None") |
comboFillShape->setCurrentItem(comboFillShape->count()-1); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pm2S.fill(doc->PageColors[itc.key()].getRGBColor()); |
comboFillShape->insertItem(pm2S, itc.key()); |
if (itc.key() == doc->Dbrush) |
comboFillShape->setCurrentItem(comboFillShape->count()-1); |
} |
subTabShapeLayout->addWidget( comboFillShape, 2, 1, Qt::AlignLeft ); |
textLabel9b = new QLabel( comboFillShape, tr( "&Fill Color:" ), subTabShape, "textLabel9b" ); |
subTabShapeLayout->addWidget( textLabel9b, 2, 0 ); |
shadingFillShape = new QSpinBox( subTabShape, "shadingFillShape" ); |
shadingFillShape->setMaxValue( 100 ); |
shadingFillShape->setSuffix( tr( " %" ) ); |
shadingFillShape->setMinValue( 0 ); |
shadingFillShape->setValue(doc->Dshade); |
subTabShapeLayout->addWidget( shadingFillShape, 3, 1, Qt::AlignLeft ); |
textLabel10b = new QLabel( shadingFillShape, tr( "S&hading:" ), subTabShape, "textLabel10b" ); |
subTabShapeLayout->addWidget( textLabel10b, 3, 0 ); |
comboStyleShape = new LineCombo(subTabShape); |
comboStyleShape->setEditable(false); |
switch (doc->DLineArt) |
{ |
case SolidLine: |
comboStyleShape->setCurrentItem(0); |
break; |
case DashLine: |
comboStyleShape->setCurrentItem(1); |
break; |
case DotLine: |
comboStyleShape->setCurrentItem(2); |
break; |
case DashDotLine: |
comboStyleShape->setCurrentItem(3); |
break; |
case DashDotDotLine: |
comboStyleShape->setCurrentItem(4); |
break; |
default: |
comboStyleShape->setCurrentItem(0); |
break; |
} |
subTabShapeLayout->addWidget( comboStyleShape, 4, 1, Qt::AlignLeft ); |
textLabel11b = new QLabel( comboStyleShape, tr( "Line Style:" ), subTabShape, "textLabel11b" ); |
subTabShapeLayout->addWidget( textLabel11b, 4, 0 ); |
lineWidthShape = new MSpinBox( 0, 36, subTabShape, 1 ); |
lineWidthShape->setSuffix( tr( " pt" ) ); |
lineWidthShape->setValue(doc->Dwidth); |
subTabShapeLayout->addWidget( lineWidthShape, 5, 1, Qt::AlignLeft ); |
textLabel12b = new QLabel( lineWidthShape, tr( "Line &Width:" ), subTabShape, "TextLabel2_3_4" ); |
subTabShapeLayout->addWidget( textLabel12b, 5, 0 ); |
subStackTools->addWidget( subTabShape, 1 ); |
subTabLine = new QWidget( subStackTools, "subTabLine" ); |
subTabLineLayout = new QGridLayout( subTabLine, 1, 1, 11, 6, "subTabLineLayout"); |
subTabLineLayout->setAlignment( Qt::AlignTop ); |
colorComboLine = new QComboBox( true, subTabLine, "colorComboLine" ); |
colorComboLine->setEditable(false); |
QPixmap pm2L = QPixmap(15, 15); |
comboFillShape->insertItem( tr("None")); |
if (doc->DpenLine == "None") |
colorComboLine->setCurrentItem(colorComboLine->count()-1); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pm2L.fill(doc->PageColors[itc.key()].getRGBColor()); |
colorComboLine->insertItem(pm2L, itc.key()); |
if (itc.key() == doc->DpenLine) |
colorComboLine->setCurrentItem(colorComboLine->count()-1); |
} |
subTabLineLayout->addMultiCellWidget( colorComboLine, 0, 0, 1, 2, Qt::AlignLeft ); |
textLabel13b = new QLabel(colorComboLine, tr("&Line Color:"), subTabLine, "textLabel13b" ); |
subTabLineLayout->addWidget( textLabel13b, 0, 0 ); |
shadingLine = new QSpinBox( subTabLine, "shadingLine" ); |
shadingLine->setMaxValue( 100 ); |
shadingLine->setValue(doc->DshadeLine); |
shadingLine->setSuffix( tr( " %" ) ); |
subTabLineLayout->addMultiCellWidget( shadingLine, 1, 1, 1, 2, Qt::AlignLeft ); |
textLabel14b = new QLabel(shadingLine, tr("&Shading:"), subTabLine, "textLabel14b" ); |
subTabLineLayout->addWidget( textLabel14b, 1, 0 ); |
comboStyleLine = new LineCombo(subTabLine); |
comboStyleLine->setEditable(false); |
switch (doc->DLstyleLine) |
{ |
case SolidLine: |
comboStyleLine->setCurrentItem(0); |
break; |
case DashLine: |
comboStyleLine->setCurrentItem(1); |
break; |
case DotLine: |
comboStyleLine->setCurrentItem(2); |
break; |
case DashDotLine: |
comboStyleLine->setCurrentItem(3); |
break; |
case DashDotDotLine: |
comboStyleLine->setCurrentItem(4); |
break; |
default: |
comboStyleLine->setCurrentItem(0); |
break; |
} |
subTabLineLayout->addMultiCellWidget( comboStyleLine, 2, 2, 1, 2, Qt::AlignLeft ); |
textLabel15b = new QLabel(subTabLine, tr("Line S&tyle:"), subTabLine, "textLabel15b" ); |
subTabLineLayout->addWidget( textLabel15b, 2, 0 ); |
startArrow = new ArrowChooser(subTabLine, true); |
subTabLineLayout->addWidget( startArrow, 4, 1 ); |
endArrow = new ArrowChooser(subTabLine, false); |
subTabLineLayout->addWidget( endArrow, 4, 2 ); |
startArrow->rebuildList(&doc->arrowStyles); |
endArrow->rebuildList(&doc->arrowStyles); |
startArrow->setCurrentItem(doc->DstartArrow); |
endArrow->setCurrentItem(doc->DendArrow); |
arrowText = new QLabel( tr( "Arrows:" ), subTabLine, "arrowText" ); |
subTabLineLayout->addMultiCellWidget( arrowText, 3, 4, 0, 0 ); |
startArrowText = new QLabel( startArrow, tr( "Start:" ), subTabLine, "startArrowText" ); |
subTabLineLayout->addWidget( startArrowText, 3, 1 ); |
endArrowText = new QLabel( endArrow, tr( "End:" ), subTabLine, "endArrowText" ); |
subTabLineLayout->addWidget( endArrowText, 3, 2 ); |
lineWidthLine = new MSpinBox( 1, 36, subTabLine, 1 ); |
lineWidthLine->setSuffix( tr( " pt" ) ); |
lineWidthLine->setValue(doc->DwidthLine); |
subTabLineLayout->addMultiCellWidget( lineWidthLine, 5, 5, 1, 2, Qt::AlignLeft ); |
textLabel16b = new QLabel(lineWidthLine, tr("Line &Width:"), subTabLine, "textLabel16b" ); |
subTabLineLayout->addWidget( textLabel16b, 5, 0 ); |
subStackTools->addWidget( subTabLine, 2 ); |
subTabImage = new QWidget( subStackTools, "subTabImage" ); |
subTabImageLayout = new QGridLayout( subTabImage, 1, 1, 11, 6, "subTabImageLayout"); |
subTabImageLayout->setAlignment( Qt::AlignTop ); |
buttonGroup3 = new QButtonGroup( subTabImage, "buttonGroup3" ); |
buttonGroup3->setCheckable( true ); |
buttonGroup3->setChecked( doc->ScaleType ); |
buttonGroup3->setColumnLayout(0, Qt::Vertical ); |
buttonGroup3->layout()->setSpacing( 6 ); |
buttonGroup3->layout()->setMargin( 11 ); |
buttonGroup3->setTitle( tr( "&Free Scaling" ) ); |
buttonGroup3Layout = new QGridLayout( buttonGroup3->layout() ); |
buttonGroup3Layout->setAlignment( Qt::AlignTop ); |
scalingHorizontal = new QSpinBox( buttonGroup3, "scalingHorizontal" ); |
scalingHorizontal->setMaxValue( 1000 ); |
scalingHorizontal->setMinValue( 1 ); |
scalingHorizontal->setValue(qRound(doc->ScaleX * 100)); |
scalingHorizontal->setSuffix( tr( " %" ) ); |
buttonGroup3Layout->addWidget( scalingHorizontal, 0, 1, Qt::AlignRight ); |
textLabel17b = new QLabel(scalingHorizontal, tr("&Horizontal Scaling:"), buttonGroup3, "textLabel17b" ); |
buttonGroup3Layout->addWidget( textLabel17b, 0, 0 ); |
scalingVertical = new QSpinBox( buttonGroup3, "scalingVertical" ); |
scalingVertical->setMaxValue( 1000 ); |
scalingVertical->setMinValue( 1 ); |
scalingVertical->setSuffix( tr( " %" ) ); |
scalingVertical->setValue(qRound(doc->ScaleY * 100)); |
buttonGroup3Layout->addWidget( scalingVertical, 1, 1, Qt::AlignRight ); |
textLabel18b = new QLabel(scalingVertical, tr( "&Vertical Scaling:" ), buttonGroup3, "textLabel18b" ); |
buttonGroup3Layout->addWidget( textLabel18b, 1, 0 ); |
chainButton = new LinkButton( buttonGroup3 ); |
chainButton->setToggleButton( true ); |
chainButton->setAutoRaise(true); |
buttonGroup3Layout->addMultiCellWidget( chainButton, 0, 1, 2, 2, Qt::AlignLeft ); |
subTabImageLayout->addMultiCellWidget( buttonGroup3, 0, 0, 0, 1 ); |
buttonGroup5 = new QButtonGroup( subTabImage, "buttonGroup5" ); |
buttonGroup5->setCheckable( true ); |
buttonGroup5->setChecked( !doc->ScaleType ); |
buttonGroup5->setColumnLayout(0, Qt::Vertical ); |
buttonGroup5->layout()->setSpacing( 6 ); |
buttonGroup5->layout()->setMargin( 11 ); |
buttonGroup5->setTitle( tr( "&Scale Picture to Frame Size" ) ); |
buttonGroup5Layout = new QHBoxLayout( buttonGroup5->layout() ); |
buttonGroup5Layout->setAlignment( Qt::AlignTop ); |
checkRatioImage = new QCheckBox( buttonGroup5, "checkRatioImage" ); |
checkRatioImage->setText( tr( "Keep Aspect &Ratio" ) ); |
checkRatioImage->setChecked(doc->AspectRatio); |
buttonGroup5Layout->addWidget( checkRatioImage ); |
subTabImageLayout->addMultiCellWidget( buttonGroup5, 1, 1, 0, 1 ); |
comboFillImage = new QComboBox( true, subTabImage, "comboFillImage" ); |
comboFillImage->setEditable(false); |
QPixmap pm2I = QPixmap(15, 15); |
comboFillImage->insertItem( tr("None")); |
if (doc->DbrushPict == "None") |
comboFillImage->setCurrentItem(comboFillImage->count()-1); |
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc) |
{ |
pm2I.fill(doc->PageColors[itc.key()].getRGBColor()); |
comboFillImage->insertItem(pm2I, itc.key()); |
if (itc.key() == doc->DbrushPict) |
comboFillImage->setCurrentItem(comboFillImage->count()-1); |
} |
subTabImageLayout->addWidget( comboFillImage, 2, 1, Qt::AlignLeft ); |
textLabel19b = new QLabel(comboFillImage, tr( "F&ill Color:" ), subTabImage, "textLabel19b" ); |
subTabImageLayout->addWidget( textLabel19b, 2, 0 ); |
shadingFillImage = new QSpinBox( subTabImage, "shadingFillImage" ); |
shadingFillImage->setMaxValue( 100 ); |
shadingFillImage->setValue( doc->ShadePict ); |
shadingFillImage->setSuffix( tr( " %" ) ); |
subTabImageLayout->addWidget( shadingFillImage, 3, 1, Qt::AlignLeft ); |
textLabel20b = new QLabel(shadingFillImage, tr( "S&hading:" ), subTabImage, "textLabel20b" ); |
subTabImageLayout->addWidget( textLabel20b, 3, 0 ); |
subStackTools->addWidget( subTabImage, 3 ); |
subTabPolygon = new QWidget( subStackTools, "subTabPolygon" ); |
subTabPolygonLayout = new QHBoxLayout( subTabPolygon, 11, 6, "subTabPolygonLayout"); |
subTabPolygonLayout->setAlignment( Qt::AlignTop ); |
polyWidget = new PolygonWidget(subTabPolygon, doc->PolyC, doc->PolyFd, doc->PolyF, doc->PolyS, doc->PolyR); |
subTabPolygonLayout->addWidget( polyWidget ); |
subStackTools->addWidget( subTabPolygon, 4 ); |
subTabZoom = new QWidget( subStackTools, "subTabZoom" ); |
subTabZoomLayout = new QGridLayout( subTabZoom, 1, 1, 11, 6, "subTabZoomLayout"); |
subTabZoomLayout->setAlignment( Qt::AlignTop ); |
minimumZoom = new QSpinBox( subTabZoom, "minimumZoom" ); |
minimumZoom->setMaxValue( 3200 ); |
minimumZoom->setMinValue( 10 ); |
minimumZoom->setValue(doc->MagMin); |
minimumZoom->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( minimumZoom, 0, 1, Qt::AlignLeft ); |
textLabel21b = new QLabel( minimumZoom, tr( "Mi&nimum:" ), subTabZoom, "textLabel21b" ); |
subTabZoomLayout->addWidget( textLabel21b, 0, 0); |
maximumZoom = new QSpinBox( subTabZoom, "maximumZoom" ); |
maximumZoom->setMaxValue( 3200 ); |
maximumZoom->setMinValue( 10 ); |
maximumZoom->setValue(doc->MagMax); |
maximumZoom->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( maximumZoom, 1, 1, Qt::AlignLeft ); |
textLabel22b = new QLabel( maximumZoom, tr( "Ma&ximum:" ), subTabZoom, "textLabel22b" ); |
subTabZoomLayout->addWidget( textLabel22b, 1, 0 ); |
zoomStep = new QSpinBox( subTabZoom, "zoomStep" ); |
zoomStep->setMaxValue( 200 ); |
zoomStep->setMinValue( 1 ); |
zoomStep->setLineStep( 25 ); |
zoomStep->setValue( doc->MagStep ); |
zoomStep->setSuffix( tr( " %" ) ); |
subTabZoomLayout->addWidget( zoomStep, 2, 1, Qt::AlignLeft ); |
textLabel23b = new QLabel( zoomStep, tr( "&Stepping:" ), subTabZoom, "textLabel23b" ); |
subTabZoomLayout->addWidget( textLabel23b, 2, 0 ); |
subStackTools->addWidget( subTabZoom, 5 ); |
tabToolsLayout->addWidget( subStackTools ); |
tabTools = new TabTools( prefsWidgets, &doc->toolSettings, UmReFaktor, ein, doc); |
addItem( tr("Tools"), loadIcon("tools.png"), tabTools); |
tabHyphenator = new HySettings(prefsWidgets, &ap->LangTransl); |
709,42 → 310,7 |
leftR->setMaxValue(pageWidth - rightR->value()); |
topR->setMaxValue(pageHeight - bottomR->value()); |
bottomR->setMaxValue(pageHeight - topR->value()); |
toolText->setOn(true); |
setSample(); |
//tooltips |
QToolTip::add( toolText, tr( "Text Frame Properties" ) ); |
QToolTip::add( toolImage, tr( "Picture Frame Properties" ) ); |
QToolTip::add( toolShape, tr( "Shape Drawing Properties" ) ); |
QToolTip::add( toolZoom, tr( "Magnification Level Defaults" ) ); |
QToolTip::add( toolLine, tr( "Line Drawing Properties" ) ); |
QToolTip::add( toolPoly, tr( "Polygon Drawing Properties" ) ); |
QToolTip::add( fontComboText, tr( "Font for new text frames" ) ); |
QToolTip::add( sizeComboText, tr( "Size of font for new text frames" ) ); |
QToolTip::add( colorComboText, tr( "Color of font" ) ); |
QToolTip::add( columnsText, tr( "Number of columns in a text frame" ) ); |
QToolTip::add( gapText, tr( "Gap between text frame columns" ) ); |
QToolTip::add( previewText, tr( "Sample of your font" ) ); |
QToolTip::add( buttonGroup3, tr( "Picture frames allow pictures to scale to any size" ) ); |
QToolTip::add( scalingHorizontal, tr( "Horizontal scaling of images" ) ); |
QToolTip::add( scalingVertical, tr( "Vertical scaling of images" ) ); |
QToolTip::add( chainButton, tr( "Keep horizontal and vertical scaling the same" ) ); |
QToolTip::add( buttonGroup5, tr( "Pictures in picture frames are scaled to the size of the frame" ) ); |
QToolTip::add( checkRatioImage, tr( "Automatically scaled pictures keep their original proportions" ) ); |
QToolTip::add( comboFillImage, tr( "Fill color of picture frames" ) ); |
QToolTip::add( shadingFillImage, tr( "Saturation of color of fill" ) ); |
QToolTip::add( colorComboLineShape, tr( "Line color of shapes" ) ); |
QToolTip::add( shadingLineShape, tr( "Saturation of color of lines" ) ); |
QToolTip::add( comboFillShape, tr( "Fill color of shapes" ) ); |
QToolTip::add( shadingFillShape, tr( "Saturation of color of fill" ) ); |
QToolTip::add( comboStyleShape, tr( "Line style of shapes" ) ); |
QToolTip::add( lineWidthShape, tr( "Line width of shapes" ) ); |
QToolTip::add( minimumZoom, tr( "Minimum magnification allowed" ) ); |
QToolTip::add( maximumZoom, tr( "Maximum magnification allowed" ) ); |
QToolTip::add( zoomStep, tr( "Change in magnification for each zoom operation" ) ); |
QToolTip::add( colorComboLine, tr( "Color of lines" ) ); |
QToolTip::add( shadingLine, tr( "Saturation of color" ) ); |
QToolTip::add( comboStyleLine, tr( "Style of lines" ) ); |
QToolTip::add( lineWidthLine, tr( "Width of lines" ) ); |
QToolTip::add( backColor, tr( "Color for paper" ) ); |
QToolTip::add( checkUnprintable, tr( "Mask the area outside the margins in the margin color" ) ); |
QToolTip::add( facingPages, tr( "Enable single or spread based layout" ) ); |
761,19 → 327,6 |
connect(leftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int))); |
connect(rightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int))); |
connect(backColor, SIGNAL(clicked()), this, SLOT(changePaperColor())); |
connect(toolShape, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolPoly, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolImage, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolText, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolLine, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(toolZoom, SIGNAL(clicked()), this, SLOT(setTool())); |
connect(fontComboText, SIGNAL(activated(int)), this, SLOT(setSample())); |
connect(sizeComboText, SIGNAL(activated(int)), this, SLOT(setSample())); |
connect(buttonGroup3, SIGNAL(clicked(int)), this, SLOT(changeImageScalingFree(int))); |
connect(buttonGroup5, SIGNAL(clicked(int)), this, SLOT(changeImageScalingRatio(int))); |
connect(chainButton, SIGNAL(clicked()), this, SLOT(toggleChain())); |
connect(scalingHorizontal, SIGNAL(valueChanged(int)), this, SLOT(hChange())); |
connect(scalingVertical, SIGNAL(valueChanged(int)), this, SLOT(vChange())); |
connect(unitCombo, SIGNAL(activated(int)), this, SLOT(unitChange())); |
if (CMSavail) |
830,7 → 383,7 |
tabGuides->snapDistance->setSuffix(einh); |
tabTypo->baseGrid->setSuffix(einh); |
tabTypo->baseOffset->setSuffix(einh); |
gapText->setSuffix(einh); |
tabTools->gapText->setSuffix(einh); |
topScratch->setSuffix(einh); |
bottomScratch->setSuffix(einh); |
leftScratch->setSuffix(einh); |
860,8 → 413,8 |
tabTypo->baseGrid->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
tabTypo->baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
tabTypo->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
topScratch->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion); |
bottomScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val); |
883,105 → 436,6 |
connect(rightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int))); |
} |
/*! |
\fn void ReformDoc::ToggleKette() |
\author Franz Schmid |
\date |
\brief ReformDoc (Tools, Image Frame), Sets Y Scale value from X Scale value when chain is toggled |
\param None |
\retval None |
*/ |
void ReformDoc::toggleChain() |
{ |
if (chainButton->isOn()) |
scalingVertical->setValue(scalingHorizontal->value()); |
} |
/*! |
\fn void ReformDoc::HChange() |
\author Franz Schmid |
\date |
\brief ReformDoc (Tools, Image Frame), Sets Y Scale value from X Scale value when X Scale value is changed |
\param None |
\retval None |
*/ |
void ReformDoc::hChange() |
{ |
if (chainButton->isOn()) |
scalingVertical->setValue(scalingHorizontal->value()); |
} |
/*! |
\fn void ReformDoc::vChange() |
\author Franz Schmid |
\date |
\brief ReformDoc (Tools, Image Frame). Sets X Scale value from Y Scale value when Y Scale value is changed |
\param None |
\retval None |
*/ |
void ReformDoc::vChange() |
{ |
if (chainButton->isOn()) |
scalingHorizontal->setValue(scalingVertical->value()); |
} |
void ReformDoc::changeImageScalingFree(int) |
{ |
if (buttonGroup3->isChecked()) |
buttonGroup5->setChecked(false); |
else |
buttonGroup5->setChecked(true); |
} |
void ReformDoc::changeImageScalingRatio(int) |
{ |
if (buttonGroup5->isChecked()) |
buttonGroup3->setChecked(false); |
else |
buttonGroup3->setChecked(true); |
} |
/*! |
\fn void ReformDoc::SetSample() |
\author Franz Schmid |
\date |
\brief ReformDoc (Tools, Text frame), Sets the sample text in selected font in text frame preferences |
\param None |
\retval None |
*/ |
void ReformDoc::setSample() |
{ |
QString ts = tr( "Woven silk pyjamas exchanged for blue quartz" ); |
QString da = (*fon)[fontComboText->currentText()]->Datei; |
int s = sizeComboText->currentText().left(2).toInt(); |
QPixmap pm = fontSamples(da, s, ts, paletteBackgroundColor()); |
previewText->setPixmap(pm); |
} |
/*! |
\fn void ReformDoc::SetTool() |
\author Franz Schmid |
\date |
\brief ReformDoc (Tools), Raises widget for selected Tool properties |
\param None |
\retval None |
*/ |
void ReformDoc::setTool() |
{ |
if (toolText == sender()) |
subStackTools->raiseWidget(0); |
if (toolShape == sender()) |
subStackTools->raiseWidget(1); |
if (toolLine == sender()) |
subStackTools->raiseWidget(2); |
if (toolImage == sender()) |
subStackTools->raiseWidget(3); |
if (toolPoly == sender()) |
subStackTools->raiseWidget(4); |
if (toolZoom == sender()) |
subStackTools->raiseWidget(5); |
} |
void ReformDoc::changePaperColor() |
{ |
QColor neu = QColor(); |
/branches/Version13x/Scribus/scribus/scribusdoc.cpp |
---|
35,9 → 35,9 |
UsedFonts.clear(); |
FT_Init_FreeType( &library ); |
AllFonts = &prefsData->AvailFonts; |
AddFont(prefsData->DefFont, prefsData->AvailFonts[prefsData->DefFont]->Font); |
Dfont = prefsData->DefFont; |
Dsize = prefsData->DefSize; |
AddFont(prefsData->toolSettings.defFont, prefsData->AvailFonts[prefsData->toolSettings.defFont]->Font); |
toolSettings.defFont = prefsData->toolSettings.defFont; |
toolSettings.defSize = prefsData->toolSettings.defSize; |
guidesSettings.marginsShown = prefsData->guidesSettings.marginsShown; |
guidesSettings.framesShown = prefsData->guidesSettings.framesShown; |
guidesSettings.gridShown = prefsData->guidesSettings.gridShown; |
59,24 → 59,24 |
PageColors.clear(); |
PageColors.insert("Black", CMYKColor(0, 0, 0, 255)); |
PageColors.insert("White", CMYKColor(0, 0, 0, 0)); |
if (prefsData->Dpen != "None") |
PageColors.insert(prefsData->Dpen, prefsData->DColors[prefsData->Dpen]); |
Dpen = prefsData->Dpen; |
if (prefsData->DpenLine != "None") |
PageColors.insert(prefsData->DpenLine, prefsData->DColors[prefsData->DpenLine]); |
DpenLine = prefsData->DpenLine; |
if (prefsData->DpenText != "None") |
PageColors.insert(prefsData->DpenText, prefsData->DColors[prefsData->DpenText]); |
DpenText = prefsData->DpenText; |
if (prefsData->DstrokeText != "None") |
PageColors.insert(prefsData->DstrokeText, prefsData->DColors[prefsData->DstrokeText]); |
DstrokeText = prefsData->DstrokeText; |
if (prefsData->Dbrush != "None") |
PageColors.insert(prefsData->Dbrush, prefsData->DColors[prefsData->Dbrush]); |
Dbrush = prefsData->Dbrush; |
if (prefsData->DbrushPict != "None") |
PageColors.insert(prefsData->DbrushPict, prefsData->DColors[prefsData->DbrushPict]); |
DbrushPict = prefsData->DbrushPict; |
if (prefsData->toolSettings.dPen != "None") |
PageColors.insert(prefsData->toolSettings.dPen, prefsData->DColors[prefsData->toolSettings.dPen]); |
toolSettings.dPen = prefsData->toolSettings.dPen; |
if (prefsData->toolSettings.dPenLine != "None") |
PageColors.insert(prefsData->toolSettings.dPenLine, prefsData->DColors[prefsData->toolSettings.dPenLine]); |
toolSettings.dPenLine = prefsData->toolSettings.dPenLine; |
if (prefsData->toolSettings.dPenText != "None") |
PageColors.insert(prefsData->toolSettings.dPenText, prefsData->DColors[prefsData->toolSettings.dPenText]); |
toolSettings.dPenText = prefsData->toolSettings.dPenText; |
if (prefsData->toolSettings.dStrokeText != "None") |
PageColors.insert(prefsData->toolSettings.dStrokeText, prefsData->DColors[prefsData->toolSettings.dStrokeText]); |
toolSettings.dStrokeText = prefsData->toolSettings.dStrokeText; |
if (prefsData->toolSettings.dBrush != "None") |
PageColors.insert(prefsData->toolSettings.dBrush, prefsData->DColors[prefsData->toolSettings.dBrush]); |
toolSettings.dBrush = prefsData->toolSettings.dBrush; |
if (prefsData->toolSettings.dBrushPict != "None") |
PageColors.insert(prefsData->toolSettings.dBrushPict, prefsData->DColors[prefsData->toolSettings.dBrushPict]); |
toolSettings.dBrushPict = prefsData->toolSettings.dBrushPict; |
typographicSetttings.valueSuperScript = prefsData->typographicSetttings.valueSuperScript; |
typographicSetttings.scalingSuperScript = prefsData->typographicSetttings.scalingSuperScript; |
typographicSetttings.valueSubScript = prefsData->typographicSetttings.valueSubScript; |
85,30 → 85,30 |
typographicSetttings.autoLineSpacing = prefsData->typographicSetttings.autoLineSpacing; |
typographicSetttings.valueBaseGrid = prefsData->typographicSetttings.valueBaseGrid; |
typographicSetttings.offsetBaseGrid = prefsData->typographicSetttings.offsetBaseGrid; |
Dshade = prefsData->Dshade; |
Dshade2 = prefsData->Dshade2; |
ShadePict = prefsData->ShadePict; |
ScaleX = prefsData->ScaleX; |
ScaleY = prefsData->ScaleY; |
ScaleType = prefsData->ScaleType; |
AspectRatio = prefsData->AspectRatio; |
DCols = prefsData->DCols; |
DGap = prefsData->DGap; |
DLineArt = PenStyle(prefsData->DLineArt); |
Dwidth = prefsData->Dwidth; |
DshadeLine = prefsData->DshadeLine; |
DLstyleLine = PenStyle(prefsData->DLstyleLine); |
DwidthLine = prefsData->DwidthLine; |
DstartArrow = prefsData->DstartArrow; |
DendArrow = prefsData->DendArrow; |
PolyC = prefsData->PolyC; |
PolyF = prefsData->PolyF; |
PolyS = prefsData->PolyS; |
PolyFd = prefsData->PolyFd; |
PolyR = prefsData->PolyR; |
MagMin = prefsData->MagMin; |
MagMax = prefsData->MagMax; |
MagStep = prefsData->MagStep; |
toolSettings.dShade = prefsData->toolSettings.dShade; |
toolSettings.dShade2 = prefsData->toolSettings.dShade2; |
toolSettings.shadePict = prefsData->toolSettings.shadePict; |
toolSettings.scaleX = prefsData->toolSettings.scaleX; |
toolSettings.scaleY = prefsData->toolSettings.scaleY; |
toolSettings.scaleType = prefsData->toolSettings.scaleType; |
toolSettings.aspectRatio = prefsData->toolSettings.aspectRatio; |
toolSettings.dCols = prefsData->toolSettings.dCols; |
toolSettings.dGap = prefsData->toolSettings.dGap; |
toolSettings.dLineArt = PenStyle(prefsData->toolSettings.dLineArt); |
toolSettings.dWidth = prefsData->toolSettings.dWidth; |
toolSettings.dShadeLine = prefsData->toolSettings.dShadeLine; |
toolSettings.dLstyleLine = PenStyle(prefsData->toolSettings.dLstyleLine); |
toolSettings.dWidthLine = prefsData->toolSettings.dWidthLine; |
toolSettings.dStartArrow = prefsData->toolSettings.dStartArrow; |
toolSettings.dEndArrow = prefsData->toolSettings.dEndArrow; |
toolSettings.polyC = prefsData->toolSettings.polyC; |
toolSettings.polyF = prefsData->toolSettings.polyF; |
toolSettings.polyS = prefsData->toolSettings.polyS; |
toolSettings.polyFd = prefsData->toolSettings.polyFd; |
toolSettings.polyR = prefsData->toolSettings.polyR; |
toolSettings.magMin = prefsData->toolSettings.magMin; |
toolSettings.magMax = prefsData->toolSettings.magMax; |
toolSettings.magStep = prefsData->toolSettings.magStep; |
docUnitIndex = prefsData->docUnitIndex; |
marginColored = prefsData->marginColored; |
Language = prefsData->Language; |
154,15 → 154,15 |
vg.gapBefore = 0; |
vg.gapAfter = 0; |
vg.Font = ""; |
vg.FontSize = Dsize; |
vg.FontSize = toolSettings.defSize; |
vg.TabValues.clear(); |
vg.Drop = false; |
vg.DropLin = 2; |
vg.FontEffect = 0; |
vg.FColor = Dbrush; |
vg.FShade = Dshade; |
vg.SColor = Dpen; |
vg.SShade = Dshade2; |
vg.FColor = toolSettings.dBrush; |
vg.FShade = toolSettings.dShade; |
vg.SColor = toolSettings.dPen; |
vg.SShade = toolSettings.dShade2; |
vg.BaseAdj = false; |
docParagraphStyles.append(vg); |
vg.Vname = "Center Internal"; |
/branches/Version13x/Scribus/scribus/editformats.cpp |
---|
147,22 → 147,22 |
{ |
struct ParagraphStyle sty; |
sty.Vname = tr("New Style"); |
sty.LineSpa = ((Docu->Dsize / 10.0) * static_cast<double>(Docu->typographicSetttings.autoLineSpacing) / 100) + (Docu->Dsize / 10.0); |
sty.LineSpa = ((Docu->toolSettings.defSize / 10.0) * static_cast<double>(Docu->typographicSetttings.autoLineSpacing) / 100) + (Docu->toolSettings.defSize / 10.0); |
sty.textAlignment = 0; |
sty.Indent = 0; |
sty.First = 0; |
sty.gapBefore = 0; |
sty.gapAfter = 0; |
sty.Font = Docu->Dfont; |
sty.FontSize = Docu->Dsize; |
sty.Font = Docu->toolSettings.defFont; |
sty.FontSize = Docu->toolSettings.defSize; |
sty.TabValues.clear(); |
sty.Drop = false; |
sty.DropLin = 2; |
sty.FontEffect = 0; |
sty.FColor = Docu->Dbrush; |
sty.FShade = Docu->Dshade; |
sty.SColor = Docu->Dpen; |
sty.SShade = Docu->Dshade2; |
sty.FColor = Docu->toolSettings.dBrush; |
sty.FShade = Docu->toolSettings.dShade; |
sty.SColor = Docu->toolSettings.dPen; |
sty.SShade = Docu->toolSettings.dShade2; |
sty.BaseAdj = false; |
TempVorl.append(sty); |
sFnumber = TempVorl.count()-1; |
/branches/Version13x/Scribus/scribus/scribusXml.cpp |
---|
107,9 → 107,9 |
tmp2.replace(QRegExp("\r"), QChar(5)); |
tmp2.replace(QRegExp("\n"), QChar(5)); |
tmp2.replace(QRegExp("\t"), QChar(4)); |
tmpf = it->attribute("CFONT", doc->Dfont); |
tmpf = it->attribute("CFONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(Prefs->AvailFonts, tmpf, Prefs, doc); |
164,7 → 164,7 |
ReplacedFonts[fStr] = tmpf; |
} |
fo = avail[tmpf]->Font; |
fo.setPointSize(qRound(doc->Dsize / 10.0)); |
fo.setPointSize(qRound(doc->toolSettings.defSize / 10.0)); |
doc->AddFont(tmpf, fo); |
DoFonts[fStr] = tmpf; |
return tmpf; |
436,9 → 436,9 |
vg->textAlignment = QStoInt(pg->attribute("ALIGN")); |
vg->gapBefore = QStodouble(pg->attribute("VOR","0")); |
vg->gapAfter = QStodouble(pg->attribute("NACH","0")); |
tmpf = pg->attribute("FONT", doc->Dfont); |
tmpf = pg->attribute("FONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(Prefs->AvailFonts, tmpf, Prefs, doc); |
449,9 → 449,9 |
vg->Drop = static_cast<bool>(QStoInt(pg->attribute("DROP","0"))); |
vg->DropLin = QStoInt(pg->attribute("DROPLIN","2")); |
vg->FontEffect = QStoInt(pg->attribute("EFFECT","0")); |
vg->FColor = pg->attribute("FCOLOR", doc->Dbrush); |
vg->FColor = pg->attribute("FCOLOR", doc->toolSettings.dBrush); |
vg->FShade = QStoInt(pg->attribute("FSHADE", "100")); |
vg->SColor = pg->attribute("SCOLOR", doc->Dpen); |
vg->SColor = pg->attribute("SCOLOR", doc->toolSettings.dPen); |
vg->SShade = QStoInt(pg->attribute("SSHADE", "100")); |
vg->BaseAdj = static_cast<bool>(QStoInt(pg->attribute("BASE","0"))); |
if ((pg->hasAttribute("NUMTAB")) && (QStoInt(pg->attribute("NUMTAB","0")) != 0)) |
694,7 → 694,7 |
} |
DoVorl.clear(); |
DoFonts.clear(); |
DoFonts[doc->Dfont] = doc->Dfont; |
DoFonts[doc->toolSettings.defFont] = doc->toolSettings.defFont; |
DoVorl[0] = "0"; |
DoVorl[1] = "1"; |
DoVorl[2] = "2"; |
887,9 → 887,9 |
doc->OldBM = true; |
OB.BMnr = QStoInt(obj.attribute("BookNr","0")); |
OB.textAlignment = DoVorl[QStoInt(obj.attribute("ALIGN","0"))].toUInt(); |
tmpf = obj.attribute("IFONT", doc->Dfont); |
tmpf = obj.attribute("IFONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(avail, tmpf, view->Prefs, doc); |
1079,7 → 1079,7 |
doc->guidesSettings.linkShown = view->Prefs->guidesSettings.linkShown; |
doc->guidesSettings.showPic = true; |
DoFonts.clear(); |
doc->Dsize=qRound(QStodouble(dc.attribute("DSIZE")) * 10); |
doc->toolSettings.defSize=qRound(QStodouble(dc.attribute("DSIZE")) * 10); |
Defont=dc.attribute("DFONT"); |
if (!avail.find(Defont)) |
{ |
1087,17 → 1087,17 |
if (view->Prefs->GFontSub.contains(Defont)) |
Defont = view->Prefs->GFontSub[dd]; |
else |
Defont = view->Prefs->DefFont; |
Defont = view->Prefs->toolSettings.defFont; |
DoFonts[dd] = Defont; |
} |
else |
DoFonts[Defont] = Defont; |
fo = avail[Defont]->Font; |
fo.setPointSize(qRound(doc->Dsize / 10.0)); |
fo.setPointSize(qRound(doc->toolSettings.defSize / 10.0)); |
doc->AddFont(Defont, fo); |
doc->Dfont = Defont; |
doc->DCols=QStoInt(dc.attribute("DCOL", "1")); |
doc->DGap=QStodouble(dc.attribute("DGAP", "0.0")); |
doc->toolSettings.defFont = Defont; |
doc->toolSettings.dCols=QStoInt(dc.attribute("DCOL", "1")); |
doc->toolSettings.dGap=QStodouble(dc.attribute("DGAP", "0.0")); |
doc->DocAutor=dc.attribute("AUTHOR"); |
doc->DocComments=dc.attribute("COMMENTS"); |
doc->DocKeyWords=dc.attribute("KEYWORDS",""); |
1143,8 → 1143,8 |
doc->GuideLock = static_cast<bool>(QStoInt(dc.attribute("GUIDELOCK", "0"))); |
doc->guidesSettings.minorGrid = QStodouble(dc.attribute("MINGRID", tmp.setNum(view->Prefs->guidesSettings.minorGrid))); |
doc->guidesSettings.majorGrid = QStodouble(dc.attribute("MAJGRID", tmp.setNum(view->Prefs->guidesSettings.majorGrid))); |
doc->DstartArrow = 0; |
doc->DendArrow = 0; |
doc->toolSettings.dStartArrow = 0; |
doc->toolSettings.dEndArrow = 0; |
doc->LastAuto = 0; |
QDomNode PAGE=DOC.firstChild(); |
counter = 0; |
1171,9 → 1171,9 |
vg.textAlignment = QStoInt(pg.attribute("ALIGN")); |
vg.gapBefore = QStodouble(pg.attribute("VOR","0")); |
vg.gapAfter = QStodouble(pg.attribute("NACH","0")); |
tmpf = pg.attribute("FONT", doc->Dfont); |
tmpf = pg.attribute("FONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(avail, tmpf, view->Prefs, doc); |
1184,9 → 1184,9 |
vg.Drop = static_cast<bool>(QStoInt(pg.attribute("DROP","0"))); |
vg.DropLin = QStoInt(pg.attribute("DROPLIN","2")); |
vg.FontEffect = QStoInt(pg.attribute("EFFECT","0")); |
vg.FColor = pg.attribute("FCOLOR", doc->Dbrush); |
vg.FColor = pg.attribute("FCOLOR", doc->toolSettings.dBrush); |
vg.FShade = QStoInt(pg.attribute("FSHADE","100")); |
vg.SColor = pg.attribute("SCOLOR", doc->Dpen); |
vg.SColor = pg.attribute("SCOLOR", doc->toolSettings.dPen); |
vg.SShade = QStoInt(pg.attribute("SSHADE","100")); |
vg.BaseAdj = static_cast<bool>(QStoInt(pg.attribute("BASE","0"))); |
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0)) |
1343,9 → 1343,9 |
OB.textAlignment = QStoInt(obj.attribute("ALIGN","0")); |
OB.startArrowIndex = 0; |
OB.endArrowIndex = 0; |
tmpf = obj.attribute("IFONT", doc->Dfont); |
tmpf = obj.attribute("IFONT", doc->toolSettings.defFont); |
if (tmpf == "") |
tmpf = doc->Dfont; |
tmpf = doc->toolSettings.defFont; |
tmf = tmpf; |
if (!DoFonts.contains(tmpf)) |
tmpf = AskForFont(avail, tmpf, view->Prefs, doc); |
1691,7 → 1691,7 |
newVersion = true; |
QDomNode DOC=elem.firstChild(); |
DoFonts.clear(); |
DoFonts[doc->Dfont] = doc->Dfont; |
DoFonts[doc->toolSettings.defFont] = doc->toolSettings.defFont; |
DoVorl.clear(); |
DoVorl[0] = "0"; |
DoVorl[1] = "1"; |
1747,7 → 1747,7 |
tmpf = FontSub[tmpf]; |
} |
fo = avail[tmpf]->Font; |
fo.setPointSize(qRound(doc->Dsize / 10.0)); |
fo.setPointSize(qRound(doc->toolSettings.defSize / 10.0)); |
if(!doc->UsedFonts.contains(tmpf)) |
doc->AddFont(tmpf, fo); |
DoFonts[pg.attribute("NAME")] = tmpf; |
1806,11 → 1806,11 |
OB.isBookmark = false; |
OB.BMnr = 0; |
OB.textAlignment = DoVorl[QStoInt(pg.attribute("ALIGN","0"))].toUInt(); |
tmf = pg.attribute("IFONT", doc->Dfont); |
tmf = pg.attribute("IFONT", doc->toolSettings.defFont); |
if (tmf == "") |
tmf = doc->Dfont; |
tmf = doc->toolSettings.defFont; |
if (DoFonts[tmf] == "") |
OB.IFont = doc->Dfont; |
OB.IFont = doc->toolSettings.defFont; |
else |
OB.IFont = DoFonts[tmf]; |
OB.LayerNr = 0; |
2477,10 → 2477,10 |
dc.setAttribute("AUTOSPALTEN",doc->PageSp); |
dc.setAttribute("ABSTSPALTEN",doc->PageSpa); |
dc.setAttribute("UNITS",doc->docUnitIndex); |
dc.setAttribute("DFONT",doc->Dfont); |
dc.setAttribute("DSIZE",doc->Dsize / 10.0); |
dc.setAttribute("DCOL",doc->DCols); |
dc.setAttribute("DGAP",doc->DGap); |
dc.setAttribute("DFONT",doc->toolSettings.defFont); |
dc.setAttribute("DSIZE",doc->toolSettings.defSize / 10.0); |
dc.setAttribute("DCOL",doc->toolSettings.dCols); |
dc.setAttribute("DGAP",doc->toolSettings.dGap); |
dc.setAttribute("AUTHOR",doc->DocAutor); |
dc.setAttribute("COMMENTS",doc->DocComments); |
dc.setAttribute("KEYWORDS",doc->DocKeyWords); |
2535,11 → 2535,11 |
dc.setAttribute("SHOWLINK", static_cast<int>(doc->guidesSettings.linkShown)); |
dc.setAttribute("GuideRad", doc->guidesSettings.guideRad); |
dc.setAttribute("GRAB",doc->guidesSettings.grabRad); |
dc.setAttribute("POLYC", doc->PolyC); |
dc.setAttribute("POLYF", doc->PolyF); |
dc.setAttribute("POLYR", doc->PolyR); |
dc.setAttribute("POLYFD", doc->PolyFd); |
dc.setAttribute("POLYS", static_cast<int>(doc->PolyS)); |
dc.setAttribute("POLYC", doc->toolSettings.polyC); |
dc.setAttribute("POLYF", doc->toolSettings.polyF); |
dc.setAttribute("POLYR", doc->toolSettings.polyR); |
dc.setAttribute("POLYFD", doc->toolSettings.polyFd); |
dc.setAttribute("POLYS", static_cast<int>(doc->toolSettings.polyS)); |
dc.setAttribute("AutoSave", static_cast<int>(doc->AutoSave)); |
dc.setAttribute("AutoSaveTime", doc->AutoSaveTime); |
dc.setAttribute("ScratchBottom", doc->ScratchBottom); |
2546,29 → 2546,29 |
dc.setAttribute("ScatchLeft", doc->ScratchLeft); |
dc.setAttribute("ScratchRight", doc->ScratchRight); |
dc.setAttribute("ScratchTop", doc->ScratchTop); |
dc.setAttribute("StartArrow", doc->DstartArrow); |
dc.setAttribute("EndArrow", doc->DendArrow); |
dc.setAttribute("PEN",doc->Dpen); |
dc.setAttribute("BRUSH",doc->Dbrush); |
dc.setAttribute("PENLINE",doc->DpenLine); |
dc.setAttribute("PENTEXT",doc->DpenText); |
dc.setAttribute("StrokeText",doc->DstrokeText); |
dc.setAttribute("STIL",doc->DLineArt); |
dc.setAttribute("STILLINE",doc->DLstyleLine); |
dc.setAttribute("WIDTH",doc->Dwidth); |
dc.setAttribute("WIDTHLINE",doc->DwidthLine); |
dc.setAttribute("PENSHADE",doc->Dshade2); |
dc.setAttribute("LINESHADE",doc->DshadeLine); |
dc.setAttribute("BRUSHSHADE",doc->Dshade); |
dc.setAttribute("MAGMIN",doc->MagMin); |
dc.setAttribute("MAGMAX",doc->MagMax); |
dc.setAttribute("MAGSTEP",doc->MagStep); |
dc.setAttribute("CPICT",doc->DbrushPict); |
dc.setAttribute("PICTSHADE",doc->ShadePict); |
dc.setAttribute("PICTSCX",doc->ScaleX); |
dc.setAttribute("PICTSCY",doc->ScaleY); |
dc.setAttribute("PSCALE", static_cast<int>(doc->ScaleType)); |
dc.setAttribute("PASPECT", static_cast<int>(doc->AspectRatio)); |
dc.setAttribute("StartArrow", doc->toolSettings.dStartArrow); |
dc.setAttribute("EndArrow", doc->toolSettings.dEndArrow); |
dc.setAttribute("PEN",doc->toolSettings.dPen); |
dc.setAttribute("BRUSH",doc->toolSettings.dBrush); |
dc.setAttribute("PENLINE",doc->toolSettings.dPenLine); |
dc.setAttribute("PENTEXT",doc->toolSettings.dPenText); |
dc.setAttribute("StrokeText",doc->toolSettings.dStrokeText); |
dc.setAttribute("STIL",doc->toolSettings.dLineArt); |
dc.setAttribute("STILLINE",doc->toolSettings.dLstyleLine); |
dc.setAttribute("WIDTH",doc->toolSettings.dWidth); |
dc.setAttribute("WIDTHLINE",doc->toolSettings.dWidthLine); |
dc.setAttribute("PENSHADE",doc->toolSettings.dShade2); |
dc.setAttribute("LINESHADE",doc->toolSettings.dShadeLine); |
dc.setAttribute("BRUSHSHADE",doc->toolSettings.dShade); |
dc.setAttribute("MAGMIN",doc->toolSettings.magMin); |
dc.setAttribute("MAGMAX",doc->toolSettings.magMax); |
dc.setAttribute("MAGSTEP",doc->toolSettings.magStep); |
dc.setAttribute("CPICT",doc->toolSettings.dBrushPict); |
dc.setAttribute("PICTSHADE",doc->toolSettings.shadePict); |
dc.setAttribute("PICTSCX",doc->toolSettings.scaleX); |
dc.setAttribute("PICTSCY",doc->toolSettings.scaleY); |
dc.setAttribute("PSCALE", static_cast<int>(doc->toolSettings.scaleType)); |
dc.setAttribute("PASPECT", static_cast<int>(doc->toolSettings.aspectRatio)); |
dc.setAttribute("MINORC",doc->guidesSettings.minorColor.name()); |
dc.setAttribute("MAJORC",doc->guidesSettings.majorColor.name()); |
dc.setAttribute("GuideC", doc->guidesSettings.guideColor.name()); |
2859,8 → 2859,8 |
dc1a.setAttribute("DScale",Vor->DisScale); |
elem.appendChild(dc1a); |
QDomElement dc2=docu.createElement("FONTS"); |
dc2.setAttribute("FACE",Vor->DefFont); |
dc2.setAttribute("SIZE",Vor->DefSize / 10.0); |
dc2.setAttribute("FACE",Vor->toolSettings.defFont); |
dc2.setAttribute("SIZE",Vor->toolSettings.defSize / 10.0); |
elem.appendChild(dc2); |
QDomElement dc3=docu.createElement("TYPO"); |
dc3.setAttribute("TIEF",Vor->typographicSetttings.valueSubScript); |
2873,36 → 2873,36 |
dc3.setAttribute("BASEO", Vor->typographicSetttings.offsetBaseGrid); |
elem.appendChild(dc3); |
QDomElement dc9=docu.createElement("TOOLS"); |
dc9.setAttribute("PEN",Vor->Dpen); |
dc9.setAttribute("BRUSH",Vor->Dbrush); |
dc9.setAttribute("PENLINE",Vor->DpenLine); |
dc9.setAttribute("PENTEXT",Vor->DpenText); |
dc9.setAttribute("StrokeText",Vor->DstrokeText); |
dc9.setAttribute("TEXTCOL",Vor->DCols); |
dc9.setAttribute("TEXTGAP",Vor->DGap); |
dc9.setAttribute("STIL",Vor->DLineArt); |
dc9.setAttribute("STILLINE",Vor->DLstyleLine); |
dc9.setAttribute("WIDTH",Vor->Dwidth); |
dc9.setAttribute("WIDTHLINE",Vor->DwidthLine); |
dc9.setAttribute("PENSHADE",Vor->Dshade2); |
dc9.setAttribute("LINESHADE",Vor->DshadeLine); |
dc9.setAttribute("BRUSHSHADE",Vor->Dshade); |
dc9.setAttribute("MAGMIN",Vor->MagMin); |
dc9.setAttribute("MAGMAX",Vor->MagMax); |
dc9.setAttribute("MAGSTEP",Vor->MagStep); |
dc9.setAttribute("CPICT",Vor->DbrushPict); |
dc9.setAttribute("PICTSHADE",Vor->ShadePict); |
dc9.setAttribute("PICTSCX",Vor->ScaleX); |
dc9.setAttribute("PICTSCY",Vor->ScaleY); |
dc9.setAttribute("POLYC", Vor->PolyC); |
dc9.setAttribute("POLYF", Vor->PolyF); |
dc9.setAttribute("POLYR", Vor->PolyR); |
dc9.setAttribute("POLYFD", Vor->PolyFd); |
dc9.setAttribute("POLYS", static_cast<int>(Vor->PolyS)); |
dc9.setAttribute("PSCALE", static_cast<int>(Vor->ScaleType)); |
dc9.setAttribute("PASPECT", static_cast<int>(Vor->AspectRatio)); |
dc9.setAttribute("StartArrow", Vor->DstartArrow); |
dc9.setAttribute("EndArrow", Vor->DendArrow); |
dc9.setAttribute("PEN",Vor->toolSettings.dPen); |
dc9.setAttribute("BRUSH",Vor->toolSettings.dBrush); |
dc9.setAttribute("PENLINE",Vor->toolSettings.dPenLine); |
dc9.setAttribute("PENTEXT",Vor->toolSettings.dPenText); |
dc9.setAttribute("StrokeText",Vor->toolSettings.dStrokeText); |
dc9.setAttribute("TEXTCOL",Vor->toolSettings.dCols); |
dc9.setAttribute("TEXTGAP",Vor->toolSettings.dGap); |
dc9.setAttribute("STIL",Vor->toolSettings.dLineArt); |
dc9.setAttribute("STILLINE",Vor->toolSettings.dLstyleLine); |
dc9.setAttribute("WIDTH",Vor->toolSettings.dWidth); |
dc9.setAttribute("WIDTHLINE",Vor->toolSettings.dWidthLine); |
dc9.setAttribute("PENSHADE",Vor->toolSettings.dShade2); |
dc9.setAttribute("LINESHADE",Vor->toolSettings.dShadeLine); |
dc9.setAttribute("BRUSHSHADE",Vor->toolSettings.dShade); |
dc9.setAttribute("MAGMIN",Vor->toolSettings.magMin); |
dc9.setAttribute("MAGMAX",Vor->toolSettings.magMax); |
dc9.setAttribute("MAGSTEP",Vor->toolSettings.magStep); |
dc9.setAttribute("CPICT",Vor->toolSettings.dBrushPict); |
dc9.setAttribute("PICTSHADE",Vor->toolSettings.shadePict); |
dc9.setAttribute("PICTSCX",Vor->toolSettings.scaleX); |
dc9.setAttribute("PICTSCY",Vor->toolSettings.scaleY); |
dc9.setAttribute("POLYC", Vor->toolSettings.polyC); |
dc9.setAttribute("POLYF", Vor->toolSettings.polyF); |
dc9.setAttribute("POLYR", Vor->toolSettings.polyR); |
dc9.setAttribute("POLYFD", Vor->toolSettings.polyFd); |
dc9.setAttribute("POLYS", static_cast<int>(Vor->toolSettings.polyS)); |
dc9.setAttribute("PSCALE", static_cast<int>(Vor->toolSettings.scaleType)); |
dc9.setAttribute("PASPECT", static_cast<int>(Vor->toolSettings.aspectRatio)); |
dc9.setAttribute("StartArrow", Vor->toolSettings.dStartArrow); |
dc9.setAttribute("EndArrow", Vor->toolSettings.dEndArrow); |
elem.appendChild(dc9); |
QDomElement dc4=docu.createElement("MAINWINDOW"); |
dc4.setAttribute("XPOS",Vor->mainWinSettings.xPosition); |
3156,36 → 3156,36 |
} |
if (dc.tagName()=="TOOLS") |
{ |
Vorein->Dpen = dc.attribute("PEN"); |
Vorein->Dbrush = dc.attribute("BRUSH"); |
Vorein->DpenLine = dc.attribute("PENLINE"); |
Vorein->DpenText = dc.attribute("PENTEXT"); |
Vorein->DstrokeText = dc.attribute("StrokeText", Vorein->DpenText); |
Vorein->DCols = QStoInt(dc.attribute("TEXTCOL", "1")); |
Vorein->DGap = QStodouble(dc.attribute("TEXTGAP", "0.0")); |
Vorein->DLineArt = QStoInt(dc.attribute("STIL")); |
Vorein->DLstyleLine = QStoInt(dc.attribute("STILLINE")); |
Vorein->Dwidth = QStodouble(dc.attribute("WIDTH")); |
Vorein->DwidthLine = QStodouble(dc.attribute("WIDTHLINE")); |
Vorein->Dshade2 = QStoInt(dc.attribute("PENSHADE")); |
Vorein->DshadeLine = QStoInt(dc.attribute("LINESHADE")); |
Vorein->Dshade = QStoInt(dc.attribute("BRUSHSHADE")); |
Vorein->MagMin = QStoInt(dc.attribute("MAGMIN","10")); |
Vorein->MagMax = QStoInt(dc.attribute("MAGMAX","3200")); |
Vorein->MagStep = QStoInt(dc.attribute("MAGSTEP","25")); |
Vorein->DbrushPict = dc.attribute("CPICT"); |
Vorein->ShadePict = QStoInt(dc.attribute("PICTSHADE","100")); |
Vorein->ScaleX = QStodouble(dc.attribute("PICTSCX","1")); |
Vorein->ScaleY = QStodouble(dc.attribute("PICTSCY","1")); |
Vorein->ScaleType = static_cast<bool>(QStoInt(dc.attribute("PSCALE", "1"))); |
Vorein->AspectRatio = static_cast<bool>(QStoInt(dc.attribute("PASPECT", "0"))); |
Vorein->PolyC = QStoInt(dc.attribute("POLYC", "4")); |
Vorein->PolyF = QStodouble(dc.attribute("POLYF", "0.5")); |
Vorein->PolyR = QStodouble(dc.attribute("POLYR", "0")); |
Vorein->PolyFd = QStoInt(dc.attribute("POLYFD", "0")); |
Vorein->PolyS = static_cast<bool>(QStoInt(dc.attribute("POLYS", "0"))); |
Vorein->DstartArrow = QStoInt(dc.attribute("StartArrow", "0")); |
Vorein->DendArrow = QStoInt(dc.attribute("EndArrow", "0")); |
Vorein->toolSettings.dPen = dc.attribute("PEN"); |
Vorein->toolSettings.dBrush = dc.attribute("BRUSH"); |
Vorein->toolSettings.dPenLine = dc.attribute("PENLINE"); |
Vorein->toolSettings.dPenText = dc.attribute("PENTEXT"); |
Vorein->toolSettings.dStrokeText = dc.attribute("StrokeText", Vorein->toolSettings.dPenText); |
Vorein->toolSettings.dCols = QStoInt(dc.attribute("TEXTCOL", "1")); |
Vorein->toolSettings.dGap = QStodouble(dc.attribute("TEXTGAP", "0.0")); |
Vorein->toolSettings.dLineArt = QStoInt(dc.attribute("STIL")); |
Vorein->toolSettings.dLstyleLine = QStoInt(dc.attribute("STILLINE")); |
Vorein->toolSettings.dWidth = QStodouble(dc.attribute("WIDTH")); |
Vorein->toolSettings.dWidthLine = QStodouble(dc.attribute("WIDTHLINE")); |
Vorein->toolSettings.dShade2 = QStoInt(dc.attribute("PENSHADE")); |
Vorein->toolSettings.dShadeLine = QStoInt(dc.attribute("LINESHADE")); |
Vorein->toolSettings.dShade = QStoInt(dc.attribute("BRUSHSHADE")); |
Vorein->toolSettings.magMin = QStoInt(dc.attribute("MAGMIN","10")); |
Vorein->toolSettings.magMax = QStoInt(dc.attribute("MAGMAX","3200")); |
Vorein->toolSettings.magStep = QStoInt(dc.attribute("MAGSTEP","25")); |
Vorein->toolSettings.dBrushPict = dc.attribute("CPICT"); |
Vorein->toolSettings.shadePict = QStoInt(dc.attribute("PICTSHADE","100")); |
Vorein->toolSettings.scaleX = QStodouble(dc.attribute("PICTSCX","1")); |
Vorein->toolSettings.scaleY = QStodouble(dc.attribute("PICTSCY","1")); |
Vorein->toolSettings.scaleType = static_cast<bool>(QStoInt(dc.attribute("PSCALE", "1"))); |
Vorein->toolSettings.aspectRatio = static_cast<bool>(QStoInt(dc.attribute("PASPECT", "0"))); |
Vorein->toolSettings.polyC = QStoInt(dc.attribute("POLYC", "4")); |
Vorein->toolSettings.polyF = QStodouble(dc.attribute("POLYF", "0.5")); |
Vorein->toolSettings.polyR = QStodouble(dc.attribute("POLYR", "0")); |
Vorein->toolSettings.polyFd = QStoInt(dc.attribute("POLYFD", "0")); |
Vorein->toolSettings.polyS = static_cast<bool>(QStoInt(dc.attribute("POLYS", "0"))); |
Vorein->toolSettings.dStartArrow = QStoInt(dc.attribute("StartArrow", "0")); |
Vorein->toolSettings.dEndArrow = QStoInt(dc.attribute("EndArrow", "0")); |
} |
if (dc.tagName()=="MAINWINDOW") |
{ |
3337,8 → 3337,8 |
else |
newFont = dc.attribute("FACE"); |
if (newFont!="") |
Vorein->DefFont = newFont; |
Vorein->DefSize = qRound(QStodouble(dc.attribute("SIZE")) * 10.0); |
Vorein->toolSettings.defFont = newFont; |
Vorein->toolSettings.defSize = qRound(QStodouble(dc.attribute("SIZE")) * 10.0); |
} |
if (dc.tagName()=="FONT") |
{ |
/branches/Version13x/Scribus/scribus/scribusstructs.h |
---|
382,12 → 382,52 |
QColor margColor; |
}; |
struct toolPrefs |
{ |
/* Texttool */ |
QString defFont; |
int defSize; |
QString dPenText; |
QString dStrokeText; |
int dCols; |
double dGap; |
/* ShapeTool */ |
QString dPen; |
QString dBrush; |
int dShade; |
int dShade2; |
int dLineArt; |
double dWidth; |
/* Line Tool */ |
QString dPenLine; |
int dShadeLine; |
double dWidthLine; |
int dLstyleLine; |
int dStartArrow; |
int dEndArrow; |
/* Regular Polygon Tool */ |
int polyC; |
int polyFd; |
double polyF; |
bool polyS; |
double polyR; |
/* Picture Tool */ |
QString dBrushPict; |
int shadePict; |
double scaleX; |
double scaleY; |
bool scaleType; |
bool aspectRatio; |
/* Magnifier Tool */ |
int magMin; |
int magMax; |
int magStep; |
}; |
struct ApplicationPrefs |
{ |
SCFonts AvailFonts; |
QValueList<ArrowDesc> arrowStyles; |
QString DefFont; |
int DefSize; |
ColorList DColors; |
int Wheelval; |
int AppFontSize; |
395,27 → 435,7 |
QString GUI; |
guidesPrefs guidesSettings; |
typoPrefs typographicSetttings; |
QString Dpen; |
QString Dbrush; |
int Dshade; |
int Dshade2; |
int DLineArt; |
double Dwidth; |
QString DpenLine; |
QString DpenText; |
QString DstrokeText; |
int DshadeLine; |
double DwidthLine; |
int DLstyleLine; |
int DstartArrow; |
int DendArrow; |
int MagMin; |
int MagMax; |
int MagStep; |
QString DbrushPict; |
int ShadePict; |
double ScaleX; |
double ScaleY; |
toolPrefs toolSettings; |
int docUnitIndex; |
windowPrefs mainToolBarSettings; |
windowPrefs pdfToolBarSettings; |
437,11 → 457,6 |
uint RecentDCount; |
CMSData DCMSset; |
QMap<int,Keys> KeyActions; |
int PolyC; |
int PolyFd; |
double PolyF; |
bool PolyS; |
double PolyR; |
QString PrinterName; |
QString PrinterFile; |
QString PrinterCommand; |
455,8 → 470,6 |
double RandRechts; |
bool DoppelSeiten; |
bool ErsteLinks; |
bool ScaleType; |
bool AspectRatio; |
int MinWordLen; |
int HyCount; |
QString Language; |
471,8 → 484,6 |
bool AutoSave; |
int AutoSaveTime; |
double DisScale; |
int DCols; |
double DGap; |
QString DColorSet; |
QStringList CustomColorSets; |
bool PrPr_Mode; |
/branches/Version13x/Scribus/scribus/reformdoc.h |
---|
14,22 → 14,17 |
#include <qcolor.h> |
#include "scribusstructs.h" |
#include "linkbutton.h" |
#include "prefsdialogbase.h" |
#include "scfonts.h" |
class QSpinBox; |
class ScribusDoc; |
class ScribusApp; |
class FontCombo; |
class PolygonWidget; |
class ArrowChooser; |
class TabTypograpy; |
class HySettings; |
class CMSPrefs; |
class MSpinBox; |
class LineCombo; |
class TabGuides; |
class TabTools; |
class ReformDoc : public PrefsDialogBase |
37,7 → 32,7 |
Q_OBJECT |
public: |
ReformDoc( QWidget* parent, ScribusDoc* doc, ApplicationPrefs *prefsData ); |
ReformDoc( QWidget* parent, ScribusDoc* doc ); |
~ReformDoc() {}; |
QWidget* tabPage; |
QGroupBox* groupBox7; |
77,7 → 72,7 |
TabGuides* tabGuides; |
QWidget* tabView; |
TabTypograpy* tabTypo; |
QWidget* tabTools; |
TabTools* tabTools; |
HySettings* tabHyphenator; |
CMSPrefs* tabColorManagement; |
QLabel* textLabel9; |
84,86 → 79,13 |
QPushButton* backColor; |
QButtonGroup* pageBackground; |
QCheckBox* checkUnprintable; |
QButtonGroup* buttonGroupTools; |
QToolButton* toolShape; |
QToolButton* toolPoly; |
QToolButton* toolImage; |
QToolButton* toolText; |
QToolButton* toolLine; |
QToolButton* toolZoom; |
QWidgetStack* subStackTools; |
QWidget* subTabText; |
QLabel* textLabel3b; |
QLabel* textLabel3b2; |
QLabel* textLabel1b; |
QLabel* textLabel2b; |
QLabel* textLabel4b; |
QSpinBox* columnsText; |
QLabel* previewText; |
FontCombo* fontComboText; |
QComboBox* sizeComboText; |
QComboBox* colorComboText; |
QComboBox* colorComboStrokeText; |
QLabel* textLabel5b; |
MSpinBox* gapText; |
QWidget* subTabShape; |
QLabel* textLabel9b; |
QLabel* textLabel10b; |
MSpinBox* lineWidthShape; |
QLabel* textLabel12b; |
QLabel* textLabel11b; |
LineCombo* comboStyleShape; |
QSpinBox* shadingFillShape; |
QComboBox* comboFillShape; |
QSpinBox* shadingLineShape; |
QLabel* textLabel7b; |
QComboBox* colorComboLineShape; |
QLabel* textLabel8b; |
QWidget* subTabLine; |
MSpinBox* lineWidthLine; |
QSpinBox* shadingLine; |
QComboBox* colorComboLine; |
QLabel* textLabel13b; |
QLabel* textLabel14b; |
QLabel* textLabel15b; |
QLabel* textLabel16b; |
LineCombo* comboStyleLine; |
QWidget* subTabImage; |
QComboBox* comboFillImage; |
QLabel* textLabel19b; |
QSpinBox* shadingFillImage; |
QLabel* textLabel20b; |
QButtonGroup* buttonGroup3; |
QLabel* textLabel17b; |
QLabel* textLabel18b; |
QSpinBox* scalingHorizontal; |
QSpinBox* scalingVertical; |
LinkButton* chainButton; |
QButtonGroup* buttonGroup5; |
QCheckBox* checkRatioImage; |
QWidget* subTabPolygon; |
PolygonWidget* polyWidget; |
QWidget* subTabZoom; |
QLabel* textLabel21b; |
QSpinBox* minimumZoom; |
QLabel* textLabel22b; |
QLabel* textLabel23b; |
QSpinBox* maximumZoom; |
QSpinBox* zoomStep; |
QGroupBox* groupAutoSave; |
QLabel* textLabel1m; |
QSpinBox* autoSaveTime; |
QComboBox* unitCombo; |
ArrowChooser* startArrow; |
ArrowChooser* endArrow; |
QLabel* startArrowText; |
QLabel* endArrowText; |
QLabel* arrowText; |
ScribusApp *ap; |
ScribusDoc* docc; |
SCFonts *fon; |
int einheit; |
int decimals; |
double Umrech; |
188,27 → 110,10 |
QVBoxLayout* pageBackgroundLayout; |
QHBoxLayout* layout10; |
QSpacerItem* spacer3; |
QHBoxLayout* tabToolsLayout; |
QVBoxLayout* buttonGroupToolsLayout; |
QGridLayout* subTabTextLayout; |
QGridLayout* subTabShapeLayout; |
QGridLayout* subTabLineLayout; |
QGridLayout* subTabImageLayout; |
QGridLayout* buttonGroup3Layout; |
QHBoxLayout* buttonGroup5Layout; |
QHBoxLayout* subTabPolygonLayout; |
QGridLayout* subTabZoomLayout; |
QHBoxLayout* groupAutoSaveLayout; |
protected slots: |
virtual void unitChange(); |
virtual void toggleChain(); |
virtual void hChange(); |
virtual void vChange(); |
virtual void changeImageScalingFree(int); |
virtual void changeImageScalingRatio(int); |
virtual void setSample(); |
virtual void setTool(); |
virtual void changePaperColor(); |
virtual void setDS(); |
virtual void setTop(int v); |
/branches/Version13x/Scribus/scribus/pageitem.cpp |
---|
74,8 → 74,8 |
Doc = pa; |
Pcolor = fill; |
Pcolor2 = PType == 4 ? fill : outline; |
TxtFill = Doc->DpenText; |
TxtStroke = Doc->DstrokeText; |
TxtFill = Doc->toolSettings.dPenText; |
TxtStroke = Doc->toolSettings.dStrokeText; |
ShTxtStroke = 100; |
ShTxtFill = 100; |
TxtScale = 100; |
89,7 → 89,7 |
GrEndY = 0; |
Pwidth = w2; |
OldPwidth = w2; |
PLineArt = Doc->DLineArt; |
PLineArt = PenStyle(Doc->toolSettings.dLineArt); |
PLineEnd = FlatCap; |
PLineJoin = MiterJoin; |
Select = false; |
96,9 → 96,9 |
FrameOnly = false; |
ClipEdited = false; |
FrameType = 0; |
IFont = Doc->Dfont; |
ISize = Doc->Dsize; |
LineSp = ((Doc->Dsize / 10.0) * static_cast<double>(Doc->typographicSetttings.autoLineSpacing) / 100) + (Doc->Dsize / 10.0); |
IFont = Doc->toolSettings.defFont; |
ISize = Doc->toolSettings.defSize; |
LineSp = ((Doc->toolSettings.defSize / 10.0) * static_cast<double>(Doc->typographicSetttings.autoLineSpacing) / 100) + (Doc->toolSettings.defSize / 10.0); |
Doc->docParagraphStyles[0].LineSpa = LineSp; |
CurX = 0; |
CurY = 0; |
245,16 → 245,16 |
fill_gradient = VGradient(VGradient::linear); |
fill_gradient.clearStops(); |
if (Pcolor == "None") |
fill_gradient.addStop(Doc->PageColors[Doc->Dbrush].getRGBColor(), 0.0, 0.5, 1.0, Doc->Dbrush, 100); |
fill_gradient.addStop(Doc->PageColors[Doc->toolSettings.dBrush].getRGBColor(), 0.0, 0.5, 1.0, Doc->toolSettings.dBrush, 100); |
else |
fill_gradient.addStop(Doc->PageColors[Pcolor].getRGBColor(), 0.0, 0.5, 1.0, Pcolor, 100); |
if (Pcolor2 == "None") |
fill_gradient.addStop(Doc->PageColors[Doc->Dpen].getRGBColor(), 1.0, 0.5, 1.0, Doc->Dpen, 100); |
fill_gradient.addStop(Doc->PageColors[Doc->toolSettings.dPen].getRGBColor(), 1.0, 0.5, 1.0, Doc->toolSettings.dPen, 100); |
else |
fill_gradient.addStop(Doc->PageColors[Pcolor2].getRGBColor(), 1.0, 0.5, 1.0, Pcolor2, 100); |
Language = Doc->Language; |
Cols = Doc->DCols; |
ColGap = Doc->DGap; |
Cols = Doc->toolSettings.dCols; |
ColGap = Doc->toolSettings.dGap; |
LeftLink = 0; |
RightLink = 0; |
TopLink = 0; |
272,8 → 272,8 |
Dirty = false; |
ChangedMasterItem = false; |
OnMasterPage = Doc->currentPage->PageNam; |
startArrowIndex = Doc->DstartArrow; |
endArrowIndex = Doc->DendArrow; |
startArrowIndex = Doc->toolSettings.dStartArrow; |
endArrowIndex = Doc->toolSettings.dEndArrow; |
} |
/** Zeichnet das Item */ |
/branches/Version13x/Scribus/scribus/scribusview.cpp |
---|
1298,7 → 1298,7 |
{ |
for (int cc = 0; cc < Cols; ++cc) |
{ |
z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, Doc->Dwidth, Doc->DpenText); |
z = PaintText(Tx + offX, Ty + offY, deltaX, deltaY, Doc->toolSettings.dWidth, Doc->toolSettings.dPenText); |
b = Doc->Items.at(z); |
b->isTableItem = true; |
SelItem.append(b); |
1343,7 → 1343,7 |
Doc->appMode = NormalMode; |
if (RecordP.size() > 1) |
{ |
uint z = PaintPolyLine(0, 0, 1, 1, Doc->Dwidth, "None", Doc->DpenLine); |
uint z = PaintPolyLine(0, 0, 1, 1, Doc->toolSettings.dWidth, "None", Doc->toolSettings.dPenLine); |
b = Doc->Items.at(z); |
b->PoLine.resize(0); |
b->PoLine.addPoint(RecordP.point(0)); |
1763,7 → 1763,7 |
np1 = ApplyGridF(np1); |
b->Width = np1.x() - b->Xpos; |
b->Height = np1.y()- b->Ypos; |
FPointArray cli = RegularPolygonF(b->Width, b->Height, Doc->PolyC, Doc->PolyS, Doc->PolyF, Doc->PolyR); |
FPointArray cli = RegularPolygonF(b->Width, b->Height, Doc->toolSettings.polyC, Doc->toolSettings.polyS, Doc->toolSettings.polyF, Doc->toolSettings.polyR); |
FPoint np = FPoint(cli.point(0)); |
b->PoLine.resize(2); |
b->PoLine.setPoint(0, np); |
3987,15 → 3987,15 |
switch (Doc->SubMode) |
{ |
case 0: |
z = PaintRect(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->Dbrush, Doc->Dpen); |
z = PaintRect(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dBrush, Doc->toolSettings.dPen); |
SetupDraw(z); |
break; |
case 1: |
z = PaintEllipse(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->Dbrush, Doc->Dpen); |
z = PaintEllipse(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dBrush, Doc->toolSettings.dPen); |
SetupDraw(z); |
break; |
default: |
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->Dbrush, Doc->Dpen); |
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dBrush, Doc->toolSettings.dPen); |
SetFrameShape(Doc->Items.at(z), Doc->ValCount, Doc->ShapeValues); |
Doc->Items.at(z)->FrameType = Doc->SubMode+2; |
SetupDraw(z); |
4011,7 → 4011,7 |
break; |
case DrawText: |
selectPage(m); |
z = PaintText(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->DpenText); |
z = PaintText(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dPenText); |
SetupDraw(z); |
emit HaveSel(4); |
break; |
4106,7 → 4106,7 |
break; |
case DrawLine: |
selectPage(m); |
z = PaintLine(Rxp, Ryp, 1+Rxpd, Rypd, Doc->DwidthLine, Doc->DpenLine); |
z = PaintLine(Rxp, Ryp, 1+Rxpd, Rypd, Doc->toolSettings.dWidthLine, Doc->toolSettings.dPenLine); |
b = Doc->Items.at(z); |
b->Select = true; |
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true); |
4242,9 → 4242,9 |
case DrawRegularPolygon: |
{ |
selectPage(m); |
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->Dbrush, Doc->Dpen); |
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dBrush, Doc->toolSettings.dPen); |
b = Doc->Items.at(z); |
FPointArray cli = RegularPolygonF(b->Width, b->Height, Doc->PolyC, Doc->PolyS, Doc->PolyF, Doc->PolyR); |
FPointArray cli = RegularPolygonF(b->Width, b->Height, Doc->toolSettings.polyC, Doc->toolSettings.polyS, Doc->toolSettings.polyF, Doc->toolSettings.polyR); |
FPoint np = FPoint(cli.point(0)); |
b->PoLine.resize(2); |
b->PoLine.setPoint(0, np); |
4278,7 → 4278,7 |
if (FirstPoly) |
{ |
selectPage(m); |
z = PaintPolyLine(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, "None", Doc->DpenLine); |
z = PaintPolyLine(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, "None", Doc->toolSettings.dPenLine); |
b = Doc->Items.at(z); |
SelItem.clear(); |
SelItem.append(b); |
4322,7 → 4322,7 |
case InsertPDFTextAnnotation: |
case InsertPDFLinkAnnotation: |
selectPage(m); |
z = PaintText(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->Dwidth, Doc->DpenText); |
z = PaintText(Rxp, Ryp, 1+Rxpd, 1+Rypd, Doc->toolSettings.dWidth, Doc->toolSettings.dPenText); |
b = Doc->Items.at(z); |
b->isAnnotation = true; |
switch (Doc->appMode) |
7228,8 → 7228,8 |
{ |
PageItem* b = Doc->Items.at(nr); |
b->Select = true; |
b->IFont = Doc->Dfont; |
b->ISize = Doc->Dsize; |
b->IFont = Doc->toolSettings.defFont; |
b->ISize = Doc->toolSettings.defSize; |
mCG = true; |
HowTo = 1; |
qApp->setOverrideCursor(QCursor(SizeFDiagCursor), true); |
8073,7 → 8073,7 |
fe->Margins.Top+fe->Yoffset, |
Doc->PageB-fe->Margins.Right-fe->Margins.Left, |
Doc->PageH-fe->Margins.Bottom-fe->Margins.Top, |
1, Doc->Dpen); |
1, Doc->toolSettings.dPen); |
Doc->Items.at(z)->isAutoText = true; |
Doc->Items.at(z)->BackBox = Doc->LastAuto; |
Doc->Items.at(z)->Cols = qRound(Doc->PageSp); |
8430,10 → 8430,10 |
void ScribusView::slotZoomIn2(int mx,int my) |
{ |
rememberPreviousSettings(mx,my); |
Scale += static_cast<double>(Doc->MagStep*Prefs->DisScale)/100.0; |
if (Scale > static_cast<double>(Doc->MagMax*Prefs->DisScale)/100.0) |
Scale += static_cast<double>(Doc->toolSettings.magStep*Prefs->DisScale)/100.0; |
if (Scale > static_cast<double>(Doc->toolSettings.magMax*Prefs->DisScale)/100.0) |
{ |
Scale = static_cast<double>(Doc->MagMax*Prefs->DisScale)/100.0; |
Scale = static_cast<double>(Doc->toolSettings.magMax*Prefs->DisScale)/100.0; |
return; |
} |
slotDoZoom(); |
8443,9 → 8443,9 |
void ScribusView::slotZoomOut2(int mx,int my) |
{ |
rememberPreviousSettings(mx,my); |
Scale -= static_cast<double>(Doc->MagStep*Prefs->DisScale)/100.0; |
if (Scale < static_cast<double>(Doc->MagMin*Prefs->DisScale)/100.0) |
Scale = static_cast<double>(Doc->MagMin*Prefs->DisScale)/100.0; |
Scale -= static_cast<double>(Doc->toolSettings.magStep*Prefs->DisScale)/100.0; |
if (Scale < static_cast<double>(Doc->toolSettings.magMin*Prefs->DisScale)/100.0) |
Scale = static_cast<double>(Doc->toolSettings.magMin*Prefs->DisScale)/100.0; |
slotDoZoom(); |
} |
8968,9 → 8968,9 |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->PLineArt = Doc->DLineArt; |
ite->Shade = Doc->Dshade; |
ite->Shade2 = Doc->Dshade2; |
ite->PLineArt = PenStyle(Doc->toolSettings.dLineArt); |
ite->Shade = Doc->toolSettings.dShade; |
ite->Shade2 = Doc->toolSettings.dShade2; |
ite->ItemNr = Doc->Items.count()-1; |
SetOvalFrame(ite); |
ite->ContourLine = ite->PoLine.copy(); |
8985,17 → 8985,17 |
/** Zeichnet einen Bildrahmen */ |
int ScribusView::PaintPict(double x, double y, double b, double h) |
{ |
PageItem* ite = new PageItem(Doc, 2, x, y, b, h, 1, Doc->DbrushPict, "None"); |
PageItem* ite = new PageItem(Doc, 2, x, y, b, h, 1, Doc->toolSettings.dBrushPict, "None"); |
Doc->Items.append(ite); |
if (Doc->MasterP) |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->Shade = Doc->ShadePict; |
ite->LocalScX = Doc->ScaleX; |
ite->LocalScY = Doc->ScaleY; |
ite->ScaleType = Doc->ScaleType; |
ite->AspectRatio = Doc->AspectRatio; |
ite->Shade = Doc->toolSettings.shadePict; |
ite->LocalScX = Doc->toolSettings.scaleX; |
ite->LocalScY = Doc->toolSettings.scaleY; |
ite->ScaleType = Doc->toolSettings.scaleType; |
ite->AspectRatio = Doc->toolSettings.aspectRatio; |
ite->IProfile = Doc->CMSSettings.DefaultInputProfile; |
ite->IRender = Doc->CMSSettings.DefaultIntentMonitor2; |
ite->ItemNr = Doc->Items.count()-1; |
9018,9 → 9018,9 |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->PLineArt = Doc->DLineArt; |
ite->Shade = Doc->Dshade; |
ite->Shade2 = Doc->Dshade2; |
ite->PLineArt = PenStyle(Doc->toolSettings.dLineArt); |
ite->Shade = Doc->toolSettings.dShade; |
ite->Shade2 = Doc->toolSettings.dShade2; |
ite->ItemNr = Doc->Items.count()-1; |
SetRectFrame(ite); |
ite->ContourLine = ite->PoLine.copy(); |
9041,9 → 9041,9 |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->PLineArt = Doc->DLineArt; |
ite->Shade = Doc->Dshade; |
ite->Shade2 = Doc->Dshade2; |
ite->PLineArt = PenStyle(Doc->toolSettings.dLineArt); |
ite->Shade = Doc->toolSettings.dShade; |
ite->Shade2 = Doc->toolSettings.dShade2; |
ite->ItemNr =Doc-> Items.count()-1; |
ite->ClipEdited = true; |
ite->FrameType = 3; |
9064,9 → 9064,9 |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->PLineArt = Doc->DLineArt; |
ite->Shade = Doc->Dshade; |
ite->Shade2 = Doc->Dshade2; |
ite->PLineArt = PenStyle(Doc->toolSettings.dLineArt); |
ite->Shade = Doc->toolSettings.dShade; |
ite->Shade2 = Doc->toolSettings.dShade2; |
ite->ItemNr = Doc->Items.count()-1; |
ite->ClipEdited = true; |
if (!Doc->loading) |
9108,8 → 9108,8 |
Doc->MasterItems = Doc->Items; |
else |
Doc->DocItems = Doc->Items; |
ite->PLineArt = Doc->DLstyleLine; |
ite->Shade2 = Doc->DshadeLine; |
ite->PLineArt = PenStyle(Doc->toolSettings.dLstyleLine); |
ite->Shade2 = Doc->toolSettings.dShadeLine; |
ite->ItemNr = Doc->Items.count()-1; |
if (!Doc->loading) |
{ |
10605,7 → 10605,7 |
AdjustPreview(b, false); |
} |
if ((b->PType != 4) && (b->PType != 8)) |
b->IFont = Doc->Dfont; |
b->IFont = Doc->toolSettings.defFont; |
if (Buffer->GrType != 0) |
{ |
if ((Buffer->GrColor != "") && (Buffer->GrColor2 != "")) |
/branches/Version13x/Scribus/scribus/scribusdoc.h |
---|
157,28 → 157,10 |
int SubMode; |
double *ShapeValues; |
int ValCount; |
QString Dpen; |
QString Dbrush; |
double Dwidth; |
int Dshade; |
int Dshade2; |
PenStyle DLineArt; |
QString DpenLine; |
QString DpenText; |
QString DstrokeText; |
int DstartArrow; |
int DendArrow; |
int DCols; |
double DGap; |
int DshadeLine; |
PenStyle DLstyleLine; |
double DwidthLine; |
QString Dfont; |
QString DocName; |
QMap<QString,QFont> UsedFonts; |
SCFonts *AllFonts; |
ApplicationPrefs *prefsValues; |
int Dsize; |
QColor papColor; |
int CurrentSel; |
int CurrentStyle; |
194,19 → 176,11 |
int EditClipMode; |
typoPrefs typographicSetttings; |
guidesPrefs guidesSettings; |
toolPrefs toolSettings; |
/** Letztes Element fuer AutoTextrahmen */ |
PageItem *LastAuto; |
/** Erstes Element fuer AutoTextrahmen */ |
PageItem *FirstAuto; |
int MagMin; |
int MagMax; |
int MagStep; |
QString DbrushPict; |
int ShadePict; |
double ScaleX; |
double ScaleY; |
bool ScaleType; |
bool AspectRatio; |
int docUnitIndex; |
bool DragP; |
bool leaveDrag; |
268,11 → 242,6 |
bool DoDrawing; |
QValueList<int> OpenNodes; |
QTimer *CurTimer; |
int PolyC; |
int PolyFd; |
double PolyF; |
bool PolyS; |
double PolyR; |
}; |
#endif |
/branches/Version13x/Scribus/scribus/missing.cpp |
---|
313,13 → 313,13 |
replaceFontCombo = new FontCombo(this, Prefs); |
if (doc != 0) |
{ |
replaceFontCombo->setCurrentText(doc->Dfont); |
replacementFont = doc->Dfont; |
replaceFontCombo->setCurrentText(doc->toolSettings.defFont); |
replacementFont = doc->toolSettings.defFont; |
} |
else |
{ |
replaceFontCombo->setCurrentText(Prefs->DefFont); |
replacementFont = Prefs->DefFont; |
replaceFontCombo->setCurrentText(Prefs->toolSettings.defFont); |
replacementFont = Prefs->toolSettings.defFont; |
} |
missingFontGridLayout->addWidget( replaceFontCombo, 1, 2 ); |
insteadLabel = new QLabel( tr( "instead" ), this, "insteadLabel" ); |
/branches/Version13x/Scribus/scribus/libabout/about.cpp |
---|
65,7 → 65,7 |
tabLayout1->addWidget( pixmapLabel1 ); |
buildID = new QLabel( tab, "BB" ); |
buildID->setAlignment(Qt::AlignCenter); |
QString bu = tr("%1. %2 %3 ").arg("15").arg("January").arg("2005"); |
QString bu = tr("%1. %2 %3 ").arg("16").arg("January").arg("2005"); |
#ifdef HAVE_CMS |
bu += "C"; |
#else |
/branches/Version13x/Scribus/scribus/scribus.cpp |
---|
75,6 → 75,7 |
#include "arrowchooser.h" |
#include "tabtypography.h" |
#include "tabguides.h" |
#include "tabtools.h" |
#include "undogui.h" |
#include "filewatcher.h" |
#ifdef _MSC_VER |
322,8 → 323,8 |
{ |
/** Default font and size **/ |
SCFontsIterator it(Prefs.AvailFonts); |
Prefs.DefFont = it.currentKey(); |
Prefs.DefSize = 120; |
Prefs.toolSettings.defFont = it.currentKey(); |
Prefs.toolSettings.defSize = 120; |
Prefs.AppFontSize = qApp->font().pointSize(); |
/** Default colours **/ |
394,37 → 395,37 |
Prefs.typographicSetttings.valueBaseGrid = 14.4; |
Prefs.typographicSetttings.offsetBaseGrid = 0.0; |
Prefs.GUI = "Default"; |
Prefs.Dpen = "Black"; |
Prefs.Dbrush = "Black"; |
Prefs.Dshade = 100; |
Prefs.Dshade2 = 100; |
Prefs.DLineArt = SolidLine; |
Prefs.Dwidth = 1; |
Prefs.DpenLine = "Black"; |
Prefs.DpenText = "Black"; |
Prefs.DstrokeText = "Black"; |
Prefs.toolSettings.dPen = "Black"; |
Prefs.toolSettings.dBrush = "Black"; |
Prefs.toolSettings.dShade = 100; |
Prefs.toolSettings.dShade2 = 100; |
Prefs.toolSettings.dLineArt = SolidLine; |
Prefs.toolSettings.dWidth = 1; |
Prefs.toolSettings.dPenLine = "Black"; |
Prefs.toolSettings.dPenText = "Black"; |
Prefs.toolSettings.dStrokeText = "Black"; |
Prefs.DpapColor = QColor(white); |
Prefs.DCols = 1; |
Prefs.DGap = 0.0; |
Prefs.DshadeLine = 100; |
Prefs.DLstyleLine = SolidLine; |
Prefs.DwidthLine = 1; |
Prefs.DstartArrow = 0; |
Prefs.DendArrow = 0; |
Prefs.MagMin = 10; |
Prefs.MagMax = 3200; |
Prefs.MagStep = 25; |
Prefs.DbrushPict = "White"; |
Prefs.ShadePict = 100; |
Prefs.ScaleX = 1; |
Prefs.ScaleY = 1; |
Prefs.toolSettings.dCols = 1; |
Prefs.toolSettings.dGap = 0.0; |
Prefs.toolSettings.dShadeLine = 100; |
Prefs.toolSettings.dLstyleLine = SolidLine; |
Prefs.toolSettings.dWidthLine = 1; |
Prefs.toolSettings.dStartArrow = 0; |
Prefs.toolSettings.dEndArrow = 0; |
Prefs.toolSettings.magMin = 10; |
Prefs.toolSettings.magMax = 3200; |
Prefs.toolSettings.magStep = 25; |
Prefs.toolSettings.dBrushPict = "White"; |
Prefs.toolSettings.shadePict = 100; |
Prefs.toolSettings.scaleX = 1; |
Prefs.toolSettings.scaleY = 1; |
Prefs.guidesSettings.before = true; |
Prefs.docUnitIndex = 0; |
Prefs.PolyC = 4; |
Prefs.PolyF = 0.5; |
Prefs.PolyS = false; |
Prefs.PolyFd = 0; |
Prefs.PolyR = 0; |
Prefs.toolSettings.polyC = 4; |
Prefs.toolSettings.polyF = 0.5; |
Prefs.toolSettings.polyS = false; |
Prefs.toolSettings.polyFd = 0; |
Prefs.toolSettings.polyR = 0; |
Prefs.mainToolBarSettings.visible = true; |
Prefs.pdfToolBarSettings.visible = true; |
Prefs.mPaletteSettings.visible = false; |
465,8 → 466,8 |
Prefs.RandRechts = 9; |
Prefs.DoppelSeiten = false; |
Prefs.ErsteLinks = false; |
Prefs.ScaleType = true; |
Prefs.AspectRatio = true; |
Prefs.toolSettings.scaleType = true; |
Prefs.toolSettings.aspectRatio = true; |
Prefs.MinWordLen = 3; |
Prefs.HyCount = 2; |
Prefs.Language = ""; |
2547,7 → 2548,7 |
bool fp = doc->PageFP; |
double tpr2, lr2, rr2, br2; |
bool ret = false; |
ReformDoc* dia = new ReformDoc(this, doc, &Prefs); |
ReformDoc* dia = new ReformDoc(this, doc); |
if (dia->exec()) |
{ |
slotChangeUnit(dia->unitCombo->currentItem(), false); |
2587,80 → 2588,80 |
doc->typographicSetttings.autoLineSpacing = dia->tabTypo->autoLine->value(); |
doc->typographicSetttings.valueBaseGrid = dia->tabTypo->baseGrid->value() / UmReFaktor; |
doc->typographicSetttings.offsetBaseGrid = dia->tabTypo->baseOffset->value() / UmReFaktor; |
doc->Dfont = dia->fontComboText->currentText(); |
doc->Dsize = dia->sizeComboText->currentText().left(2).toInt() * 10; |
doc->DstrokeText = dia->colorComboStrokeText->currentText(); |
if (doc->DstrokeText == tr("None")) |
doc->DstrokeText = "None"; |
doc->DpenText = dia->colorComboText->currentText(); |
if (doc->DpenText == tr("None")) |
doc->DpenText = "None"; |
doc->DCols = dia->columnsText->value(); |
doc->DGap = dia->gapText->value() / UmReFaktor; |
doc->Dpen = dia->colorComboLineShape->currentText(); |
if (doc->Dpen == tr("None")) |
doc->Dpen = "None"; |
doc->Dbrush = dia->comboFillShape->currentText(); |
if (doc->Dbrush == tr("None")) |
doc->Dbrush = "None"; |
doc->Dshade = dia->shadingFillShape->value(); |
doc->Dshade2 = dia->shadingLineShape->value(); |
switch (dia->comboStyleShape->currentItem()) |
doc->toolSettings.defFont = dia->tabTools->fontComboText->currentText(); |
doc->toolSettings.defSize = dia->tabTools->sizeComboText->currentText().left(2).toInt() * 10; |
doc->toolSettings.dStrokeText = dia->tabTools->colorComboStrokeText->currentText(); |
if (doc->toolSettings.dStrokeText == tr("None")) |
doc->toolSettings.dStrokeText = "None"; |
doc->toolSettings.dPenText = dia->tabTools->colorComboText->currentText(); |
if (doc->toolSettings.dPenText == tr("None")) |
doc->toolSettings.dPenText = "None"; |
doc->toolSettings.dCols = dia->tabTools->columnsText->value(); |
doc->toolSettings.dGap = dia->tabTools->gapText->value() / UmReFaktor; |
doc->toolSettings.dPen = dia->tabTools->colorComboLineShape->currentText(); |
if (doc->toolSettings.dPen == tr("None")) |
doc->toolSettings.dPen = "None"; |
doc->toolSettings.dBrush = dia->tabTools->comboFillShape->currentText(); |
if (doc->toolSettings.dBrush == tr("None")) |
doc->toolSettings.dBrush = "None"; |
doc->toolSettings.dShade = dia->tabTools->shadingFillShape->value(); |
doc->toolSettings.dShade2 = dia->tabTools->shadingLineShape->value(); |
switch (dia->tabTools->comboStyleShape->currentItem()) |
{ |
case 0: |
doc->DLineArt = SolidLine; |
doc->toolSettings.dLineArt = SolidLine; |
break; |
case 1: |
doc->DLineArt = DashLine; |
doc->toolSettings.dLineArt = DashLine; |
break; |
case 2: |
doc->DLineArt = DotLine; |
doc->toolSettings.dLineArt = DotLine; |
break; |
case 3: |
doc->DLineArt = DashDotLine; |
doc->toolSettings.dLineArt = DashDotLine; |
break; |
case 4: |
doc->DLineArt = DashDotDotLine; |
doc->toolSettings.dLineArt = DashDotDotLine; |
break; |
} |
doc->Dwidth = dia->lineWidthShape->value(); |
doc->DstartArrow = dia->startArrow->currentItem(); |
doc->DendArrow = dia->endArrow->currentItem(); |
doc->MagMin = dia->minimumZoom->value(); |
doc->MagMax = dia->maximumZoom->value(); |
doc->MagStep = dia->zoomStep->value(); |
doc->DpenLine = dia->colorComboLine->currentText(); |
if (doc->DpenLine == tr("None")) |
doc->DpenLine = "None"; |
doc->DshadeLine = dia->shadingLine->value(); |
switch (dia->comboStyleLine->currentItem()) |
doc->toolSettings.dWidth = dia->tabTools->lineWidthShape->value(); |
doc->toolSettings.dStartArrow = dia->tabTools->startArrow->currentItem(); |
doc->toolSettings.dEndArrow = dia->tabTools->endArrow->currentItem(); |
doc->toolSettings.magMin = dia->tabTools->minimumZoom->value(); |
doc->toolSettings.magMax = dia->tabTools->maximumZoom->value(); |
doc->toolSettings.magStep = dia->tabTools->zoomStep->value(); |
doc->toolSettings.dPenLine = dia->tabTools->colorComboLine->currentText(); |
if (doc->toolSettings.dPenLine == tr("None")) |
doc->toolSettings.dPenLine = "None"; |
doc->toolSettings.dShadeLine = dia->tabTools->shadingLine->value(); |
switch (dia->tabTools->comboStyleLine->currentItem()) |
{ |
case 0: |
doc->DLstyleLine = SolidLine; |
doc->toolSettings.dLstyleLine = SolidLine; |
break; |
case 1: |
doc->DLstyleLine = DashLine; |
doc->toolSettings.dLstyleLine = DashLine; |
break; |
case 2: |
doc->DLstyleLine = DotLine; |
doc->toolSettings.dLstyleLine = DotLine; |
break; |
case 3: |
doc->DLstyleLine = DashDotLine; |
doc->toolSettings.dLstyleLine = DashDotLine; |
break; |
case 4: |
doc->DLstyleLine = DashDotDotLine; |
doc->toolSettings.dLstyleLine = DashDotDotLine; |
break; |
} |
doc->DwidthLine = dia->lineWidthLine->value(); |
doc->DbrushPict = dia->comboFillImage->currentText(); |
if (doc->DbrushPict == tr("None")) |
doc->DbrushPict = "None"; |
doc->ShadePict = dia->shadingFillImage->value(); |
doc->ScaleX = static_cast<double>(dia->scalingHorizontal->value()) / 100.0; |
doc->ScaleY = static_cast<double>(dia->scalingVertical->value()) / 100.0; |
doc->ScaleType = dia->buttonGroup3->isChecked(); |
doc->AspectRatio = dia->checkRatioImage->isChecked(); |
dia->polyWidget->getValues(&doc->PolyC, &doc->PolyFd, &doc->PolyF, &doc->PolyS, &doc->PolyR); |
doc->toolSettings.dWidthLine = dia->tabTools->lineWidthLine->value(); |
doc->toolSettings.dBrushPict = dia->tabTools->comboFillImage->currentText(); |
if (doc->toolSettings.dBrushPict == tr("None")) |
doc->toolSettings.dBrushPict = "None"; |
doc->toolSettings.shadePict = dia->tabTools->shadingFillImage->value(); |
doc->toolSettings.scaleX = static_cast<double>(dia->tabTools->scalingHorizontal->value()) / 100.0; |
doc->toolSettings.scaleY = static_cast<double>(dia->tabTools->scalingVertical->value()) / 100.0; |
doc->toolSettings.scaleType = dia->tabTools->buttonGroup3->isChecked(); |
doc->toolSettings.aspectRatio = dia->tabTools->checkRatioImage->isChecked(); |
dia->tabTools->polyWidget->getValues(&doc->toolSettings.polyC, &doc->toolSettings.polyFd, &doc->toolSettings.polyF, &doc->toolSettings.polyS, &doc->toolSettings.polyR); |
doc->ScratchBottom = dia->bottomScratch->value() / UmReFaktor; |
doc->ScratchLeft = dia->leftScratch->value() / UmReFaktor; |
doc->ScratchRight = dia->rightScratch->value() / UmReFaktor; |
2773,7 → 2774,7 |
{ |
pm.fill(doc->PageColors[it.key()].getRGBColor()); |
ColorMenC->insertItem(pm, it.key()); |
if (it.key() == doc->Dbrush) |
if (it.key() == doc->toolSettings.dBrush) |
ColorMenC->setCurrentItem(a); |
a++; |
} |
2918,7 → 2919,7 |
{ |
pm.fill(doc->PageColors[it.key()].getRGBColor()); |
ColorMenC->insertItem(pm, it.key()); |
if (it.key() == doc->Dbrush) |
if (it.key() == doc->toolSettings.dBrush) |
ColorMenC->setCurrentItem(a); |
a++; |
} |
6514,7 → 6515,7 |
FontID.insert(ff, Prefs.AvailFonts[nf]->SCName); |
} |
else |
doc->docParagraphStyles[a].Font = doc->Dfont; |
doc->docParagraphStyles[a].Font = doc->toolSettings.defFont; |
} |
} |
} |
6583,7 → 6584,7 |
{ |
pm.fill(doc->PageColors[it.key()].getRGBColor()); |
ColorMenC->insertItem(pm, it.key()); |
if (it.key() == doc->Dbrush) |
if (it.key() == doc->toolSettings.dBrush) |
ColorMenC->setCurrentItem(a); |
a++; |
} |
6957,7 → 6958,7 |
for (it3 = doc->UsedFonts.begin(); it3 != doc->UsedFonts.end(); ++it3) |
{ |
a = FontMenu->insertItem(new FmItem(it3.key(), it3.data())); |
if (it3.key() == doc->Dfont) |
if (it3.key() == doc->toolSettings.defFont) |
FontMenu->setItemChecked(a, true); |
FontID.insert(a, it3.key()); |
} |
7080,7 → 7081,7 |
QFont apf = qApp->font(); |
apf.setPointSize(Prefs.AppFontSize); |
qApp->setFont(apf,true); |
dia->polyWidget->getValues(&Prefs.PolyC, &Prefs.PolyFd, &Prefs.PolyF, &Prefs.PolyS, &Prefs.PolyR); |
dia->tabTools->polyWidget->getValues(&Prefs.toolSettings.polyC, &Prefs.toolSettings.polyFd, &Prefs.toolSettings.polyF, &Prefs.toolSettings.polyS, &Prefs.toolSettings.polyR); |
Prefs.PageFormat = dia->GZComboF->currentItem(); |
Prefs.Ausrichtung = dia->GZComboO->currentItem(); |
Prefs.PageBreite = dia->Pagebr; |
7126,8 → 7127,8 |
Prefs.ScratchRight = dia->rightScratch->value() / UmReFaktor; |
Prefs.ScratchTop = dia->topScratch->value() / UmReFaktor; |
Prefs.DpapColor = dia->colorPaper; |
Prefs.DefFont = dia->fontComboText->currentText(); |
Prefs.DefSize = dia->sizeComboText->currentText().left(2).toInt() * 10; |
Prefs.toolSettings.defFont = dia->tabTools->fontComboText->currentText(); |
Prefs.toolSettings.defSize = dia->tabTools->sizeComboText->currentText().left(2).toInt() * 10; |
Prefs.guidesSettings.marginsShown = dia->tabGuides->checkMargin->isChecked(); |
Prefs.guidesSettings.framesShown = dia->tabGuides->checkFrame->isChecked(); |
Prefs.guidesSettings.gridShown = dia->tabGuides->checkGrid->isChecked(); |
7152,77 → 7153,77 |
Prefs.typographicSetttings.autoLineSpacing = dia->tabTypo->autoLine->value(); |
Prefs.typographicSetttings.valueBaseGrid = dia->tabTypo->baseGrid->value() / UmReFaktor; |
Prefs.typographicSetttings.offsetBaseGrid = dia->tabTypo->baseOffset->value() / UmReFaktor; |
Prefs.Dpen = dia->colorComboLineShape->currentText(); |
if (Prefs.Dpen == tr("None")) |
Prefs.Dpen = "None"; |
Prefs.DpenText = dia->colorComboText->currentText(); |
if (Prefs.DpenText == tr("None")) |
Prefs.DpenText = "None"; |
Prefs.DstrokeText = dia->colorComboStrokeText->currentText(); |
if (Prefs.DstrokeText == tr("None")) |
Prefs.DstrokeText = "None"; |
Prefs.DCols = dia->columnsText->value(); |
Prefs.DGap = dia->gapText->value() / UmReFaktor; |
Prefs.Dbrush = dia->comboFillShape->currentText(); |
if (Prefs.Dbrush == tr("None")) |
Prefs.Dbrush = "None"; |
Prefs.Dshade = dia->shadingFillShape->value(); |
Prefs.Dshade2 = dia->shadingLineShape->value(); |
switch (dia->comboStyleShape->currentItem()) |
Prefs.toolSettings.dPen = dia->tabTools->colorComboLineShape->currentText(); |
if (Prefs.toolSettings.dPen == tr("None")) |
Prefs.toolSettings.dPen = "None"; |
Prefs.toolSettings.dPenText = dia->tabTools->colorComboText->currentText(); |
if (Prefs.toolSettings.dPenText == tr("None")) |
Prefs.toolSettings.dPenText = "None"; |
Prefs.toolSettings.dStrokeText = dia->tabTools->colorComboStrokeText->currentText(); |
if (Prefs.toolSettings.dStrokeText == tr("None")) |
Prefs.toolSettings.dStrokeText = "None"; |
Prefs.toolSettings.dCols = dia->tabTools->columnsText->value(); |
Prefs.toolSettings.dGap = dia->tabTools->gapText->value() / UmReFaktor; |
Prefs.toolSettings.dBrush = dia->tabTools->comboFillShape->currentText(); |
if (Prefs.toolSettings.dBrush == tr("None")) |
Prefs.toolSettings.dBrush = "None"; |
Prefs.toolSettings.dShade = dia->tabTools->shadingFillShape->value(); |
Prefs.toolSettings.dShade2 = dia->tabTools->shadingLineShape->value(); |
switch (dia->tabTools->comboStyleShape->currentItem()) |
{ |
case 0: |
Prefs.DLineArt = SolidLine; |
Prefs.toolSettings.dLineArt = SolidLine; |
break; |
case 1: |
Prefs.DLineArt = DashLine; |
Prefs.toolSettings.dLineArt = DashLine; |
break; |
case 2: |
Prefs.DLineArt = DotLine; |
Prefs.toolSettings.dLineArt = DotLine; |
break; |
case 3: |
Prefs.DLineArt = DashDotLine; |
Prefs.toolSettings.dLineArt = DashDotLine; |
break; |
case 4: |
Prefs.DLineArt = DashDotDotLine; |
Prefs.toolSettings.dLineArt = DashDotDotLine; |
break; |
} |
Prefs.Dwidth = dia->lineWidthShape->value(); |
Prefs.DpenLine = dia->colorComboLine->currentText(); |
if (Prefs.DpenLine == tr("None")) |
Prefs.DpenLine = "None"; |
Prefs.DshadeLine = dia->shadingLine->value(); |
switch (dia->comboStyleLine->currentItem()) |
Prefs.toolSettings.dWidth = dia->tabTools->lineWidthShape->value(); |
Prefs.toolSettings.dPenLine = dia->tabTools->colorComboLine->currentText(); |
if (Prefs.toolSettings.dPenLine == tr("None")) |
Prefs.toolSettings.dPenLine = "None"; |
Prefs.toolSettings.dShadeLine = dia->tabTools->shadingLine->value(); |
switch (dia->tabTools->comboStyleLine->currentItem()) |
{ |
case 0: |
Prefs.DLstyleLine = SolidLine; |
Prefs.toolSettings.dLstyleLine = SolidLine; |
break; |
case 1: |
Prefs.DLstyleLine = DashLine; |
Prefs.toolSettings.dLstyleLine = DashLine; |
break; |
case 2: |
Prefs.DLstyleLine = DotLine; |
Prefs.toolSettings.dLstyleLine = DotLine; |
break; |
case 3: |
Prefs.DLstyleLine = DashDotLine; |
Prefs.toolSettings.dLstyleLine = DashDotLine; |
break; |
case 4: |
Prefs.DLstyleLine = DashDotDotLine; |
Prefs.toolSettings.dLstyleLine = DashDotDotLine; |
break; |
} |
Prefs.DwidthLine = dia->lineWidthLine->value(); |
Prefs.DstartArrow = dia->startArrow->currentItem(); |
Prefs.DendArrow = dia->endArrow->currentItem(); |
Prefs.MagMin = dia->minimumZoom->value(); |
Prefs.MagMax = dia->maximumZoom->value(); |
Prefs.MagStep = dia->zoomStep->value(); |
Prefs.DbrushPict = dia->comboFillImage->currentText(); |
if (Prefs.DbrushPict == tr("None")) |
Prefs.DbrushPict = "None"; |
Prefs.ShadePict = dia->shadingFillImage->value(); |
Prefs.ScaleX = static_cast<double>(dia->scalingHorizontal->value()) / 100.0; |
Prefs.ScaleY = static_cast<double>(dia->scalingVertical->value()) / 100.0; |
Prefs.ScaleType = dia->buttonGroup3->isChecked(); |
Prefs.AspectRatio = dia->checkRatioImage->isChecked(); |
Prefs.toolSettings.dWidthLine = dia->tabTools->lineWidthLine->value(); |
Prefs.toolSettings.dStartArrow = dia->tabTools->startArrow->currentItem(); |
Prefs.toolSettings.dEndArrow = dia->tabTools->endArrow->currentItem(); |
Prefs.toolSettings.magMin = dia->tabTools->minimumZoom->value(); |
Prefs.toolSettings.magMax = dia->tabTools->maximumZoom->value(); |
Prefs.toolSettings.magStep = dia->tabTools->zoomStep->value(); |
Prefs.toolSettings.dBrushPict = dia->tabTools->comboFillImage->currentText(); |
if (Prefs.toolSettings.dBrushPict == tr("None")) |
Prefs.toolSettings.dBrushPict = "None"; |
Prefs.toolSettings.shadePict = dia->tabTools->shadingFillImage->value(); |
Prefs.toolSettings.scaleX = static_cast<double>(dia->tabTools->scalingHorizontal->value()) / 100.0; |
Prefs.toolSettings.scaleY = static_cast<double>(dia->tabTools->scalingVertical->value()) / 100.0; |
Prefs.toolSettings.scaleType = dia->tabTools->buttonGroup3->isChecked(); |
Prefs.toolSettings.aspectRatio = dia->tabTools->checkRatioImage->isChecked(); |
Prefs.AutoSave = dia->ASon->isChecked(); |
Prefs.AutoSaveTime = dia->ASTime->value() * 60 * 1000; |
Prefs.MinWordLen = dia->tabHyphenator->wordLen->value(); |
8404,8 → 8405,11 |
InputProfiles[nam] = pfad + d[dc]; |
break; |
case icSigDisplayClass: |
MonitorProfiles[nam] = pfad + d[dc]; |
InputProfiles[nam] = pfad + d[dc]; |
if (static_cast<int>(cmsGetColorSpace(hIn)) == icSigRgbData) |
{ |
MonitorProfiles[nam] = pfad + d[dc]; |
InputProfiles[nam] = pfad + d[dc]; |
} |
break; |
case icSigOutputClass: |
PrinterProfiles[nam] = pfad + d[dc]; |
8442,7 → 8446,7 |
doc->PageColors[it.key()].RecalcRGB(); |
pm.fill(doc->PageColors[it.key()].getRGBColor()); |
ColorMenC->insertItem(pm, it.key()); |
if (it.key() == doc->Dbrush) |
if (it.key() == doc->toolSettings.dBrush) |
ColorMenC->setCurrentItem(a); |
a++; |
if (dia != NULL) |
9236,8 → 9240,8 |
doc->UsedFonts.remove(itfo); |
} |
} |
doc->AddFont(Prefs.DefFont, Prefs.AvailFonts[Prefs.DefFont]->Font); |
doc->AddFont(doc->Dfont, Prefs.AvailFonts[doc->Dfont]->Font); |
doc->AddFont(Prefs.toolSettings.defFont, Prefs.AvailFonts[Prefs.toolSettings.defFont]->Font); |
doc->AddFont(doc->toolSettings.defFont, Prefs.AvailFonts[doc->toolSettings.defFont]->Font); |
buildFontMenu(); |
} |
/branches/Version13x/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp |
---|
18,7 → 18,7 |
} |
int i = Carrier->view->PaintRect(ValueToPoint(x), ValueToPoint(y), |
ValueToPoint(b), ValueToPoint(h), |
Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
Carrier->view->SetRectFrame(Carrier->doc->Items.at(i)); |
if (Name != "") |
Carrier->doc->Items.at(i)->AnName = QString::fromUtf8(Name); |
34,7 → 34,7 |
return NULL; |
if(!checkHaveDocument()) |
return NULL; |
int i = Carrier->view->PaintEllipse(ValueToPoint(x), ValueToPoint(y), ValueToPoint(b), ValueToPoint(h), Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
int i = Carrier->view->PaintEllipse(ValueToPoint(x), ValueToPoint(y), ValueToPoint(b), ValueToPoint(h), Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
if (ItemExists(QString::fromUtf8(Name))) |
{ |
PyErr_SetString(NameExistsError, QObject::tr("An object with the requested name already exists","python error")); |
76,7 → 76,7 |
return NULL; |
if(!checkHaveDocument()) |
return NULL; |
int i = Carrier->view->PaintText(ValueToPoint(x), ValueToPoint(y), ValueToPoint(b), ValueToPoint(h), Carrier->doc->Dwidth, Carrier->doc->DpenText); |
int i = Carrier->view->PaintText(ValueToPoint(x), ValueToPoint(y), ValueToPoint(b), ValueToPoint(h), Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dPenText); |
if (ItemExists(QString::fromUtf8(Name))) |
{ |
PyErr_SetString(NameExistsError, QObject::tr("An object with the requested name already exists","python error")); |
106,7 → 106,7 |
return NULL; |
} |
h = ValueToPoint(h); |
int i = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
int i = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
PageItem *it = Carrier->doc->Items.at(i); |
it->PoLine.resize(4); |
it->PoLine.setPoint(0, 0, 0); |
163,7 → 163,7 |
i++; |
y = ValueToPoint(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i)))); |
i++; |
int ic = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
int ic = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
PageItem *it = Carrier->doc->Items.at(ic); |
it->PoLine.resize(2); |
it->PoLine.setPoint(0, 0, 0); |
238,7 → 238,7 |
i++; |
y = ValueToPoint(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i)))); |
i++; |
int ic = Carrier->view->PaintPoly(x, y, 1, 1, Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
int ic = Carrier->view->PaintPoly(x, y, 1, 1, Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
PageItem *it = Carrier->doc->Items.at(ic); |
it->PoLine.resize(2); |
it->PoLine.setPoint(0, 0, 0); |
323,7 → 323,7 |
i++; |
ky2 = ValueToPoint(static_cast<double>(PyFloat_AsDouble(PyList_GetItem(il, i)))); |
i++; |
int ic = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->Dwidth, Carrier->doc->Dbrush, Carrier->doc->Dpen); |
int ic = Carrier->view->PaintPolyLine(x, y, 1, 1, Carrier->doc->toolSettings.dWidth, Carrier->doc->toolSettings.dBrush, Carrier->doc->toolSettings.dPen); |
PageItem *it = Carrier->doc->Items.at(ic); |
it->PoLine.resize(2); |
it->PoLine.setPoint(0, 0, 0); |
/branches/Version13x/Scribus/scribus/plugins/libchar/charselect.h |
---|
3,6 → 3,7 |
#include <qdialog.h> |
class QTimer; |
class QLabel; |
class QPushbutton; |
class QTable; |
96,11 → 97,11 |
QMap<int,int> usedCharClasses; |
QString chToIns; |
QString fontInUse; |
int maxCount; |
uint maxCount; |
int characterClass; |
public slots: |
void newChar(int r, int c); |
void newChar(uint r, uint c); |
void newFont(int font); |
void newCharClass(int c); |
void delEdit(); |
120,13 → 121,20 |
ChTable(CharSelect* parent, ScribusApp *pl); |
~ChTable() {}; |
bool mPressed; |
bool alternate; |
Zoom* dia; |
ScribusApp *ap; |
CharSelect* par; |
int maxCount; |
QTimer* watchTimer; |
uint maxCount; |
uint rowA; |
uint colA; |
public slots: |
void showAlternate(); |
signals: |
void selectChar(int, int); |
void selectChar(uint, uint); |
protected: |
virtual void contentsMouseReleaseEvent(QMouseEvent *m); |
/branches/Version13x/Scribus/scribus/plugins/libchar/charselect.cpp |
---|
1,6 → 1,6 |
#include <qtextcodec.h> |
#include <qcursor.h> |
#include <qtimer.h> |
#include <qlabel.h> |
#include <qpushbutton.h> |
#include <qtable.h> |
9,6 → 9,7 |
#include <qstringlist.h> |
#include <qcombobox.h> |
#include <qfont.h> |
#include <qpopupmenu.h> |
#include "scribus.h" |
#include "fontcombo.h" |
85,7 → 86,12 |
ChTable::ChTable(CharSelect* parent, ScribusApp *pl) : QTable(parent) |
{ |
watchTimer = new QTimer(this); |
// connect(watchTimer, SIGNAL(timeout()), this, SLOT(showAlternate())); |
mPressed = false; |
alternate = false; |
rowA = 0; |
colA = 0; |
setFocusPolicy(NoFocus); |
ap = pl; |
par = parent; |
95,13 → 101,15 |
void ChTable::contentsMousePressEvent(QMouseEvent* e) |
{ |
e->accept(); |
int r = rowAt(e->pos().y()); |
int c = columnAt(e->pos().x()); |
uint r = rowAt(e->pos().y()); |
uint c = columnAt(e->pos().x()); |
QString font; |
font = par->fontInUse; |
mPressed = true; |
alternate = false; |
if ((e->button() == RightButton) && ((r*16+c) < maxCount)) |
{ |
mPressed = true; |
watchTimer->stop(); |
int bh = 48 + qRound(-(*ap->doc->AllFonts)[font]->numDescender * 48) + 3; |
QPixmap pixm(bh,bh); |
ScPainter *p = new ScPainter(&pixm, bh, bh); |
127,21 → 135,52 |
dia->move(ps.x()-2, ps.y()-2); |
dia->show(); |
} |
/* if (e->button() == LeftButton) |
{ |
rowA = rowAt(e->pos().y()); |
colA = columnAt(e->pos().x()); |
watchTimer->start(3000, true); |
} */ |
} |
void ChTable::contentsMouseReleaseEvent(QMouseEvent* e) |
{ |
e->accept(); |
watchTimer->stop(); |
if ((e->button() == RightButton) && (mPressed)) |
{ |
mPressed = false; |
dia->close(); |
delete dia; |
} |
if (e->button() == LeftButton) |
if ((e->button() == LeftButton) && (!alternate)) |
emit selectChar(rowAt(e->pos().y()), columnAt(e->pos().x())); |
mPressed = false; |
alternate = false; |
} |
void ChTable::showAlternate() |
{ |
/* watchTimer->stop(); |
alternate = true; |
QString font; |
QString chToIns = ""; |
font = par->fontInUse; |
uint baseChar = rowA*16+colA; |
if (baseChar < maxCount) |
{ |
QPopupMenu *pmen = new QPopupMenu(); |
chToIns = QChar(par->characters[baseChar]); |
pmen->insertItem(FontSample((*ap->doc->AllFonts)[font]->Datei, 20, chToIns, paletteBackgroundColor(), true)); |
if ((*ap->doc->AllFonts)[font]->CharWidth.contains(par->characters[baseChar] + 0xF720)) |
{ |
chToIns = QChar(par->characters[baseChar] + 0xF720); |
pmen->insertItem(FontSample((*ap->doc->AllFonts)[font]->Datei, 20, chToIns, paletteBackgroundColor(), true)); |
} |
int re = pmen->indexOf(pmen->exec(QCursor::pos())); |
delete pmen; |
} */ |
} |
CharSelect::CharSelect( QWidget* parent, PageItem *item, ScribusApp *pl) : QDialog( parent, "CharSelect", true, 0 ) |
{ |
QString font; |
228,7 → 267,7 |
connect(closeButton, SIGNAL(clicked()), this, SLOT(accept())); |
connect(deleteButton, SIGNAL(clicked()), this, SLOT(delEdit())); |
connect(insertButton, SIGNAL(clicked()), this, SLOT(insChar())); |
connect(zTabelle, SIGNAL(selectChar(int, int)), this, SLOT(newChar(int, int))); |
connect(zTabelle, SIGNAL(selectChar(uint, uint)), this, SLOT(newChar(uint, uint))); |
connect(fontSelector, SIGNAL(activated(int)), this, SLOT(newFont(int))); |
connect(rangeSelector, SIGNAL(activated(int)), this, SLOT(newCharClass(int))); |
setupRangeCombo(); |
547,7 → 586,7 |
zTabelle->maxCount = maxCount; |
int ab = maxCount / 16; |
int ac = maxCount % 16; |
int cc = 0; |
uint cc = 0; |
if (ac != 0) |
ab++; |
zTabelle->setNumRows( ab ); |
606,7 → 645,7 |
setupRangeCombo(); |
} |
void CharSelect::newChar(int r, int c) // , int b, const QPoint &pp) |
void CharSelect::newChar(uint r, uint c) // , int b, const QPoint &pp) |
{ |
QString font; |
font = fontInUse; |
/branches/Version13x/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp |
---|
188,7 → 188,7 |
Prog->view->setUpdatesEnabled(false); |
Prog->ScriptRunning = true; |
qApp->setOverrideCursor(QCursor(waitCursor), true); |
gc->Family = Doku->Dfont; |
gc->Family = Doku->toolSettings.defFont; |
if (!Doku->PageColors.contains("Black")) |
Doku->PageColors.insert("Black", CMYKColor(0, 0, 0, 255)); |
m_gc.push( gc ); |
1577,7 → 1577,7 |
QString family = params; |
QString ret = ""; |
family.replace( QRegExp( "'" ) , QChar( ' ' ) ); |
obj->Family = Doku->Dfont; // family; |
obj->Family = Doku->toolSettings.defFont; // family; |
bool found = false; |
SCFontsIterator it(Prog->Prefs.AvailFonts); |
for ( ; it.current(); ++it) |
1595,7 → 1595,7 |
if (found) |
obj->Family = ret; |
else |
obj->Family = Doku->Dfont; |
obj->Family = Doku->toolSettings.defFont; |
} |
else if( command == "font-size" ) |
obj->FontSize = static_cast<int>(parseUnit(params) * 10.0); |
/branches/Version13x/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp |
---|
569,7 → 569,7 |
bool firstPa = false; |
for ( QDomNode n = b.firstChild(); !n.isNull(); n = n.nextSibling() ) |
{ |
int FontSize = Doku->Dsize; |
int FontSize = Doku->toolSettings.defSize; |
int AbsStyle = 0; |
QDomElement e = n.toElement(); |
if( m_styleStack.hasAttribute("fo:text-align")) |
589,7 → 589,7 |
ite->LineSp = FontSize + FontSize * 0.2; |
Serializer *ss = new Serializer(""); |
ss->Objekt = QString::fromUtf8(e.text())+QChar(10); |
ss->GetText(ite, AbsStyle, Doku->Dfont, FontSize*10, firstPa); |
ss->GetText(ite, AbsStyle, Doku->toolSettings.defFont, FontSize*10, firstPa); |
delete ss; |
firstPa = true; |
if (ite->PType != 7) |
/branches/Version13x/Scribus/scribus/plugins/fontpreview/ui.cpp |
---|
70,7 → 70,7 |
if (carrier->view->SelItem.count() != 0) |
item = fontList->findItem(carrier->doc->CurrFont); |
else |
item = fontList->findItem(carrier->Prefs.DefFont); |
item = fontList->findItem(carrier->Prefs.toolSettings.defFont); |
} |
if (item != 0) |
{ |
114,8 → 114,8 |
{ |
uint size = 16; |
QString t = tr("Woven silk pyjamas exchanged for blue quartz"); |
if (carrier->doc->Dsize && carrier->doc->Dsize < 28 && carrier->doc->Dsize > 10) |
size = carrier->doc->Dsize; |
if (carrier->doc->toolSettings.defSize && carrier->doc->toolSettings.defSize < 28 && carrier->doc->toolSettings.defSize > 10) |
size = carrier->doc->toolSettings.defSize; |
t.replace('\n', " "); // remove French <NL> from translation... |
QString da = carrier->Prefs.AvailFonts[item->text()]->Datei; |
QPixmap pixmap = fontSamples(da, size, t, paletteBackgroundColor()); |
/branches/Version13x/Scribus/scribus/polyprops.cpp |
---|
4,12 → 4,12 |
extern QPixmap loadIcon(QString nam); |
PolygonProps::PolygonProps(QWidget* parent, int PolyC, int PolyFd, double PolyF, bool PolyS, double PolyR) : QDialog( parent, "poly", true, 0 ) |
PolygonProps::PolygonProps(QWidget* parent, int polyC, int polyFd, double polyF, bool polyS, double polyR) : QDialog( parent, "poly", true, 0 ) |
{ |
setCaption( tr( "Polygon Properties" ) ); |
setIcon(loadIcon("AppIcon.png")); |
PolygonPropsLayout = new QVBoxLayout( this, 10, 5, "PolygonPropsLayout"); |
polyWidget = new PolygonWidget(this, PolyC, PolyFd, PolyF, PolyS, PolyR); |
polyWidget = new PolygonWidget(this, polyC, polyFd, polyF, polyS, polyR); |
PolygonPropsLayout->addWidget( polyWidget ); |
Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1_2"); |
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); |
27,7 → 27,7 |
connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); |
} |
void PolygonProps::getValues(int* PolyC, int* PolyFd, double* PolyF, bool* PolyS, double* PolyR) |
void PolygonProps::getValues(int* polyC, int* polyFd, double* polyF, bool* polyS, double* polyR) |
{ |
polyWidget->getValues(PolyC, PolyFd, PolyF, PolyS, PolyR); |
polyWidget->getValues(polyC, polyFd, polyF, polyS, polyR); |
} |
/branches/Version13x/Scribus/scribus/scpreview.cpp |
---|
126,12 → 126,12 |
FT_Face face; |
error = FT_New_Face( library, Prefs->AvailFonts[tmpf]->Datei, 0, &face ); |
if (error) |
tmpf = Prefs->DefFont; |
tmpf = Prefs->toolSettings.defFont; |
if (Prefs->AvailFonts[tmpf]->ReadMetrics()) |
Prefs->AvailFonts[tmpf]->CharWidth[13] = 0; |
else |
{ |
tmpf = Prefs->DefFont; |
tmpf = Prefs->toolSettings.defFont; |
Prefs->AvailFonts[tmpf]->ReadMetrics(); |
Prefs->AvailFonts[tmpf]->CharWidth[13] = 0; |
} |
/branches/Version13x/Scribus/scribus/colorm.cpp |
---|
335,9 → 335,9 |
for (it = EditColors.begin(); it != EditColors.end(); ++it) |
{ |
found = false; |
if ((it.key() == ScApp->doc->Dbrush) || (it.key() == ScApp->doc->Dpen) || |
(it.key() == ScApp->doc->DbrushPict) |
|| (it.key() == ScApp->doc->DpenLine) || (it.key() == ScApp->doc->DpenText)) |
if ((it.key() == ScApp->doc->toolSettings.dBrush) || (it.key() == ScApp->doc->toolSettings.dPen) || |
(it.key() == ScApp->doc->toolSettings.dBrushPict) |
|| (it.key() == ScApp->doc->toolSettings.dPenLine) || (it.key() == ScApp->doc->toolSettings.dPenText)) |
{ |
UsedC.insert(it.key(), it.data()); |
continue; |