Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 131 → Rev 132

/trunk/Scribus/configure.in
13,7 → 13,7
AC_ARG_PROGRAM
 
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(scribus,1.1.4)
AM_INIT_AUTOMAKE(scribus,1.1.5cvs)
 
dnl KDE_SET_PREFIX
 
/trunk/Scribus/ChangeLogCVS
1,46 → 1,6
Changes since Version 1.1.3
18.12.2003 Groups can now rotated with the Properties Palette.
Changes since Version 1.1.4
21.12.2003 Added a right Click Context Menu for Pages too.
Improved the Node Palette.
You can set now the Base Point for Object resizing and moving
in the Properties Palette the same way as for the Rotation.
 
17.12.2003 Updated the German and Russian Translation.
 
16.12.2003 Added new Brazilian Translation.
Updated the Russian Translation.
 
15.12.2003 Added infomation about Pictures to the Info Entry in the context Menue.
 
14.12.2003 Added an Info Entry to the right mouse click context Menue.
Fixed redraw Issues.
Fixed Grid drawing Issues when the Zoom Factor is != 100 %.
 
12.12.2003 Added a Toolbar Button for the Story Editor.
Added a Statusbar to the Story Editor.
 
10.12.2003 Fixed Preferences Issues.
Combined the Toolbar Buttons for Rectangles and Circles into one Button
containing all Autoforms.
 
09.12.2003 Added some new Shapes to the Autoforms Menue.
Fixed the disabled Keyboard Bug.
 
07.12.2003 Added various Shapes to the Shape Tab in the Properties Palette.
Fixed misbehaviour with some corrupted Docs.
 
06.12.2003 Added Convert to Outlines to right mouse click context Menue.
The resolution setting is now used for all Pictures if they provide one.
 
05.12.2003 Fixed incorrect hyphens in the PDF-Export with Russian Text.
 
04.12.2003 Fixed Crash with SVG-Import.
 
03.12.2003 Updated the Danish Traslation.
Added a Crash Handler.
 
01.12.2003 Fixed crash when holding down a key whilst editing a Textframe.
Improved import of Template Pages, Line Styles and Styles.
Fixed PDF-Export Issues.
 
30.11.2003 Template Pages and Line Styles can now imported too.
 
29.11.2003 Added Button for importing Styles for other Documents to the Style Editor.
You can now switch Blackpoint Compensation on or off in the CMS Preferences.
 
/trunk/Scribus/scribus/mpalette.h
105,6 → 105,7
QRadioButton* BottomRight;
QLabel* Text3;
MSpinBox* Rot;
QLabel* Text3r;
QToolButton* FlipH;
QToolButton* FlipV;
QToolButton* Locked;
214,7 → 215,6
void setBH(double x, double y);
void setR(double r);
void setRR(double r);
void setRM(int r);
void setLsp(double r);
void setSize(int s);
void setExtra(double e);
301,12 → 301,10
QVBoxLayout* pageLayout_4;
QVBoxLayout* pageLayout_5;
QHBoxLayout* layout60;
QHBoxLayout* layout60a;
QVBoxLayout* Layout44;
QVBoxLayout* Layout44a;
QHBoxLayout* Layout13;
QGridLayout* Layout12;
QVBoxLayout* Layout15_2;
QHBoxLayout* Layout13;
QHBoxLayout* layout47;
QVBoxLayout* layout46;
QGridLayout* layout41;
/trunk/Scribus/scribus/mpalette.cpp
129,6 → 129,76
Height = new MSpinBox( GeoGroup, 2 );
Height->setSuffix( tr( " pt" ) );
GeoGroupLayout->addWidget( Height, 3, 1 );
Text3 = new QLabel( GeoGroup, "Text3" );
Text3->setText( tr( "Rotation:" ) );
GeoGroupLayout->addWidget( Text3, 4, 0 );
Rot = new MSpinBox( GeoGroup, 2);
Rot->setSuffix(" °");
Rot->setWrapping( true );
GeoGroupLayout->addWidget( Rot, 4, 1 );
Text3r = new QLabel( GeoGroup, "Text3r" );
Text3r->setText( tr( "Basepoint:" ) );
GeoGroupLayout->addWidget( Text3r, 5, 0 );
RotationGroup = new QButtonGroup( GeoGroup, "RotationGroup" );
RotationGroup->setTitle( "" );
RotationGroup->setFrameShape( QButtonGroup::NoFrame );
RotationGroup->setColumnLayout(0, Qt::Vertical );
RotationGroup->layout()->setSpacing( 0 );
RotationGroup->layout()->setMargin( 0 );
RotationGroupLayout = new QHBoxLayout( RotationGroup->layout() );
RotationGroupLayout->setAlignment( Qt::AlignTop );
Layout12 = new QGridLayout( 0, 1, 1, 0, 0, "Layout12");
TopLeft = new QRadioButton( RotationGroup, "TopLeft" );
TopLeft->setText( tr( "" ) );
TopLeft->setChecked( true );
Layout12->addWidget( TopLeft, 0, 0, Qt::AlignCenter );
Line1 = new QFrame( RotationGroup, "Line1" );
Line1->setMinimumSize( QSize( 20, 4 ) );
Line1->setMaximumSize( QSize( 20, 4 ) );
Line1->setFrameShape( QFrame::HLine );
Line1->setFrameShadow( QFrame::Plain );
Line1->setLineWidth( 3 );
Line1->setFrameShape( QFrame::HLine );
Layout12->addWidget( Line1, 0, 1, Qt::AlignCenter );
TopRight = new QRadioButton( RotationGroup, "TopRight" );
TopRight->setText( tr( "" ) );
Layout12->addWidget( TopRight, 0, 2, Qt::AlignCenter );
Line2 = new QFrame( RotationGroup, "Line2" );
Line2->setMinimumSize( QSize( 4, 20 ) );
Line2->setMaximumSize( QSize( 4, 20 ) );
Line2->setFrameShape( QFrame::VLine );
Line2->setFrameShadow( QFrame::Plain );
Line2->setLineWidth( 3 );
Line2->setFrameShape( QFrame::VLine );
Layout12->addWidget( Line2, 1, 0, Qt::AlignCenter );
Center = new QRadioButton( RotationGroup, "Center" );
Center->setText( tr( "" ) );
Layout12->addWidget( Center, 1, 1, Qt::AlignCenter );
Line4 = new QFrame( RotationGroup, "Line4" );
Line4->setMinimumSize( QSize( 4, 20 ) );
Line4->setMaximumSize( QSize( 4, 20 ) );
Line4->setFrameShadow( QFrame::Plain );
Line4->setLineWidth( 3 );
Line4->setFrameShape( QFrame::VLine );
Layout12->addWidget( Line4, 1, 2, Qt::AlignCenter );
BottomLeft = new QRadioButton( RotationGroup, "BottomLeft" );
BottomLeft->setText( tr( "" ) );
Layout12->addWidget( BottomLeft, 2, 0, Qt::AlignCenter );
Line5 = new QFrame( RotationGroup, "Line5" );
Line5->setMinimumSize( QSize( 20, 4 ) );
Line5->setMaximumSize( QSize( 20, 4 ) );
Line5->setFrameShape( QFrame::HLine );
Line5->setFrameShadow( QFrame::Plain );
Line5->setLineWidth( 3 );
Line5->setFrameShape( QFrame::HLine );
Layout12->addWidget( Line5, 2, 1, Qt::AlignCenter );
BottomRight = new QRadioButton( RotationGroup, "BottomRight" );
BottomRight->setText( tr( "" ) );
Layout12->addWidget( BottomRight, 2, 2, Qt::AlignCenter );
RotationGroupLayout->addLayout( Layout12 );
QSpacerItem* spacer12 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
RotationGroupLayout->addItem( spacer12 );
GeoGroupLayout->addWidget( RotationGroup, 5, 1 );
pageLayout->addWidget( GeoGroup );
 
layout60 = new QHBoxLayout( 0, 0, 5, "layout60");
211,78 → 281,6
Textflow2->setText( tr( "Use Bounding Box" ) );
pageLayout->addWidget( Textflow2 );
 
layout60a = new QHBoxLayout( 0, 0, 5, "layout60a");
RotationGroup = new QButtonGroup( page, "RotationGroup" );
RotationGroup->setTitle( tr( "Rotation" ) );
RotationGroup->setColumnLayout(0, Qt::Vertical );
RotationGroup->layout()->setSpacing( 4 );
RotationGroup->layout()->setMargin( 5 );
RotationGroupLayout = new QHBoxLayout( RotationGroup->layout() );
RotationGroupLayout->setAlignment( Qt::AlignTop );
Layout12 = new QGridLayout( 0, 1, 1, 0, 0, "Layout12");
TopLeft = new QRadioButton( RotationGroup, "TopLeft" );
TopLeft->setText( tr( "" ) );
TopLeft->setChecked( true );
Layout12->addWidget( TopLeft, 0, 0, Qt::AlignCenter );
Line1 = new QFrame( RotationGroup, "Line1" );
Line1->setMinimumSize( QSize( 20, 4 ) );
Line1->setMaximumSize( QSize( 20, 4 ) );
Line1->setFrameShape( QFrame::HLine );
Line1->setFrameShadow( QFrame::Plain );
Line1->setLineWidth( 3 );
Line1->setFrameShape( QFrame::HLine );
Layout12->addWidget( Line1, 0, 1, Qt::AlignCenter );
TopRight = new QRadioButton( RotationGroup, "TopRight" );
TopRight->setText( tr( "" ) );
Layout12->addWidget( TopRight, 0, 2, Qt::AlignCenter );
Line2 = new QFrame( RotationGroup, "Line2" );
Line2->setMinimumSize( QSize( 4, 20 ) );
Line2->setMaximumSize( QSize( 4, 20 ) );
Line2->setFrameShape( QFrame::VLine );
Line2->setFrameShadow( QFrame::Plain );
Line2->setLineWidth( 3 );
Line2->setFrameShape( QFrame::VLine );
Layout12->addWidget( Line2, 1, 0, Qt::AlignCenter );
Center = new QRadioButton( RotationGroup, "Center" );
Center->setText( tr( "" ) );
Layout12->addWidget( Center, 1, 1, Qt::AlignCenter );
Line4 = new QFrame( RotationGroup, "Line4" );
Line4->setMinimumSize( QSize( 4, 20 ) );
Line4->setMaximumSize( QSize( 4, 20 ) );
Line4->setFrameShadow( QFrame::Plain );
Line4->setLineWidth( 3 );
Line4->setFrameShape( QFrame::VLine );
Layout12->addWidget( Line4, 1, 2, Qt::AlignCenter );
BottomLeft = new QRadioButton( RotationGroup, "BottomLeft" );
BottomLeft->setText( tr( "" ) );
Layout12->addWidget( BottomLeft, 2, 0, Qt::AlignCenter );
Line5 = new QFrame( RotationGroup, "Line5" );
Line5->setMinimumSize( QSize( 20, 4 ) );
Line5->setMaximumSize( QSize( 20, 4 ) );
Line5->setFrameShape( QFrame::HLine );
Line5->setFrameShadow( QFrame::Plain );
Line5->setLineWidth( 3 );
Line5->setFrameShape( QFrame::HLine );
Layout12->addWidget( Line5, 2, 1, Qt::AlignCenter );
BottomRight = new QRadioButton( RotationGroup, "BottomRight" );
BottomRight->setText( tr( "" ) );
Layout12->addWidget( BottomRight, 2, 2, Qt::AlignCenter );
RotationGroupLayout->addLayout( Layout12 );
 
Layout15_2 = new QVBoxLayout( 0, 3, 0, "Layout15_2");
Text3 = new QLabel( RotationGroup, "Text3" );
Text3->setText( tr( "by:" ) );
Layout15_2->addWidget( Text3 );
Rot = new MSpinBox( RotationGroup, 2);
Rot->setSuffix(" °");
Rot->setWrapping( true );
Layout15_2->addWidget( Rot );
RotationGroupLayout->addLayout(Layout15_2);
 
layout60a->addWidget(RotationGroup);
QSpacerItem* spacer12 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout60a->addItem( spacer12 );
pageLayout->addLayout(layout60a);
QSpacerItem* spacer13 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
pageLayout->addItem( spacer13 );
TabStack->addWidget( page, 0 );
1423,10 → 1421,39
void Mpalette::setXY(double x, double y)
{
bool tmp = HaveItem;
double inX, inY, b, h, r;
QWMatrix ma;
FPoint n;
if (HaveItem)
{
b = CurItem->Width;
h = CurItem->Height;
r = CurItem->Rot;
}
else
{
b = 0.0;
h = 0.0;
r = 0.0;
}
HaveItem = false;
Xpos->setValue(qRound(x*UmReFaktor*100.0));
Ypos->setValue(qRound(y*UmReFaktor*100.0));
if (LMode)
ma.translate(x, y);
ma.rotate(r);
if (TopLeft->isChecked())
n = FPoint(0.0, 0.0);
if (TopRight->isChecked())
n = FPoint(b, 0.0);
if (Center->isChecked())
n = FPoint(b / 2.0, h / 2.0);
if (BottomLeft->isChecked())
n = FPoint(0.0, h);
if (BottomRight->isChecked())
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));
if ((LMode) && (tmp))
setBH(CurItem->Width, CurItem->Height);
HaveItem = tmp;
}
1473,14 → 1500,6
HaveItem = tmp;
}
 
void Mpalette::setRM(int r)
{
bool tmp = HaveItem;
HaveItem = false;
RotationGroup->setButton(r);
HaveItem = tmp;
}
 
void Mpalette::setLsp(double r)
{
bool tmp = HaveItem;
1690,7 → 1709,8
 
void Mpalette::NewX()
{
double x,y,w,h, gx, gy, gh, gw;
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;
1713,7 → 1733,21
doc->ActPage->RotateItem(r, CurItem->ItemNr);
}
else
doc->ActPage->MoveItem(x - CurItem->Xpos, 0, CurItem, true);
{
ma.translate(CurItem->Xpos, CurItem->Ypos);
ma.rotate(CurItem->Rot);
if (TopLeft->isChecked())
base = CurItem->Xpos;
if (Center->isChecked())
base = ma.m11() * (CurItem->Width / 2.0) + ma.m21() * (CurItem->Height / 2.0) + ma.dx();
if (TopRight->isChecked())
base = ma.m11() * CurItem->Width + ma.m21() * 0.0 + ma.dx();
if (BottomRight->isChecked())
base = ma.m11() * CurItem->Width + ma.m21() * CurItem->Height + ma.dx();
if (BottomLeft->isChecked())
base = ma.m11() * 0.0 + ma.m21() * CurItem->Height + ma.dx();
doc->ActPage->MoveItem(x - base, 0, CurItem, true);
}
}
emit DocChanged();
}
1721,7 → 1755,8
 
void Mpalette::NewY()
{
double x,y,w,h, gx, gy, gh, gw;
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;
1744,7 → 1779,21
doc->ActPage->RotateItem(r, CurItem->ItemNr);
}
else
doc->ActPage->MoveItem(0, y - CurItem->Ypos, CurItem);
{
ma.translate(CurItem->Xpos, CurItem->Ypos);
ma.rotate(CurItem->Rot);
if (TopLeft->isChecked())
base = CurItem->Ypos;
if (Center->isChecked())
base = ma.m22() * (CurItem->Height / 2.0) + ma.m12() * (CurItem->Width / 2.0) + ma.dy();
if (TopRight->isChecked())
base = ma.m22() * 0.0 + ma.m12() * CurItem->Width + ma.dy();
if (BottomRight->isChecked())
base = ma.m22() * CurItem->Height + ma.m12() * CurItem->Width + ma.dy();
if (BottomLeft->isChecked())
base = ma.m22() * CurItem->Height + ma.m12() * 0.0 + ma.dy();
doc->ActPage->MoveItem(0, y - base, CurItem);
}
}
emit DocChanged();
}
2176,7 → 2225,33
doc->ActPage->RCenter = FPoint(gx+gw, gy+gh);
}
else
doc->RotMode = m;
{
double inX, inY, b, h, r;
HaveItem = false;
QWMatrix ma;
FPoint n;
b = CurItem->Width;
h = CurItem->Height;
r = CurItem->Rot;
ma.translate(CurItem->Xpos, CurItem->Ypos);
ma.rotate(r);
if (TopLeft->isChecked())
n = FPoint(0.0, 0.0);
if (TopRight->isChecked())
n = FPoint(b, 0.0);
if (Center->isChecked())
n = FPoint(b / 2.0, h / 2.0);
if (BottomLeft->isChecked())
n = FPoint(0.0, h);
if (BottomRight->isChecked())
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));
HaveItem = true;
}
doc->RotMode = m;
}
}
 
/trunk/Scribus/scribus/icons/expand.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/Scribus/scribus/icons/Makefile.am
===================================================================
--- trunk/Scribus/scribus/icons/Makefile.am (revision 131)
+++ trunk/Scribus/scribus/icons/Makefile.am (revision 132)
@@ -1,10 +1,14 @@
####### kdevelop will overwrite this part!!! (begin)##########
-EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png oval.png rect.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png arrowr.png arrowl.png arrowu.png arrowd.png cross.png triangle2.png trir.png tril.png trid.png trit.png halfovalu.png halfovald.png halfovalr.png halfovall.png frame.png torus.png signature.png rotate_cw.png rotate_ccw.png
+EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png oval.png rect.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png arrowr.png arrowl.png arrowu.png arrowd.png cross.png triangle2.png trir.png tril.png trid.png trit.png halfovalu.png halfovald.png halfovalr.png halfovall.png frame.png torus.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
+ $(INSTALL_DATA) $(srcdir)/crop.png $(prefix)/lib/scribus/icons/crop.png
+ $(mkinstalldirs) $(prefix)/lib/scribus/icons/
+ $(INSTALL_DATA) $(srcdir)/expand.png $(prefix)/lib/scribus/icons/expand.png
+ $(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/rotate_cw.png $(prefix)/lib/scribus/icons/rotate_cw.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/rotate_ccw.png $(prefix)/lib/scribus/icons/rotate_ccw.png
@@ -439,6 +443,8 @@
-rm -f $(prefix)/lib/scribus/icons/signature.png
-rm -f $(prefix)/lib/scribus/icons/rotate_cw.png
-rm -f $(prefix)/lib/scribus/icons/rotate_ccw.png
+ -rm -f $(prefix)/lib/scribus/icons/crop.png
+ -rm -f $(prefix)/lib/scribus/icons/expand.png
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/icons/crop.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/Scribus/scribus/page.h
===================================================================
--- trunk/Scribus/scribus/page.h (revision 131)
+++ trunk/Scribus/scribus/page.h (revision 132)
@@ -96,10 +96,7 @@
bool PointOnLine(QPoint Start, QPoint Ende, QRect MArea);
void MirrorPolyH();
void MirrorPolyV();
- void ShearPolyHR();
- void ShearPolyHL();
- void ShearPolyVU();
- void ShearPolyVD();
+ void TransformPoly(int mode);
void Reset1Control();
void ResetControl();
void AdjustItemSize(PageItem *b);
@@ -189,8 +186,10 @@
bool MoveGX;
FPoint RCenter;
bool MidButt;
+ int RotMode;
public slots:
+ void PasteToPage();
void TextToPath();
void ChLineWidth(double w);
void ChLineArt(PenStyle w);
@@ -308,7 +307,6 @@
void DelBM(PageItem *);
void NewBMNr(int, int);
void ChBMText(PageItem *);
- void RotMode(int);
void RasterPic(bool);
void DelObj(uint, uint);
void MoveObj(uint, uint, uint);
/trunk/Scribus/scribus/frameedit.h
25,21 → 25,22
QToolButton* MoveControl;
QToolButton* AddNode;
QToolButton* DeleteNode;
QButtonGroup* ButtonGroup2;
QToolButton* AsymMove;
QToolButton* SymMove;
QToolButton* ResNode;
QToolButton* Res1Node;
QButtonGroup* ButtonGroup3;
QToolButton* PolySplit;
QToolButton* BezierClose;
QToolButton* PolyMirrorH;
QToolButton* PolyMirrorV;
QButtonGroup* ButtonGroup4;
QToolButton* PolyShearL;
QToolButton* PolyShearR;
QToolButton* PolyShearU;
QToolButton* PolyShearD;
QToolButton* RotateCCW;
QToolButton* RotateCW;
QToolButton* Expand;
QToolButton* Crop;
QCheckBox* AbsMode;
QLabel* TextLabel1;
MSpinBox* YSpin;
64,6 → 65,10
void SplitPoly();
void MirrorH();
void MirrorV();
void doRotCCW();
void doRotCW();
void doCrop();
void doExpand();
void ShearR();
void ShearL();
void ShearU();
79,10 → 84,7
 
protected:
QVBoxLayout* NodePaletteLayout;
QHBoxLayout* ButtonGroup1Layout;
QHBoxLayout* ButtonGroup2Layout;
QHBoxLayout* ButtonGroup3Layout;
QHBoxLayout* ButtonGroup4Layout;
QGridLayout* ButtonGroup1Layout;
QGridLayout* Layout2;
 
signals:
/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(20).arg("December").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(21).arg("December").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
3437,7 → 3437,6
connect(doc->ActPage, SIGNAL(ItemTextStil(int)), Mpal, SLOT(setStil(int)));
connect(doc->ActPage, SIGNAL(ItemTextSca(int)), Mpal, SLOT(setTScale(int)));
connect(doc->ActPage, SIGNAL(ItemTextAbs(int)), Mpal, SLOT(setAli(int)));
connect(doc->ActPage, SIGNAL(RotMode(int)), Mpal, SLOT(setRM(int)));
connect(doc->ActPage, SIGNAL(SetLineArt(PenStyle, PenCapStyle, PenJoinStyle)), Mpal, SLOT( setLIvalue(PenStyle, PenCapStyle, PenJoinStyle)));
connect(doc->ActPage, SIGNAL(ItemFarben(QString, QString, int, int)), this, SLOT(setCSMenu(QString, QString, int, int)));
connect(doc->ActPage, SIGNAL(ItemFarben(QString, QString, int, int)), Mpal->Cpal, SLOT(setActFarben(QString, QString, int, int)));
/trunk/Scribus/scribus/page.cpp
20,6 → 20,7
#include "pageitem.h"
#include "serializer.h"
#include "scribusXml.h"
#include "scribus.h"
 
#if (_MSC_VER >= 1200)
#include "win-config.h"
75,6 → 76,7
extern void Level2Layer(ScribusDoc *doc, struct Layer *ll, int Level);
extern FPoint GetMaxClipF(FPointArray Clip);
extern void WordAndPara(PageItem* b, int *w, int *p, int *c, int *wN, int *pN, int *cN);
extern ScribusApp* ScApp;
 
Page::Page(QWidget *pa, int x, int y, int b, int h, ScribusDoc *doc, QScrollView *view)
: QWidget(pa, "ps", WRepaintNoErase)
1040,8 → 1042,30
Transform(b, &p);
alt = QRegion(p.xForm(QRect(0, 0, static_cast<int>(b->Width), static_cast<int>(b->Height))));
p.end();
QWMatrix ma;
ma.rotate(b->Rot);
double dX = ma.m11() * (b->Width - newX) + ma.m21() * (b->Height - newY) + ma.dx();
double dY = ma.m22() * (b->Height - newY) + ma.m12() * (b->Width - newX) + ma.dy();
b->Width = newX;
b->Height = newY;
if ((doku->RotMode != 0) && (fromMP))
{
switch (doku->RotMode)
{
case 2:
MoveItem(dX / 2.0, dY / 2.0, b);
break;
case 4:
MoveItem(dX, dY, b);
break;
case 3:
MoveItem(0.0, dY, b);
break;
case 1:
MoveItem(dX, 0.0, b);
break;
}
}
b->RadRect = QMIN(b->RadRect, QMIN(b->Width,b->Height)/2);
if ((b->PType == 2) && (!b->Sizing) && (!doku->EditClip))
{
1462,13 → 1486,79
MarkClip(b);
}
 
void Page::ShearPolyHR()
void Page::TransformPoly(int mode)
{
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.shear(-0.017455, 0);
FPoint oldPos = FPoint(b->Xpos, b->Ypos);
double offsX = b->Width / 2.0;
double offsY = b->Height / 2.0;
ma.translate(-offsX, -offsY);
switch (mode)
{
case 0:
ma.rotate(-1.0);
break;
case 1:
ma.rotate(1.0);
break;
case 2:
ma.scale(0.9, 0.9);
break;
case 3:
ma.scale(1.1, 1.1);
break;
case 4:
ma.shear(0.017455, 0);
break;
case 5:
ma.shear(-0.017455, 0);
break;
case 6:
ma.shear(0, -0.017455);
break;
case 7:
ma.shear(0, 0.017455);
break;
}
b->PoLine.map(ma);
b->PoLine.translate(offsX, offsY);
AdjustItemSize(b);
QWMatrix ma2;
ma2.translate(oldPos.x(), oldPos.y());
ma2.scale(1, 1);
ma2.translate(offsX, offsY);
FPoint n = FPoint(-offsX, -offsY);
switch (mode)
{
case 0:
ma2.rotate(-1.0);
break;
case 1:
ma2.rotate(1.0);
break;
case 2:
ma2.scale(0.9, 0.9);
break;
case 3:
ma2.scale(1.1, 1.1);
break;
case 4:
ma2.shear(0.017455, 0);
break;
case 5:
ma2.shear(-0.017455, 0);
break;
case 6:
ma2.shear(0, -0.017455);
break;
case 7:
ma2.shear(0, 0.017455);
break;
}
double x = ma2.m11() * n.x() + ma2.m21() * n.y() + ma2.dx();
double y = ma2.m22() * n.y() + ma2.m12() * n.x() + ma2.dy();
MoveItem(x-oldPos.x(), y-oldPos.y(), b);
if (b->PType == 8)
UpdatePolyClip(b);
RefreshItem(b);
1476,48 → 1566,6
b->FrameType = 3;
}
 
void Page::ShearPolyHL()
{
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.shear(0.017455, 0);
b->PoLine.map(ma);
AdjustItemSize(b);
if (b->PType == 8)
UpdatePolyClip(b);
RefreshItem(b);
MarkClip(b);
b->FrameType = 3;
}
 
void Page::ShearPolyVU()
{
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.shear(0, -0.017455);
b->PoLine.map(ma);
AdjustItemSize(b);
if (b->PType == 8)
UpdatePolyClip(b);
RefreshItem(b);
MarkClip(b);
b->FrameType = 3;
}
 
void Page::ShearPolyVD()
{
PageItem *b = SelItem.at(0);
QWMatrix ma;
ma.shear(0, 0.017455);
b->PoLine.map(ma);
AdjustItemSize(b);
if (b->PType == 8)
UpdatePolyClip(b);
RefreshItem(b);
MarkClip(b);
b->FrameType = 3;
}
 
void Page::Reset1Control()
{
PageItem *b = SelItem.at(0);
1834,6 → 1882,14
emit DocChanged();
}
 
void Page::PasteToPage()
{
emit LoadElem(ScApp->Buffer2, qRound(Mxp/doku->Scale), qRound(Myp/doku->Scale), false, false, doku);
doku->DraggedElem = 0;
doku->DragElements.clear();
update();
}
 
void Page::mouseReleaseEvent(QMouseEvent *m)
{
PageItem *b;
1964,6 → 2020,19
MarkClip(b);
return;
}
if ((!GetItem(&b)) && (m->button() == RightButton) && (!doku->DragP) && (doku->AppMode == 1))
{
if (ScApp->Buffer2.startsWith("<SCRIBUSELEM"))
{
Mxp = m->x();
Myp = m->y();
QPopupMenu *pmen = new QPopupMenu();
pmen->insertItem( tr("Paste") , this, SLOT(PasteToPage()));
pmen->exec(QCursor::pos());
delete pmen;
return;
}
}
if ((doku->AppMode != 6) /* && (doku->AppMode != 7) */ && (!doku->EditClip) && (doku->AppMode != 13))
{
if ((GetItem(&b)) && (m->button() == RightButton) && (!doku->DragP))
2443,6 → 2512,8
}
if (doku->AppMode != 7)
{
if (doku->AppMode == 9)
doku->RotMode = RotMode;
doku->AppMode = 1;
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
emit PaintingDone();
3815,6 → 3886,7
case 9:
if (GetItem(&b))
{
RotMode = doku->RotMode;
p.begin(this);
Transform(b, &p);
doku->RotMode = 2;
3846,7 → 3918,6
storeUndoInf(b);
doku->UnDoValid = true;
emit UndoAvail();
emit RotMode(doku->RotMode);
p.end();
}
}
/trunk/Scribus/scribus/frameedit.cpp
22,9 → 22,9
ButtonGroup1->setColumnLayout(0, Qt::Vertical );
ButtonGroup1->layout()->setSpacing( 0 );
ButtonGroup1->layout()->setMargin( 0 );
ButtonGroup1Layout = new QHBoxLayout( ButtonGroup1->layout() );
ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
ButtonGroup1Layout->setAlignment( Qt::AlignTop );
ButtonGroup1Layout->setSpacing( 2 );
ButtonGroup1Layout->setSpacing( 0 );
ButtonGroup1Layout->setMargin( 0 );
 
MoveNode = new QToolButton( ButtonGroup1, "MoveNode" );
32,127 → 32,115
MoveNode->setPixmap(loadIcon("MoveNode.png"));
MoveNode->setToggleButton( true );
MoveNode->setOn(true);
ButtonGroup1Layout->addWidget( MoveNode );
ButtonGroup1Layout->addWidget( MoveNode, 0, 0 );
MoveControl = new QToolButton( ButtonGroup1, "MoveControl" );
MoveControl->setText( tr( "" ) );
MoveControl->setPixmap(loadIcon("MoveKontrol.png"));
MoveControl->setToggleButton( true );
ButtonGroup1Layout->addWidget( MoveControl );
ButtonGroup1Layout->addWidget( MoveControl, 0, 1 );
AddNode = new QToolButton( ButtonGroup1, "AddNode" );
AddNode->setText( tr( "" ) );
AddNode->setPixmap(loadIcon("AddNode.png"));
AddNode->setToggleButton( true );
ButtonGroup1Layout->addWidget( AddNode );
ButtonGroup1Layout->addWidget( AddNode, 0, 2 );
DeleteNode = new QToolButton( ButtonGroup1, "DeleteNode" );
DeleteNode->setText( tr( "" ) );
DeleteNode->setPixmap(loadIcon("DeleteNode.png"));
DeleteNode->setToggleButton( true );
ButtonGroup1Layout->addWidget( DeleteNode );
NodePaletteLayout->addWidget( ButtonGroup1 );
ButtonGroup1Layout->addWidget( DeleteNode, 0, 3 );
 
ButtonGroup2 = new QButtonGroup( this, "ButtonGroup2" );
ButtonGroup2->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup2->setFrameShadow( QButtonGroup::Plain );
ButtonGroup2->setTitle( tr( "" ) );
ButtonGroup2->setExclusive( true );
ButtonGroup2->setColumnLayout(0, Qt::Vertical );
ButtonGroup2->layout()->setSpacing( 2 );
ButtonGroup2->layout()->setMargin( 0 );
ButtonGroup2Layout = new QHBoxLayout( ButtonGroup2->layout() );
ButtonGroup2Layout->setAlignment( Qt::AlignTop );
AsymMove = new QToolButton( ButtonGroup2, "AsymMove" );
AsymMove = new QToolButton( ButtonGroup1, "AsymMove" );
AsymMove->setEnabled( false );
AsymMove->setText( tr( "" ) );
AsymMove->setPixmap(loadIcon("MoveAsym.png"));
AsymMove->setToggleButton( true );
ButtonGroup2Layout->addWidget( AsymMove );
SymMove = new QToolButton( ButtonGroup2, "SymMove" );
ButtonGroup1Layout->addWidget( AsymMove, 1, 0 );
SymMove = new QToolButton( ButtonGroup1, "SymMove" );
SymMove->setEnabled( false );
SymMove->setText( tr( "" ) );
SymMove->setPixmap(loadIcon("MoveSym.png"));
SymMove->setToggleButton( true );
ButtonGroup2Layout->addWidget( SymMove );
ResNode = new QToolButton( ButtonGroup2, "resnode" );
ButtonGroup1Layout->addWidget( SymMove, 1, 1 );
ResNode = new QToolButton( ButtonGroup1, "resnode" );
ResNode->setEnabled( false );
ResNode->setText( tr( "" ) );
ResNode->setPixmap(loadIcon("ResetNode.png"));
ButtonGroup2Layout->addWidget( ResNode );
Res1Node = new QToolButton( ButtonGroup2, "res1node" );
ButtonGroup1Layout->addWidget( ResNode, 1, 2 );
Res1Node = new QToolButton( ButtonGroup1, "res1node" );
Res1Node->setEnabled( false );
Res1Node->setText( tr( "" ) );
Res1Node->setPixmap(loadIcon("Reset1Node.png"));
ButtonGroup2Layout->addWidget( Res1Node );
NodePaletteLayout->addWidget( ButtonGroup2 );
ButtonGroup1Layout->addWidget( Res1Node, 1, 3 );
 
ButtonGroup3 = new QButtonGroup( this, "ButtonGroup3" );
ButtonGroup3->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup3->setFrameShadow( QButtonGroup::Plain );
ButtonGroup3->setTitle( tr( "" ) );
ButtonGroup3->setExclusive( true );
ButtonGroup3->setColumnLayout(0, Qt::Vertical );
ButtonGroup3->layout()->setSpacing( 2 );
ButtonGroup3->layout()->setMargin( 0 );
ButtonGroup3Layout = new QHBoxLayout( ButtonGroup3->layout() );
ButtonGroup3Layout->setAlignment( Qt::AlignTop );
PolySplit = new QToolButton( ButtonGroup3, "PolySplit" );
PolySplit = new QToolButton( ButtonGroup1, "PolySplit" );
PolySplit->setEnabled( false );
PolySplit->setText( tr( "" ) );
PolySplit->setToggleButton( true );
PolySplit->setPixmap(loadIcon("PolyCut.png"));
ButtonGroup3Layout->addWidget( PolySplit );
BezierClose = new QToolButton( ButtonGroup3, "BezierClose" );
ButtonGroup1Layout->addWidget( PolySplit, 2, 0 );
BezierClose = new QToolButton( ButtonGroup1, "BezierClose" );
BezierClose->setEnabled( false );
BezierClose->setText( tr( "" ) );
BezierClose->setPixmap(loadIcon("BezierClose.png"));
ButtonGroup3Layout->addWidget( BezierClose );
ButtonGroup1Layout->addWidget( BezierClose, 2, 1 );
 
PolyMirrorH = new QToolButton( ButtonGroup3, "MirrorH" );
PolyMirrorH = new QToolButton( ButtonGroup1, "MirrorH" );
PolyMirrorH->setText( tr( "" ) );
PolyMirrorH->setPixmap(loadIcon("hmirror.png"));
ButtonGroup3Layout->addWidget( PolyMirrorH );
ButtonGroup1Layout->addWidget( PolyMirrorH, 2, 2 );
 
PolyMirrorV = new QToolButton( ButtonGroup3, "MirrorV" );
PolyMirrorV = new QToolButton( ButtonGroup1, "MirrorV" );
PolyMirrorV->setText( tr( "" ) );
PolyMirrorV->setPixmap(loadIcon("vmirror.png"));
ButtonGroup3Layout->addWidget( PolyMirrorV );
ButtonGroup1Layout->addWidget( PolyMirrorV, 2, 3 );
 
NodePaletteLayout->addWidget( ButtonGroup3 );
 
ButtonGroup4 = new QButtonGroup( this, "ButtonGroup4" );
ButtonGroup4->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup4->setFrameShadow( QButtonGroup::Plain );
ButtonGroup4->setTitle( tr( "" ) );
ButtonGroup4->setExclusive( true );
ButtonGroup4->setColumnLayout(0, Qt::Vertical );
ButtonGroup4->layout()->setSpacing( 2 );
ButtonGroup4->layout()->setMargin( 0 );
ButtonGroup4Layout = new QHBoxLayout( ButtonGroup4->layout() );
ButtonGroup4Layout->setAlignment( Qt::AlignTop );
 
PolyShearL = new QToolButton( ButtonGroup4, "ShearL" );
PolyShearL = new QToolButton( ButtonGroup1, "ShearL" );
PolyShearL->setAutoRepeat(true);
PolyShearL->setText( tr( "" ) );
PolyShearL->setPixmap(loadIcon("shear_left.png"));
ButtonGroup4Layout->addWidget( PolyShearL );
PolyShearR = new QToolButton( ButtonGroup4, "ShearR" );
ButtonGroup1Layout->addWidget( PolyShearL, 3, 0 );
PolyShearR = new QToolButton( ButtonGroup1, "ShearR" );
PolyShearR->setAutoRepeat(true);
PolyShearR->setText( tr( "" ) );
PolyShearR->setPixmap(loadIcon("shear_right.png"));
ButtonGroup4Layout->addWidget( PolyShearR );
PolyShearU = new QToolButton( ButtonGroup4, "ShearU" );
ButtonGroup1Layout->addWidget( PolyShearR, 3, 1 );
PolyShearU = new QToolButton( ButtonGroup1, "ShearU" );
PolyShearU->setAutoRepeat(true);
PolyShearU->setText( tr( "" ) );
PolyShearU->setPixmap(loadIcon("shear_up.png"));
ButtonGroup4Layout->addWidget( PolyShearU );
PolyShearD = new QToolButton( ButtonGroup4, "ShearD" );
ButtonGroup1Layout->addWidget( PolyShearU, 3, 2 );
PolyShearD = new QToolButton( ButtonGroup1, "ShearD" );
PolyShearD->setAutoRepeat(true);
PolyShearD->setText( tr( "" ) );
PolyShearD->setPixmap(loadIcon("shear_down.png"));
ButtonGroup4Layout->addWidget( PolyShearD );
ButtonGroup1Layout->addWidget( PolyShearD, 3, 3 );
 
RotateCCW = new QToolButton( ButtonGroup1, "RotateCCW" );
RotateCCW->setAutoRepeat(true);
RotateCCW->setText( tr( "" ) );
RotateCCW->setPixmap(loadIcon("rotate_ccw.png"));
ButtonGroup1Layout->addWidget( RotateCCW, 4, 0 );
RotateCW = new QToolButton( ButtonGroup1, "RotateCW" );
RotateCW->setAutoRepeat(true);
RotateCW->setText( tr( "" ) );
RotateCW->setPixmap(loadIcon("rotate_cw.png"));
ButtonGroup1Layout->addWidget( RotateCW, 4, 1 );
Expand = new QToolButton( ButtonGroup1, "Expand" );
Expand->setAutoRepeat(true);
Expand->setText( tr( "" ) );
Expand->setPixmap(loadIcon("expand.png"));
ButtonGroup1Layout->addWidget( Expand, 4, 2 );
Crop = new QToolButton( ButtonGroup1, "Crop" );
Crop->setAutoRepeat(true);
Crop->setText( tr( "" ) );
Crop->setPixmap(loadIcon("crop.png"));
ButtonGroup1Layout->addWidget( Crop, 4, 3 );
 
 
 
/* QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
ButtonGroup4Layout->addItem( spacer_2 ); */
NodePaletteLayout->addWidget( ButtonGroup4 );
NodePaletteLayout->addWidget( ButtonGroup1 );
 
AbsMode = new QCheckBox( this, "Textflow" );
AbsMode->setText( tr( "Absolute Coordinates" ) );
197,6 → 185,10
QToolTip::add( PolyShearL, tr( "Shears the Path horizontal to the left" ) );
QToolTip::add( PolyShearU, tr( "Shears the Path vertical up" ) );
QToolTip::add( PolyShearD, tr( "Shears the Path vertical down" ) );
QToolTip::add( RotateCCW, tr( "Rotates the Path counter-clockwise" ) );
QToolTip::add( RotateCCW, tr( "Rotates the Path clockwise" ) );
QToolTip::add( Crop, tr( "Reduce the Size of the Path by 10%" ) );
QToolTip::add( Expand, tr( "Enlarges the Size of the Path by 10%" ) );
QToolTip::add( AbsMode, tr( "When checked use Coordinates relative to the Page,\notherwise Coordinates are relative to the Object." ) );
 
// signals and slots connections
219,6 → 211,10
connect(PolyShearL, SIGNAL(clicked()), this, SLOT(ShearL()));
connect(PolyShearU, SIGNAL(clicked()), this, SLOT(ShearU()));
connect(PolyShearD, SIGNAL(clicked()), this, SLOT(ShearD()));
connect(RotateCCW, SIGNAL(clicked()), this, SLOT(doRotCCW()));
connect(RotateCW, SIGNAL(clicked()), this, SLOT(doRotCW()));
connect(Crop, SIGNAL(clicked()), this, SLOT(doCrop()));
connect(Expand, SIGNAL(clicked()), this, SLOT(doExpand()));
connect(AbsMode, SIGNAL(clicked()), this, SLOT(ToggleAbsMode()));
}
 
295,28 → 291,52
PolySplit->setEnabled(true);
}
 
void NodePalette::doRotCCW()
{
if (doc != 0)
doc->ActPage->TransformPoly(0);
}
 
void NodePalette::doRotCW()
{
if (doc != 0)
doc->ActPage->TransformPoly(1);
}
 
void NodePalette::doCrop()
{
if (doc != 0)
doc->ActPage->TransformPoly(2);
}
 
void NodePalette::doExpand()
{
if (doc != 0)
doc->ActPage->TransformPoly(3);
}
 
void NodePalette::ShearR()
{
if (doc != 0)
doc->ActPage->ShearPolyHR();
doc->ActPage->TransformPoly(5);
}
 
void NodePalette::ShearL()
{
if (doc != 0)
doc->ActPage->ShearPolyHL();
doc->ActPage->TransformPoly(4);
}
 
void NodePalette::ShearU()
{
if (doc != 0)
doc->ActPage->ShearPolyVU();
doc->ActPage->TransformPoly(6);
}
 
void NodePalette::ShearD()
{
if (doc != 0)
doc->ActPage->ShearPolyVD();
doc->ActPage->TransformPoly(7);
}
 
void NodePalette::MirrorH()
/trunk/Scribus/scribus/scribusXml.cpp
1983,7 → 1983,7
}
}
elem.setAttribute("COUNT", Selitems->count());
elem.setAttribute("Version", "1.1.2");
elem.setAttribute("Version", "1.1.5");
for (uint co=0; co<Selitems->count(); ++co)
{
QString CurDirP = QDir::currentDirPath();
2669,7 → 2669,7
QString st="<SCRIBUSUTF8></SCRIBUSUTF8>";
docu.setContent(st);
QDomElement elem=docu.documentElement();
elem.setAttribute("Version", "1.1.4");
elem.setAttribute("Version", "1.1.5");
QDomElement dc=docu.createElement("DOCUMENT");
dc.setAttribute("ANZPAGES",doc->PageC);
dc.setAttribute("PAGEWITH",doc->PageB);