Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 138 → Rev 139

/trunk/Scribus/ChangeLogCVS
1,4 → 1,10
Changes since Version 1.1.4
31.12.2003 Fixed Rounding Errors in the Properties Palette.
Added Settings for Number of Columns and the ColumnGap to the Preferences.
First Support for Tabs, currently there is a Tab set every 100 pts in a Textframe.
 
29.12.2003 Fixed Crash when closing Docs.
 
28.12.2003 Text flows now around both Sides of Objects.
You can use now Units like pt or mm in Floating Point Spinboxes where applicable.
Added some new Commands to the Scripter:
/trunk/Scribus/scribus/mpalette.h
114,7 → 114,7
QLabel* SRect;
Autoforms* SCustom;
QLabel* Text4;
QSpinBox* RoundRect;
MSpinBox* RoundRect;
QCheckBox* Textflow;
QCheckBox* Textflow2;
QToolButton* EditShape;
/trunk/Scribus/scribus/hyphenator.cpp
206,7 → 206,7
firstC = text.find(QRegExp("\\w"), firstC+Ccount);
if (firstC < 0)
break;
lastC = text.find(QRegExp("\\s|\\W|\\d|\\n|\\r"), firstC);
lastC = text.find(QRegExp("\\s|\\W|\\d|\\n|\\r|\\t"), firstC);
if (lastC < 0)
lastC = static_cast<int>(text.length());
Ccount = lastC - firstC;
/trunk/Scribus/scribus/edit1format.h
19,7 → 19,7
Q_OBJECT
 
public:
EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au);
EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin);
~EditStyle() {};
 
QLabel* TextLabel1;
/trunk/Scribus/scribus/mpalette.cpp
316,7 → 316,7
Text4->setText( tr( "Round\nCorners:" ) );
Layout13->addWidget( Text4 );
 
RoundRect = new QSpinBox( page_2, "Corner" );
RoundRect = new MSpinBox( page_2, 1 );
RoundRect->setSuffix( tr( " pt" ) );
Layout13->addWidget( RoundRect );
pageLayout_2->addLayout( Layout13 );
400,7 → 400,7
TextLabel3->setText( tr( "Start Offset:" ) );
DistanceLayout2->addWidget( TextLabel3, 1, 0);
Dist = new MSpinBox( Distance2, 1 );
Dist->setSuffix( tr( " pts" ) );
Dist->setSuffix( tr( " pt" ) );
Dist->setMaxValue( 3000 );
Dist->setMinValue( 0 );
Dist->setLineStep(10);
409,7 → 409,7
TextLabel2->setText( tr( "Distance from Curve:" ) );
DistanceLayout2->addWidget( TextLabel2, 2, 0);
LineW = new MSpinBox( Distance2, 1 );
LineW->setSuffix( tr( " pts" ) );
LineW->setSuffix( tr( " pt" ) );
LineW->setMaxValue( 3000 );
LineW->setMinValue( -3000 );
LineW->setLineStep(10);
979,8 → 979,8
Height->setMinValue( 1 );
Rot->setMaxValue( 36000 );
Rot->setMinValue( 0 );
RoundRect->setMaxValue( 3000 );
RoundRect->setMinValue( -3000 );
RoundRect->setMaxValue( 30000 );
RoundRect->setMinValue( -30000);
LYpos->setMaxValue( 300000 );
LYpos->setMinValue( -300000 );
ScaleY->setMaxValue( 3000 );
1002,6 → 1002,7
Width->setDecimals(100);
Height->setDecimals(100);
Rot->setDecimals(100);
RoundRect->setDecimals(10);
Extra->setDecimals(10);
Size->setDecimals(10);
LineSp->setDecimals(10);
1035,17 → 1036,17
HaveItem = false;
CurItem = i;
NameEdit->setText(i->AnName);
RoundRect->setValue(qRound(i->RadRect));
RoundRect->setValue(qRound(i->RadRect*UmReFaktor*RoundRect->Decimals));
DCol->setValue(i->Cols);
DGap->setValue(qRound(i->ColGap*10.0));
DGap->setValue(qRound(i->ColGap*UmReFaktor*DGap->Decimals));
DCol->setMaxValue(QMAX(qRound(i->Width / QMAX(i->ColGap, 10.0)), 1));
DGap->setMaxValue(QMAX(qRound((i->Width / i->Cols - i->Extra - i->RExtra)*10.0), 0));
DGap->setMaxValue(QMAX(qRound((i->Width / i->Cols - i->Extra - i->RExtra)*UmReFaktor*DGap->Decimals), 0));
DCol->setMinValue(1);
DGap->setMinValue(0);
DLeft->setValue(qRound(i->Extra*10.0));
DTop->setValue(qRound(i->TExtra*10.0));
DBottom->setValue(qRound(i->BExtra*10.0));
DRight->setValue(qRound(i->RExtra*10.0));
DLeft->setValue(qRound(i->Extra*UmReFaktor*DLeft->Decimals));
DTop->setValue(qRound(i->TExtra*UmReFaktor*DTop->Decimals));
DBottom->setValue(qRound(i->BExtra*UmReFaktor*DBottom->Decimals));
DRight->setValue(qRound(i->RExtra*UmReFaktor*DRight->Decimals));
Revert->setOn(i->Reverse);
Textflow->setChecked(i->Textflow);
Textflow2->setChecked(i->Textflow2);
1407,9 → 1408,35
bool tmp = HaveItem;
HaveItem = false;
QString ein;
double oldX = static_cast<double>(Xpos->value()) / old / Xpos->Decimals;
double oldY = static_cast<double>(Ypos->value()) / old / Ypos->Decimals;
double oldW = static_cast<double>(Width->value()) / old / Width->Decimals;
double oldH = static_cast<double>(Height->value()) / old / Height->Decimals;
double oldLX = static_cast<double>(LXpos->value()) / old / LXpos->Decimals;
double oldLY = static_cast<double>(LYpos->value()) / old / LYpos->Decimals;
double oldG = static_cast<double>(DGap->value()) / old / DGap->Decimals;
double oldGM = static_cast<double>(DGap->maxValue()) / old / DGap->Decimals;
double oldDT = static_cast<double>(DTop->value()) / old / DTop->Decimals;
double oldDL = static_cast<double>(DLeft->value()) / old / DLeft->Decimals;
double oldDB = static_cast<double>(DBottom->value()) / old / DBottom->Decimals;
double oldDR = static_cast<double>(DRight->value()) / old / DRight->Decimals;
double oldRR = static_cast<double>(RoundRect->value()) / old / RoundRect->Decimals;
double oldRM = static_cast<double>(RoundRect->maxValue()) / old / RoundRect->Decimals;
Umrech = UmReFaktor;
Width->setLineStep(100);
Height->setLineStep(100);
Xpos->setDecimals(100);
Ypos->setDecimals(100);
Width->setDecimals(100);
Height->setDecimals(100);
LXpos->setDecimals(100);
LYpos->setDecimals(100);
DGap->setDecimals(10);
DLeft->setDecimals(10);
DTop->setDecimals(10);
DBottom->setDecimals(10);
DRight->setDecimals(10);
RoundRect->setDecimals(10);
switch (doc->Einheit)
{
case 0:
1422,6 → 1449,18
ein = " in";
Width->setLineStep(10);
Height->setLineStep(10);
Xpos->setDecimals(10000);
Ypos->setDecimals(10000);
Width->setDecimals(10000);
Height->setDecimals(10000);
LXpos->setDecimals(10000);
LYpos->setDecimals(10000);
DGap->setDecimals(10000);
DLeft->setDecimals(10000);
DTop->setDecimals(10000);
DBottom->setDecimals(10000);
DRight->setDecimals(10000);
RoundRect->setDecimals(10000);
break;
case 3:
ein = " p";
1433,12 → 1472,26
Height->setSuffix( ein );
LXpos->setSuffix( ein );
LYpos->setSuffix( ein );
Xpos->setValue(qRound(static_cast<double>(Xpos->value()) / old * UmReFaktor));
Ypos->setValue(qRound(static_cast<double>(Ypos->value()) / old * UmReFaktor));
Width->setValue(qRound(static_cast<double>(Width->value()) / old * UmReFaktor));
Height->setValue(qRound(static_cast<double>(Height->value()) / old * UmReFaktor));
LXpos->setValue(qRound(static_cast<double>(LXpos->value()) / old * UmReFaktor));
LYpos->setValue(qRound(static_cast<double>(LYpos->value()) / old * UmReFaktor));
DGap->setSuffix( ein );
DLeft->setSuffix( ein );
DTop->setSuffix( ein );
DBottom->setSuffix( ein );
DRight->setSuffix( ein );
RoundRect->setSuffix( ein );
Xpos->setValue(qRound(oldX * UmReFaktor * Xpos->Decimals));
Ypos->setValue(qRound(oldY * UmReFaktor * Ypos->Decimals));
Width->setValue(qRound(oldW * UmReFaktor * Width->Decimals));
Height->setValue(qRound(oldH * UmReFaktor * Height->Decimals));
LXpos->setValue(qRound(oldLX * UmReFaktor * LXpos->Decimals));
LYpos->setValue(qRound(oldLY * UmReFaktor * LYpos->Decimals));
DGap->setMaxValue(qRound(oldGM * UmReFaktor * DGap->Decimals));
DGap->setValue(qRound(oldG * UmReFaktor * DGap->Decimals));
DLeft->setValue(qRound(oldDL * UmReFaktor * DLeft->Decimals));
DTop->setValue(qRound(oldDT * UmReFaktor * DTop->Decimals));
DBottom->setValue(qRound(oldDB * UmReFaktor * DBottom->Decimals));
DRight->setValue(qRound(oldDR * UmReFaktor * DRight->Decimals));
RoundRect->setMaxValue(qRound(oldRM * UmReFaktor * RoundRect->Decimals));
RoundRect->setValue(qRound(oldRR * UmReFaktor * RoundRect->Decimals));
HaveItem = tmp;
}
 
1483,8 → 1536,8
n = FPoint(b, h);
inX = ma.m11() * n.x() + ma.m21() * n.y() + ma.dx();
inY = ma.m22() * n.y() + ma.m12() * n.x() + ma.dy();
Xpos->setValue(qRound(inX*UmReFaktor*100.0));
Ypos->setValue(qRound(inY*UmReFaktor*100.0));
Xpos->setValue(qRound(inX*UmReFaktor*Xpos->Decimals));
Ypos->setValue(qRound(inY*UmReFaktor*Ypos->Decimals));
if ((LMode) && (tmp))
setBH(CurItem->Width, CurItem->Height);
HaveItem = tmp;
1498,17 → 1551,17
QPoint dp;
if ((LMode) && (CurItem->PType == 5))
{
ma.translate(static_cast<double>(Xpos->value()) / UmReFaktor / 100.0, static_cast<double>(Ypos->value()) / UmReFaktor / 100.0);
ma.translate(static_cast<double>(Xpos->value()) / UmReFaktor / Xpos->Decimals, static_cast<double>(Ypos->value()) / UmReFaktor / Ypos->Decimals);
ma.rotate(static_cast<double>(Rot->value())/100.0*(-1));
dp = ma * QPoint(static_cast<int>(x), static_cast<int>(y));
Width->setValue(qRound(dp.x()*UmReFaktor*100.0));
Height->setValue(qRound(dp.y()*UmReFaktor*100.0));
Width->setValue(qRound(dp.x()*UmReFaktor*Width->Decimals));
Height->setValue(qRound(dp.y()*UmReFaktor*Height->Decimals));
}
else
{
RoundRect->setMaxValue(static_cast<int>(QMIN(x, y)/2));
Width->setValue(qRound(x*UmReFaktor*100.0));
Height->setValue(qRound(y*UmReFaktor*100.0));
RoundRect->setMaxValue(qRound(QMIN(x, y)/2*UmReFaktor*RoundRect->Decimals));
Width->setValue(qRound(x*UmReFaktor*Width->Decimals));
Height->setValue(qRound(y*UmReFaktor*Height->Decimals));
}
HaveItem = tmp;
}
1528,7 → 1581,7
{
bool tmp = HaveItem;
HaveItem = false;
RoundRect->setValue(qRound(r));
RoundRect->setValue(qRound(r*UmReFaktor*RoundRect->Decimals));
HaveItem = tmp;
}
 
1537,11 → 1590,11
bool tmp = HaveItem;
HaveItem = false;
DCol->setValue(r);
DGap->setValue(qRound(g*10.0));
DGap->setValue(qRound(g*UmReFaktor*DGap->Decimals));
if (tmp)
{
DCol->setMaxValue(QMAX(qRound(CurItem->Width / QMAX(CurItem->ColGap, 10.0)), 1));
DGap->setMaxValue(QMAX(qRound((CurItem->Width / CurItem->Cols - CurItem->Extra - CurItem->RExtra)*10.0), 0));
DGap->setMaxValue(QMAX(qRound((CurItem->Width / CurItem->Cols - CurItem->Extra - CurItem->RExtra)*DGap->Decimals), 0));
}
DCol->setMinValue(1);
DGap->setMinValue(0);
1602,8 → 1655,8
{
bool tmp = HaveItem;
HaveItem = false;
LXpos->setValue(qRound(x * UmReFaktor * 100));
LYpos->setValue(qRound(y * UmReFaktor * 100));
LXpos->setValue(qRound(x * UmReFaktor * LXpos->Decimals));
LYpos->setValue(qRound(y * UmReFaktor * LYpos->Decimals));
ScaleX->setValue(qRound(scx * 1000));
ScaleY->setValue(qRound(scy * 1000));
HaveItem = tmp;
1759,10 → 1812,10
{
double x,y,w,h, gx, gy, gh, gw, base;
QWMatrix ma;
x = static_cast<double>(Xpos->value()) / UmReFaktor / 100.0;
y = static_cast<double>(Ypos->value()) / UmReFaktor / 100.0;
w = static_cast<double>(Width->value()) / UmReFaktor / 100.0;
h = static_cast<double>(Height->value()) / UmReFaktor / 100.0;
x = static_cast<double>(Xpos->value()) / UmReFaktor / Xpos->Decimals;
y = static_cast<double>(Ypos->value()) / UmReFaktor / Ypos->Decimals;
w = static_cast<double>(Width->value()) / UmReFaktor / Width->Decimals;
h = static_cast<double>(Height->value()) / UmReFaktor / Height->Decimals;
if ((HaveDoc) && (HaveItem))
{
if (doc->ActPage->GroupSel)
1811,10 → 1864,10
{
double x,y,w,h, gx, gy, gh, gw, base;
QWMatrix ma;
x = static_cast<double>(Xpos->value()) / UmReFaktor / 100.0;
y = static_cast<double>(Ypos->value()) / UmReFaktor / 100.0;
w = static_cast<double>(Width->value()) / UmReFaktor / 100.0;
h = static_cast<double>(Height->value()) / UmReFaktor / 100.0;
x = static_cast<double>(Xpos->value()) / UmReFaktor / Xpos->Decimals;
y = static_cast<double>(Ypos->value()) / UmReFaktor / Ypos->Decimals;
w = static_cast<double>(Width->value()) / UmReFaktor / Width->Decimals;
h = static_cast<double>(Height->value()) / UmReFaktor / Height->Decimals;
if ((HaveDoc) && (HaveItem))
{
if (doc->ActPage->GroupSel)
1862,10 → 1915,10
void Mpalette::NewW()
{
double x,y,w,h, gx, gy, gh, gw;
x = static_cast<double>(Xpos->value()) / UmReFaktor / 100.0;
y = static_cast<double>(Ypos->value()) / UmReFaktor / 100.0;
w = static_cast<double>(Width->value()) / UmReFaktor / 100.0;
h = static_cast<double>(Height->value()) / UmReFaktor / 100.0;
x = static_cast<double>(Xpos->value()) / UmReFaktor / Xpos->Decimals;
y = static_cast<double>(Ypos->value()) / UmReFaktor / Ypos->Decimals;
w = static_cast<double>(Width->value()) / UmReFaktor / Width->Decimals;
h = static_cast<double>(Height->value()) / UmReFaktor / Height->Decimals;
if ((HaveDoc) && (HaveItem))
{
if (doc->ActPage->GroupSel)
1899,10 → 1952,10
void Mpalette::NewH()
{
double x,y,w,h, gx, gy, gh, gw;
x = static_cast<double>(Xpos->value()) / UmReFaktor / 100.0;
y = static_cast<double>(Ypos->value()) / UmReFaktor / 100.0;
w = static_cast<double>(Width->value()) / UmReFaktor / 100.0;
h = static_cast<double>(Height->value()) / UmReFaktor / 100.0;
x = static_cast<double>(Xpos->value()) / UmReFaktor / Xpos->Decimals;
y = static_cast<double>(Ypos->value()) / UmReFaktor / Ypos->Decimals;
w = static_cast<double>(Width->value()) / UmReFaktor / Width->Decimals;
h = static_cast<double>(Height->value()) / UmReFaktor / Height->Decimals;
if ((HaveDoc) && (HaveItem))
{
if (doc->ActPage->GroupSel)
1955,7 → 2008,7
{
if ((HaveDoc) && (HaveItem))
{
CurItem->RadRect = RoundRect->value();
CurItem->RadRect = static_cast<double>(RoundRect->value()) / UmReFaktor / RoundRect->Decimals;
doc->ActPage->SetFrameRounded();
emit DocChanged();
}
1984,7 → 2037,7
{
if ((HaveDoc) && (HaveItem))
{
CurItem->ColGap = static_cast<double>(DGap->value()) / 10.0;
CurItem->ColGap = static_cast<double>(DGap->value()) / UmReFaktor / DGap->Decimals;
doc->ActPage->RefreshItem(CurItem);
emit DocChanged();
}
2025,7 → 2078,7
{
if ((HaveDoc) && (HaveItem))
{
doc->ActPage->ChLocalXY(static_cast<double>(LXpos->value()) / UmReFaktor / 100.0, static_cast<double>(LYpos->value()) / UmReFaktor / 100.0);
doc->ActPage->ChLocalXY(static_cast<double>(LXpos->value()) / UmReFaktor / LXpos->Decimals, static_cast<double>(LYpos->value()) / UmReFaktor / LYpos->Decimals);
emit DocChanged();
}
}
2329,8 → 2382,8
inX = gx+gw;
inY = gy+gh;
}
Xpos->setValue(qRound(inX*UmReFaktor*100.0));
Ypos->setValue(qRound(inY*UmReFaktor*100.0));
Xpos->setValue(qRound(inX*UmReFaktor*Xpos->Decimals));
Ypos->setValue(qRound(inY*UmReFaktor*Ypos->Decimals));
}
else
{
2354,8 → 2407,8
n = FPoint(b, h);
inX = ma.m11() * n.x() + ma.m21() * n.y() + ma.dx();
inY = ma.m22() * n.y() + ma.m12() * n.x() + ma.dy();
Xpos->setValue(qRound(inX*UmReFaktor*100.0));
Ypos->setValue(qRound(inY*UmReFaktor*100.0));
Xpos->setValue(qRound(inX*UmReFaktor*Xpos->Decimals));
Ypos->setValue(qRound(inY*UmReFaktor*Ypos->Decimals));
}
HaveItem = true;
doc->RotMode = m;
2430,10 → 2483,10
{
if ((HaveDoc) && (HaveItem))
{
CurItem->Extra = static_cast<double>(DLeft->value()) / 10.0;
CurItem->TExtra = static_cast<double>(DTop->value()) / 10.0;
CurItem->BExtra = static_cast<double>(DBottom->value()) / 10.0;
CurItem->RExtra = static_cast<double>(DRight->value()) / 10.0;
CurItem->Extra = static_cast<double>(DLeft->value()) / UmReFaktor / DLeft->Decimals;
CurItem->TExtra = static_cast<double>(DTop->value()) / UmReFaktor / DTop->Decimals;
CurItem->BExtra = static_cast<double>(DBottom->value()) / UmReFaktor / DBottom->Decimals;
CurItem->RExtra = static_cast<double>(DRight->value()) / UmReFaktor / DRight->Decimals;
doc->ActPage->RefreshItem(CurItem);
emit DocChanged();
}
2521,20 → 2574,10
if (HaveDoc)
{
if ((CMSavail) && (doc->CMSSettings.CMSinUse))
{
GroupBoxCM->show();
/* TextCms1->show();
InputP->show();
TextCms2->show();
MonitorI->show(); */
}
else
{
GroupBoxCM->hide();
/* TextCms1->hide();
TextCms2->hide();
InputP->hide();
MonitorI->hide(); */
return;
}
disconnect(InputP, SIGNAL(activated(const QString&)), this, SLOT(ChProf(const QString&)));
/trunk/Scribus/scribus/util.cpp
1462,6 → 1462,8
{
if( (b->Ptext.at(a)->ch == "\n") || (b->Ptext.at(a)->ch == "\r"))
Text += QString(QChar(5))+"\t";
if(b->Ptext.at(a)->ch == "\t")
Text += QString(QChar(4))+"\t";
else
Text += b->Ptext.at(a)->ch+"\t";
Text += b->Ptext.at(a)->cfont+"\t";
1479,6 → 1481,9
Buffer->Ptext = Text;
Buffer->Clip = b->Clip.copy();
Buffer->PoLine = b->PoLine.copy();
Buffer->TabValues = b->TabValues;
Buffer->DashValues = b->DashValues;
Buffer->DashOffset = b->DashOffset;
Buffer->PoShow = b->PoShow;
Buffer->BaseOffs = b->BaseOffs;
Buffer->Textflow = b->Textflow;
/trunk/Scribus/scribus/edit1format.cpp
1,9 → 1,10
#include "edit1format.h"
#include "edit1format.moc"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
#include <qmessagebox.h>
 
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au)
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin)
: QDialog( parent, "EditST", true, 0)
{
setCaption( tr( "Edit Style" ) );
82,19 → 83,15
GroupBox10Layout->addWidget( TextLabel2, 0, 0 );
 
LeftInd = new MSpinBox( GroupBox10, 1 );
LeftInd->setSuffix( tr( " pt" ) );
LeftInd->setMaxValue( 3000 );
LeftInd->setMinValue( -3000 );
LeftInd->setLineStep(10);
LeftInd->setValue(qRound(vor->Indent * 10));
GroupBox10Layout->addWidget( LeftInd, 1, 1 );
 
FirstLin = new MSpinBox( GroupBox10, 1);
FirstLin->setSuffix( tr( " pt" ) );
FirstLin->setMaxValue( 3000 );
FirstLin->setMinValue( -3000 );
FirstLin->setLineStep(10);
FirstLin->setValue(qRound(vor->First * 10));
GroupBox10Layout->addWidget( FirstLin, 0, 1 );
EditStyleLayout->addWidget( GroupBox10, 3, 1 );
 
160,19 → 157,15
 
AboveV = new MSpinBox( AbstandV, 1 );
AboveV->setMinimumSize( QSize( 70, 22 ) );
AboveV->setSuffix( tr( " pt" ) );
AboveV->setMaxValue( 3000 );
AboveV->setMinValue( 0 );
AboveV->setValue(qRound(vor->Avor * 10));
AboveV->setLineStep(10);
AbstandVLayout->addWidget( AboveV, 0, 1 );
 
BelowV = new MSpinBox( AbstandV, 1 );
BelowV->setMinimumSize( QSize( 70, 22 ) );
BelowV->setSuffix( tr( " pt" ) );
BelowV->setMaxValue( 3000 );
BelowV->setMinValue( 0 );
BelowV->setValue(qRound(vor->Anach * 10));
BelowV->setLineStep(10);
AbstandVLayout->addWidget( BelowV, 1, 1 );
 
226,6 → 219,38
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OkButton, SIGNAL( clicked() ), this, SLOT( Verlassen() ) );
connect(SizeC, SIGNAL(valueChanged(int)), this, SLOT(FontChange(int)));
LeftInd->setDecimals(10);
FirstLin->setDecimals(10);
AboveV->setDecimals(10);
BelowV->setDecimals(10);
QString ein;
switch (dEin)
{
case 0:
ein = " pt";
break;
case 1:
ein = " mm";
break;
case 2:
ein = " in";
LeftInd->setDecimals(10000);
FirstLin->setDecimals(10000);
AboveV->setDecimals(10000);
BelowV->setDecimals(10000);
break;
case 3:
ein = " p";
break;
}
LeftInd->setSuffix(ein);
FirstLin->setSuffix(ein);
AboveV->setSuffix(ein);
BelowV->setSuffix(ein);
BelowV->setValue(qRound(vor->Anach * UmReFaktor * BelowV->Decimals));
AboveV->setValue(qRound(vor->Avor * UmReFaktor * AboveV->Decimals));
FirstLin->setValue(qRound(vor->First * UmReFaktor * FirstLin->Decimals));
LeftInd->setValue(qRound(vor->Indent * UmReFaktor * LeftInd->Decimals));
}
 
void EditStyle::FontChange(int val)
274,11 → 299,11
werte->Ausri = 3;
if (Forced->isChecked())
werte->Ausri = 4;
werte->LineSpa = static_cast<double>(LineSpVal->value()) / 10;
werte->Indent = static_cast<double>(LeftInd->value() / 10);
werte->First = static_cast<double>(FirstLin->value() / 10);
werte->Avor = static_cast<double>(AboveV->value() / 10);
werte->Anach = static_cast<double>(BelowV->value() / 10);
werte->LineSpa = static_cast<double>(LineSpVal->value()) / 10.0;
werte->Indent = static_cast<double>(LeftInd->value() / UmReFaktor / LeftInd->Decimals);
werte->First = static_cast<double>(FirstLin->value() / UmReFaktor / FirstLin->Decimals);
werte->Avor = static_cast<double>(AboveV->value() / UmReFaktor / AboveV->Decimals);
werte->Anach = static_cast<double>(BelowV->value() / UmReFaktor / BelowV->Decimals);
werte->Vname = Name->text();
werte->Font = FontC->currentText();
werte->FontSize = SizeC->value();
/trunk/Scribus/scribus/scfonts.cpp
408,6 → 408,7
t->EmbedPS = true;
t->UseFont = true;
t->CharWidth[13] = 0;
t->CharWidth[9] = 1;
t->Family = QString(face->family_name);
}
}
/trunk/Scribus/scribus/icons/Lock.xpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/icons/signature.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/icons/Text.xpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/icons/Unlock.xpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/pageitem.h
255,6 → 255,7
QValueStack<int> Groups;
bool InvPict;
QValueList<double> DashValues;
QValueList<double> TabValues;
double DashOffset;
VGradient fill_gradient;
QString Language;
/trunk/Scribus/scribus/pageitem.cpp
199,11 → 199,12
InvPict = false;
NamedLStyle = "";
DashValues.clear();
TabValues.clear();
DashOffset = 0;
fill_gradient = VGradient(VGradient::linear);
Language = doc->Language;
Cols = 1;
ColGap = 0.0;
Cols = Doc->DCols;
ColGap = Doc->DGap;
}
 
/** Zeichnet das Item */
705,8 → 706,28
}
hl->xp = CurX+hl->cextra;
hl->yp = CurY;
// CurY = oldCurY;
CurX += wide+hl->cextra;
if (hl->ch == QChar(9))
{
if (TabValues.isEmpty())
CurX = ceil(CurX / 100.0) * 100.0;
else
{
double tCurX = CurX;
double oCurX = CurX;
for (int yg = static_cast<int>(TabValues.count()-1); yg > -1; yg--)
{
if (CurX < TabValues[yg])
{
tCurX = TabValues[yg];
}
}
if (tCurX == oCurX)
CurX = ceil(CurX / 100.0) * 100.0;
else
CurX = tCurX;
}
}
pt1 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY-asce));
if ((!cl.contains(pf.xForm(pt1))) || (!cl.contains(pf.xForm(pt2))) || (CurX+RExtra+lineCorr > ColBound.y()))
726,7 → 747,7
Zli->wide = wide;
Zli->kern = hl->cextra;
Zli->scale = hl->cscale;
if ((hl->ch == " ") && (!outs))
if (((hl->ch == " ") || (hl->ch == QChar(9))) && (!outs))
{
LastXp = hl->xp;
LastSP = BuPos;
1138,7 → 1159,7
CurY = 0;
hl = Ptext.at(a);
chx = hl->ch;
if ((chx == QChar(30)) || (chx == QChar(13)))
if ((chx == QChar(30)) || (chx == QChar(13)) || (chx == QChar(9)))
continue;
chs = hl->csize;
SetZeichAttr(hl, &chs, &chx);
1475,6 → 1496,8
ccx = " ";
if (ccx == QChar(13))
return;
if (ccx == QChar(9))
return;
double csi = static_cast<double>(hl->Siz) / 100.0;
uint chr = ccx[0].unicode();
if ((*Doc->AllFonts)[hl->ZFo]->CharWidth.contains(chr))
/trunk/Scribus/scribus/scribusdoc.h
177,6 → 177,9
QString Language;
int Cols;
double ColGap;
QValueList<double> TabValues;
QValueList<double> DashValues;
double DashOffset;
};
 
/** Seitenraender */
409,6 → 412,8
bool AutoSave;
int AutoSaveTime;
double DisScale;
int DCols;
double DGap;
};
/**
* the Document Class
484,6 → 489,8
PenStyle DLineArt;
QString DpenLine;
QString DpenText;
int DCols;
double DGap;
int DshadeLine;
PenStyle DLstyleLine;
double DwidthLine;
594,6 → 601,7
QWidget* WinHan;
bool DoDrawing;
QValueList<int> OpenNodes;
QTimer *CurTimer;
};
 
#endif
/trunk/Scribus/scribus/scribusview.cpp
1077,7 → 1077,7
for (uint d = 0; d < ite->MaxChars; ++d)
{
hl = ite->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10))) // || (hl->ch == QChar(32)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
continue;
if (hl->yp == 0)
break;
1571,7 → 1571,7
for (d = 0; d < c->MaxChars; ++d)
{
hl = c->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
continue;
if (hl->yp == 0)
break;
1969,7 → 1969,7
for (d = 0; d < c->MaxChars; ++d)
{
hl = c->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(30))) // || (hl->ch == QChar(32)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(30)) || (hl->ch == QChar(9)))
continue;
tsz = hl->csize;
chx = hl->ch;
/trunk/Scribus/scribus/werktoolb.cpp
38,25 → 38,8
Select = new QToolButton(loadIcon("Kreuz.xpm"), tr("Select Items"), QString::null, this, SLOT(ModeFromTB()), this);
Select->setToggleButton(true);
Select->setOn(true);
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this, SLOT(ModeFromTB()), this);
Rotiere->setToggleButton( true );
Rotiere->setEnabled(false);
Zoom = new QToolButton(loadIcon("Lupe.xpm"), tr("Zooms in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom->setToggleButton( true );
Texte = new QToolButton(loadIcon("Text.xpm"), tr("Insert Text Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Texte->setToggleButton( true );
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
Textedit2 = new QToolButton(loadIcon("signature.png"), tr("Edit the Text with the Story Editor"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit2->setToggleButton( true );
Textedit2->setEnabled( FALSE );
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"), tr("Break Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus->setToggleButton( true );
KetteAus->setEnabled(false);
BildB = new QToolButton(loadIcon("Bild.xpm"), tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()), this);
BildB->setToggleButton( true );
Rechteck = new Autoforms( this );
72,6 → 55,23
Linien->setToggleButton( true );
PolyLin = new QToolButton(loadIcon("beziertool.png"), tr("Insert Bezier Curves"), QString::null, this, SLOT(ModeFromTB()), this);
PolyLin->setToggleButton( true );
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this, SLOT(ModeFromTB()), this);
Rotiere->setToggleButton( true );
Rotiere->setEnabled(false);
Zoom = new QToolButton(loadIcon("Lupe.xpm"), tr("Zooms in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom->setToggleButton( true );
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
Textedit2 = new QToolButton(loadIcon("signature.png"), tr("Edit the Text with the Story Editor"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit2->setToggleButton( true );
Textedit2->setEnabled( FALSE );
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Link Text Frames"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"), tr("Unlink Text Frames"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus->setToggleButton( true );
KetteAus->setEnabled(false);
setCloseMode(QDockWindow::Undocked);
connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(Docken(QDockWindow::Place)));
connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(Verbergen(bool)));
/trunk/Scribus/scribus/libabout/about.cpp
38,7 → 38,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(28).arg("December").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(31).arg("December").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
233,6 → 233,8
Prefs.Dwidth = 1;
Prefs.DpenLine = "Black";
Prefs.DpenText = "Black";
Prefs.DCols = 1;
Prefs.DGap = 0.0;
Prefs.DshadeLine = 100;
Prefs.DLstyleLine = SolidLine;
Prefs.DwidthLine = 1;
1239,11 → 1241,13
b->Dirty = true;
doc->ActPage->RefreshItem(b);
}
if (((kk + KeyMod) == Prefs.KeyActions[60].KeyID) || ((kk + KeyMod) == Prefs.KeyActions[67].KeyID))
if ((kk == Key_Tab) || ((kk + KeyMod) == Prefs.KeyActions[60].KeyID) || ((kk + KeyMod) == Prefs.KeyActions[67].KeyID))
{
hg = new Pti;
if ((kk + KeyMod) == Prefs.KeyActions[60].KeyID)
hg->ch = QString(QChar(30));
else if (kk == Key_Tab)
hg->ch = QString(QChar(9));
else
hg->ch = QString(QChar(29));
hg->cfont = doc->CurrFont;
1509,6 → 1513,8
doc->Dbrush = Prefs.Dbrush;
doc->Dshade = Prefs.Dshade;
doc->Dshade2 = Prefs.Dshade2;
doc->DCols = Prefs.DCols;
doc->DGap = Prefs.DGap;
doc->DLineArt = PenStyle(Prefs.DLineArt);
doc->Dwidth = Prefs.Dwidth;
doc->DpenLine = Prefs.DpenLine;
1701,7 → 1707,7
}
if (doc->TemplateMode)
ActWin->muster->show();
setAppMode(doc->AppMode);
// setAppMode(doc->AppMode);
}
w->setFocus();
if (w->isMaximized())
1715,6 → 1721,11
BookPal->BView->First = ActWin->First;
BookPal->BView->Last = ActWin->Last;
RestoreBookMarks();
if (doc->ActPage->SelItem.count() != 0)
HaveNewSel(doc->ActPage->SelItem.at(0)->PType);
else
HaveNewSel(-1);
setAppMode(doc->AppMode);
}
 
void ScribusApp::windowsMenuActivated( int id )
1863,7 → 1874,7
pageMenu->setItemEnabled(pgmv, 0);
}
if (doc->isModified())
slotDocCh();
slotDocCh(false);
fileMenu->setItemEnabled(fid5, 1);
fileMenu->setItemEnabled(fid51, 1);
Sepal->EnablePal();
2128,9 → 2139,7
ObjMenu->setItemEnabled(DistM, 1);
ObjMenu->setItemEnabled(Gr, 1);
ObjMenu->setItemEnabled(PfadTP, 0);
bool hPoly = false;
if (b->Groups.count() == 0)
hPoly = true;
bool hPoly = true;
for (uint bx=0; bx<doc->ActPage->SelItem.count(); ++bx)
{
if (doc->ActPage->SelItem.at(bx)->PType != 6)
2364,6 → 2373,8
doc->Dbrush = Prefs.Dbrush;
doc->Dshade = Prefs.Dshade;
doc->Dshade2 = Prefs.Dshade2;
doc->DCols = Prefs.DCols;
doc->DGap = Prefs.DGap;
doc->DLineArt = PenStyle(Prefs.DLineArt);
doc->Dwidth = Prefs.Dwidth;
doc->DpenLine = Prefs.DpenLine;
2764,6 → 2775,7
bool ScribusApp::DoFileClose()
{
uint a;
setAppMode(1);
doc->ASaveTimer->stop();
disconnect(doc->ASaveTimer, SIGNAL(timeout()), doc->WinHan, SLOT(slotAutoSave()));
disconnect(doc->WinHan, SIGNAL(AutoSaved()), this, SLOT(slotAutoSaved()));
3918,9 → 3930,9
doc->AppMode = mode;
if (oldMode == 7)
{
disconnect(CurTimer, SIGNAL(timeout()), doc->ActPage, SLOT(BlinkCurs()));
CurTimer->stop();
delete CurTimer;
disconnect(doc->CurTimer, SIGNAL(timeout()), doc->ActPage, SLOT(BlinkCurs()));
doc->CurTimer->stop();
delete doc->CurTimer;
editMenu->setItemEnabled(edid4, 0);
editMenu->setItemEnabled(edid5, 0);
doc->ActPage->slotDoCurs(false);
3964,9 → 3976,9
WerkTools->Textedit2->setOn(false);
doc->ActPage->slotDoCurs(true);
menuBar()->setItemEnabled(Obm, 0);
CurTimer = new QTimer(doc->ActPage);
connect(CurTimer, SIGNAL(timeout()), doc->ActPage, SLOT(BlinkCurs()));
CurTimer->start(500);
doc->CurTimer = new QTimer(doc->ActPage);
connect(doc->CurTimer, SIGNAL(timeout()), doc->ActPage, SLOT(BlinkCurs()));
doc->CurTimer->start(500);
if (b != 0)
{
if (b->HasSel)
4003,6 → 4015,24
}
else
doc->SubMode = -1;
if (mode == 1)
{
WerkTools->Select->setOn(true);
WerkTools->Rotiere->setOn(false);
WerkTools->Textedit->setOn(false);
WerkTools->Textedit2->setOn(false);
WerkTools->Zoom->setOn(false);
WerkTools->Texte->setOn(false);
WerkTools->BildB->setOn(false);
WerkTools->Rechteck->setOn(false);
WerkTools->Linien->setOn(false);
WerkTools->Polygon->setOn(false);
WerkTools->PolyLin->setOn(false);
WerkTools->KetteEin->setOn(false);
WerkTools->KetteAus->setOn(false);
WerkToolsP->PDFTool->setOn(false);
WerkToolsP->PDFaTool->setOn(false);
}
}
}
 
5167,6 → 5197,8
if (doc->DpenLine == tr("None"))
doc->DpenLine = "None";
doc->DshadeLine = dia->Shade22->value();
doc->DCols = dia->TextColVal->value();
doc->DGap = dia->TextGapVal->value() / UmReFaktor / 10;
switch (dia->Linestyle2->currentItem())
{
case 0:
5251,6 → 5283,8
Prefs.DpenText = dia->ForegroundT->currentText();
if (Prefs.DpenText == tr("None"))
Prefs.DpenText = "None";
Prefs.DCols = dia->TextColVal->value();
Prefs.DGap = dia->TextGapVal->value() / UmReFaktor / 10;
Prefs.Dbrush = dia->Background->currentText();
if (Prefs.Dbrush == tr("None"))
Prefs.Dbrush = "None";
/trunk/Scribus/scribus/libprefs/prefs.cpp
103,7 → 103,7
GroupBox20Layout->setMargin( 25 );
UnitCombo = new QComboBox( true, GroupBox20, "UnitCombo" );
UnitCombo->insertItem( tr( "Points (pt)" ) );
UnitCombo->insertItem( tr( "Millimeters (mm)" ) );
UnitCombo->insertItem( tr( "Millimetres (mm)" ) );
UnitCombo->insertItem( tr( "Inches (in)" ) );
UnitCombo->insertItem( tr( "Picas (p)" ) );
UnitCombo->setEditable(false);
849,6 → 849,23
}
}
Layout15a->addWidget( ForegroundT, 2, 1 );
TextCol = new QLabel(ToolFrame, "TextCol");
TextCol->setText( tr("Columns:") );
Layout15a->addWidget( TextCol, 3, 0 );
TextColVal = new QSpinBox( ToolFrame, "TextColVal" );
TextColVal->setMaxValue( 100 );
TextColVal->setMinValue( 1 );
TextColVal->setValue(ap->HaveDoc ? ap->doc->DCols : Vor->DCols );
Layout15a->addWidget( TextColVal, 3, 1 );
TextGap = new QLabel(ToolFrame, "TextCol");
TextGap->setText( tr("Gap:") );
Layout15a->addWidget( TextGap, 4, 0 );
TextGapVal = new MSpinBox( ToolFrame, 1 );
TextGapVal->setSuffix( tr( " pt" ) );
TextGapVal->setMaxValue( 200 );
TextGapVal->setMinValue( 0 );
TextGapVal->setValue(ap->HaveDoc ? static_cast<int>(ap->doc->DGap*10) : static_cast<int>(Vor->DGap*10));
Layout15a->addWidget( TextGapVal, 4, 1 );
TextLabel1_4 = new QLabel( ToolFrame, "TextLabel1_4" );
TextLabel1_4->setMinimumSize(QSize(260, 70));
TextLabel1_4->setMaximumSize(QSize(260, 70));
855,7 → 872,7
TextLabel1_4->setText( tr( "Woven silk pyjamas exchanged for blue quartz" ) );
TextLabel1_4->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
SetSample();
Layout15a->addMultiCellWidget( TextLabel1_4, 3, 3, 0, 1 );
Layout15a->addMultiCellWidget( TextLabel1_4, 5, 5, 0, 1 );
QSpacerItem* sp09 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
ToolFrameLayout->addItem( sp09 );
ToolFrameLayout->addLayout( Layout15a );
966,7 → 983,7
}
Layout15b->addWidget(Linestyle, 4, 1);
LineW = new MSpinBox( ToolFrame2, 1 );
LineW->setSuffix( tr( " pts" ) );
LineW->setSuffix( tr( " pt" ) );
LineW->setMaxValue( 200 );
LineW->setMinValue( 0 );
LineW->setLineStep(10);
1948,58 → 1965,37
void Preferences::UnitChange()
{
double AltUmrech = Umrech;
QString einh;
Einheit = UnitCombo->currentItem();
switch (UnitCombo->currentItem())
{
case 0:
Umrech = 1.0;
SpinBox1->setSuffix( tr( " pt" ) );
SpinBox2->setSuffix( tr( " pt" ) );
SpinBox2g->setSuffix( tr( " pt" ) );
Breite->setSuffix( tr( " pt" ) );
Hoehe->setSuffix( tr( " pt" ) );
TopR->setSuffix( tr( " pt" ) );
BottomR->setSuffix( tr( " pt" ) );
LeftR->setSuffix( tr( " pt" ) );
RightR->setSuffix( tr( " pt" ) );
einh = tr( " pt" );
break;
case 1:
Umrech = 0.3527777;
SpinBox1->setSuffix( tr( " mm" ) );
SpinBox2->setSuffix( tr( " mm" ) );
SpinBox2g->setSuffix( tr( " mm" ) );
Breite->setSuffix( tr( " mm" ) );
Hoehe->setSuffix( tr( " mm" ) );
TopR->setSuffix( tr( " mm" ) );
BottomR->setSuffix( tr( " mm" ) );
LeftR->setSuffix( tr( " mm" ) );
RightR->setSuffix( tr( " mm" ) );
einh = tr( " mm" );
break;
case 2:
Umrech = 1.0 / 72.0;
SpinBox1->setSuffix( tr( " in" ) );
SpinBox2->setSuffix( tr( " in" ) );
SpinBox2g->setSuffix( tr( " in" ) );
Breite->setSuffix( tr( " in" ) );
Hoehe->setSuffix( tr( " in" ) );
TopR->setSuffix( tr( " in" ) );
BottomR->setSuffix( tr( " in" ) );
LeftR->setSuffix( tr( " in" ) );
RightR->setSuffix( tr( " in" ) );
einh = tr( " in" );
break;
case 3:
Umrech = 1.0 / 12.0;
SpinBox1->setSuffix( tr( " p" ) );
SpinBox2->setSuffix( tr( " p" ) );
SpinBox2g->setSuffix( tr( " p" ) );
Breite->setSuffix( tr( " p" ) );
Hoehe->setSuffix( tr( " p" ) );
TopR->setSuffix( tr( " p" ) );
BottomR->setSuffix( tr( " p" ) );
LeftR->setSuffix( tr( " p" ) );
RightR->setSuffix( tr( " p" ) );
einh = tr( " p" );
break;
}
SpinBox1->setSuffix(einh);
SpinBox2->setSuffix(einh);
SpinBox2g->setSuffix(einh);
Breite->setSuffix(einh);
Hoehe->setSuffix(einh);
TopR->setSuffix(einh);
BottomR->setSuffix(einh);
LeftR->setSuffix(einh);
RightR->setSuffix(einh);
TextGapVal->setSuffix(einh);
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
disconnect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
2009,14 → 2005,10
SpinBox1->setValue(qRound(SpinBox1->value() / AltUmrech * Umrech));
SpinBox2->setValue(qRound(SpinBox2->value() / AltUmrech * Umrech));
SpinBox2g->setValue(qRound(SpinBox2g->value() / AltUmrech * Umrech));
TextGapVal->setValue(qRound(TextGapVal->value() / AltUmrech * Umrech));
Breite->setValue(qRound(Pagebr * Umrech * 100));
Hoehe->setValue(qRound(Pageho * Umrech * 100));
/* RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value()); */
 
 
RightR->setMaxValue(Breite->value() - qRound(RandL * Umrech * 100));
LeftR->setMaxValue(Breite->value() - qRound(RandR * Umrech * 100));
TopR->setMaxValue(Hoehe->value() - qRound(RandB * Umrech * 100));
2026,13 → 2018,6
BottomR->setValue(qRound(RandB * Umrech * 100));
LeftR->setValue(qRound(RandL * Umrech * 100));
RightR->setValue(qRound(RandR * Umrech * 100));
/* if (GZComboF->currentItem() == 30)
{
Breite->setValue(qRound(Breite->value() / AltUmrech * Umrech));
Hoehe->setValue(qRound(Hoehe->value() / AltUmrech * Umrech));
}
else
setSize(GZComboF->currentItem()); */
DrawRuler();
connect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
/trunk/Scribus/scribus/libprefs/prefs.h
135,6 → 135,10
QLabel* TextLabelT25;
QLabel* TextLabelT26;
QComboBox* Foreground;
QLabel* TextCol;
QLabel* TextGap;
QSpinBox* TextColVal;
MSpinBox* TextGapVal;
QSpinBox* Shade2;
QComboBox* Background;
QSpinBox* Shade;
/trunk/Scribus/scribus/mspinbox.cpp
34,6 → 34,15
case 2:
Decimals = 100;
Width = 2;
break;
case 3:
Decimals = 1000;
Width = 3;
break;
case 4:
Decimals = 10000;
Width = 3;
break;
default:
Decimals = 100;
Width = 2;
73,13 → 82,13
 
QString MSpinBox::mapValueToText(int value)
{
double dez = Width == 1 ? 10.0 : 100.0;
return QString::number(static_cast<double>(value) / dez, 'f', Width);
// double dez = Width == 1 ? 10.0 : 100.0;
return QString::number(static_cast<double>(value) / Decimals, 'f', Width);
}
 
int MSpinBox::mapTextToValue(bool *)
{
double dez = Width == 1 ? 10.0 : 100.0;
// double dez = Width == 1 ? 10.0 : 100.0;
FunctionParser fp;
QString ts = text();
QString su = suffix();
120,7 → 129,7
if (ret >= 0)
return 0;
double erg = fp.Eval(NULL);
return qRound(erg*dez);
return qRound(erg*Decimals);
}
 
void MSpinBox::setDecimals(int deci)
131,6 → 140,10
Width = 0;
if (deci > 9 && deci < 100)
Width = 1;
if (deci > 99)
if (deci > 99 && deci < 1000)
Width = 2;
if (deci > 999 && deci < 10000)
Width = 3;
if (deci > 9999)
Width = 4;
}
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
403,7 → 403,7
for (d = 0; d < Item->MaxChars; d++)
{
hl = Item->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
continue;
if (hl->yp == 0)
break;
463,7 → 463,7
for (d = 0; d < Item->MaxChars; d++)
{
hl = Item->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
continue;
if (hl->ch == QChar(29))
chx = " ";
/trunk/Scribus/scribus/serializer.cpp
79,7 → 79,6
hg->ch = Objekt.at(a);
if ((hg->ch == QChar(10)) || (hg->ch == QChar(5)))
hg->ch = QChar(13);
if (hg->ch == QChar(9)) { hg->ch = " "; }
if (font != "")
{
hg->cfont = font;
/trunk/Scribus/scribus/page.cpp
283,8 → 283,8
hg->ch = text.at(a);
if (hg->ch == QChar(10))
hg->ch = QChar(13);
if (hg->ch == QChar(9))
hg->ch = " ";
if (hg->ch == QChar(4))
hg->ch = QChar(9);
if (hg->ch == QChar(5))
hg->ch = QChar(13);
hg->cfont = b->IFont;
4960,9 → 4960,11
b = SelItem.at(0);
b->Frame = false;
b->ClipEdited = true;
b->Groups.clear();
for (uint a = 1; a < SelItem.count(); ++a)
{
bb = SelItem.at(a);
bb->Groups.clear();
toDel.append(bb->ItemNr);
QWMatrix ma;
ma.translate(bb->Xpos, bb->Ypos);
6426,6 → 6428,8
hg->ch = (*it);
if (hg->ch == QChar(5))
hg->ch = QChar(13);
if (hg->ch == QChar(4))
hg->ch = QChar(9);
it++;
hg->cfont = *it;
it++;
6564,6 → 6568,9
b->ISize = Buffer->ISize;
b->ExtraV = Buffer->ExtraV;
b->Groups = Buffer->Groups;
b->TabValues = Buffer->TabValues;
b->DashValues = Buffer->DashValues;
b->DashOffset = Buffer->DashOffset;
b->Locked = Buffer->Locked;
b->Transparency = Buffer->Transparency;
b->TranspStroke = Buffer->TranspStroke;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
1563,7 → 1563,7
for (uint d = 0; d < ite->MaxChars; ++d)
{
hl = ite->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
continue;
if (ite->PType == 8)
{
/trunk/Scribus/scribus/scribus.h
122,7 → 122,6
ProfilesL PDFXProfiles;
double DispX;
double DispY;
QTimer *CurTimer;
bool NoFonts;
int HaveDoc;
struct preV Prefs;
/trunk/Scribus/scribus/scribusdoc.cpp
194,6 → 194,7
UsedFonts[name] = fo;
(*AllFonts)[name]->ReadMetrics();
(*AllFonts)[name]->CharWidth[13] = 0;
(*AllFonts)[name]->CharWidth[9] = 1;
QString afnm = (*AllFonts)[name]->Datei.left((*AllFonts)[name]->Datei.length()-3);
QFile afm(afnm+"afm");
if(!(afm.exists()))
/trunk/Scribus/scribus/editformats.cpp
96,7 → 96,7
sty.FontSize = TempVorl[sFnumber].FontSize;
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine));
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine), Docu->Einheit);
if (!dia2->exec())
TempVorl.remove(TempVorl.fromLast());
delete dia2;
117,7 → 117,7
sty.FontSize = Docu->Dsize;
TempVorl.append(sty);
sFnumber = TempVorl.count()-1;
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine));
EditStyle* dia2 = new EditStyle(this, &TempVorl[sFnumber], TempVorl, true, fon, static_cast<double>(Docu->AutoLine), Docu->Einheit);
if (!dia2->exec())
TempVorl.remove(TempVorl.fromLast());
delete dia2;
126,7 → 126,7
 
void StilFormate::editFormat()
{
EditStyle* dia = new EditStyle(this, &TempVorl[sFnumber], TempVorl, false, fon, static_cast<double>(Docu->AutoLine));
EditStyle* dia = new EditStyle(this, &TempVorl[sFnumber], TempVorl, false, fon, static_cast<double>(Docu->AutoLine), Docu->Einheit);
dia->exec();
delete dia;
UpdateFList();
/trunk/Scribus/scribus/scribusXml.cpp
786,6 → 786,35
}
else
OB.Groups.clear();
if ((obj.hasAttribute("NUMTAB")) && (QStoInt(obj.attribute("NUMTAB","0")) != 0))
{
tmp = obj.attribute("TABS");
QTextStream tgv(&tmp, IO_ReadOnly);
OB.TabValues.clear();
for (int cxv = 0; cxv < QStoInt(obj.attribute("NUMTAB","0")); ++cxv)
{
tgv >> xf;
OB.TabValues.append(xf);
}
tmp = "";
}
else
OB.TabValues.clear();
if ((obj.hasAttribute("NUMDASH")) && (QStoInt(obj.attribute("NUMDASH","0")) != 0))
{
tmp = obj.attribute("DASHS");
QTextStream dgv(&tmp, IO_ReadOnly);
OB.DashValues.clear();
for (int cxv = 0; cxv < QStoInt(obj.attribute("NUMDASH","0")); ++cxv)
{
dgv >> xf;
OB.DashValues.append(xf);
}
tmp = "";
}
else
OB.DashValues.clear();
OB.DashOffset = QStodouble(obj.attribute("DASHOFF","0.0"));
QDomNode IT=OBJ.firstChild();
while(!IT.isNull())
{
795,6 → 824,7
tmp2 = it.attribute("CH");
tmp2.replace(QRegExp("\r"), QChar(5));
tmp2.replace(QRegExp("\n"), QChar(5));
tmp2.replace(QRegExp("\t"), QChar(4));
tmf = it.attribute("CFONT", doc->Dfont);
if (tmf == "")
tmf = doc->Dfont;
946,6 → 976,8
DoFonts[Defont] = Defont;
}
doc->Dsize=qRound(QStodouble(dc.attribute("DSIZE")) * 10);
doc->DCols=QStoInt(dc.attribute("DCOL", "1"));
doc->DGap=QStodouble(dc.attribute("DGAP", "0.0"));
doc->DocAutor=dc.attribute("AUTHOR");
doc->DocComments=dc.attribute("COMMENTS");
doc->DocKeyWords=dc.attribute("KEYWORDS","");
1381,6 → 1413,35
}
else
OB.Groups.clear();
if ((obj.hasAttribute("NUMTAB")) && (QStoInt(obj.attribute("NUMTAB","0")) != 0))
{
tmp = obj.attribute("TABS");
QTextStream tgv(&tmp, IO_ReadOnly);
OB.TabValues.clear();
for (int cxv = 0; cxv < QStoInt(obj.attribute("NUMTAB","0")); ++cxv)
{
tgv >> xf;
OB.TabValues.append(xf);
}
tmp = "";
}
else
OB.TabValues.clear();
if ((obj.hasAttribute("NUMDASH")) && (QStoInt(obj.attribute("NUMDASH","0")) != 0))
{
tmp = obj.attribute("DASHS");
QTextStream dgv(&tmp, IO_ReadOnly);
OB.DashValues.clear();
for (int cxv = 0; cxv < QStoInt(obj.attribute("NUMDASH","0")); ++cxv)
{
dgv >> xf;
OB.DashValues.append(xf);
}
tmp = "";
}
else
OB.DashValues.clear();
OB.DashOffset = QStodouble(obj.attribute("DASHOFF","0.0"));
QDomNode IT=OBJ.firstChild();
while(!IT.isNull())
{
1390,6 → 1451,7
tmp2 = it.attribute("CH");
tmp2.replace(QRegExp("\r"), QChar(5));
tmp2.replace(QRegExp("\n"), QChar(5));
tmp2.replace(QRegExp("\t"), QChar(4));
tmf = it.attribute("CFONT", doc->Dfont);
if (tmf == "")
tmf = doc->Dfont;
1886,6 → 1948,35
else
OB.Groups.clear();
tmp = "";
if ((pg.hasAttribute("NUMTAB")) && (QStoInt(pg.attribute("NUMTAB","0")) != 0))
{
tmp = pg.attribute("TABS");
QTextStream tgv(&tmp, IO_ReadOnly);
OB.TabValues.clear();
for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMTAB","0")); ++cxv)
{
tgv >> xf;
OB.TabValues.append(xf);
}
tmp = "";
}
else
OB.TabValues.clear();
if ((pg.hasAttribute("NUMDASH")) && (QStoInt(pg.attribute("NUMDASH","0")) != 0))
{
tmp = pg.attribute("DASHS");
QTextStream dgv(&tmp, IO_ReadOnly);
OB.DashValues.clear();
for (int cxv = 0; cxv < QStoInt(pg.attribute("NUMDASH","0")); ++cxv)
{
dgv >> xf;
OB.DashValues.append(xf);
}
tmp = "";
}
else
OB.DashValues.clear();
OB.DashOffset = QStodouble(pg.attribute("DASHOFF","0.0"));
QDomNode IT=DOC.firstChild();
while(!IT.isNull())
{
1895,6 → 1986,7
tmp2 = it.attribute("CH");
tmp2.replace(QRegExp("\r"), QChar(5));
tmp2.replace(QRegExp("\n"), QChar(5));
tmp2.replace(QRegExp("\t"), QChar(4));
tmf = it.attribute("CFONT", doc->Dfont);
if (tmf == "")
tmf = doc->Dfont;
2175,6 → 2267,8
tsc = item->Ptext.at(k)->cscale;
if (item->Ptext.at(k)->ch == QChar(13))
text = QChar(5);
if (item->Ptext.at(k)->ch == QChar(9))
text = QChar(4);
else
text = item->Ptext.at(k)->ch;
k++;
2217,6 → 2311,8
{
if (item->Ptext.at(k)->ch == QChar(13))
text += QChar(5);
if (item->Ptext.at(k)->ch == QChar(9))
text += QChar(4);
else
text += item->Ptext.at(k)->ch;
k++;
2262,6 → 2358,23
glp += tmp.setNum((*nx)) + " ";
}
ob.setAttribute("GROUPS", glp);
ob.setAttribute("NUMTAB", static_cast<int>(item->TabValues.count()));
QString tlp = "";
QValueList<double>::Iterator tax;
for (tax = item->TabValues.begin(); tax != item->TabValues.end(); ++tax)
{
tlp += tmp.setNum((*tax)) + " ";
}
ob.setAttribute("TABS", tlp);
ob.setAttribute("NUMDASH", static_cast<int>(item->DashValues.count()));
QString dlp = "";
QValueList<double>::Iterator dax;
for (dax = item->DashValues.begin(); dax != item->DashValues.end(); ++dax)
{
dlp += tmp.setNum((*dax)) + " ";
}
ob.setAttribute("DASHS", dlp);
ob.setAttribute("DASHOFF", item->DashOffset);
ob.setAttribute("NUMPO",item->PoLine.size());
QString polp = "";
for (uint nxx=0; nxx<item->PoLine.size(); ++nxx)
2556,6 → 2669,8
tsc = item->Ptext.at(k)->cscale;
if (item->Ptext.at(k)->ch == QChar(13))
text = QChar(5);
if (item->Ptext.at(k)->ch == QChar(9))
text = QChar(4);
else
text = item->Ptext.at(k)->ch;
k++;
2598,6 → 2713,8
{
if (item->Ptext.at(k)->ch == QChar(13))
text += QChar(5);
if (item->Ptext.at(k)->ch == QChar(9))
text += QChar(4);
else
text += item->Ptext.at(k)->ch;
k++;
2636,6 → 2753,23
glp += tmp.setNum((*nx)) + " ";
}
ob.setAttribute("GROUPS", glp);
ob.setAttribute("NUMTAB", static_cast<int>(item->TabValues.count()));
QString tlp = "";
QValueList<double>::Iterator tax;
for (tax = item->TabValues.begin(); tax != item->TabValues.end(); ++tax)
{
tlp += tmp.setNum((*tax)) + " ";
}
ob.setAttribute("TABS", tlp);
ob.setAttribute("NUMDASH", static_cast<int>(item->DashValues.count()));
QString dlp = "";
QValueList<double>::Iterator dax;
for (dax = item->DashValues.begin(); dax != item->DashValues.end(); ++dax)
{
dlp += tmp.setNum((*dax)) + " ";
}
ob.setAttribute("DASHS", dlp);
ob.setAttribute("DASHOFF", item->DashOffset);
ob.setAttribute("NUMPO",item->PoLine.size());
QString polp = "";
for (uint nxx=0; nxx<item->PoLine.size(); ++nxx)
2701,6 → 2835,8
dc.setAttribute("UNITS",doc->Einheit);
dc.setAttribute("DFONT",doc->Dfont);
dc.setAttribute("DSIZE",doc->Dsize / 10.0);
dc.setAttribute("DCOL",doc->DCols);
dc.setAttribute("DGAP",doc->DGap);
dc.setAttribute("AUTHOR",doc->DocAutor);
dc.setAttribute("COMMENTS",doc->DocComments);
dc.setAttribute("KEYWORDS",doc->DocKeyWords);
2965,6 → 3101,8
dc9.setAttribute("BRUSH",Vor->Dbrush);
dc9.setAttribute("PENLINE",Vor->DpenLine);
dc9.setAttribute("PENTEXT",Vor->DpenText);
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);
3193,6 → 3331,8
Vorein->Dbrush = dc.attribute("BRUSH");
Vorein->DpenLine = dc.attribute("PENLINE");
Vorein->DpenText = dc.attribute("PENTEXT");
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"));
/trunk/Scribus/scribus.kdevprj
23,7 → 23,7
cppflags=
cxxflags=\s-O0 -Wall
ldadd=-ldl -lcms -ltiff -lm $(LIB_QT) -lXext -lX11
ldflags=\s-s -export-dynamic\s
ldflags=\s-s -export-dynamic\s
 
[General]
AMChanged=false
40,7 → 40,7
sgml_file=
short_info=
sub_dir=scribus/
version=1.1.4cvs
version=1.1.5cvs
version_control=CVS
workspace=1
 
101,7 → 101,7
type=DATA
 
[scribus/Makefile.am]
files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h,scribus/story.cpp,scribus/story.h,scribus/autoform.cpp,scribus/autoform.h
files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h,scribus/story.cpp,scribus/story.h,scribus/autoform.cpp,scribus/autoform.h.scribus/fparser.cpp,scribus/fparser.h
sub_dirs=icons,libabout,libprefs,plugins,libpostscript,profiles,libpdf,dicts,po,qm
type=prog_main
 
554,6 → 554,18
install_location=
type=HEADER
 
[scribus/fparser.cpp]
dist=true
install=false
install_location=
type=SOURCE
 
[scribus/fparser.h]
dist=true
install=true
install_location=$$(prefix)/include/scribus/fparser.h
type=HEADER
 
[scribus/fpoint.cpp]
dist=true
install=false
973,42 → 985,6
sub_dirs=
type=normal
 
[scribus/icons/arrowl.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowl.png
type=DATA
 
[scribus/icons/arrowr.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowr.png
type=DATA
 
[scribus/icons/arrowu.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowu.png
type=DATA
 
[scribus/icons/arrowd.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowd.png
type=DATA
 
[scribus/icons/cross.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/cross.png
type=DATA
 
[scribus/icons/triangle2.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/triangle2.png
type=DATA
 
[scribus/icons/MiterJoin.png]
dist=true
install=true
1183,6 → 1159,30
install_location=$$(prefix)/lib/scribus/icons/acrobat.png
type=DATA
 
[scribus/icons/arrowd.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowd.png
type=DATA
 
[scribus/icons/arrowl.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowl.png
type=DATA
 
[scribus/icons/arrowr.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowr.png
type=DATA
 
[scribus/icons/arrowu.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/arrowu.png
type=DATA
 
[scribus/icons/beziertool.png]
dist=true
install=true
1213,6 → 1213,12
install_location=$$(prefix)/lib/scribus/icons/combobox.png
type=DATA
 
[scribus/icons/cross.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/cross.png
type=DATA
 
[scribus/icons/doc.png]
dist=true
install=true
1399,6 → 1405,12
install_location=$$(prefix)/lib/scribus/icons/triangle.png
type=DATA
 
[scribus/icons/triangle2.png]
dist=true
install=true
install_location=$$(prefix)/lib/scribus/icons/triangle2.png
type=DATA
 
[scribus/icons/txt.png]
dist=true
install=true