Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 339 → Rev 340

/trunk/Scribus/ChangeLogCVS
1,5 → 1,14
Changes since Version 1.1.7
 
18.07.2004
* bug #874: Tab order in Multiple Duplicate
* bug #875: Preset values for linescreen angles, per color
* feature # 98: Ability to have distance of text from outside edge of text or image frame
* feature #871: Corrupted PDF export issue
 
17.07.2004
* bug #860: Lots of crash saying that is due to signal 11
 
16.07.2004
* bug #860: Lots of crash saying that is due to signal 11
* bug #868: Editing shapes of frames needs lock/unlock actions
/trunk/Scribus/scribus/pdfopts.cpp
507,8 → 507,8
LPIgroupLayout->addWidget( textLPI2, 1, 1 );
LPIangle = new QSpinBox( LPIgroup, "LPIangle" );
LPIangle->setSuffix( QString::fromUtf8(" °"));
LPIangle->setMinValue(-90);
LPIangle->setMaxValue(90);
LPIangle->setMinValue(-180);
LPIangle->setMaxValue(180);
LPIangle->setValue(Optionen->LPISettings[LPIcolor->currentText()].Angle);
LPIgroupLayout->addWidget( LPIangle, 1, 2 );
textLPI3 = new QLabel( LPIgroup, "textLPI3" );
/trunk/Scribus/scribus/mpalette.h
155,6 → 155,7
 
QCheckBox* Textflow;
QCheckBox* Textflow2;
QCheckBox* Textflow3;
QCheckBox* Aspect;
QCheckBox* showcurveCheckBox;
QCheckBox* TopLine;
329,6 → 330,7
void NewRotMode(int m);
void DoFlow();
void DoFlow2();
void DoFlow3();
void MakeIrre(int f, int c, double *vals);
void EditSh();
void NewTDist();
/trunk/Scribus/scribus/lineformats.cpp
26,40 → 26,32
Layout15->setSpacing( 6 );
Layout15->setMargin( 0 );
 
LoadLS = new QPushButton( this, "LoadF" );
LoadLS->setText( tr( "Append" ) );
LoadLS = new QPushButton( tr( "&Append" ), this, "LoadF" );
Layout15->addWidget( LoadLS );
 
NewB = new QPushButton( this, "NewB" );
NewB->setText( tr( "New" ) );
NewB = new QPushButton( tr( "&New" ), this, "NewB" );
Layout15->addWidget( NewB );
 
EditB = new QPushButton( this, "EditB" );
EditB->setText( tr( "Edit" ) );
EditB = new QPushButton( tr( "&Edit" ), this, "EditB" );
EditB->setDefault( true );
EditB->setEnabled(false);
Layout15->addWidget( EditB );
 
DublicateB = new QPushButton( this, "DublicateB" );
DublicateB->setText( tr( "Duplicate" ) );
DublicateB = new QPushButton( tr( "D&uplicate" ), this, "DublicateB" );
DublicateB->setEnabled(false);
Layout15->addWidget( DublicateB );
 
DeleteB = new QPushButton( this, "DeleteB" );
DeleteB->setText( tr( "Delete" ) );
DeleteB = new QPushButton( tr( "&Delete" ), this, "DeleteB" );
DeleteB->setEnabled(false);
Layout15->addWidget( DeleteB );
 
SaveB = new QPushButton( this, "SaveB" );
SaveB->setText( tr( "Save" ) );
SaveB = new QPushButton( tr( "&Save" ), this, "SaveB" );
Layout15->addWidget( SaveB );
 
ExitB = new QPushButton( this, "ExitB" );
ExitB->setText( tr( "OK" ) );
ExitB = new QPushButton( tr( "&OK" ), this, "ExitB" );
Layout15->addWidget( ExitB );
 
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout15->addWidget( CancelB );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout15->addItem( spacer );
/trunk/Scribus/scribus/align.cpp
122,19 → 122,16
Layout3->setMargin( 10 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
OKbutton = new QPushButton( this, "OKbutton" );
OKbutton->setText( tr( "OK" ) );
OKbutton = new QPushButton( tr( "&OK" ), this, "OKbutton" );
OKbutton->setDefault( true );
Layout3->addWidget( OKbutton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_2 );
ButtonApply = new QPushButton( this, "ButtonApply" );
ButtonApply->setText( tr( "Apply" ) );
ButtonApply = new QPushButton( tr( "&Apply" ), this, "ButtonApply" );
Layout3->addWidget( ButtonApply );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_3 );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout3->addWidget( CancelB );
QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_4 );
/trunk/Scribus/scribus/customfdialog.cpp
150,7 → 150,7
if (au2 == "")
au2 = tr("Unknown");
Aut += au2;
setText( tr("Scribus-Document")+"\n\n"+Tit+Aut);
setText( tr("Scribus Document")+"\n\n"+Tit+Aut);
}
else
setText(Buffer.left(200));
179,8 → 179,7
Layout1 = new QHBoxLayout(Layout);
Layout1->setSpacing( 0 );
Layout1->setMargin( 0 );
SaveZip = new QCheckBox(Layout, "test");
SaveZip->setText( tr("Compress File"));
SaveZip = new QCheckBox(tr( "&Compress File" ), Layout, "test");
Layout1->addWidget(SaveZip, Qt::AlignLeft);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
189,8 → 188,7
Layout1C = new QHBoxLayout(LayoutC);
Layout1C->setSpacing( 0 );
Layout1C->setMargin( 0 );
WFonts = new QCheckBox(LayoutC, "test");
WFonts->setText( tr("Include Fonts"));
WFonts = new QCheckBox(tr( "&Include Fonts" ), LayoutC, "test");
Layout1C->addWidget(WFonts, Qt::AlignLeft);
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1C->addItem( spacer2 );
208,8 → 206,7
Layout1 = new QHBoxLayout(Layout);
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
SaveZip = new QCheckBox(Layout, "test");
SaveZip->setText( tr("Compress File"));
SaveZip = new QCheckBox(tr( "&Compress File" ), Layout, "test");
Layout1->addWidget(SaveZip);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
/trunk/Scribus/scribus/mpalette.cpp
334,6 → 334,9
Textflow2 = new QCheckBox( page, "Textflow2" );
Textflow2->setText( tr( "Use Bounding Box" ) );
pageLayout->addWidget( Textflow2 );
Textflow3 = new QCheckBox( page, "Textflow3" );
Textflow3->setText( tr( "Use Contour Line" ) );
pageLayout->addWidget( Textflow3 );
 
QSpacerItem* spacer13 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
pageLayout->addItem( spacer13 );
851,6 → 854,7
connect(RotationGroup, SIGNAL(clicked(int)), this, SLOT(NewRotMode(int)));
connect(Textflow, SIGNAL(clicked()), this, SLOT(DoFlow()));
connect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
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()));
1029,8 → 1033,13
DBottom->setValue(i->BExtra*UmReFaktor);
DRight->setValue(i->RExtra*UmReFaktor);
Revert->setOn(i->Reverse);
disconnect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
disconnect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
Textflow->setChecked(i->Textflow);
Textflow2->setChecked(i->Textflow2);
Textflow3->setChecked(i->UseContour);
connect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
connect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
ToggleFlow();
langCombo->setCurrentText(i->Language);
bool setter;
2597,12 → 2606,42
return;
if ((HaveDoc) && (HaveItem))
{
disconnect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
disconnect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
CurItem->Textflow2 = Textflow2->isChecked();
if (CurItem->Textflow2)
{
Textflow3->setChecked(false);
CurItem->UseContour = false;
}
doc->ActPage->update();
emit DocChanged();
connect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
connect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
}
}
 
void Mpalette::DoFlow3()
{
if (ScApp->ScriptRunning)
return;
if ((HaveDoc) && (HaveItem))
{
disconnect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
disconnect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
CurItem->UseContour = Textflow3->isChecked();
if (CurItem->UseContour)
{
Textflow2->setChecked(false);
CurItem->Textflow2 = false;
}
doc->ActPage->update();
emit DocChanged();
connect(Textflow2, SIGNAL(clicked()), this, SLOT(DoFlow2()));
connect(Textflow3, SIGNAL(clicked()), this, SLOT(DoFlow3()));
}
}
 
void Mpalette::MakeIrre(int f, int c, double *vals)
{
if (ScApp->ScriptRunning)
3017,6 → 3056,7
void Mpalette::ToggleFlow()
{
Textflow2->setEnabled(Textflow->isChecked());
Textflow3->setEnabled(Textflow->isChecked());
}
 
void Mpalette::handlePathLine()
/trunk/Scribus/scribus/util.cpp
1723,6 → 1723,8
Buffer->Ptext = Text;
Buffer->Clip = b->Clip.copy();
Buffer->PoLine = b->PoLine.copy();
Buffer->ContourLine = b->ContourLine.copy();
Buffer->UseContour = b->UseContour;
Buffer->TabValues = b->TabValues;
Buffer->DashValues = b->DashValues;
Buffer->DashOffset = b->DashOffset;
/trunk/Scribus/scribus/pageitem.h
119,6 → 119,8
/** Definiert die Clipping-Region des Elements; */
QPointArray Clip;
FPointArray PoLine;
bool UseContour;
FPointArray ContourLine;
QValueList<uint> Segments;
bool PoShow;
double BaseOffs;
/trunk/Scribus/scribus/scrap.cpp
130,15 → 130,15
BiblioLayout->setSpacing( 0 );
BiblioLayout->setMargin( 0 );
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(NewLib()), CTRL+Key_N);
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(Load()), CTRL+Key_O);
fSave = fmenu->insertItem(loadIcon("DateiSave16.png"), tr("Save"), this, SLOT(Save()), CTRL+Key_S);
fmenu->insertItem( tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiClos16.png"), tr("Close"), this, SLOT(CloseWin()));
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("&New"), this, SLOT(NewLib()), CTRL+Key_N);
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("&Load..."), this, SLOT(Load()), CTRL+Key_O);
fSave = fmenu->insertItem(loadIcon("DateiSave16.png"), tr("&Save"), this, SLOT(Save()), CTRL+Key_S);
fmenu->insertItem( tr("Save &As..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiClos16.png"), tr("&Close"), this, SLOT(CloseWin()));
vmenu = new QPopupMenu();
vS = vmenu->insertItem( tr( "Small" ) );
vM = vmenu->insertItem( tr( "Medium" ) );
vB = vmenu->insertItem( tr( "Big" ) );
vS = vmenu->insertItem( tr( "&Small" ) );
vM = vmenu->insertItem( tr( "&Medium" ) );
vB = vmenu->insertItem( tr( "&Large" ) );
switch (prefs->PSize)
{
case 40:
152,8 → 152,8
break;
}
menuBar = new QMenuBar(this);
menuBar->insertItem( tr("File"), fmenu);
menuBar->insertItem( tr("Preview"), vmenu);
menuBar->insertItem( tr("&File"), fmenu);
menuBar->insertItem( tr("&Preview"), vmenu);
BiblioLayout->setMenuBar( menuBar );
 
Frame3 = new QFrame( this, "Frame3" );
/trunk/Scribus/scribus/picstatus.cpp
182,8 → 182,7
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
 
OkB = new QPushButton( this, "OkB" );
OkB->setText( tr( "OK" ) );
OkB = new QPushButton( tr( "&OK" ), this, "OkB" );
Layout2->addWidget( OkB );
PicStatusLayout->addLayout( Layout2 );
 
/trunk/Scribus/scribus/page.h
188,6 → 188,7
bool MidButt;
int RotMode;
FPointArray RecordP;
bool EditContour;
 
public slots:
void PasteToPage();
/trunk/Scribus/scribus/guidemanager.cpp
99,12 → 99,12
Layout4 = new QHBoxLayout(0, 0, 6, "Layout4");
TextLabel2 = new QLabel(HorGroup, "TextLabel2");
TextLabel2->setText( tr("Y-Pos:"));
TextLabel2 = new QLabel(tr("&Y-Pos:"), HorGroup, "TextLabel2");
Layout4->addWidget(TextLabel2);
HorSpin = new MSpinBox(0, LocPageHeight, HorGroup, 4);
HorSpin->setDecimals(decimals);
TextLabel2->setBuddy(HorSpin);
Layout4->addWidget(HorSpin);
HorGroupLayout->addLayout(Layout4);
111,13 → 111,11
Layout3 = new QHBoxLayout(0, 0, 6, "Layout3");
HorSet = new QPushButton(HorGroup, "HorSet");
HorSet->setText( tr("Add"));
HorSet = new QPushButton( tr( "&Add" ), HorGroup, "HorSet");
HorSet->setAutoDefault(false);
Layout3->addWidget(HorSet);
HorDel = new QPushButton(HorGroup, "HorDel");
HorDel->setText(tr("Delete"));
HorDel = new QPushButton( tr( "D&elete" ), HorGroup, "HorDel");
HorDel->setAutoDefault(false);
Layout3->addWidget(HorDel);
139,12 → 137,12
Layout2 = new QHBoxLayout(0, 0, 6, "Layout2");
TextLabel1 = new QLabel(VerGroup, "TextLabel1");
TextLabel1->setText( tr("X-Pos:"));
TextLabel1 = new QLabel(tr("&X-Pos:"), VerGroup, "TextLabel1");
Layout2->addWidget(TextLabel1);
VerSpin = new MSpinBox(0, LocPageWidth, VerGroup, 4);
VerSpin->setDecimals(decimals);
TextLabel1->setBuddy(VerSpin);
Layout2->addWidget(VerSpin);
VerGroupLayout->addLayout(Layout2);
151,13 → 149,11
Layout1 = new QHBoxLayout(0, 0, 6, "Layout1");
VerSet = new QPushButton(VerGroup, "VerSet");
VerSet->setText( tr("Add"));
VerSet = new QPushButton( tr( "A&dd" ), VerGroup, "VerSet");
VerSet->setAutoDefault(false);
Layout1->addWidget(VerSet);
VerDel = new QPushButton(VerGroup, "VerDel");
VerDel->setText( tr("Delete"));
VerDel = new QPushButton( tr( "De&lete" ), VerGroup, "VerDel");
VerDel->setAutoDefault(false);
Layout1->addWidget(VerDel);
167,8 → 163,7
GuideManagerLayout->addLayout(Layout6);
Lock = new QCheckBox(this, "Lock");
Lock->setText( tr("Lock Guides"));
Lock = new QCheckBox( tr( "&Lock Guides" ), this, "Lock");
Lock->setChecked(LocLocked);
GuideManagerLayout->addWidget(Lock);
177,8 → 172,7
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer);
OK = new QPushButton(this, "OK");
OK->setText( tr("OK"));
OK = new QPushButton( tr( "&OK" ), this, "OK");
OK->setDefault(true);
Layout5->addWidget(OK );
185,8 → 179,7
QSpacerItem* spacer_2 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer_2);
Cancel = new QPushButton(this, "Cancel");
Cancel->setText( tr("Cancel"));
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel");
Cancel->setAccel(QKeySequence("Esc"));
Layout5->addWidget(Cancel);
/trunk/Scribus/scribus/pageitem.cpp
128,17 → 128,16
switch (art)
{
case 6:
Clip.setPoints(4, static_cast<int>(w/2), 0,
static_cast<int>(w), static_cast<int>(h/2),
static_cast<int>(w/2), static_cast<int>(h),
0,static_cast<int>(h/2));
Clip.setPoints(4, static_cast<int>(w/2), 0, static_cast<int>(w), static_cast<int>(h/2),
static_cast<int>(w/2), static_cast<int>(h), 0,static_cast<int>(h/2));
break;
default:
Clip.setPoints(4, 0,0, static_cast<int>(w),0, static_cast<int>(w),
static_cast<int>(h), 0,static_cast<int>(h));
Clip.setPoints(4, 0,0, static_cast<int>(w),0, static_cast<int>(w), static_cast<int>(h), 0,static_cast<int>(h));
break;
}
PoLine.resize(0);
ContourLine.resize(0);
UseContour = false;
Segments.clear();
PoShow = false;
BaseOffs = 0;
313,8 → 312,8
Doc->Vorlagen[xxx].First = 0;
Doc->Vorlagen[xxx].Avor = 0;
Doc->Vorlagen[xxx].Anach = 0;
Doc->Vorlagen[xxx].Ausri = xxx;
}
Doc->Vorlagen[0].Ausri = Ausrich;
pf.begin(Parent);
pf.translate(Xpos*sc, Ypos*sc);
pf.rotate(Rot);
574,8 → 573,7
QRegion cl = QRegion(pf2.xForm(Clip));
for (a=0; a<OwnPage->Items.count(); ++a)
{
if (((OwnPage->Items.at(a)->ItemNr > ItemNr)
&& (OwnPage->Items.at(a)->LayerNr == LayerNr))
if (((OwnPage->Items.at(a)->ItemNr > ItemNr) && (OwnPage->Items.at(a)->LayerNr == LayerNr))
|| (Doc->Layers[OwnPage->Items.at(a)->LayerNr].Level > Doc->Layers[LayerNr].Level))
{
if (OwnPage->Items.at(a)->Textflow)
594,7 → 592,16
cm = QRegion(pp.xForm(tcli));
}
else
cm = QRegion(pp.xForm(OwnPage->Items.at(a)->Clip));
{
if ((OwnPage->Items.at(a)->UseContour) && (OwnPage->Items.at(a)->ContourLine.size() != 0))
{
QValueList<uint> Segs;
QPointArray Clip2 = FlattenPath(OwnPage->Items.at(a)->ContourLine, Segs);
cm = QRegion(pp.xForm(Clip2));
}
else
cm = QRegion(pp.xForm(OwnPage->Items.at(a)->Clip));
}
pp.end();
cl = cl.subtract(cm);
}
1636,9 → 1643,9
}
if ((!Tinput) && (!Doc->RePos))
{
double scp = QMAX(Doc->Scale, 1);
if ((Frame) && (ScApp->Prefs.FramesShown) && ((PType == 2) || (PType == 4)))
{
double scp = QMAX(Doc->Scale, 1);
p->setPen(black, 1 / scp, DotLine, FlatCap, MiterJoin);
if ((isBookmark) || (isAnnotation))
p->setPen(blue, 1 / scp, DotLine, FlatCap, MiterJoin);
1650,6 → 1657,12
p->setupPolygon(&PoLine);
p->drawPolyLine();
}
if ((ScApp->Prefs.FramesShown) && (UseContour) && (ContourLine.size() != 0))
{
p->setPen(lightGray, 1 / scp, DotLine, FlatCap, MiterJoin);
p->setupPolygon(&ContourLine);
p->drawPolyLine();
}
}
Tinput = false;
FrameOnly = false;
/trunk/Scribus/scribus/frameedit.h
13,42 → 13,43
#include "scribusdoc.h"
 
class NodePalette : public QDialog
{
Q_OBJECT
{
Q_OBJECT
 
public:
NodePalette( QWidget* parent);
~NodePalette() {};
NodePalette( QWidget* parent);
~NodePalette() {};
 
QButtonGroup* ButtonGroup1;
QToolButton* MoveNode;
QToolButton* MoveControl;
QToolButton* AddNode;
QToolButton* DeleteNode;
QToolButton* AsymMove;
QToolButton* SymMove;
QButtonGroup* ButtonGroup1;
QToolButton* MoveNode;
QToolButton* MoveControl;
QToolButton* AddNode;
QToolButton* DeleteNode;
QToolButton* AsymMove;
QToolButton* SymMove;
QToolButton* ResNode;
QToolButton* Res1Node;
QToolButton* PolySplit;
QToolButton* BezierClose;
QToolButton* PolyMirrorH;
QToolButton* PolyMirrorV;
QToolButton* PolyShearL;
QToolButton* PolyShearR;
QToolButton* PolyShearU;
QToolButton* PolyShearD;
QToolButton* RotateCCW;
QToolButton* RotateCW;
QToolButton* Expand;
QToolButton* Crop;
QToolButton* PolySplit;
QToolButton* BezierClose;
QToolButton* PolyMirrorH;
QToolButton* PolyMirrorV;
QToolButton* PolyShearL;
QToolButton* PolyShearR;
QToolButton* PolyShearU;
QToolButton* PolyShearD;
QToolButton* RotateCCW;
QToolButton* RotateCW;
QToolButton* Expand;
QToolButton* Crop;
QCheckBox* AbsMode;
QLabel* TextLabel1;
MSpinBox* YSpin;
QLabel* TextLabel2;
MSpinBox* XSpin;
QPushButton* PushButton1;
void setDoc(ScribusDoc *dc);
ScribusDoc *doc;
QCheckBox* EditCont;
QLabel* TextLabel1;
MSpinBox* YSpin;
QLabel* TextLabel2;
MSpinBox* XSpin;
QPushButton* PushButton1;
void setDoc(ScribusDoc *dc);
ScribusDoc *doc;
 
private slots:
void closeEvent(QCloseEvent *);
74,6 → 75,7
void ShearU();
void ShearD();
void ToggleAbsMode();
void ToggleConMode();
 
public slots:
void MoveN();
83,9 → 85,9
void PolyStatus(int typ, uint size);
 
protected:
QVBoxLayout* NodePaletteLayout;
QGridLayout* ButtonGroup1Layout;
QGridLayout* Layout2;
QVBoxLayout* NodePaletteLayout;
QGridLayout* ButtonGroup1Layout;
QGridLayout* Layout2;
 
signals:
void Schliessen();
/trunk/Scribus/scribus/scribusdoc.h
165,10 → 165,12
QString Ptext;
QPointArray Clip;
FPointArray PoLine;
FPointArray ContourLine;
bool PoShow;
double BaseOffs;
bool Textflow;
bool Textflow2;
bool UseContour;
int Ausrich;
QString IFont;
int ISize;
/trunk/Scribus/scribus/muster.cpp
27,27 → 27,22
Layout2->setSpacing( 6 );
Layout2->setMargin( 0 );
 
LoadM = new QPushButton( this, "LoadF" );
LoadM->setText( tr( "Append" ) );
LoadM = new QPushButton( tr( "&Append" ), this, "LoadF" );
Layout2->addWidget( LoadM );
 
NewB = new QPushButton( this, "NewB" );
NewB->setText( tr( "New" ) );
NewB = new QPushButton( tr( "&New" ), this, "NewB" );
Layout2->addWidget( NewB );
 
DuplicateB = new QPushButton( this, "DublicateB" );
DuplicateB->setText( tr( "Duplicate" ) );
DuplicateB = new QPushButton( tr( "D&uplicate" ), this, "DublicateB" );
Layout2->addWidget( DuplicateB );
 
DeleteB = new QPushButton( this, "DeleteB" );
DeleteB->setText( tr( "Delete" ) );
DeleteB = new QPushButton( tr( "&Delete" ), this, "DeleteB" );
Layout2->addWidget( DeleteB );
 
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout2->addItem( spacer );
 
ExitB = new QPushButton( this, "ExitB" );
ExitB->setText( tr( "Close" ) );
ExitB = new QPushButton( tr( "&Close" ), this, "ExitB" );
Layout2->addWidget( ExitB );
MusterSeitenLayout->addLayout( Layout2 );
if (temp == "")
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("16").arg("July").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("18").arg("July").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/newfile.cpp
43,8 → 43,7
ButtonGroup1_2Layout = new QVBoxLayout(ButtonGroup1_2->layout());
ButtonGroup1_2Layout->setAlignment(Qt::AlignTop);
Layout6 = new QGridLayout(0, 1, 1, 0, 6, "Layout6");
TextLabel1 = new QLabel( ButtonGroup1_2, "TextLabel1" );
TextLabel1->setText( tr( "Size:" ));
TextLabel1 = new QLabel( tr( "&Size:" ), ButtonGroup1_2, "TextLabel1" );
Layout6->addWidget( TextLabel1, 0, 0 );
ComboBox1 = new QComboBox( true, ButtonGroup1_2, "ComboBox1" );
QString sizelist[] = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "B0", "B1", "B2", "B3", "B4",
54,9 → 53,9
for (uint m = 0; m < num_mappings; ++m)
ComboBox1->insertItem(sizelist[m]);
ComboBox1->setEditable(false);
TextLabel1->setBuddy(ComboBox1);
Layout6->addWidget(ComboBox1, 0, 1 );
TextLabel2 = new QLabel( ButtonGroup1_2, "TextLabel2" );
TextLabel2->setText( tr( "Orientation:" ));
TextLabel2 = new QLabel( tr( "&Orientation:" ), ButtonGroup1_2, "TextLabel2" );
Layout6->addWidget( TextLabel2, 1, 0 );
ComboBox2 = new QComboBox( true, ButtonGroup1_2, "ComboBox2" );
ComboBox2->insertItem( tr( "Portrait" ) );
63,34 → 62,33
ComboBox2->insertItem( tr( "Landscape" ) );
ComboBox2->setEditable(false);
ComboBox2->setCurrentItem(Vor->Ausrichtung);
TextLabel2->setBuddy(ComboBox2);
Layout6->addWidget( ComboBox2, 1, 1 );
ButtonGroup1_2Layout->addLayout( Layout6 );
 
Layout5 = new QHBoxLayout( 0, 0, 6, "Layout5");
TextLabel1_2 = new QLabel( ButtonGroup1_2, "TextLabel1_2" );
TextLabel1_2->setText( tr( "Width:" ) );
TextLabel1_2 = new QLabel( tr( "&Width:" ), ButtonGroup1_2, "TextLabel1_2" );
Layout5->addWidget( TextLabel1_2 );
Breite = new MSpinBox( 1, 10000, ButtonGroup1_2, decimals );
Breite->setEnabled( false );
Breite->setMinimumSize( QSize( 70, 20 ) );
Breite->setSuffix(ein);
TextLabel1_2->setBuddy(Breite);
Layout5->addWidget( Breite );
TextLabel2_2 = new QLabel( ButtonGroup1_2, "TextLabel2_2" );
TextLabel2_2->setText( tr( "Height:" ) );
TextLabel2_2 = new QLabel( tr( "&Height:" ), ButtonGroup1_2, "TextLabel2_2" );
Layout5->addWidget( TextLabel2_2 );
Hoehe = new MSpinBox( 1, 10000, ButtonGroup1_2, decimals );
Hoehe->setEnabled( false );
Hoehe->setMinimumSize( QSize( 70, 20 ) );
Hoehe->setSuffix(ein);
TextLabel2_2->setBuddy(Hoehe);
Layout5->addWidget( Hoehe );
ButtonGroup1_2Layout->addLayout( Layout5 );
Layout8 = new QHBoxLayout( 0, 0, 6, "Layout8");
Doppelseiten = new QCheckBox( ButtonGroup1_2, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Doppelseiten = new QCheckBox( tr( "&Facing Pages" ), ButtonGroup1_2, "Doppelseiten" );
Doppelseiten->setChecked(Vor->DoppelSeiten);
Layout8->addWidget( Doppelseiten );
ErsteSeite = new QCheckBox( ButtonGroup1_2, "CheckBox3" );
ErsteSeite->setText( tr( "Left Page first" ) );
ErsteSeite = new QCheckBox( tr( "Left &Page First" ), ButtonGroup1_2, "CheckBox3" );
ErsteSeite->setChecked(Vor->ErsteLinks);
Layout8->addWidget( ErsteSeite );
ButtonGroup1_2Layout->addLayout( Layout8 );
108,17 → 106,13
Layout3 = new QGridLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 5 );
TextLabel6 = new QLabel( GroupBox7, "TextLabel6" );
TextLabel6->setText( tr( "Left:" ) );
TextLabel6 = new QLabel( tr( "&Left:" ), GroupBox7, "TextLabel6" );
Layout3->addWidget( TextLabel6, 0, 2 );
TextLabel8 = new QLabel( GroupBox7, "TextLabel8" );
TextLabel8->setText( tr( "Right:" ) );
TextLabel8 = new QLabel( tr( "&Right:" ), GroupBox7, "TextLabel8" );
Layout3->addWidget( TextLabel8, 1, 2 );
TextLabel5 = new QLabel( GroupBox7, "TextLabel5" );
TextLabel5->setText( tr( "Top:" ) );
TextLabel5 = new QLabel( tr( "&Top:" ), GroupBox7, "TextLabel5" );
Layout3->addWidget( TextLabel5, 0, 0 );
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
TextLabel7 = new QLabel( tr( "&Bottom:" ), GroupBox7, "TextLabel7" );
Layout3->addWidget( TextLabel7, 1, 0 );
TopR = new MSpinBox( 0, 1000, GroupBox7, decimals );
TopR->setMinimumSize( QSize( 70, 20 ) );
125,6 → 119,7
TopR->setSuffix( ein );
TopR->setValue(Vor->RandOben * Umrech);
Top = Vor->RandOben;
TextLabel5->setBuddy(TopR);
Layout3->addWidget( TopR, 0, 1 );
BottomR = new MSpinBox( 0, 1000, GroupBox7, decimals );
BottomR->setMinimumSize( QSize( 70, 20 ) );
131,6 → 126,7
BottomR->setSuffix( ein );
BottomR->setValue(Vor->RandUnten * Umrech);
Bottom = Vor->RandUnten;
TextLabel7->setBuddy(BottomR);
Layout3->addWidget( BottomR, 1, 1 );
LeftR = new MSpinBox( 0, 1000, GroupBox7, decimals );
LeftR->setMinimumSize( QSize( 70, 20 ) );
137,6 → 133,7
LeftR->setSuffix( ein );
LeftR->setValue(Vor->RandLinks * Umrech);
Left = Vor->RandLinks;
TextLabel6->setBuddy(LeftR);
Layout3->addWidget( LeftR, 0, 3 );
RightR = new MSpinBox( 0, 1000, GroupBox7, decimals );
RightR->setMinimumSize( QSize( 70, 20 ) );
143,6 → 140,7
RightR->setSuffix( ein );
RightR->setValue(Vor->RandRechts * Umrech);
Right = Vor->RandRechts;
TextLabel8->setBuddy(RightR);
Layout3->addWidget( RightR, 1, 3 );
GroupBox7Layout->addLayout( Layout3 );
Layout9->addWidget( GroupBox7 );
165,15 → 163,14
GroupBox3->layout()->setMargin( 10 );
GroupBox3Layout = new QGridLayout( GroupBox3->layout() );
GroupBox3Layout->setAlignment( Qt::AlignTop );
TextLabel1_3 = new QLabel( GroupBox3, "TextLabel1_3" );
TextLabel1_3->setText( tr( "First Page Number:" ) );
TextLabel1_3 = new QLabel( tr( "First Page &Number:" ), GroupBox3, "TextLabel1_3" );
GroupBox3Layout->addMultiCellWidget( TextLabel1_3, 0, 0, 0, 1 );
PgNr = new QSpinBox( GroupBox3, "PgNr" );
PgNr->setMaxValue( 1000 );
PgNr->setMinValue( 1 );
TextLabel1_3->setBuddy(PgNr);
GroupBox3Layout->addWidget( PgNr, 0, 2, Qt::AlignRight );
TextLabel2_3 = new QLabel( GroupBox3, "TextLabel2_3" );
TextLabel2_3->setText( tr( "Default Unit:" ) );
TextLabel2_3 = new QLabel( tr( "Default &Unit:" ), GroupBox3, "TextLabel2_3" );
GroupBox3Layout->addWidget( TextLabel2_3, 1, 0 );
ComboBox3 = new QComboBox( true, GroupBox3, "ComboBox3" );
ComboBox3->insertItem( tr( "Points (pts)" ) );
182,11 → 179,11
ComboBox3->insertItem( tr( "Picas (p)" ) );
ComboBox3->setCurrentItem(einheit);
ComboBox3->setEditable(false);
TextLabel2_3->setBuddy(ComboBox3);
GroupBox3Layout->addMultiCellWidget( ComboBox3, 1, 1, 1, 2 );
Layout10->addWidget( GroupBox3 );
 
AutoFrame = new QCheckBox( this, "AutoFrame" );
AutoFrame->setText( tr( "Automatic Text Frames" ) );
AutoFrame = new QCheckBox( tr( "&Automatic Text Frames" ), this, "AutoFrame" );
Layout10->addWidget( AutoFrame );
 
GroupBox4 = new QGroupBox( this, "GroupBox4" );
201,21 → 198,21
Layout2 = new QGridLayout;
Layout2->setSpacing( 6 );
Layout2->setMargin( 5 );
TextLabel4 = new QLabel( GroupBox4, "TextLabel4" );
TextLabel4->setText( tr( "Gap:" ) );
TextLabel4 = new QLabel( tr( "&Gap:" ), GroupBox4, "TextLabel4" );
Layout2->addWidget( TextLabel4, 1, 0 );
TextLabel3 = new QLabel( GroupBox4, "TextLabel3" );
TextLabel3->setText( tr( "Columns:" ) );
TextLabel3 = new QLabel( tr( "Colu&mns:" ), GroupBox4, "TextLabel3" );
Layout2->addWidget( TextLabel3, 0, 0 );
Distance = new MSpinBox( 0, 1000, GroupBox4, decimals );
Distance->setSuffix( ein );
Distance->setValue(11 * Umrech);
Dist = 11;
TextLabel4->setBuddy(Distance);
Layout2->addWidget( Distance, 1, 1, Qt::AlignLeft );
SpinBox10 = new QSpinBox( GroupBox4, "SpinBox10" );
SpinBox10->setButtonSymbols( QSpinBox::UpDownArrows );
SpinBox10->setMinValue( 1 );
SpinBox10->setValue( 1 );
TextLabel3->setBuddy(SpinBox10);
Layout2->addWidget( SpinBox10, 0, 1, Qt::AlignLeft );
GroupBox4Layout->addLayout( Layout2 );
Layout10->addWidget( GroupBox4 );
224,14 → 221,12
Layout1 = new QHBoxLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout1->addWidget( OKButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
CancelB->setAutoDefault( false );
Layout1->addWidget( CancelB );
Layout10->addLayout( Layout1 );
489,7 → 484,7
void NewDoc::setDS()
{
bool test = Doppelseiten->isChecked() ? false : true;
TextLabel6->setText(test == false ? tr("Inside:") : tr("Left:"));
TextLabel8->setText(test == false ? tr("Outside:") : tr("Right:"));
TextLabel6->setText(test == false ? tr("&Inside:") : tr("&Left:"));
TextLabel8->setText(test == false ? tr("&Outside:") : tr("&Right:"));
ErsteSeite->setEnabled(test == false ? true : false);
}
/trunk/Scribus/scribus/scribus.cpp
758,7 → 758,7
MenID = viewMenu->insertItem("&75%", this, SLOT(slotZoom75()));
SetKeyEntry(36, tr("75%"), MenID, 0);
MenID = viewMenu->insertItem( tr("&100%"), this, SLOT(slotZoom100()), CTRL+Key_1);
SetKeyEntry(37, tr("Actual Size"), MenID, CTRL+Key_1);
SetKeyEntry(37, tr("100%"), MenID, CTRL+Key_1);
MenID = viewMenu->insertItem("&200%", this, SLOT(slotZoom200()));
SetKeyEntry(38, tr("200%"), MenID, 0);
MenID = viewMenu->insertItem( tr("&Thumbnails"), this, SLOT(slotZoom20()));
776,12 → 776,13
Ras = viewMenu->insertItem( tr("Show &Grid"), this, SLOT(ToggleRaster()));
SetKeyEntry(43, tr("Show Grid"), Ras, 0);
viewMenu->setItemChecked(Ras, false);
uRas = viewMenu->insertItem( tr("Snap to &Grid"), this, SLOT(ToggleURaster()));
SetKeyEntry(44, tr("Snap to Grid"), uRas, 0);
Guide = viewMenu->insertItem( tr("Show G&uides"), this, SLOT(ToggleGuides()));
viewMenu->setItemChecked(Guide, true);
Base = viewMenu->insertItem( tr("Show &Baseline Grid"), this, SLOT(ToggleBase()));
viewMenu->insertSeparator();
uRas = viewMenu->insertItem( tr("Sn&ap to Grid"), this, SLOT(ToggleURaster()));
SetKeyEntry(44, tr("Snap to Grid"), uRas, 0);
uGuide = viewMenu->insertItem( tr("Sna&p to Guides"), this, SLOT(ToggleUGuides()));
Base = viewMenu->insertItem( tr("Show &Baseline Grid"), this, SLOT(ToggleBase()));
toolMenu=new QPopupMenu();
viewMpal = toolMenu->insertItem( tr("&Properties"), this, SLOT(ToggleMpal()));
SetKeyEntry(46, tr("Properties"), viewMpal, 0);
2113,12 → 2114,15
doc->PDF_Optionen.Intent = doc->CMSSettings.DefaultIntentMonitor;
doc->PDF_Optionen.Intent2 = doc->CMSSettings.DefaultIntentMonitor2;
struct LPIset lpo;
lpo.Angle = 0;
lpo.Frequency = 75;
lpo.SpotFunc = 2;
lpo.Angle = 105;
doc->PDF_Optionen.LPISettings.insert("Cyan", lpo);
lpo.Angle = 75;
doc->PDF_Optionen.LPISettings.insert("Magenta", lpo);
lpo.Angle = 90;
doc->PDF_Optionen.LPISettings.insert("Yellow", lpo);
lpo.Angle = 45;
doc->PDF_Optionen.LPISettings.insert("Black", lpo);
doc->ActiveLayer = 0;
HaveDoc++;
3229,12 → 3233,15
if (doc->PDF_Optionen.LPISettings.count() == 0)
{
struct LPIset lpo;
lpo.Angle = 0;
lpo.Frequency = 75;
lpo.SpotFunc = 2;
lpo.Angle = 105;
doc->PDF_Optionen.LPISettings.insert("Cyan", lpo);
lpo.Angle = 75;
doc->PDF_Optionen.LPISettings.insert("Magenta", lpo);
lpo.Angle = 90;
doc->PDF_Optionen.LPISettings.insert("Yellow", lpo);
lpo.Angle = 45;
doc->PDF_Optionen.LPISettings.insert("Black", lpo);
}
connect(w, SIGNAL(Schliessen()), this, SLOT(DoFileClose()));
4930,6 → 4937,7
{
doc->ActPage->MarkClip(doc->ActPage->SelItem.at(0));
Npal->PolyStatus(doc->ActPage->SelItem.at(0)->PType, doc->ActPage->SelItem.at(0)->PoLine.size());
Npal->EditCont->setChecked(false);
}
}
ShapeMenu->setItemChecked(ShapeEdit, doc->EditClip);
/trunk/Scribus/scribus/applytemplate.cpp
10,11 → 10,12
ApplyTLayout = new QVBoxLayout( this, 10, 8, "ApplyTLayout");
layout3 = new QHBoxLayout( 0, 0, 6, "layout3");
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Template:" ) );
TextLabel1->setText( tr( "&Template:" ) );
layout3->addWidget( TextLabel1 );
Templ = new QComboBox( true, this, "Templ" );
Templ->setMinimumSize( QSize( 120, 22 ) );
Templ->setEditable(false);
TextLabel1->setBuddy(Templ);
QString na = Nam == "Normal" ? tr("Normal") : Nam, in;
int cc = 0;
QMap<QString,int>::Iterator it;
39,12 → 40,12
SinglePage = new QRadioButton( buttonGroup1, "radioButton1" );
/* PFJ - 28/02/04 - altered from TRUE to true */
SinglePage->setChecked( true );
SinglePage->setText( tr( "Apply to Current Page" ) );
SinglePage->setText( tr( "Apply to &Current Page" ) );
buttonGroup1Layout->addWidget( SinglePage );
 
layout2 = new QHBoxLayout( 0, 0, 6, "layout2");
PageRange = new QRadioButton( buttonGroup1, "radioButton2" );
PageRange->setText( tr( "Apply from Page:" ) );
PageRange->setText( tr( "Apply from &Page:" ) );
layout2->addWidget( PageRange );
FromPage = new QSpinBox( buttonGroup1, "FromPage" );
FromPage->setMinValue( 1 );
52,7 → 53,7
FromPage->setValue(view->Doc->ActPage->PageNr+1);
layout2->addWidget( FromPage );
TextLabel2 = new QLabel( buttonGroup1, "textLabel1" );
TextLabel2->setText( tr( "to:" ) );
TextLabel2->setText( tr( "To:" ) );
layout2->addWidget( TextLabel2 );
ToPage = new QSpinBox( buttonGroup1, "toPage" );
ToPage->setMinValue( 1 );
69,14 → 70,12
Layout4->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout4->addWidget( OKButton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_2 );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout4->addWidget( CancelB );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_3 );
/trunk/Scribus/scribus/javadocs.cpp
24,22 → 24,18
 
Layout1 = new QVBoxLayout( 0, 0, 6, "Layout1");
 
EditScript = new QPushButton( this, "EditScript" );
EditScript->setText( tr( "Edit..." ) );
EditScript = new QPushButton( tr( "&Edit..." ), this, "EditScript" );
Layout1->addWidget( EditScript );
 
AddScript = new QPushButton( this, "AddScript" );
AddScript->setText( tr( "Add..." ) );
AddScript = new QPushButton( tr( "&Add..." ), this, "AddScript" );
Layout1->addWidget( AddScript );
 
DeleteScript = new QPushButton( this, "DeleteScript" );
DeleteScript->setText( tr( "Delete" ) );
DeleteScript = new QPushButton( tr( "&Delete" ), this, "DeleteScript" );
Layout1->addWidget( DeleteScript );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout1->addItem( spacer );
 
ExitDia = new QPushButton( this, "ExitDia" );
ExitDia->setText( tr( "Close" ) );
ExitDia = new QPushButton( tr( "&Close" ), this, "ExitDia" );
ExitDia->setDefault( true );
Layout1->addWidget( ExitDia );
if (Doc->JavaScripts.count() == 0)
/trunk/Scribus/scribus/plugins/libchar/charselect.cpp
219,20 → 219,17
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
 
Einf = new QPushButton( this, "Einf" );
Einf->setText( tr( "Insert" ) );
Einf = new QPushButton(tr( "&Insert" ), this, "Einf" );
Layout1->addWidget( Einf );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_2 );
 
Delete = new QPushButton( this, "Delete" );
Delete->setText( tr( "Clear" ) );
Delete = new QPushButton(tr("C&lear"), this, "Delete" );
Layout1->addWidget( Delete );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_3 );
 
Close = new QPushButton( this, "Close" );
Close->setText( tr( "Close" ) );
Close = new QPushButton(tr("&Close"), this, "Close" );
Layout1->addWidget( Close );
QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_4 );
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
156,35 → 156,35
Layout3->setSpacing(1);
Layout3->setMargin(0);
AliasText = new QCheckBox(this, "TextAntiAlias");
AliasText->setText( tr("Anti-alias Text"));
AliasText->setText( tr("Anti-alias &Text"));
AliasText->setChecked(app->Prefs.PrPr_AlphaText);
Layout2->addWidget(AliasText);
AliasGr = new QCheckBox(this, "GraphicsAntiAlias");
AliasGr->setText( tr("Anti-alias Graphics"));
AliasGr->setText( tr("Anti-alias &Graphics"));
AliasGr->setChecked(app->Prefs.PrPr_AlphaGraphics);
Layout2->addWidget(AliasGr);
AliasTr = new QCheckBox(this, "DisplayTransparency");
AliasTr->setText( tr("Display Transparency"));
AliasTr->setText( tr("Display Trans&parency"));
AliasTr->setChecked(app->Prefs.PrPr_Transparency);
Layout2->addWidget(AliasTr);
EnableCMYK = new QCheckBox(this, "DisplayCMYK");
EnableCMYK->setText( tr("Display CMYK"));
EnableCMYK->setText( tr("&Display CMYK"));
EnableCMYK->setChecked(app->Prefs.PrPr_Mode);
Layout2->addWidget(EnableCMYK);
EnableCMYK_C = new QCheckBox(this, "DisplayCMYK_C");
EnableCMYK_C->setText( tr("C"));
EnableCMYK_C->setText( tr("&C"));
EnableCMYK_C->setChecked(app->Prefs.PrPr_C);
Layout3->addWidget(EnableCMYK_C);
EnableCMYK_M = new QCheckBox(this, "DisplayCMYK_M");
EnableCMYK_M->setText( tr("M"));
EnableCMYK_M->setText( tr("&M"));
EnableCMYK_M->setChecked(app->Prefs.PrPr_M);
Layout3->addWidget(EnableCMYK_M);
EnableCMYK_Y = new QCheckBox(this, "DisplayCMYK_Y");
EnableCMYK_Y->setText( tr("Y"));
EnableCMYK_Y->setText( tr("&Y"));
EnableCMYK_Y->setChecked(app->Prefs.PrPr_Y);
Layout3->addWidget(EnableCMYK_Y);
EnableCMYK_K = new QCheckBox(this, "DisplayCMYK_K");
EnableCMYK_K->setText( tr("K"));
EnableCMYK_K->setText( tr("&K"));
EnableCMYK_K->setChecked(app->Prefs.PrPr_K);
if (!app->Prefs.PrPr_Mode)
{
/trunk/Scribus/scribus/mdup.cpp
26,12 → 26,12
Ncopies->setMinValue( 1 );
Ncopies->setValue(1);
Layout4->addWidget( Ncopies, 0, 1 );
ShiftH = new MSpinBox( -1000, 1000, this, 2 );
ShiftH->setValue(Dx);
Layout4->addWidget( ShiftH, 1, 1 );
ShiftV = new MSpinBox( -1000, 1000, this, 2 );
ShiftV->setValue(Dy);
Layout4->addWidget( ShiftV, 2, 1 );
ShiftH = new MSpinBox( -1000, 1000, this, 2 );
ShiftH->setValue(Dx);
Layout4->addWidget( ShiftH, 1, 1 );
QString Suffix[] = { tr(" pt"), tr(" mm"), tr(" in"), tr(" p")};
ShiftH->setSuffix(Suffix[Ein]);
ShiftV->setSuffix(Suffix[Ein]);
58,6 → 58,12
PushButton13->setText( tr( "Cancel" ) );
Layout3->addWidget( PushButton13 );
MdupLayout->addLayout( Layout3 );
QWidget::setTabOrder ( Ncopies, ShiftH );
QWidget::setTabOrder ( ShiftH, ShiftV );
QWidget::setTabOrder ( ShiftV, PushButton12 );
QWidget::setTabOrder ( PushButton12, PushButton13 );
QWidget::setTabOrder ( PushButton13, Ncopies );
Ncopies->setFocus();
setMaximumSize(sizeHint());
 
// signals and slots connections
/trunk/Scribus/scribus/page.cpp
142,6 → 142,7
GxM = 0;
MoveGX = false;
CursVis = false;
EditContour = false;
}
 
void Page::dragLeaveEvent(QDragLeaveEvent *e)
1452,6 → 1453,7
}
b->OldB2 = b->Width;
b->OldH2 = b->Height;
b->ContourLine = b->PoLine.copy();
}
else
{
1471,6 → 1473,7
}
b->OldB2 = b->Width;
b->OldH2 = b->Height;
b->ContourLine = b->PoLine.copy();
}
if ((b->OldB2 == 0) || (b->OldH2 == 0))
return;
1487,6 → 1490,7
b->GrEndX = gr.point(1).x();
b->GrEndY = gr.point(0).y();
b->PoLine.map(ma);
b->ContourLine.map(ma);
if (b->PType == 8)
UpdatePolyClip(b);
else
1938,7 → 1942,9
{
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.scale(-1, 1);
ma.scale(1, -1);
if (EditContour)
return;
b->PoLine.map(ma);
b->PoLine.translate(b->Width, 0);
if (b->PType == 8)
1954,6 → 1960,8
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.scale(1, -1);
if (EditContour)
return;
b->PoLine.map(ma);
b->PoLine.translate(0, b->Height);
if (b->PType == 8)
1966,6 → 1974,8
 
void Page::TransformPoly(int mode)
{
if (EditContour)
return;
PageItem *b = SelItem.at(0);
QWMatrix ma;
FPoint oldPos = FPoint(b->Xpos, b->Ypos);
2047,11 → 2057,37
void Page::Reset1Control()
{
PageItem *b = SelItem.at(0);
FPoint np = b->PoLine.point(ClRe-1);
FPoint np, tp, tp2;
QRect rd;
if (EditContour)
{
np = b->ContourLine.point(ClRe-1);
tp2 = GetMinClipF(b->ContourLine);
tp = GetMaxClipF(b->ContourLine);
rd = QRect(QPoint(qRound(tp2.x()-10), qRound(tp2.y()-10)), QPoint(qRound(tp.x()+20), qRound(tp.y()+20)));
}
else
np = b->PoLine.point(ClRe-1);
b->OldB2 = b->Width;
b->OldH2 = b->Height;
b->PoLine.setPoint(ClRe, np);
AdjustItemSize(b);
if (EditContour)
{
b->ContourLine.setPoint(ClRe, np);
QPainter p;
p.begin(this);
Transform(b, &p);
RepaintTextRegion(b, QRegion(p.xForm(rd)), true);
p.end();
b->FrameOnly = true;
b->Tinput = true;
b->paintObj();
b->FrameOnly = false;
}
else
{
b->PoLine.setPoint(ClRe, np);
AdjustItemSize(b);
}
MarkClip(b);
}
 
2058,17 → 2094,53
void Page::ResetControl()
{
PageItem *b = SelItem.at(0);
FPoint np = b->PoLine.point(ClRe);
FPoint np, tp, tp2;
QRect rd;
if (EditContour)
{
np = b->ContourLine.point(ClRe);
tp2 = GetMinClipF(b->ContourLine);
tp = GetMaxClipF(b->ContourLine);
rd = QRect(QPoint(qRound(tp2.x()-10), qRound(tp2.y()-10)), QPoint(qRound(tp.x()+20), qRound(tp.y()+20)));
}
else
np = b->PoLine.point(ClRe);
b->OldB2 = b->Width;
b->OldH2 = b->Height;
if ((ClRe == 0) || (ClRe == static_cast<int>(b->PoLine.size()-2)))
b->PoLine.setPoint(ClRe+1, np);
{
if (EditContour)
b->ContourLine.setPoint(ClRe+1, np);
else
b->PoLine.setPoint(ClRe+1, np);
}
else
{
b->PoLine.setPoint(ClRe+1, np);
b->PoLine.setPoint((ClRe % 4 != 0 ? ClRe + 3 : ClRe - 1), np);
if (EditContour)
{
b->ContourLine.setPoint(ClRe+1, np);
b->ContourLine.setPoint((ClRe % 4 != 0 ? ClRe + 3 : ClRe - 1), np);
}
else
{
b->PoLine.setPoint(ClRe+1, np);
b->PoLine.setPoint((ClRe % 4 != 0 ? ClRe + 3 : ClRe - 1), np);
}
}
AdjustItemSize(b);
if (!EditContour)
AdjustItemSize(b);
else
{
QPainter p;
p.begin(this);
Transform(b, &p);
RepaintTextRegion(b, QRegion(p.xForm(rd)), true);
p.end();
b->FrameOnly = true;
b->Tinput = true;
b->paintObj();
b->FrameOnly = false;
}
MarkClip(b);
}
 
2077,7 → 2149,10
if (((EdPoints) && (ClRe % 2 != 0)) || ((!EdPoints) && (ClRe % 2 == 0)))
return;
FPointArray Clip;
Clip = b->PoLine;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
b->FrameType = 3;
uint EndInd = Clip.size();
uint StartInd = 0;
2106,7 → 2181,7
FPoint np = ip;
if (ClRe != -1)
{
if (np.x() < 0)
if ((np.x() < 0) && (!EditContour))
{
SizeItem(b->Width - np.x(), b->Height, b->ItemNr, false, false);
if (b->Rot != 0)
2121,7 → 2196,7
MoveItemI(-np.x()/b->LocalScX, 0, b->ItemNr);
np.setX(0);
}
if (np.y() < 0)
if ((np.y() < 0) && (!EditContour))
{
SizeItem(b->Width, b->Height - np.y(), b->ItemNr, false, false);
if (b->Rot != 0)
2146,8 → 2221,7
Clip.setPoint(ClRe+1, ap2);
}
Clip.setPoint(ClRe, np);
if (((ClRe % 4 != 0) && (ClRe % 2 == 0)) && (ClRe+3 < static_cast<int>(EndInd)) &&
(ClRe != static_cast<int>(StartInd)))
if (((ClRe % 4 != 0) && (ClRe % 2 == 0)) && (ClRe+3 < static_cast<int>(EndInd)) && (ClRe != static_cast<int>(StartInd)))
{
FPoint ap = Clip.point(ClRe+2);
FPoint ap2 = Clip.point(ClRe+3);
2219,10 → 2293,30
lk.setY(lk.y() + dy*2);
Clip.setPoint(kon, lk);
}
b->PoLine = Clip.copy();
if (EditContour)
b->ContourLine = Clip.copy();
else
b->PoLine = Clip.copy();
b->Clip = FlattenPath(b->PoLine, b->Segments);
AdjustItemSize(b);
// emit DocChanged();
if (!EditContour)
AdjustItemSize(b);
else
{
FPoint tp2 = GetMinClipF(b->ContourLine);
FPoint tp = GetMaxClipF(b->ContourLine);
QPainter p;
p.begin(this);
Transform(b, &p);
QRect rd;
rd = QRect(QPoint(qRound(tp2.x()-10), qRound(tp2.y()-10)), QPoint(qRound(tp.x()+20), qRound(tp.y()+20)));
RepaintTextRegion(b, QRegion(p.xForm(rd)), true);
p.end();
b->FrameOnly = true;
b->Tinput = true;
b->paintObj();
b->FrameOnly = false;
MarkClip(b);
}
}
}
void Page::ConvertClip(PageItem *b)
2649,21 → 2743,25
}
b = SelItem.at(0);
SelNode.clear();
QRect Sele = QRect(static_cast<int>(Mxp*sc), static_cast<int>(Myp*sc),
static_cast<int>(SeRx-(Mxp*sc)), static_cast<int>(SeRy-(Myp*sc)));
for (uint a = 0; a < b->PoLine.count(); ++a)
QRect Sele = QRect(static_cast<int>(Mxp*sc), static_cast<int>(Myp*sc), static_cast<int>(SeRx-(Mxp*sc)), static_cast<int>(SeRy-(Myp*sc)));
FPointArray Clip;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
for (uint a = 0; a < Clip.count(); ++a)
{
if (b->PoLine.point(a).x() > 900000)
if (Clip.point(a).x() > 900000)
continue;
p.begin(this);
Transform(b, &p);
QPoint npf = p.xForm(b->PoLine.pointQ(a));
QPoint npf = p.xForm(Clip.pointQ(a));
p.end();
if ((Sele.contains(npf)) && ((a == 0) || (((a-2) % 4) == 0)))
{
ClRe = a;
SelNode.append(a);
emit ClipPo(b->PoLine.point(a).x(), b->PoLine.point(a).y());
emit ClipPo(Clip.point(a).x(), Clip.point(a).y());
}
}
HaveSelRect = false;
2710,24 → 2808,25
{
Mxp = m->x();
Myp = m->y();
pmen->insertItem( tr("Paste") , this, SLOT(PasteToPage()));
pmen->insertItem( tr("&Paste") , this, SLOT(PasteToPage()));
pmen->insertSeparator();
}
menid = pmen->insertItem(tr("Show Margins"), ScApp, SLOT(ToggleMarks()));
menid = pmen->insertItem(tr("Show &Margins"), ScApp, SLOT(ToggleMarks()));
pmen->setItemChecked(menid, ScApp->Prefs.MarginsShown);
menid = pmen->insertItem(tr("Show Frames"), ScApp, SLOT(ToggleFrames()));
menid = pmen->insertItem(tr("Show &Frames"), ScApp, SLOT(ToggleFrames()));
pmen->setItemChecked(menid, ScApp->Prefs.FramesShown);
menid = pmen->insertItem(tr("Show Images"), ScApp, SLOT(TogglePics()));
menid = pmen->insertItem(tr("Show &Images"), ScApp, SLOT(TogglePics()));
pmen->setItemChecked(menid, doku->ShowPic);
menid = pmen->insertItem(tr("Show Grid"), ScApp, SLOT(ToggleRaster()));
menid = pmen->insertItem(tr("Show &Grid"), ScApp, SLOT(ToggleRaster()));
pmen->setItemChecked(menid, ScApp->Prefs.GridShown);
menid = pmen->insertItem(tr("Show Guides"), ScApp, SLOT(ToggleGuides()));
menid = pmen->insertItem(tr("Show G&uides"), ScApp, SLOT(ToggleGuides()));
pmen->setItemChecked(menid, ScApp->Prefs.GuidesShown);
menid = pmen->insertItem(tr("Show Baseline Grid"), ScApp, SLOT(ToggleBase()));
menid = pmen->insertItem(tr("Show &Baseline Grid"), ScApp, SLOT(ToggleBase()));
pmen->setItemChecked(menid, ScApp->Prefs.BaseShown);
int uRas = pmen->insertItem( tr("Snap to Grid"), ScApp, SLOT(ToggleURaster()));
pmen->insertSeparator();
int uRas = pmen->insertItem( tr("Sn&ap to Grid"), ScApp, SLOT(ToggleURaster()));
pmen->setItemChecked(uRas, doku->useRaster);
int uGuide = pmen->insertItem( tr("Snap to Guides"), ScApp, SLOT(ToggleUGuides()));
int uGuide = pmen->insertItem( tr("Sna&p to Guides"), ScApp, SLOT(ToggleUGuides()));
pmen->setItemChecked(uGuide, doku->SnapGuides);
pmen->exec(QCursor::pos());
delete pmen;
2778,11 → 2877,11
InfoGroupLayout->addWidget( ParCT, 1, 0, Qt::AlignRight );
ParC->setText(fi.fileName());
InfoGroupLayout->addWidget( ParC, 1, 1 );
WordCT->setText( tr("Original ppi: "));
WordCT->setText( tr("Original PPI: "));
InfoGroupLayout->addWidget( WordCT, 2, 0, Qt::AlignRight );
WordC->setText(txtC.setNum(qRound(b->dpiX))+" x "+txtC2.setNum(qRound(b->dpiY)));
InfoGroupLayout->addWidget( WordC, 2, 1 );
CharCT->setText( tr("Actual ppi: "));
CharCT->setText( tr("Actual PPI: "));
InfoGroupLayout->addWidget( CharCT, 3, 0, Qt::AlignRight );
CharC->setText(txtC.setNum(qRound(72.0 / b->LocalScX))+" x "+
txtC2.setNum(qRound(72.0 / b->LocalScY)));
2842,55 → 2941,55
 
pmen4->insertItem(InfoGroup);
 
pmen->insertItem( tr("Info"), pmen4);
pmen->insertItem( tr("In&fo"), pmen4);
}
if (b->PType == 2)
{
pmen->insertItem( tr("Get Picture..."), this, SIGNAL(LoadPic()));
int px = pmen->insertItem( tr("Image Visible"), this, SLOT(TogglePic()));
pmen->insertItem( tr("&Get Picture..."), this, SIGNAL(LoadPic()));
int px = pmen->insertItem( tr("I&mage Visible"), this, SLOT(TogglePic()));
pmen->setItemChecked(px, b->PicArt);
if (b->PicAvail)
pmen->insertItem( tr("Update Picture"), this, SLOT(UpdatePic()));
pmen->insertItem( tr("&Update Picture"), this, SLOT(UpdatePic()));
if (b->PicAvail && b->isRaster)
pmen->insertItem( tr("Edit Picture"), this, SLOT(CallGimp()));
pmen->insertItem( tr("&Edit Picture"), this, SLOT(CallGimp()));
if ((b->PicAvail) && (!b->isTableItem))
pmen->insertItem( tr("Adjust Frame to Picture"), this, SLOT(FrameToPic()));
pmen->insertItem( tr("&Adjust Frame to Picture"), this, SLOT(FrameToPic()));
}
if (b->PType == 4)
{
pmen->insertItem( tr("Get Text..."), this, SIGNAL(LoadPic()));
pmen->insertItem( tr("Append Text..."), this, SIGNAL(AppendText()));
pmen->insertItem( tr("Edit Text..."), this, SIGNAL(EditText()));
pmen->insertItem( tr("Insert Sample Text"), this, SLOT(LoremIpsum()));
pmen->insertItem( tr("&Get Text..."), this, SIGNAL(LoadPic()));
pmen->insertItem( tr("&Append Text..."), this, SIGNAL(AppendText()));
pmen->insertItem( tr("&Edit Text..."), this, SIGNAL(EditText()));
pmen->insertItem( tr("&Insert Sample Text"), this, SLOT(LoremIpsum()));
if (PageNam == "")
{
int pxb = pmenPDF->insertItem( tr("Is PDF-Bookmark"), this, SLOT(ToggleBookmark()));
int pxb = pmenPDF->insertItem( tr("Is PDF &Bookmark"), this, SLOT(ToggleBookmark()));
pmenPDF->setItemChecked(pxb, b->isBookmark);
pxb = pmenPDF->insertItem( tr("Is PDF-Annotation"), this, SLOT(ToggleAnnotation()));
pxb = pmenPDF->insertItem( tr("Is PDF A&nnotation"), this, SLOT(ToggleAnnotation()));
pmenPDF->setItemChecked(pxb, b->isAnnotation);
if (b->isAnnotation)
{
if ((b->AnType == 0) || (b->AnType == 1) || (b->AnType > 9))
pmenPDF->insertItem( tr("Annotation Properties"), this, SIGNAL(AnnotProps()));
pmenPDF->insertItem( tr("Annotation P&roperties"), this, SIGNAL(AnnotProps()));
else
pmenPDF->insertItem( tr("Field Properties"), this, SIGNAL(AnnotProps()));
pmenPDF->insertItem( tr("Field P&roperties"), this, SIGNAL(AnnotProps()));
}
}
pmen->insertItem( tr("PDF-Options"), pmenPDF);
pmen->insertItem( tr("&PDF Options"), pmenPDF);
}
if (b->PType == 8)
pmen->insertItem( tr("Edit Text..."), this, SIGNAL(EditText()));
if (!b->Locked)
pmen->insertItem( tr("Lock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("&Lock"), this, SLOT(ToggleLock()));
else
pmen->insertItem( tr("Unlock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("Un&lock"), this, SLOT(ToggleLock()));
if (!b->LockRes)
pmen->insertItem( tr("Lock object size"), this, SLOT(ToggleResize()));
pmen->insertItem( tr("Lock Object &Size"), this, SLOT(ToggleResize()));
else
pmen->insertItem( tr("Unlock object size"), this, SLOT(ToggleResize()));
pmen->insertItem( tr("Unlock Object &Size"), this, SLOT(ToggleResize()));
if (!b->isSingleSel)
{
pmen->insertItem( tr("Send to Scrapbook"), this, SLOT(sentToScrap()));
pmen->insertItem( tr("Send to S&crapbook"), this, SLOT(sentToScrap()));
if (doku->Layers.count() > 1)
{
for (uint lam=0; lam < doku->Layers.count(); ++lam)
2899,7 → 2998,7
if (static_cast<int>(lam) == doku->ActiveLayer)
pmen3->setItemEnabled(lai, 0);
}
pmen->insertItem( tr("Send to Layer"), pmen3);
pmen->insertItem( tr("Send to La&yer"), pmen3);
}
connect(pmen3, SIGNAL(activated(int)), this, SLOT(sentToLayer(int)));
}
2922,17 → 3021,17
isGroup = false;
}
if (!isGroup)
pmen->insertItem( tr("Group"), this, SIGNAL(DoGroup()));
pmen->insertItem( tr("&Group"), this, SIGNAL(DoGroup()));
}
if (b->Groups.count() != 0)
pmen->insertItem( tr("Un-group"), this, SIGNAL(DoUnGroup()));
pmen->insertItem( tr("Un&group"), this, SIGNAL(DoUnGroup()));
if ((!b->isTableItem) && (!b->isSingleSel))
{
pmen->insertItem( tr("Level"), pmenLevel);
pmenLevel->insertItem( tr("Send to Back"), this, SLOT(ToBack()));
pmenLevel->insertItem( tr("Bring to Front"), this, SLOT(ToFront()));
pmenLevel->insertItem( tr("Lower"), this, SLOT(LowerItem()));
pmenLevel->insertItem( tr("Raise"), this, SLOT(RaiseItem()));
pmen->insertItem( tr("Le&vel"), pmenLevel);
pmenLevel->insertItem( tr("Send to &Back"), this, SLOT(ToBack()));
pmenLevel->insertItem( tr("Bring to &Front"), this, SLOT(ToFront()));
pmenLevel->insertItem( tr("&Lower"), this, SLOT(LowerItem()));
pmenLevel->insertItem( tr("&Raise"), this, SLOT(RaiseItem()));
}
}
if (((b->PType == 4) || (b->PType == 2) || (b->PType == 6)) && (doku->AppMode != 7))
2939,43 → 3038,43
{
if (b->PType == 4)
{
pmen2->insertItem( tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("&Picture Frame"), this, SLOT(ToPicFrame()));
if (!b->isTableItem)
{
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Outlines"), this, SLOT(TextToPath()));
pmen2->insertItem( tr("Pol&ygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("&Outlines"), this, SLOT(TextToPath()));
}
}
if (b->PType == 2)
{
pmen2->insertItem( tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("&Text Frame"), this, SLOT(ToTextFrame()));
if (!b->isTableItem)
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Pol&ygon"), this, SLOT(ToPolyFrame()));
}
if (b->PType == 6)
{
pmen2->insertItem( tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("Bezier Curve"), this, SLOT(ToBezierFrame()));
pmen2->insertItem( tr("&Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("&Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("&Bezier Curve"), this, SLOT(ToBezierFrame()));
}
pmen->insertItem( tr("Convert to"), pmen2);
pmen->insertItem( tr("Conve&rt to"), pmen2);
}
pmen->insertSeparator();
if ((!b->Locked) && (!((b->isTableItem) && (b->isSingleSel))))
pmen->insertItem( tr("Cut"), this, SIGNAL(CutItem()));
pmen->insertItem( tr("Cu&t"), this, SIGNAL(CutItem()));
if (!((b->isTableItem) && (b->isSingleSel)))
pmen->insertItem( tr("Copy"), this, SIGNAL(CopyItem()));
pmen->insertItem( tr("&Copy"), this, SIGNAL(CopyItem()));
if ((doku->AppMode == 7) && (ScApp->Buffer2.startsWith("<SCRIBUSTEXT")) && (b->PType == 4))
pmen->insertItem( tr("Paste"), ScApp, SLOT(slotEditPaste()));
pmen->insertItem( tr("&Paste"), ScApp, SLOT(slotEditPaste()));
if ((!b->Locked) && (doku->AppMode != 7) && (!((b->isTableItem) && (b->isSingleSel))))
pmen->insertItem( tr("Delete"), this, SLOT(DeleteItem()));
pmen->insertItem( tr("&Delete"), this, SLOT(DeleteItem()));
if ((b->PType == 2) || ((b->PType == 4) && (b->NextBox == 0) && (b->BackBox == 0)))
pmen->insertItem( tr("Clear Contents"), this, SLOT(ClearItem()));
pmen->insertItem( tr("C&lear Contents"), this, SLOT(ClearItem()));
pmen->insertSeparator();
if (!ScApp->Mpal->isVisible())
pmen->insertItem( tr("Show Properties..."), ScApp, SLOT(ToggleMpal()));
pmen->insertItem( tr("Show P&roperties..."), ScApp, SLOT(ToggleMpal()));
else
pmen->insertItem( tr("Hide Properties..."), ScApp, SLOT(ToggleMpal()));
pmen->insertItem( tr("Hide P&roperties..."), ScApp, SLOT(ToggleMpal()));
pmen->exec(QCursor::pos());
delete pmen;
delete pmen2;
3020,6 → 3119,7
SizeItem(tp.x(), tp.y(), b->ItemNr, false, false);
b->Clip = FlattenPath(b->PoLine, b->Segments);
AdjustItemSize(b);
b->ContourLine = b->PoLine.copy();
update();
}
if (doku->AppMode == 8)
3820,6 → 3920,7
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
RefreshItem(b);
b->ContourLine = b->PoLine.copy();
p.end();
}
if ((doku->AppMode == 13) && (m->button() == RightButton))
3829,6 → 3930,7
SizeItem(b->PoLine.WidthHeight().x(), b->PoLine.WidthHeight().y(), b->ItemNr, false, false);
SetPolyClip(b, qRound(QMAX(b->Pwidth / 2, 1)), qRound(QMAX(b->Pwidth / 2, 1)));
AdjustItemSize(b);
b->ContourLine = b->PoLine.copy();
doku->AppMode = 1;
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
emit PaintingDone();
4216,7 → 4318,10
if ((SegP1 != -1) && (SegP2 != -1))
{
FPointArray Clip;
Clip = b->PoLine;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
p.begin(this);
p.translate(static_cast<int>(b->Xpos*doku->Scale), static_cast<int>(b->Ypos*doku->Scale));
p.rotate(b->Rot);
4228,7 → 4333,10
MoveClipPoint(b, npf);
b->OldB2 = b->Width;
b->OldH2 = b->Height;
Clip = b->PoLine;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
ClRe = SegP1;
npf2.setX(Clip.point(SegP1).x() + (npfN.x()-npfM.x()));
npf2.setY(Clip.point(SegP1).y() + (npfN.y()-npfM.y()));
4242,17 → 4350,21
if ((SelNode.count() != 0) && (EdPoints))
{
int storedClRe = ClRe;
FPointArray Clip;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
for (uint itm = 0; itm < SelNode.count(); ++itm)
{
p.begin(this);
p.translate(static_cast<int>(b->Xpos*doku->Scale),
static_cast<int>(b->Ypos*doku->Scale));
p.translate(static_cast<int>(b->Xpos*doku->Scale), static_cast<int>(b->Ypos*doku->Scale));
p.rotate(b->Rot);
FPoint npfN = FPoint(p.xFormDev(QPoint(newX, newY)));
FPoint npfM = FPoint(p.xFormDev(QPoint(Mxp, Myp)));
p.end();
npf.setX(b->PoLine.point(*SelNode.at(itm)).x() + (npfN.x()-npfM.x()));
npf.setY(b->PoLine.point(*SelNode.at(itm)).y() + (npfN.y()-npfM.y()));
npf.setX(Clip.point(*SelNode.at(itm)).x() + (npfN.x()-npfM.x()));
npf.setY(Clip.point(*SelNode.at(itm)).y() + (npfN.y()-npfM.y()));
ClRe = *SelNode.at(itm);
b->OldB2 = b->Width;
b->OldH2 = b->Height;
4336,202 → 4448,151
for (a = 0; a < SelItem.count(); ++a)
{
b = SelItem.at(0);
switch (HowTo)
if ((HowTo == 1) || (HowTo == 2))
{
case 0:
break;
case 1:
p.begin(this);
Transform(b, &p);
if ((m->state() & ShiftButton) && (!(m->state() & ControlButton)))
switch (HowTo)
{
mop = QPoint(m->x(), static_cast<int>((b->Ypos + (newX - b->Xpos)) * sc));
QCursor::setPos(mapToGlobal(mop));
}
else
{
if ((m->state() & ControlButton) && (!(m->state() & ShiftButton)))
case 1:
p.begin(this);
Transform(b, &p);
if ((m->state() & ShiftButton) && (!(m->state() & ControlButton)))
{
mop = QPoint(m->x(), static_cast<int>((b->Ypos + ((newX - b->Xpos) / b->OldB2 * b->OldH2)) * sc));
mop = QPoint(m->x(), static_cast<int>((b->Ypos + (newX - b->Xpos)) * sc));
QCursor::setPos(mapToGlobal(mop));
}
else
mop = QPoint(m->x(), m->y());
}
np = p.xFormDev(mop);
nx = np.x();
ny = np.y();
p.end();
if (b->PType != 5)
{
if (doku->useRaster)
{
dx = b->Xpos - int (b->Xpos / doku->minorGrid) * doku->minorGrid;
dy = b->Ypos - int (b->Ypos / doku->minorGrid) * doku->minorGrid;
nx = (qRound(np.x() / doku->minorGrid) * doku->minorGrid - dx);
ny = (qRound(np.y() / doku->minorGrid) * doku->minorGrid - dy);
if ((m->state() & ControlButton) && (!(m->state() & ShiftButton)))
{
mop = QPoint(m->x(), static_cast<int>((b->Ypos + ((newX - b->Xpos) / b->OldB2 * b->OldH2)) * sc));
QCursor::setPos(mapToGlobal(mop));
}
else
mop = QPoint(m->x(), m->y());
}
if (doku->SnapGuides)
np = p.xFormDev(mop);
nx = np.x();
ny = np.y();
p.end();
if (b->PType != 5)
{
nx += b->Xpos;
ny += b->Ypos;
ApplyGuides(&nx, &ny);
nx -= b->Xpos;
ny -= b->Ypos;
if (doku->useRaster)
{
dx = b->Xpos - int (b->Xpos / doku->minorGrid) * doku->minorGrid;
dy = b->Ypos - int (b->Ypos / doku->minorGrid) * doku->minorGrid;
nx = (qRound(np.x() / doku->minorGrid) * doku->minorGrid - dx);
ny = (qRound(np.y() / doku->minorGrid) * doku->minorGrid - dy);
}
if (doku->SnapGuides)
{
nx += b->Xpos;
ny += b->Ypos;
ApplyGuides(&nx, &ny);
nx -= b->Xpos;
ny -= b->Ypos;
}
erf = SizeItem(nx, ny, b->ItemNr);
}
erf = SizeItem(nx, ny, b->ItemNr);
}
else
{
p.begin(this);
double rba = b->Rot;
b->Rot = 0;
Transform(b, &p);
np = p.xFormDev(QPoint(m->x(), m->y()));
p.end();
b->Rot = rba;
np = ApplyGrid(np);
erf = SizeItem(np.x(), np.y(), b->ItemNr);
if (doku->SnapGuides)
else
{
p.begin(this);
b->Sizing = true;
p.setRasterOp(XorROP);
p.setPen(QPen(white, 1, DotLine, FlatCap, MiterJoin));
p.drawLine(static_cast<int>(b->Xpos*sc), static_cast<int>(b->Ypos*sc),
static_cast<int>(Mxp*sc), static_cast<int>(Myp*sc));
p.drawLine(static_cast<int>(b->Xpos*sc), static_cast<int>(b->Ypos*sc),
static_cast<int>(newX*sc), static_cast<int>(newY*sc));
double rba = b->Rot;
b->Rot = 0;
Transform(b, &p);
np = p.xFormDev(QPoint(m->x(), m->y()));
p.end();
b->Rot = rba;
np = ApplyGrid(np);
erf = SizeItem(np.x(), np.y(), b->ItemNr);
if (doku->SnapGuides)
{
p.begin(this);
b->Sizing = true;
p.setRasterOp(XorROP);
p.setPen(QPen(white, 1, DotLine, FlatCap, MiterJoin));
p.drawLine(static_cast<int>(b->Xpos*sc), static_cast<int>(b->Ypos*sc),
static_cast<int>(Mxp*sc), static_cast<int>(Myp*sc));
p.drawLine(static_cast<int>(b->Xpos*sc), static_cast<int>(b->Ypos*sc),
static_cast<int>(newX*sc), static_cast<int>(newY*sc));
p.end();
}
}
}
break;
case 2:
if (b->PType == 5)
{
p.begin(this);
Transform(b, &p);
mop = QPoint(m->x(), m->y());
npf = p.xFormDev(mop);
nx = np.x();
ny = np.y();
p.end();
double sav = doku->SnapGuides;
npf2 = FPoint(nx-Mxp, ny-Myp);
erf = MoveSizeItem(npf, npf, b->ItemNr);
doku->SnapGuides = sav;
if (sav)
b->Sizing = true;
}
else
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ox = qRound((b->Xpos+b->Width)*sc);
int oy = qRound((b->Ypos+b->Height)*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(np2, QPoint(ox,oy)));
p.end();
}
break;
case 3:
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ox = qRound(b->Xpos*sc);
int oy = qRound((b->Ypos+b->Height)*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(np2, QPoint(ox,oy)));
p.end();
break;
}
case 4:
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ox = qRound((b->Xpos+b->Width)*sc);
int oy = qRound(b->Ypos*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(np2, QPoint(ox,oy)));
p.end();
case 2:
if (b->PType == 5)
{
p.begin(this);
Transform(b, &p);
mop = QPoint(m->x(), m->y());
npf = p.xFormDev(mop);
nx = np.x();
ny = np.y();
p.end();
double sav = doku->SnapGuides;
npf2 = FPoint(nx-Mxp, ny-Myp);
erf = MoveSizeItem(npf, npf, b->ItemNr);
doku->SnapGuides = sav;
if (sav)
b->Sizing = true;
}
else
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
p.translate(static_cast<int>(b->Xpos), static_cast<int>(b->Ypos));
p.rotate(b->Rot);
np2 = p.xFormDev(QPoint(qRound(nx), qRound(ny)));
p.end();
p.begin(this);
Transform(b, &p);
PaintSizeRect(&p, QRect(np2, QPoint(qRound(b->Width), qRound(b->Height))));
p.end();
}
break;
}
case 5:
}
else
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
p.translate(static_cast<int>(b->Xpos), static_cast<int>(b->Ypos));
p.rotate(b->Rot);
np2 = p.xFormDev(QPoint(qRound(nx), qRound(ny)));
p.end();
p.begin(this);
Transform(b, &p);
switch (HowTo)
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ow = qRound((b->Xpos+b->Width)*sc);
int ox = qRound(b->Xpos*sc);
int oy = qRound(b->Ypos*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(QPoint(ox,oy), QPoint(ow, qRound(np2.y()))));
p.end();
case 0:
break;
}
case 6:
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ow = qRound((b->Ypos+b->Height)*sc);
int ox = qRound(b->Xpos*sc);
int oy = qRound(b->Ypos*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(QPoint(qRound(np2.x()), ow), QPoint(ox,oy)));
p.end();
case 3:
PaintSizeRect(&p, QRect(np2, QPoint(0, qRound(b->Height))));
break;
}
case 7:
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ow = qRound((b->Ypos+b->Height)*sc);
int ox = qRound((b->Xpos+b->Width)*sc);
int oy = qRound(b->Ypos*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(QPoint(qRound(np2.x()), ow), QPoint(ox,oy)));
p.end();
case 4:
PaintSizeRect(&p, QRect(np2, QPoint(qRound(b->Width), 0)));
break;
}
case 8:
{
p.begin(this);
np2 = QPoint(newX, newY);
np2 = ApplyGrid(np2);
int ow = qRound((b->Xpos+b->Width)*sc);
int ox = qRound(b->Xpos*sc);
int oy = qRound((b->Ypos+b->Height)*sc);
double nx = np2.x();
double ny = np2.y();
ApplyGuides(&nx, &ny);
np2 = QPoint(qRound(nx*sc), qRound(ny*sc));
PaintSizeRect(&p, QRect(QPoint(ow, qRound(np2.y())), QPoint(ox,oy)));
p.end();
case 5:
PaintSizeRect(&p, QRect(QPoint(0, 0), QPoint(qRound(b->Width), np2.y())));
break;
case 6:
PaintSizeRect(&p, QRect(QPoint(0, 0), QPoint(np2.x(), qRound(b->Height))));
break;
case 7:
PaintSizeRect(&p, QRect(QPoint(np2.x(), 0), QPoint(qRound(b->Width), qRound(b->Height))));
break;
case 8:
PaintSizeRect(&p, QRect(QPoint(0, np2.y()), QPoint(qRound(b->Width), qRound(b->Height))));
break;
}
p.end();
}
}
}
4653,64 → 4714,65
Transform(b, &p);
QRegion ganz = ViewReg();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
if (ganz.intersect(QRegion(p.xForm(QPointArray(QRect(-3, -3, static_cast<int>(b->Width+6),
static_cast<int>(b->Height+6)))))).contains(m->pos()))
if (doku->EditClip)
{
if (doku->EditClip)
QRect mpo = p.xFormDev(QRect(m->x()-doku->GrabRad, m->y()-doku->GrabRad, doku->GrabRad*2, doku->GrabRad*2));
FPointArray Clip;
QPointArray cli;
ClRe2 = -1;
SegP1 = -1;
SegP2 = -1;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
if ((doku->EditClipMode == 2) || (doku->EditClipMode == 0) || (doku->EditClipMode == 3))
{
QRect mpo = p.xFormDev(QRect(m->x()-doku->GrabRad, m->y()-doku->GrabRad,
doku->GrabRad*2, doku->GrabRad*2));
FPointArray Clip;
QPointArray cli;
ClRe2 = -1;
SegP1 = -1;
SegP2 = -1;
Clip = b->PoLine;
if ((doku->EditClipMode == 2) || (doku->EditClipMode == 0) || (doku->EditClipMode == 3))
np2 = p.xFormDev(m->pos());
for (a=0; a<Clip.size(); ++a)
{
np2 = p.xFormDev(m->pos());
for (a=0; a<Clip.size(); ++a)
if (((EdPoints) && (a % 2 != 0)) || ((!EdPoints) && (a % 2 == 0)))
continue;
np = p.xForm(Clip.pointQ(a));
tx = QRect(np.x()-3, np.y()-3, 6, 6);
if (tx.contains(m->pos()))
{
if (((EdPoints) && (a % 2 != 0)) || ((!EdPoints) && (a % 2 == 0)))
continue;
np = p.xForm(Clip.pointQ(a));
tx = QRect(np.x()-3, np.y()-3, 6, 6);
if (tx.contains(m->pos()))
{
if (doku->EditClipMode == 0)
qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
if (doku->EditClipMode == 2)
qApp->setOverrideCursor(QCursor(loadIcon("DelPoint.png"), 4, 3), true);
if (doku->EditClipMode == 3)
qApp->setOverrideCursor(QCursor(loadIcon("Split.png"), 4, 3), true);
p.end();
return;
}
if (doku->EditClipMode == 0)
qApp->setOverrideCursor(QCursor(SizeAllCursor), true);
if (doku->EditClipMode == 2)
qApp->setOverrideCursor(QCursor(loadIcon("DelPoint.png"), 4, 3), true);
if (doku->EditClipMode == 3)
qApp->setOverrideCursor(QCursor(loadIcon("Split.png"), 4, 3), true);
p.end();
return;
}
}
if ((doku->EditClipMode == 1) || (doku->EditClipMode == 0) && (EdPoints))
}
if ((doku->EditClipMode == 1) || (doku->EditClipMode == 0) && (EdPoints))
{
for (uint poi=0; poi<Clip.size()-3; poi += 4)
{
for (uint poi=0; poi<Clip.size()-3; poi += 4)
BezierPoints(&Bez, Clip.pointQ(poi), Clip.pointQ(poi+1), Clip.pointQ(poi+3), Clip.pointQ(poi+2));
cli = Bez.cubicBezier();
for (uint clp = 0; clp < cli.size()-1; ++clp)
{
BezierPoints(&Bez, Clip.pointQ(poi), Clip.pointQ(poi+1), Clip.pointQ(poi+3),
Clip.pointQ(poi+2));
cli = Bez.cubicBezier();
for (uint clp = 0; clp < cli.size()-1; ++clp)
if (PointOnLine(cli.point(clp), cli.point(clp+1), mpo))
{
if (PointOnLine(cli.point(clp), cli.point(clp+1), mpo))
{
if (doku->EditClipMode == 0)
qApp->setOverrideCursor(QCursor(loadIcon("HandC.xpm")), true);
if (doku->EditClipMode == 1)
qApp->setOverrideCursor(QCursor(loadIcon("AddPoint.png"), 4, 3), true);
ClRe2 = poi;
p.end();
return;
}
if (doku->EditClipMode == 0)
qApp->setOverrideCursor(QCursor(loadIcon("HandC.xpm")), true);
if (doku->EditClipMode == 1)
qApp->setOverrideCursor(QCursor(loadIcon("AddPoint.png"), 4, 3), true);
ClRe2 = poi;
p.end();
return;
}
}
}
}
}
if (ganz.intersect(QRegion(p.xForm(QPointArray(QRect(-3, -3, static_cast<int>(b->Width+6),
static_cast<int>(b->Height+6)))))).contains(m->pos()))
{
QWMatrix ma;
ma.scale(doku->Scale, doku->Scale);
ma.translate(b->Xpos, b->Ypos);
4851,7 → 4913,10
FPointArray Clip;
bool edited = false;
bool pfound = false;
Clip = b->PoLine;
if (EditContour)
Clip = b->ContourLine;
else
Clip = b->PoLine;
p.begin(this);
Transform(b, &p);
npf2 = FPoint(p.xFormDev(m->pos()));
4930,17 → 4995,32
else
{
cli.putPoints(0, EndInd-StartInd, Clip, StartInd);
z = PaintPoly(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth,
b->Pcolor, b->Pcolor2);
z = PaintPoly(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth, b->Pcolor, b->Pcolor2);
bb = Items.at(z);
bb->PoLine.resize(0);
if (EditContour)
bb->ContourLine.resize(0);
else
bb->PoLine.resize(0);
if (StartInd != 0)
{
bb->PoLine.putPoints(0, StartInd - 4, Clip);
bb->PoLine.putPoints(bb->PoLine.size(), Clip.size()-EndInd, Clip, EndInd);
if (EditContour)
{
bb->ContourLine.putPoints(0, StartInd - 4, Clip);
bb->ContourLine.putPoints(bb->PoLine.size(), Clip.size()-EndInd, Clip, EndInd);
}
else
{
bb->PoLine.putPoints(0, StartInd - 4, Clip);
bb->PoLine.putPoints(bb->PoLine.size(), Clip.size()-EndInd, Clip, EndInd);
}
}
else
bb->PoLine.putPoints(0, Clip.size()-EndInd-4, Clip, EndInd+4);
{
if (EditContour)
bb->ContourLine.putPoints(0, Clip.size()-EndInd-4, Clip, EndInd+4);
else
bb->PoLine.putPoints(0, Clip.size()-EndInd-4, Clip, EndInd+4);
}
bb->Rot = b->Rot;
AdjustItemSize(bb);
bb->ClipEdited = true;
4970,10 → 5050,12
{
if ((ClRe > 1) && (ClRe < static_cast<int>(Clip.size()-2)))
{
z = PaintPolyLine(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth,
b->Pcolor, b->Pcolor2);
z = PaintPolyLine(b->Xpos, b->Ypos, b->Width, b->Height, b->Pwidth, b->Pcolor, b->Pcolor2);
bb = Items.at(z);
bb->PoLine.putPoints(0, Clip.size()-(ClRe+2), Clip, ClRe+2);
if (EditContour)
bb->ContourLine.putPoints(0, Clip.size()-(ClRe+2), Clip, ClRe+2);
else
bb->PoLine.putPoints(0, Clip.size()-(ClRe+2), Clip, ClRe+2);
bb->Rot = b->Rot;
AdjustItemSize(bb);
bb->ClipEdited = true;
5038,7 → 5120,10
cli.putPoints(cli.size(), Clip.size()-(ClRe + 4), Clip, ClRe+4);
}
}
b->PoLine = cli.copy();
if (EditContour)
b->ContourLine = cli.copy();
else
b->PoLine = cli.copy();
ClRe = -1;
b->ClipEdited = true;
edited = true;
5047,10 → 5132,12
{
cli.putPoints(0, ClRe2+2, Clip);
cli.resize(cli.size()+4);
cli.putPoints(cli.size()-4, 4, npf2.x(), npf2.y(), npf2.x(), npf2.y(), npf2.x(),
npf2.y(), npf2.x(), npf2.y());
cli.putPoints(cli.size()-4, 4, npf2.x(), npf2.y(), npf2.x(), npf2.y(), npf2.x(), npf2.y(), npf2.x(), npf2.y());
cli.putPoints(cli.size(), Clip.size()-(ClRe2 + 2), Clip, ClRe2+2);
b->PoLine = cli.copy();
if (EditContour)
b->ContourLine = cli.copy();
else
b->PoLine = cli.copy();
ClRe2 = -1;
b->ClipEdited = true;
edited = true;
6506,7 → 6593,10
Transform(b, &p);
p.setPen(QPen(blue, 1, SolidLine, FlatCap, MiterJoin));
p.setBrush(NoBrush);
cli = b->PoLine;
if (EditContour)
cli = b->ContourLine;
else
cli = b->PoLine;
if (cli.size() > 3)
{
for (uint poi=0; poi<cli.size()-3; poi += 4)
8616,6 → 8706,11
if (Buffer->LayerNr != -1)
b->LayerNr = Buffer->LayerNr;
b->PoLine = Buffer->PoLine.copy();
b->UseContour = Buffer->UseContour;
if (Buffer->ContourLine.size() == 0)
b->ContourLine = b->PoLine.copy();
else
b->ContourLine = Buffer->ContourLine.copy();
if (b->PType != 5)
{
if ((b->PoLine.size() == 0) && (b->PType != 1))
9007,6 → 9102,7
ite->Shade2 = doku->Dshade2;
ite->ItemNr = Items.count()-1;
SetOvalFrame(ite);
ite->ContourLine = ite->PoLine.copy();
if (!doku->loading)
{
ite->paintObj();
9029,6 → 9125,7
ite->IRender = doku->CMSSettings.DefaultIntentMonitor2;
ite->ItemNr = Items.count()-1;
SetRectFrame(ite);
ite->ContourLine = ite->PoLine.copy();
if (!doku->loading)
{
ite->paintObj();
9047,6 → 9144,7
ite->Shade2 = doku->Dshade2;
ite->ItemNr = Items.count()-1;
SetRectFrame(ite);
ite->ContourLine = ite->PoLine.copy();
if (!doku->loading)
{
ite->paintObj();
9099,6 → 9197,7
Items.append(ite);
ite->ItemNr = Items.count()-1;
SetRectFrame(ite);
ite->ContourLine = ite->PoLine.copy();
if (!doku->loading)
{
ite->paintObj();
9112,7 → 9211,6
{
if (w == 0)
w = 1;
// PageItem* ite = new PageItem(this, 5, x, y, b, h, w, "Black", outline, doku);
PageItem* ite = new PageItem(this, 5, x, y, b, h, w, "None", outline, doku);
Items.append(ite);
ite->PLineArt = doku->DLstyleLine;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
844,9 → 844,9
HTName = ResNam+IToStr(ResCount);
Transpar[HTName] = ObjCounter;
PutDoc("<< /Type /ExtGState\n/HT "+IToStr(ObjCounter-1)+" 0 R\n>>\nendobj\n");
ResCount++;
ObjCounter++;
}
ResCount++;
ObjCounter++;
#ifdef HAVE_CMS
if ((CMSuse) && (Options->UseProfiles))
{
/trunk/Scribus/scribus/reformdoc.cpp
31,9 → 31,7
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 0 );
TextLabel5 = new QLabel( GroupBox7, "TextLabel5" );
TextLabel5->setText( tr( "Top:" ) );
Layout4->addWidget( TextLabel5, 0, 0 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setSuffix( ein );
TopR->setDecimals( decimals );
40,9 → 38,10
TopR->setMaxValue(Hoehe);
TopR->setValue(t * UmReFaktor);
Layout4->addWidget( TopR, 0, 1 );
Links = new QLabel( GroupBox7, "Links" );
Links->setText( tr( "Left:" ) );
Layout4->addWidget( Links, 0, 2 );
TextLabel5 = new QLabel( tr( "&Top:" ), GroupBox7, "TextLabel5" );
TextLabel5->setBuddy(TopR);
Layout4->addWidget( TextLabel5, 0, 0 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setSuffix( ein );
LeftR->setDecimals( decimals );
49,9 → 48,10
LeftR->setMaxValue(Breite);
LeftR->setValue(l * UmReFaktor);
Layout4->addWidget( LeftR, 0, 3 );
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
Layout4->addWidget( TextLabel7, 1, 0 );
Links = new QLabel( tr( "&Left:" ), GroupBox7, "Links" );
Links->setBuddy(LeftR);
Layout4->addWidget( Links, 0, 2 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setSuffix( ein );
BottomR->setDecimals( decimals );
58,9 → 58,10
BottomR->setMaxValue(Hoehe);
BottomR->setValue(b * UmReFaktor);
Layout4->addWidget( BottomR, 1, 1 );
Rechts = new QLabel( GroupBox7, "Rechts" );
Rechts->setText( tr( "Right:" ) );
Layout4->addWidget( Rechts, 1, 2 );
TextLabel7 = new QLabel( tr( "&Bottom:" ), GroupBox7, "TextLabel7" );
TextLabel7->setBuddy(BottomR);
Layout4->addWidget( TextLabel7, 1, 0 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setSuffix( ein );
RightR->setDecimals( decimals );
67,12 → 68,14
RightR->setMaxValue(Breite);
RightR->setValue(r * UmReFaktor);
Layout4->addWidget( RightR, 1, 3 );
Doppelseiten = new QCheckBox( GroupBox7, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Rechts = new QLabel( tr( "&Right:" ), GroupBox7, "Rechts" );
Rechts->setBuddy(RightR);
Layout4->addWidget( Rechts, 1, 2 );
Doppelseiten = new QCheckBox( tr( "&Facing Pages" ),GroupBox7, "Doppelseiten" );
Doppelseiten->setChecked( fp );
Layout4->addMultiCellWidget( Doppelseiten, 2, 2, 0, 1 );
ErsteSeite = new QCheckBox( GroupBox7, "n" );
ErsteSeite->setText( tr( "Left Page first" ) );
ErsteSeite = new QCheckBox( tr( "Left &Page First" ), GroupBox7, "n" );
ErsteSeite->setChecked( fpe );
Layout4->addMultiCellWidget( ErsteSeite, 2, 2, 2, 3 );
if (!fp)
83,14 → 86,12
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton = new QPushButton(tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout3->addWidget( OKButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
CancelB->setAutoDefault( false );
Layout3->addWidget( CancelB );
ReformDocLayout->addLayout( Layout3 );
106,7 → 107,6
QToolTip::add( LeftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
 
 
// signals and slots connections
connect( Doppelseiten, SIGNAL( clicked() ), this, SLOT( setDS() ) );
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
141,15 → 141,14
{
if (Doppelseiten->isChecked())
{
Links->setText( tr( "Inside:" ) );
Rechts->setText( tr( "Outside:" ) );
Links->setText( tr( "&Inside:" ) );
Rechts->setText( tr( "&Outside:" ) );
ErsteSeite->setEnabled(true);
}
else
{
Links->setText( tr( "Left:" ) );
Rechts->setText( tr( "Right:" ) );
Links->setText( tr( "&Left:" ) );
Rechts->setText( tr( "&Right:" ) );
ErsteSeite->setEnabled(false);
}
}
 
}
/trunk/Scribus/scribus/selfield.cpp
14,8 → 14,7
Layout5 = new QHBoxLayout( 0, 0, 6, "Layout5");
Layout1 = new QVBoxLayout( 0, 0, 6, "Layout1");
 
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Available Fields" ) );
Text1 = new QLabel( tr( "Available Fields" ), this, "Text1" );
Layout1->addWidget( Text1 );
AvailFields = new QListBox( this, "AvailFields" );
AvailFields->setMinimumSize( QSize( 130, 180 ) );
44,18 → 43,15
Layout2 = new QVBoxLayout( 0, 0, 6, "Layout2");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout2->addItem( spacer );
ToSel = new QPushButton( this, "ToSel" );
ToSel->setText( tr( ">>" ) );
ToSel = new QPushButton( tr( "&>>" ), this, "ToSel" );
Layout2->addWidget( ToSel );
FromSel = new QPushButton( this, "FromSel" );
FromSel->setText( tr( "<<" ) );
FromSel = new QPushButton( tr( "&<<" ), this, "FromSel" );
Layout2->addWidget( FromSel );
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout2->addItem( spacer_2 );
Layout5->addLayout( Layout2 );
Layout3 = new QVBoxLayout( 0, 0, 6, "Layout3");
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Selected Fields" ) );
Text2 = new QLabel( tr( "Selected Fields" ), this, "Text2" );
Layout3->addWidget( Text2 );
SelFields = new QListBox( this, "SelFields" );
SelFields->setMinimumSize( QSize( 130, 180 ) );
79,12 → 75,10
Layout4 = new QHBoxLayout( 0, 0, 6, "Layout4");
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_3 );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK = new QPushButton( tr("&OK"), this, "OK" );
OK->setDefault( true );
Layout4->addWidget( OK );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Layout4->addWidget( Cancel );
QSpacerItem* spacer_4 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_4 );
/trunk/Scribus/scribus/frameedit.cpp
161,6 → 161,11
Layout2->addWidget( XSpin, 0, 1 );
NodePaletteLayout->addLayout( Layout2 );
 
EditCont = new QCheckBox( this, "EditCont" );
EditCont->setText( tr( "Edit Contour Line" ) );
EditCont->setChecked(false);
NodePaletteLayout->addWidget( EditCont );
 
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "End Editing" ) );
NodePaletteLayout->addWidget( PushButton1 );
211,6 → 216,7
connect(Crop, SIGNAL(clicked()), this, SLOT(doCrop()));
connect(Expand, SIGNAL(clicked()), this, SLOT(doExpand()));
connect(AbsMode, SIGNAL(clicked()), this, SLOT(ToggleAbsMode()));
connect(EditCont, SIGNAL(clicked()), this, SLOT(ToggleConMode()));
}
 
void NodePalette::setDoc(ScribusDoc *dc)
236,6 → 242,7
PolySplit->setOn(false);
BezierClose->setEnabled(true);
PolySplit->setEnabled(true);
EditCont->setEnabled(false);
}
 
void NodePalette::PolyStatus(int typ, uint size)
268,6 → 275,7
doc->ActPage->Bezier2Poly();
BezierClose->setEnabled(false);
PolySplit->setEnabled(true);
EditCont->setEnabled(true);
}
 
void NodePalette::doRotCCW()
391,6 → 399,49
connect(YSpin, SIGNAL(valueChanged(int)), this, SLOT(MovePoint()));
}
 
void NodePalette::ToggleConMode()
{
if (doc != 0)
{
doc->ActPage->EditContour = EditCont->isChecked();
doc->ActPage->update();
if (EditCont->isChecked())
{
BezierClose->setEnabled(false);
PolySplit->setEnabled(false);
PolyMirrorH->setEnabled(false);
PolyMirrorV->setEnabled(false);
PolyShearR->setEnabled(false);
PolyShearL->setEnabled(false);
PolyShearU->setEnabled(false);
PolyShearD->setEnabled(false);
RotateCCW->setEnabled(false);
RotateCW->setEnabled(false);
Crop->setEnabled(false);
Expand->setEnabled(false);
XSpin->setMinValue(-3000);
YSpin->setMinValue(-3000);
}
else
{
BezierClose->setEnabled(false);
PolySplit->setEnabled(true);
PolyMirrorH->setEnabled(true);
PolyMirrorV->setEnabled(true);
PolyShearR->setEnabled(true);
PolyShearL->setEnabled(true);
PolyShearU->setEnabled(true);
PolyShearD->setEnabled(true);
RotateCCW->setEnabled(true);
RotateCW->setEnabled(true);
Crop->setEnabled(false);
Expand->setEnabled(false);
XSpin->setMinValue(0);
YSpin->setMinValue(0);
}
}
}
 
void NodePalette::HaveNode(bool have, bool mov)
{
bool setter = have ? true : false;
479,8 → 530,11
{
MoveN();
doc->ActPage->ClRe = -1;
EditCont->setChecked(false);
doc->ActPage->EditContour = false;
}
PolySplit->setEnabled( false );
BezierClose->setEnabled( false );
EditCont->setChecked(false);
emit Schliessen();
}
/trunk/Scribus/scribus/docinfo.cpp
168,8 → 168,8
QToolTip::add( coverageEdit, tr( "The extent or scope of the content of the document, possibly including location, time and jurisdiction ranges" ) );
QToolTip::add( rightsEdit, tr( "Information about rights held in and over the document, eg. copyright, patent or trademark" ) );
 
setOKButton( tr("OK") );
setCancelButton( tr("Cancel") );
setOKButton( tr("&OK") );
setCancelButton( tr("&Cancel") );
 
// signals and slots connections
connect( this, SIGNAL( applyButtonPressed() ), this, SLOT( accept() ) );
/trunk/Scribus/scribus/editformats.cpp
26,40 → 26,32
Layout15->setSpacing( 6 );
Layout15->setMargin( 0 );
 
LoadS = new QPushButton( this, "LoadF" );
LoadS->setText( tr( "Append" ) );
LoadS = new QPushButton( tr( "&Append" ), this, "LoadF" );
Layout15->addWidget( LoadS );
 
NewB = new QPushButton( this, "NewB" );
NewB->setText( tr( "New" ) );
NewB = new QPushButton( tr( "&New" ), this, "NewB" );
Layout15->addWidget( NewB );
 
EditB = new QPushButton( this, "EditB" );
EditB->setText( tr( "Edit" ) );
EditB = new QPushButton( tr( "&Edit" ), this, "EditB" );
EditB->setDefault( true );
EditB->setEnabled(false);
Layout15->addWidget( EditB );
 
DublicateB = new QPushButton( this, "DublicateB" );
DublicateB->setText( tr( "Duplicate" ) );
DublicateB = new QPushButton( tr( "D&uplicate" ), this, "DublicateB" );
DublicateB->setEnabled(false);
Layout15->addWidget( DublicateB );
 
DeleteB = new QPushButton( this, "DeleteB" );
DeleteB->setText( tr( "Delete" ) );
DeleteB = new QPushButton( tr( "&Delete" ), this, "DeleteB" );
DeleteB->setEnabled(false);
Layout15->addWidget( DeleteB );
 
SaveB = new QPushButton( this, "SaveB" );
SaveB->setText( tr( "Save" ) );
SaveB = new QPushButton( tr( "&Save" ), this, "SaveB" );
Layout15->addWidget( SaveB );
 
ExitB = new QPushButton( this, "ExitB" );
ExitB->setText( tr( "OK" ) );
ExitB = new QPushButton( tr( "&OK" ), this, "ExitB" );
Layout15->addWidget( ExitB );
 
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout15->addWidget( CancelB );
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout15->addItem( spacer );
/trunk/Scribus/scribus/scribuswin.cpp
67,14 → 67,14
{
QString CloseTxt;
if (ScApp->singleClose)
CloseTxt = tr("Leave Anyway");
CloseTxt = tr("&Leave Anyway");
else
CloseTxt = tr("Close Anyway");
CloseTxt = tr("C&lose Anyway");
int exit=QMessageBox::information(this,
tr("Warning"),
tr("Document:")+" "+doc->DocName+"\n"+ tr("has been changed since the last save."),
tr("Save Now"),
tr("Cancel"),
tr("&Save Now"),
tr("&Cancel"),
CloseTxt,
0, 1);
switch (exit)
/trunk/Scribus/scribus/colorm.cpp
57,29 → 57,23
ColorsGroup->layout()->setMargin( 11 );
Layout1 = new QVBoxLayout( ColorsGroup->layout() );
Layout1->setAlignment( Qt::AlignTop );
LoadF = new QPushButton( ColorsGroup, "LoadF" );
LoadF->setText( tr( "Append" ) );
LoadF = new QPushButton( tr( "&Append" ), ColorsGroup, "LoadF" );
Layout1->addWidget( LoadF );
NewF = new QPushButton( ColorsGroup, "NewF" );
NewF->setText( tr( "New" ) );
NewF = new QPushButton( tr( "&New" ), ColorsGroup, "NewF" );
Layout1->addWidget( NewF );
EditF = new QPushButton( ColorsGroup, "EditF" );
EditF = new QPushButton( tr( "&Edit" ), ColorsGroup, "EditF" );
EditF->setEnabled( false );
EditF->setText( tr( "Edit" ) );
EditF->setDefault( true );
Layout1->addWidget( EditF );
DupF = new QPushButton( ColorsGroup, "DupF" );
DupF = new QPushButton( tr( "D&uplicate" ), ColorsGroup, "DupF" );
DupF->setEnabled( false );
DupF->setText( tr( "Duplicate" ) );
Layout1->addWidget( DupF );
DelF = new QPushButton( ColorsGroup, "DelF" );
DelF = new QPushButton( tr( "&Delete" ), ColorsGroup, "DelF" );
DelF->setEnabled( false );
DelF->setText( tr( "Delete" ) );
Layout1->addWidget( DelF );
if (HaveDoc)
{
DelU = new QPushButton( ColorsGroup, "DelU" );
DelU->setText( tr( "Remove Unused" ) );
DelU = new QPushButton( tr( "&Remove Unused" ), ColorsGroup, "DelU" );
Layout1->addWidget( DelU );
}
layout3->addWidget( ColorsGroup );
122,16 → 116,13
LoadColSet->setPopupDelay(0);
LoadColSet->setText(DcolSet);
ColsSetGroupLayout->addWidget( LoadColSet );
SaveColSet = new QPushButton( ColsSetGroup, "SaveColSet" );
SaveColSet->setText( tr( "Save Color Set" ) );
SaveColSet = new QPushButton( tr( "&Save Color Set" ), ColsSetGroup, "SaveColSet" );
ColsSetGroupLayout->addWidget( SaveColSet );
layout3->addWidget( ColsSetGroup );
}
SaveF = new QPushButton( this, "SaveF" );
SaveF->setText( tr( "OK" ) );
SaveF = new QPushButton( tr( "&OK" ), this, "SaveF" );
layout3->addWidget( SaveF );
CancF = new QPushButton( this, "CancF" );
CancF->setText( tr( "Cancel" ) );
CancF = new QPushButton( tr( "&Cancel" ), this, "CancF" );
CancF->setDefault( true );
layout3->addWidget( CancF );
layout5->addLayout( layout3 );
/trunk/Scribus/scribus/tabmanager.cpp
30,14 → 30,12
layout10->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
layout10->addWidget( OKButton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer_2 );
CancelButton = new QPushButton( this, "CancelB" );
CancelButton->setText( tr( "Cancel" ) );
CancelButton = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
layout10->addWidget( CancelButton );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer_3 );
/trunk/Scribus/scribus/scribusXml.cpp
184,7 → 184,8
if (QStoInt(obj->attribute("TRANSPARENT","0")) == 1)
OB->Pcolor = "None";
OB->Textflow=QStoInt(obj->attribute("TEXTFLOW"));
OB->Textflow2=QStoInt(obj->attribute("TEXTFLOW2","0"));
OB->Textflow2 =QStoInt(obj->attribute("TEXTFLOW2","0"));
OB->UseContour = QStoInt(obj->attribute("TEXTFLOW3","0"));
OB->Extra=QStodouble(obj->attribute("EXTRA"));
OB->TExtra=QStodouble(obj->attribute("TEXTRA", "1"));
OB->BExtra=QStodouble(obj->attribute("BEXTRA", "1"));
248,6 → 249,21
else
OB->PoLine.resize(0);
tmp = "";
if (obj->hasAttribute("NUMCO"))
{
OB->ContourLine.resize(obj->attribute("NUMCO").toUInt());
tmp = obj->attribute("COCOOR");
QTextStream fp(&tmp, IO_ReadOnly);
for (uint cx=0; cx<obj->attribute("NUMCO").toUInt(); ++cx)
{
fp >> xf;
fp >> yf;
OB->ContourLine.setPoint(cx, xf, yf);
}
}
else
OB->ContourLine.resize(0);
tmp = "";
if ((obj->hasAttribute("NUMTAB")) && (QStoInt(obj->attribute("NUMTAB","0")) != 0))
{
tmp = obj->attribute("TABS");
373,6 → 389,7
ob->setAttribute("ANNAME", !item->AutoName ? item->AnName : QString(""));
ob->setAttribute("TEXTFLOW", item->Textflow ? 1 : 0);
ob->setAttribute("TEXTFLOW2", item->Textflow2 ? 1 : 0);
ob->setAttribute("TEXTFLOW3", item->UseContour ? 1 : 0);
ob->setAttribute("AUTOTEXT", item->isAutoText ? 1 : 0);
ob->setAttribute("EXTRA",item->Extra);
ob->setAttribute("TEXTRA",item->TExtra);
440,6 → 457,14
polp += tmp.setNum(xf) + " " + tmpy.setNum(yf) + " ";
}
ob->setAttribute("POCOOR", polp);
ob->setAttribute("NUMCO",item->ContourLine.size());
QString colp = "";
for (uint nxx=0; nxx<item->ContourLine.size(); ++nxx)
{
item->ContourLine.point(nxx, &xf, &yf);
colp += tmp.setNum(xf) + " " + tmpy.setNum(yf) + " ";
}
ob->setAttribute("COCOOR", colp);
ob->setAttribute("NUMTAB", static_cast<int>(item->TabValues.count()));
QString tlp = "";
QValueList<double>::Iterator tax;