Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 704 → Rev 705

/branches/Version13x/Scribus/configure.in
54,8 → 54,8
if test -n "$FREETYPE_CONFIG"; then
LIBFREETYPE_LIBS="`$FREETYPE_CONFIG --libs`"
LIBFREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`"
AC_CHECK_LIB(freetype, FT_Get_First_Char, [hafree=yes],[hafree=no])
AC_CHECK_LIB(freetype, FT_Get_Next_Char, [hafree=yes],[hafree=no])
AC_CHECK_LIB(freetype, FT_Get_First_Char, [hafree=yes],[hafree=no], "$LIBFREETYPE_LIBS")
AC_CHECK_LIB(freetype, FT_Get_Next_Char, [hafree=yes],[hafree=no], "$LIBFREETYPE_LIBS")
if test $hafree = yes; then
AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1, [Defines if your system has the libfreetype library])
else
/branches/Version13x/Scribus/scribus/fileloader.cpp
152,6 → 152,12
bool FileLoader::LoadFile(ScribusApp* app)
{
bool ret = false;
app->doc->MarginsShown = app->Prefs.MarginsShown;
app->doc->FramesShown = app->Prefs.FramesShown;
app->doc->GridShown = app->Prefs.GridShown;
app->doc->GuidesShown = app->Prefs.GuidesShown;
app->doc->BaseShown = app->Prefs.BaseShown;
app->doc->linkShown = app->Prefs.linkShown;
switch (FileType)
{
case 0:
318,6 → 324,7
doc->MarginsShown = static_cast<bool>(QStoInt(dc.attribute("SHOWMARGIN", "1")));
doc->BaseShown = static_cast<bool>(QStoInt(dc.attribute("SHOWBASE", "0")));
doc->ShowPic = static_cast<bool>(QStoInt(dc.attribute("SHOWPICT", "1")));
doc->linkShown = static_cast<bool>(QStoInt(dc.attribute("SHOWLINK", "0")));
QDomNode PAGE=DOC.firstChild();
counter = 0;
while(!PAGE.isNull())
/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp
54,7 → 54,7
fon = &Vor->AvailFonts;
ap = (ScribusApp*)parent;
Umrech = 1.0;
Einheit = ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit;
Einheit = Vor->Einheit;
int f[] = {2, 3, 4};
if (Einheit == 3)
decimals = f[0];
145,7 → 145,7
UnitCombo->insertItem( tr( "Inches (in)" ) );
UnitCombo->insertItem( tr( "Picas (p)" ) );
UnitCombo->setEditable(false);
UnitCombo->setCurrentItem(ap->HaveDoc ? ap->doc->Einheit : Vor->Einheit);
UnitCombo->setCurrentItem(Vor->Einheit);
GroupBox20Layout->addWidget( UnitCombo );
tabLayout->addWidget( GroupBox20, 1, 0 );
Mouse = new QGroupBox( tr( "Mouse Settings" ),tab, "Mouse" );
382,7 → 382,7
GroupASLayout = new QGridLayout( GroupAS->layout() );
GroupASLayout->setAlignment( Qt::AlignTop );
ASon = new QCheckBox( tr( "&Enabled" ), GroupAS, "Enable Autosave" );
ASon->setChecked(ap->HaveDoc ? ap->doc->AutoSave : Vor->AutoSave);
ASon->setChecked(Vor->AutoSave);
GroupASLayout->addMultiCellWidget( ASon, 0, 0, 0, 1 );
ASTime = new QSpinBox( GroupAS, "Time" );
ASTime->setMaxValue( 60 );
437,9 → 437,9
Layout10->addWidget( TextLabel2g, 2, 0 );
Layout10->addWidget( SpinBox2g, 2, 1 );
SpinBox2->setValue(ap->HaveDoc ? ap->doc->majorGrid * Umrech : Vor->DmajGrid * Umrech);
SpinBox1->setValue(ap->HaveDoc ? ap->doc->minorGrid * Umrech : Vor->DminGrid * Umrech);
SpinBox2g->setValue(ap->HaveDoc ? ap->doc->GuideRad * Umrech : Vor->GuideRad * Umrech);
SpinBox2->setValue(Vor->DmajGrid * Umrech);
SpinBox1->setValue(Vor->DminGrid * Umrech);
SpinBox2g->setValue(Vor->GuideRad * Umrech);
GroupBox1Layout->addLayout( Layout10 );
tabLayout_2->addWidget( GroupBox1, 0, 0 );
458,8 → 458,8
minColor = new QPushButton( "", GroupBox2, "minColor" );
minColor->setAutoDefault( false );
QPixmap pm = QPixmap(40, 20);
pm.fill(ap->HaveDoc ? ap->doc->minorColor : Vor->DminColor);
Cmin = ap->HaveDoc ? ap->doc->minorColor : Vor->DminColor;
pm.fill(Vor->DminColor);
Cmin = Vor->DminColor;
minColor->setPixmap(pm);
TextLabel3 = new QLabel( minColor, tr( "Min&or Grid Color:" ), GroupBox2, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
469,8 → 469,8
MaxColor = new QPushButton( "", GroupBox2, "MaxColor" );
MaxColor->setAutoDefault( false );
QPixmap pm1 = QPixmap(40, 20);
pm1.fill(ap->HaveDoc ? ap->doc->majorColor : Vor->DmajColor);
Cmax = ap->HaveDoc ? ap->doc->majorColor : Vor->DmajColor;
pm1.fill(Vor->DmajColor);
Cmax = Vor->DmajColor;
MaxColor->setPixmap(pm1);
TextLabel4 = new QLabel( MaxColor, tr( "Majo&r Grid Color:" ), GroupBox2, "TextLabel4" );
TextLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
481,8 → 481,8
GuideColor = new QPushButton( "", GroupBox2, "GuideColor" );
GuideColor->setAutoDefault( false );
QPixmap pm12 = QPixmap(40, 20);
pm12.fill(ap->HaveDoc ? ap->doc->guideColor : Vor->guideColor);
Cgui = ap->HaveDoc ? ap->doc->guideColor : Vor->guideColor;
pm12.fill(Vor->guideColor);
Cgui = Vor->guideColor;
GuideColor->setPixmap(pm12);
TextLabel4g = new QLabel( GuideColor, tr( "&User Guides Color:" ), GroupBox2, "TextLabel4g" );
TextLabel4g->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
493,8 → 493,8
BaseColor = new QPushButton( "", GroupBox2, "BaseColor" );
BaseColor->setAutoDefault( false );
QPixmap pm13 = QPixmap(40, 20);
pm13.fill(ap->HaveDoc ? ap->doc->baseColor : Vor->baseColor);
Cbase = ap->HaveDoc ? ap->doc->baseColor : Vor->baseColor;
pm13.fill(Vor->baseColor);
Cbase = Vor->baseColor;
BaseColor->setPixmap(pm13);
TextLabel4ba = new QLabel( BaseColor, tr( "Base&line Grid Color:" ), GroupBox2, "TextLabel4ba" );
TextLabel4ba->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
517,10 → 517,10
Layout7->setSpacing( 6 );
Layout7->setMargin( 0 );
RadioButton6 = new QRadioButton( tr( "In the &Background" ), ButtonGroup5, "RadioButton6" );
RadioButton6->setChecked(ap->HaveDoc ? ap->doc->Before : Vor->Before );
RadioButton6->setChecked(Vor->Before );
Layout7->addWidget( RadioButton6 );
RadioButton7 = new QRadioButton( tr( "In the Fore&ground" ), ButtonGroup5, "RadioButton6_2" );
RadioButton7->setChecked(ap->HaveDoc ? !ap->doc->Before : !Vor->Before );
RadioButton7->setChecked(!Vor->Before );
Layout7->addWidget( RadioButton7 );
ButtonGroup5Layout->addLayout( Layout7 );
tabLayout_2->addWidget( ButtonGroup5, 0, 1 );
1364,8 → 1364,8
PapColor = new QPushButton( "", GroupBox20a, "PapColor" );
PapColor->setAutoDefault( false );
QPixmap pm1a = QPixmap(40, 20);
pm1a.fill(ap->HaveDoc ? ap->doc->papColor : Vor->DpapColor);
Cpaper = ap->HaveDoc ? ap->doc->papColor : Vor->DpapColor;
pm1a.fill(Vor->DpapColor);
Cpaper = Vor->DpapColor;
PapColor->setPixmap(pm1a);
TextLabel4a = new QLabel( PapColor, tr( "&Background:" ), GroupBox20a, "TextLabel4" );
TextLabel4a->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
1375,8 → 1375,8
RandColor = new QPushButton( "", GroupBox20a, "RColor" );
RandColor->setAutoDefault( false );
pm1a.fill(ap->HaveDoc ? ap->doc->margColor : Vor->DmargColor);
Crand = ap->HaveDoc ? ap->doc->margColor : Vor->DmargColor;
pm1a.fill(Vor->DmargColor);
Crand = Vor->DmargColor;
RandColor->setPixmap(pm1a);
TextLabel4b = new QLabel( RandColor, tr( "&Margins:" ), GroupBox20a, "TextLabel4" );
TextLabel4b->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
1389,7 → 1389,7
Layout_6b->addItem( spacer2 );
GroupBox10Layout->addLayout(Layout_6b);
RandFarb = new QCheckBox( tr( "Display &Unprintable Area in Margin Color" ), GroupBox10, "Ran" );
RandFarb->setChecked(ap->HaveDoc ? ap->doc->RandFarbig : Vor->RandFarbig);
RandFarb->setChecked(Vor->RandFarbig);
GroupBox10Layout->addWidget( RandFarb );
UsePDFTrans = new QCheckBox( tr( "Use PDF 1.4 &Transparency Features" ), GroupBox10, "Ran2" );
UsePDFTrans->setChecked(Vor->PDFTransparency);
/branches/Version13x/Scribus/scribus/reformdoc.cpp
1,6 → 1,7
#include "reformdoc.h"
#include "reformdoc.moc"
#include <qtooltip.h>
#include <qcolordialog.h>
#include "scribusdoc.h"
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
147,35 → 148,216
ReformDocLayout->addWidget( GroupBox7 );
prefsWidgets->addWidget( tabPage, 0 );
 
prefsSelection->insertItem( tr("View"));
tabView = new QWidget( prefsWidgets, "tabView" );
tabViewLayout = new QVBoxLayout( tabView, 11, 6, "tabViewLayout");
checkMargin = new QCheckBox( tabView, "checkMargin" );
prefsSelection->insertItem( tr("Guides"));
tabGuides = new QWidget( prefsWidgets, "tabView" );
tabGuidesLayout = new QVBoxLayout( tabGuides, 10, 5, "tabViewLayout");
checkGrid = new QGroupBox( tabGuides, "checkGrid" );
checkGrid->setTitle( tr( "ShowGrid" ) );
checkGrid->setCheckable( TRUE );
checkGrid->setChecked(doc->GridShown);
checkGrid->setColumnLayout(0, Qt::Vertical );
checkGrid->layout()->setSpacing( 5 );
checkGrid->layout()->setMargin( 10 );
checkGridLayout = new QGridLayout( checkGrid->layout() );
checkGridLayout->setAlignment( Qt::AlignTop );
groupBox1 = new QGroupBox( checkGrid, "groupBox1" );
groupBox1->setColumnLayout(0, Qt::Vertical );
groupBox1->layout()->setSpacing( 5 );
groupBox1->layout()->setMargin( 10 );
groupBox1->setTitle( tr( "Major Grid" ) );
groupBox1Layout = new QGridLayout( groupBox1->layout() );
groupBox1Layout->setAlignment( Qt::AlignTop );
majorGridColor = new QPushButton( groupBox1, "majorGridColor" );
majorGridColor->setMinimumSize( QSize( 60, 20 ) );
majorGridColor->setMaximumSize( QSize( 60, 20 ) );
majorGridColor->setFlat( false );
majorGridColor->setAutoDefault( false );
QPixmap pm1 = QPixmap(54, 14);
pm1.fill(doc->majorColor);
colorMajorGrid = doc->majorColor;
majorGridColor->setPixmap(pm1);
majorGridColor->setText( QString::null );
groupBox1Layout->addWidget( majorGridColor, 1, 1 );
textLabel4 = new QLabel( groupBox1, "textLabel4" );
textLabel4->setText( tr( "Color:" ) );
groupBox1Layout->addWidget( textLabel4, 1, 0 );
textLabel6 = new QLabel( groupBox1, "textLabel6" );
textLabel6->setText( tr( "Spacing:" ) );
groupBox1Layout->addWidget( textLabel6, 0, 0 );
majorSpace = new MSpinBox( 1, 10000, groupBox1, 2 );
majorSpace->setValue( doc->majorGrid * UmReFaktor );
majorSpace->setSuffix( ein );
groupBox1Layout->addWidget( majorSpace, 0, 1 );
checkGridLayout->addWidget( groupBox1, 0, 0 );
groupBox2 = new QGroupBox( checkGrid, "groupBox2" );
groupBox2->setColumnLayout(0, Qt::Vertical );
groupBox2->layout()->setSpacing( 5 );
groupBox2->layout()->setMargin( 10 );
groupBox2->setTitle( tr( "Minor Grid" ) );
groupBox2Layout = new QGridLayout( groupBox2->layout() );
groupBox2Layout->setAlignment( Qt::AlignTop );
textLabel5 = new QLabel( groupBox2, "textLabel5" );
textLabel5->setText( tr( "Color:" ) );
groupBox2Layout->addWidget( textLabel5, 1, 0 );
minorGridColor = new QPushButton( groupBox2, "minorGridColor" );
minorGridColor->setMinimumSize( QSize( 60, 20 ) );
minorGridColor->setMaximumSize( QSize( 60, 20 ) );
minorGridColor->setFlat( false );
minorGridColor->setAutoDefault( false );
QPixmap pm = QPixmap(54, 14);
pm.fill(doc->minorColor);
colorMinorGrid = doc->minorColor;
minorGridColor->setPixmap(pm);
minorGridColor->setText( QString::null );
groupBox2Layout->addWidget( minorGridColor, 1, 1 );
textLabel7 = new QLabel( groupBox2, "textLabel7" );
textLabel7->setText( tr( "Spacing:" ) );
groupBox2Layout->addWidget( textLabel7, 0, 0 );
minorSpace = new MSpinBox( 1, 10000, groupBox2, 2 );
minorSpace->setValue( doc->minorGrid * UmReFaktor);
minorSpace->setSuffix( ein );
groupBox2Layout->addWidget( minorSpace, 0, 1 );
checkGridLayout->addWidget( groupBox2, 0, 1 );
tabGuidesLayout->addWidget( checkGrid );
layout11 = new QGridLayout( 0, 1, 1, 0, 5, "layout11");
textLabel8 = new QLabel( tabGuides, "textLabel8" );
textLabel8->setText( tr( "Guide Snap Distance:" ) );
layout11->addWidget( textLabel8, 0, 0 );
snapDistance = new MSpinBox( 1, 10000, tabGuides, 2 );
snapDistance->setValue( doc->GuideRad * UmReFaktor );
snapDistance->setSuffix( ein );
layout11->addWidget( snapDistance, 0, 1, Qt::AlignLeft );
checkMargin = new QCheckBox( tabGuides, "checkMargin" );
checkMargin->setText( tr( "Show Margins" ) );
checkMargin->setChecked(doc->MarginsShown);
tabViewLayout->addWidget( checkMargin );
checkFrame = new QCheckBox( tabView, "checkFrame" );
layout11->addWidget( checkMargin, 1, 0 );
checkGuides = new QCheckBox( tabGuides, "checkGuides" );
checkGuides->setText( tr( "Show Guides" ) );
checkGuides->setChecked(doc->GuidesShown);
layout11->addWidget( checkGuides, 2, 0 );
checkBaseline = new QCheckBox( tabGuides, "checkBaseline" );
checkBaseline->setText( tr( "Show Baseline Grid" ) );
checkBaseline->setChecked(doc->BaseShown);
layout11->addWidget( checkBaseline, 3, 0 );
layout2 = new QHBoxLayout( 0, 0, 5, "layout2");
textLabel2 = new QLabel( tabGuides, "textLabel2" );
textLabel2->setText( tr( "Color:" ) );
layout2->addWidget( textLabel2 );
baselineColor = new QPushButton( tabGuides, "baselineColor" );
baselineColor->setMinimumSize( QSize( 60, 20 ) );
baselineColor->setMaximumSize( QSize( 60, 20 ) );
baselineColor->setFlat( false );
baselineColor->setAutoDefault( false );
QPixmap pm4 = QPixmap(54, 14);
pm4.fill(doc->baseColor);
colorBaselineGrid = doc->baseColor;
baselineColor->setPixmap(pm4);
baselineColor->setText( QString::null );
layout2->addWidget( baselineColor );
layout11->addLayout( layout2, 3, 1 );
layout3 = new QHBoxLayout( 0, 0, 5, "layout3");
textLabel3 = new QLabel( tabGuides, "textLabel3" );
textLabel3->setText( tr( "Color:" ) );
layout3->addWidget( textLabel3 );
guideColor = new QPushButton( tabGuides, "guideColor" );
guideColor->setMinimumSize( QSize( 60, 20 ) );
guideColor->setMaximumSize( QSize( 60, 20 ) );
guideColor->setFlat( false );
guideColor->setAutoDefault( false );
QPixmap pm3 = QPixmap(54, 14);
pm3.fill(doc->guideColor);
colorGuides = doc->guideColor;
guideColor->setPixmap(pm3);
guideColor->setText( QString::null );
layout3->addWidget( guideColor );
layout11->addLayout( layout3, 2, 1 );
layout9 = new QHBoxLayout( 0, 0, 5, "layout9");
textLabel1 = new QLabel( tabGuides, "textLabel1" );
textLabel1->setText( tr( "Color:" ) );
layout9->addWidget( textLabel1 );
marginColor = new QPushButton( tabGuides, "marginColor" );
marginColor->setMinimumSize( QSize( 60, 20 ) );
marginColor->setMaximumSize( QSize( 60, 20 ) );
marginColor->setAutoDefault( false );
QPixmap pm6 = QPixmap(54, 14);
pm6.fill(doc->margColor);
colorMargin = doc->margColor;
marginColor->setPixmap(pm6);
marginColor->setFlat( false );
marginColor->setText( QString::null );
layout9->addWidget( marginColor );
layout11->addLayout( layout9, 1, 1 );
tabGuidesLayout->addLayout( layout11 );
layout12 = new QGridLayout( 0, 1, 1, 0, 5, "layout12");
checkLink = new QCheckBox( tabGuides, "checkLink" );
checkLink->setText( tr( "Show Text Chains" ) );
checkLink->setChecked(doc->linkShown);
layout12->addWidget( checkLink, 1, 0 );
checkFrame = new QCheckBox( tabGuides, "checkFrame" );
checkFrame->setText( tr( "Show Frames" ) );
checkFrame->setChecked(doc->FramesShown);
tabViewLayout->addWidget( checkFrame );
checkPictures = new QCheckBox( tabView, "checkPictures" );
layout12->addWidget( checkFrame, 0, 0 );
checkPictures = new QCheckBox( tabGuides, "checkPictures" );
checkPictures->setText( tr( "Show Pictures" ) );
layout12->addWidget( checkPictures, 0, 1 );
checkPictures->setChecked(doc->ShowPic);
tabViewLayout->addWidget( checkPictures );
checkGrid = new QCheckBox( tabView, "checkGrid" );
checkGrid->setText( tr( "Show Grid" ) );
checkGrid->setChecked(doc->GridShown);
tabViewLayout->addWidget( checkGrid );
checkGuides = new QCheckBox( tabView, "checkGuides" );
checkGuides->setText( tr( "Show Guides" ) );
checkGuides->setChecked(doc->GuidesShown);
tabViewLayout->addWidget( checkGuides );
checkBaseline = new QCheckBox( tabView, "checkBaseline" );
checkBaseline->setText( tr( "Show Baseline Grid" ) );
checkBaseline->setChecked(doc->BaseShown);
tabViewLayout->addWidget( checkBaseline );
prefsWidgets->addWidget( tabView, 1 );
tabGuidesLayout->addLayout( layout12 );
prefsWidgets->addWidget( tabGuides, 1 );
 
prefsSelection->insertItem( tr("View"));
tabView = new QWidget( prefsWidgets, "tabView" );
tabViewLayout = new QVBoxLayout( tabView, 10, 5, "tabViewLayout");
pageBackground = new QButtonGroup( tabView, "pageBackground" );
pageBackground->setTitle( tr( "Page Background" ) );
pageBackground->setColumnLayout(0, Qt::Vertical );
pageBackground->layout()->setSpacing( 5 );
pageBackground->layout()->setMargin( 10 );
pageBackgroundLayout = new QVBoxLayout( pageBackground->layout() );
pageBackgroundLayout->setAlignment( Qt::AlignTop );
layout10 = new QHBoxLayout( 0, 0, 5, "layout10");
textLabel9 = new QLabel( pageBackground, "textLabel9" );
textLabel9->setText( tr( "Color:" ) );
layout10->addWidget( textLabel9 );
backColor = new QPushButton( pageBackground, "backColor" );
backColor->setMinimumSize( QSize( 60, 20 ) );
backColor->setMaximumSize( QSize( 60, 20 ) );
backColor->setFlat( false );
backColor->setAutoDefault( false );
QPixmap pm5 = QPixmap(54, 14);
pm5.fill(doc->papColor);
colorPaper = doc->papColor;
backColor->setPixmap(pm5);
backColor->setText( QString::null );
layout10->addWidget( backColor );
spacer3 = new QSpacerItem( 61, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer3 );
pageBackgroundLayout->addLayout( layout10 );
checkUnprintable = new QCheckBox( pageBackground, "checkUnprintable" );
checkUnprintable->setText( tr( "Display &Unprintable Area in Margin Color" ) );
checkUnprintable->setAccel( QKeySequence( tr( "Alt+U" ) ) );
checkUnprintable->setChecked( doc->RandFarbig );
pageBackgroundLayout->addWidget( checkUnprintable );
tabViewLayout->addWidget( pageBackground );
buttonGroup1 = new QButtonGroup( tabView, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 5 );
buttonGroup1->layout()->setMargin( 10 );
buttonGroup1->setTitle( tr( "Placing of Guides" ) );
buttonGroup1Layout = new QVBoxLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
inBackground = new QRadioButton( buttonGroup1, "inBackground" );
inBackground->setText( tr( "In the Background" ) );
buttonGroup1Layout->addWidget( inBackground );
inForeground = new QRadioButton( buttonGroup1, "inForeground" );
inForeground->setText( tr( "In the Foreground" ) );
buttonGroup1Layout->addWidget( inForeground );
inBackground->setChecked( doc->Before );
inForeground->setChecked( !doc->Before );
tabViewLayout->addWidget( buttonGroup1 );
prefsWidgets->addWidget( tabView, 2 );
RightR->setMaxValue(Breite - LeftR->value());
LeftR->setMaxValue(Breite - RightR->value());
TopR->setMaxValue(Hoehe - BottomR->value());
196,11 → 378,95
connect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
connect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
connect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
connect(majorGridColor, SIGNAL(clicked()), this, SLOT(changeMajorColor()));
connect(minorGridColor, SIGNAL(clicked()), this, SLOT(changeMinorColor()));
connect(baselineColor, SIGNAL(clicked()), this, SLOT(changeBaselineColor()));
connect(guideColor, SIGNAL(clicked()), this, SLOT(changeGuideColor()));
connect(marginColor, SIGNAL(clicked()), this, SLOT(changeMarginColor()));
connect(backColor, SIGNAL(clicked()), this, SLOT(changePaperColor()));
prefsWidgets->raiseWidget(0);
resize( minimumSizeHint() );
clearWState( WState_Polished );
}
 
void ReformDoc::changeMajorColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorMajorGrid, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorMajorGrid = neu;
majorGridColor->setPixmap(pm);
}
}
 
void ReformDoc::changeMinorColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorMinorGrid, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorMinorGrid = neu;
minorGridColor->setPixmap(pm);
}
}
 
void ReformDoc::changePaperColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorPaper, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorPaper = neu;
backColor->setPixmap(pm);
}
}
 
void ReformDoc::changeBaselineColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorBaselineGrid, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorBaselineGrid = neu;
baselineColor->setPixmap(pm);
}
}
 
void ReformDoc::changeGuideColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorGuides, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorGuides = neu;
guideColor->setPixmap(pm);
}
}
 
void ReformDoc::changeMarginColor()
{
QColor neu = QColor();
neu = QColorDialog::getColor(colorMargin, this);
if (neu.isValid())
{
QPixmap pm = QPixmap(54, 14);
pm.fill(neu);
colorMargin = neu;
marginColor->setPixmap(pm);
}
}
 
void ReformDoc::setTop(int )
{
BottomR->setMaxValue(Hoehe - TopR->value());
/branches/Version13x/Scribus/scribus/scribusview.h
110,6 → 110,7
void DrawPageMarks(ScPainter *p, Page* page, QRect clip);
Page* addPage(int nr);
QPtrList<PageItem> SelItem;
QPtrList<PageItem> linkedFramesToShow;
QValueList<int> SelNode;
/** Deletes a Page */
void delPage(int Nr);
/branches/Version13x/Scribus/scribus/scribusXml.cpp
1053,6 → 1053,7
doc->FramesShown = view->Prefs->FramesShown;
doc->MarginsShown = view->Prefs->MarginsShown;
doc->BaseShown = view->Prefs->BaseShown;
doc->linkShown = view->Prefs->linkShown;
doc->ShowPic = true;
DoFonts.clear();
doc->Dsize=qRound(QStodouble(dc.attribute("DSIZE")) * 10);
2358,7 → 2359,7
QString st="<SCRIBUSUTF8NEW></SCRIBUSUTF8NEW>";
docu.setContent(st);
QDomElement elem=docu.documentElement();
elem.setAttribute("Version", "1.3cvs");
elem.setAttribute("Version", "1.3.0cvs");
QDomElement dc=docu.createElement("DOCUMENT");
dc.setAttribute("ANZPAGES",doc->DocPages.count());
dc.setAttribute("PAGEWITH",doc->PageB);
2433,6 → 2434,7
dc.setAttribute("SHOWMARGIN", static_cast<int>(doc->MarginsShown));
dc.setAttribute("SHOWBASE", static_cast<int>(doc->BaseShown));
dc.setAttribute("SHOWPICT", static_cast<int>(doc->ShowPic));
dc.setAttribute("SHOWLINK", static_cast<int>(doc->linkShown));
QMap<QString,multiLine>::Iterator itMU;
for (itMU = doc->MLineStyles.begin(); itMU != doc->MLineStyles.end(); ++itMU)
{
2668,6 → 2670,7
dc.setAttribute("FRV", static_cast<int>(Vor->FramesShown));
dc.setAttribute("SHOWMARGIN", static_cast<int>(Vor->MarginsShown));
dc.setAttribute("SHOWBASE", static_cast<int>(Vor->BaseShown));
dc.setAttribute("SHOWLINK", static_cast<int>(Vor->linkShown));
dc.setAttribute("STECOLOR", Vor->STEcolor.name());
dc.setAttribute("STEFONT", Vor->STEfont);
elem.appendChild(dc);
2939,6 → 2942,7
Vorein->FramesShown = static_cast<bool>(QStoInt(dc.attribute("FRV","1")));
Vorein->MarginsShown = static_cast<bool>(QStoInt(dc.attribute("SHOWMARGIN","1")));
Vorein->BaseShown = static_cast<bool>(QStoInt(dc.attribute("SHOWBASE","1")));
Vorein->linkShown = static_cast<bool>(QStoInt(dc.attribute("SHOWLINK","0")));
if (dc.hasAttribute("STECOLOR"))
Vorein->STEcolor = QColor(dc.attribute("STECOLOR"));
if (dc.hasAttribute("STEFONT"))
/branches/Version13x/Scribus/scribus/reformdoc.h
5,10 → 5,12
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qgroupbox.h>
#include <qbuttongroup.h>
#include <qradiobutton.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qcheckbox.h>
#include <qcolor.h>
#include "mspinbox.h"
#include "prefsdialogbase.h"
class ScribusDoc;
44,17 → 46,50
QComboBox* sizeQComboBox;
QComboBox* orientationQComboBox;
 
QWidget* tabGuides;
QWidget* tabView;
QLabel* textLabel1;
QLabel* textLabel2;
QLabel* textLabel3;
QLabel* textLabel4;
QLabel* textLabel5;
QLabel* textLabel6;
QLabel* textLabel7;
QLabel* textLabel8;
QLabel* textLabel9;
QGroupBox* checkGrid;
QGroupBox* groupBox1;
QGroupBox* groupBox2;
QPushButton* majorGridColor;
QPushButton* minorGridColor;
QPushButton* baselineColor;
QPushButton* guideColor;
QPushButton* marginColor;
QPushButton* backColor;
MSpinBox* minorSpace;
MSpinBox* majorSpace;
MSpinBox* snapDistance;
QButtonGroup* buttonGroup1;
QButtonGroup* pageBackground;
QRadioButton* inBackground;
QRadioButton* inForeground;
QCheckBox* checkUnprintable;
QCheckBox* checkMargin;
QCheckBox* checkFrame;
QCheckBox* checkPictures;
QCheckBox* checkGrid;
QCheckBox* checkGuides;
QCheckBox* checkBaseline;
QCheckBox* checkLink;
 
int einheit;
double Breite;
double Hoehe;
QColor colorMajorGrid;
QColor colorMinorGrid;
QColor colorBaselineGrid;
QColor colorPaper;
QColor colorGuides;
QColor colorMargin;
 
protected:
QVBoxLayout* ReformDocLayout;
63,9 → 98,29
QGridLayout* dsLayout4;
QGridLayout* Layout4;
QHBoxLayout* Layout3;
QVBoxLayout* tabGuidesLayout;
QVBoxLayout* tabViewLayout;
QGridLayout* checkGridLayout;
QGridLayout* groupBox1Layout;
QGridLayout* groupBox2Layout;
QVBoxLayout* buttonGroup1Layout;
QHBoxLayout* layout7;
QGridLayout* layout11;
QHBoxLayout* layout2;
QHBoxLayout* layout3;
QHBoxLayout* layout9;
QVBoxLayout* pageBackgroundLayout;
QHBoxLayout* layout10;
QSpacerItem* spacer3;
QGridLayout* layout12;
 
protected slots:
virtual void changeMajorColor();
virtual void changeMinorColor();
virtual void changePaperColor();
virtual void changeBaselineColor();
virtual void changeGuideColor();
virtual void changeMarginColor();
virtual void setDS();
virtual void setTop(int v);
virtual void setBottom(int v);
/branches/Version13x/Scribus/scribus/scribusview.cpp
267,33 → 267,59
if ((!Doc->Before) && (QRect(x, y, w+5, h+5).intersects(QRect(clipx, clipy, clipw, cliph))))
DrawPageMarks(painter, Doc->ActPage, QRect(clipx, clipy, clipw, cliph));
}
if (SelItem.count() != 0)
if ((SelItem.count() != 0) || (linkedFramesToShow.count() != 0))
{
double z = painter->zoomFactor();
painter->setZoomFactor(Scale);
painter->save();
PageItem *b = SelItem.at(0);
if (((Doc->AppMode == 10) || (Doc->AppMode == 11)) && (b->PType == 4))
PageItem *b;
if ((Doc->linkShown) && (linkedFramesToShow.count() != 0))
b = linkedFramesToShow.at(0);
else
b = SelItem.at(0);
if ((((Doc->AppMode == 10) || (Doc->AppMode == 11)) && (b->PType == 4)) || (Doc->linkShown))
{
PageItem *nb = b;
while (nb != 0)
if (Doc->linkShown)
{
if (nb->BackBox != 0)
nb = nb->BackBox;
else
break;
for (uint lks = 0; lks < linkedFramesToShow.count(); ++lks)
{
nb = linkedFramesToShow.at(lks);
while (nb != 0)
{
FPoint Start = transformPoint(FPoint(nb->Width/2, nb->Height), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
nb = nb->NextBox;
if (nb != 0)
{
FPoint End = transformPoint(FPoint(nb->Width/2, 0), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
painter->setPen(black, 5.0 / Scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
painter->setPenOpacity(0.3);
painter->drawLine(Start, End);
}
}
}
}
while (nb != 0)
else
{
FPoint Start = transformPoint(FPoint(nb->Width/2, nb->Height), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
nb = nb->NextBox;
if (nb != 0)
while (nb != 0)
{
FPoint End = transformPoint(FPoint(nb->Width/2, 0), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
painter->setPen(black, 5.0 / Scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
painter->setPenOpacity(0.3);
painter->drawLine(Start, End);
if (nb->BackBox != 0)
nb = nb->BackBox;
else
break;
}
while (nb != 0)
{
FPoint Start = transformPoint(FPoint(nb->Width/2, nb->Height), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
nb = nb->NextBox;
if (nb != 0)
{
FPoint End = transformPoint(FPoint(nb->Width/2, 0), nb->Xpos, nb->Ypos, nb->Rot, 1, 1);
painter->setPen(black, 5.0 / Scale, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
painter->setPenOpacity(0.3);
painter->drawLine(Start, End);
}
}
}
}
painter->setLineWidth(1);
445,6 → 471,7
PageItem* b;
ll.Sichtbar = false;
ll.LNr = 0;
linkedFramesToShow.clear();
double z = painter->zoomFactor();
if (Doc->Items.count() != 0)
{
468,6 → 495,19
if (!((Doc->EditClip) && (Mpressed)))
b->DrawObj(painter, clip);
b->Redrawn = true;
if ((b->PType == 4) && ((b->NextBox != 0) || (b->BackBox != 0)))
{
PageItem *nb = b;
while (nb != 0)
{
if (nb->BackBox != 0)
nb = nb->BackBox;
else
break;
}
if (linkedFramesToShow.find(nb) == -1)
linkedFramesToShow.append(nb);
}
if ((Doc->AppMode == 7) && (b->Select) && (b->PType == 4))
{
HR->ItemPos = b->Xpos - Doc->ScratchLeft;
819,7 → 859,7
if (ss->Read())
{
int st = doku->CurrentABStil;
ss->GetText(b, st, doku->Vorlagen[st].Font, doku->Vorlagen[st].FontSize);
ss->GetText(b, st, doku->Vorlagen[st].Font, doku->Vorlagen[st].FontSize, true);
emit DocChanged();
}
delete ss;
3841,9 → 3881,9
ss->Objekt = cc;
int st = Doc->CurrentABStil;
if (st > 5)
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize);
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize, true);
else
ss->GetText(b, st, b->IFont, b->ISize);
ss->GetText(b, st, b->IFont, b->ISize, true);
delete ss;
if (Doc->Trenner->AutoCheck)
Doc->Trenner->slotHyphenate(b);
6546,9 → 6586,6
b = Doc->ActPage->FromMaster.prev();
}
}
if ((m->state() == (ControlButton | ShiftButton)) && (SelItem.count() != 0))
{
for (a = 0; a < Doc->Items.count(); ++a)
7224,9 → 7261,9
{
int st = Doc->CurrentABStil;
if (st > 5)
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize);
ss->GetText(b, st, Doc->Vorlagen[st].Font, Doc->Vorlagen[st].FontSize, true);
else
ss->GetText(b, st, b->IFont, b->ISize);
ss->GetText(b, st, b->IFont, b->ISize, true);
}
delete ss;
if (Doc->Trenner->AutoCheck)
/branches/Version13x/Scribus/scribus/scribusdoc.h
492,6 → 492,7
bool MarginsShown;
bool GridShown;
bool BaseShown;
bool linkShown;
bool ClipMargin;
bool GCRMode;
double BaseGrid;
574,6 → 575,7
bool MarginsShown;
bool GridShown;
bool BaseShown;
bool linkShown;
/** Im Dokument benutzte Farben */
CListe PageColors;
Page* ActPage;
/branches/Version13x/Scribus/scribus/libabout/about.cpp
66,7 → 66,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("20").arg("November").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("21").arg("November").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
345,6 → 345,7
Prefs.MarginsShown = true;
Prefs.GuidesShown = true;
Prefs.BaseShown = false;
Prefs.linkShown = false;
Prefs.ClipMargin = true;
Prefs.GCRMode = true;
Prefs.PagesSbS = true;
841,6 → 842,9
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->setItemChecked(Base, false);
textLinks = viewMenu->insertItem( tr("Show &Text Chain"), this, SLOT(ToggleTextLinks()));
viewMenu->setItemChecked(textLinks, false);
viewMenu->insertSeparator();
uRas = viewMenu->insertItem( tr("Sn&ap to Grid"), this, SLOT(ToggleURaster()));
SetKeyEntry(44, tr("Snap to Grid"), uRas, 0);
2206,6 → 2210,7
doc->GridShown = Prefs.GridShown;
doc->GuidesShown = Prefs.GuidesShown;
doc->BaseShown = Prefs.BaseShown;
doc->linkShown = Prefs.linkShown;
doc->loading = true;
ScribusWin* w = new ScribusWin(wsp, doc);
view = new ScribusView(w, doc, &Prefs);
2361,6 → 2366,7
viewMenu->setItemChecked(Guide, doc->GuidesShown);
viewMenu->setItemChecked(Base, doc->BaseShown);
viewMenu->setItemChecked(Bilder, doc->ShowPic);
viewMenu->setItemChecked(textLinks, doc->linkShown);
// if (!doc->TemplateMode)
// Sepal->Rebuild();
// Tpal->BuildTree(view);
2415,6 → 2421,18
doc->GuidesShown = dia->checkGuides->isChecked();
doc->BaseShown = dia->checkBaseline->isChecked();
doc->ShowPic = dia->checkPictures->isChecked();
doc->linkShown = dia->checkLink->isChecked();
doc->Before = dia->inBackground->isChecked();
doc->RandFarbig = dia->checkUnprintable->isChecked();
doc->GuideRad = dia->snapDistance->value() / UmReFaktor;
doc->minorGrid = dia->minorSpace->value() / UmReFaktor;
doc->majorGrid = dia->majorSpace->value() / UmReFaktor;
doc->minorColor = dia->colorMinorGrid;
doc->majorColor = dia->colorMajorGrid;
doc->papColor = dia->colorPaper;
doc->margColor = dia->colorMargin;
doc->guideColor = dia->colorGuides;
doc->baseColor = dia->colorBaselineGrid;
viewMenu->setItemChecked(Markers, doc->MarginsShown);
viewMenu->setItemChecked(FrameDr, doc->FramesShown);
viewMenu->setItemChecked(Ras, doc->GridShown);
2421,6 → 2439,7
viewMenu->setItemChecked(Guide, doc->GuidesShown);
viewMenu->setItemChecked(Base, doc->BaseShown);
viewMenu->setItemChecked(Bilder, doc->ShowPic);
viewMenu->setItemChecked(textLinks, doc->linkShown);
for (uint b=0; b<doc->Items.count(); ++b)
{
if (doc->Items.at(b)->PType == 2)
3302,7 → 3321,7
doc->OpenNodes = Tpal->buildReopenVals(); */
bool ret = false;
QWidgetList windows = wsp->windowList();
ScribusWin* ActWinOld;
ScribusWin* ActWinOld = NULL;
if (windows.count() != 0)
ActWinOld = ActWin;
bool found = false;
4319,9 → 4338,9
ss->Objekt = Buffer2;
int st = doc->CurrentABStil;
if (st > 5)
ss->GetText(b, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize);
ss->GetText(b, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize, true);
else
ss->GetText(b, st, b->IFont, b->ISize);
ss->GetText(b, st, b->IFont, b->ISize, true);
delete ss;
if (doc->Trenner->AutoCheck)
doc->Trenner->slotHyphenate(b);
4990,11 → 5009,13
doc->GridShown = GuidesStat[3];
doc->GuidesShown = GuidesStat[4];
doc->BaseShown = GuidesStat[5];
doc->linkShown = GuidesStat[6];
ToggleMarks();
ToggleFrames();
ToggleRaster();
ToggleGuides();
ToggleBase();
ToggleTextLinks();
}
else
{
5004,16 → 5025,19
GuidesStat[3] = !doc->GridShown;
GuidesStat[4] = !doc->GuidesShown;
GuidesStat[5] = !doc->BaseShown;
GuidesStat[6] = !doc->linkShown;
doc->MarginsShown = false;
doc->FramesShown = false;
doc->GridShown = false;
doc->GuidesShown = false;
doc->BaseShown = false;
doc->linkShown = false;
viewMenu->setItemChecked(Markers, doc->MarginsShown);
viewMenu->setItemChecked(FrameDr, doc->FramesShown);
viewMenu->setItemChecked(Ras, doc->GridShown);
viewMenu->setItemChecked(Guide, doc->GuidesShown);
viewMenu->setItemChecked(Base, doc->BaseShown);
viewMenu->setItemChecked(textLinks, doc->linkShown);
}
view->DrawNew();
}
5058,6 → 5082,14
view->DrawNew();
}
 
void ScribusApp::ToggleTextLinks()
{
GuidesStat[0] = false;
doc->linkShown = !doc->linkShown;
viewMenu->setItemChecked(textLinks, doc->linkShown);
view->DrawNew();
}
 
void ScribusApp::ToggleURaster()
{
doc->useRaster = !doc->useRaster;
5767,7 → 5799,7
slotDocCh();
}
 
void ScribusApp::setCSMenu(QString k, QString l, int lk , int ls)
void ScribusApp::setCSMenu(QString , QString l, int , int ls)
{
uint a;
QString la;
5874,7 → 5906,7
{
QValueList<uint> ers;
QString nn;
PageItem* ite;
PageItem* ite = 0;
bool ff;
uint nr;
ers.clear();
7882,7 → 7914,7
QString nam = "";
int id = 0;
int ty = 0;
int menid;
int menid = 0;
struct PlugData pda;
pfad += "/lib/scribus/plugins/";
#if defined(__hpux)
/branches/Version13x/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
156,6 → 156,12
QDomElement docElem = inpdoc.documentElement();
double width = !docElem.attribute("width").isEmpty() ? parseUnit(docElem.attribute( "width" )) : 550.0;
double height = !docElem.attribute("height").isEmpty() ? parseUnit(docElem.attribute( "height" )) : 841.0;
if (!docElem.attribute("width").isEmpty())
getDefaultUnit(docElem.attribute( "width" ));
else if (!docElem.attribute("height").isEmpty())
getDefaultUnit(docElem.attribute( "height" ));
else
Conversion = 1.0 / 1.25;
if (Prog->DLLinput != "")
{
Prog->doc->setPage(width, height, 0, 0, 0, 0, 0, 0, false, false);
615,6 → 621,47
}
 
/*!
\fn void SVGPlug::getDefaultUnit(const QString &unit)
\author Franz Schmid
\date
\brief
\param unit const QString &
\retval none
*/
void SVGPlug::getDefaultUnit(const QString &unit)
{
QString unitval=unit;
QString un = unit.right(2);
Conversion = 1.0;
if( un == "pt" )
{
unitval.replace( "pt", "" );
Conversion = 1.0;
}
else if( un == "cm" )
{
unitval.replace( "cm", "" );
Conversion = 72.0 / 2.54;
}
else if( un == "mm" )
{
unitval.replace( "mm", "" );
Conversion = 72.0 / 25.4;
}
else if( un == "in" )
{
unitval.replace( "in", "" );
Conversion = 72.0;
}
else if( un == "px" )
{
unitval.replace( "px", "" );
Conversion = 1.0 / 1.25;
}
if (unitval == unit)
Conversion = 1.0 / 1.25;
}
/*!
\fn double SVGPlug::parseUnit(const QString &unit)
\author Franz Schmid
\date
648,9 → 695,9
else if( unit.right( 2 ) == "in" )
value = value * 72;
else if( unit.right( 2 ) == "px" )
value = value * 1.25;
value = value / 1.25;
else if(noUnit)
value = value * 1.25;
value = value / 1.25;
return value;
}
 
795,7 → 842,7
}
number = integer + decimal;
number *= sign * pow( static_cast<double>(10), static_cast<double>( expsign * exponent ) );
 
number *= Conversion;
// skip the following space
if(*ptr == ' ')
ptr++;
1589,7 → 1636,8
void SVGPlug::parseColorStops(GradientHelper *gradient, const QDomElement &e)
{
QString Col = "Black";
double offset, opa;
double offset = 0;
double opa;
for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
{
opa = 1.0;
/branches/Version13x/Scribus/scribus/plugins/svgimplugin/svgplugin.h
111,7 → 111,8
void addGraphicContext();
void setupTransform( const QDomElement &e );
void parseGroup(const QDomElement &e);
double fromPercentage( const QString &s );
double fromPercentage( const QString &s );
void getDefaultUnit(const QString &unit);
double parseUnit(const QString &unit);
QWMatrix parseTransform(const QString &transform);
const char * getCoord( const char *ptr, double &number );
134,7 → 135,7
ScribusDoc* Doku;
ScribusApp* Prog;
QDomDocument inpdoc;
double CurrX, CurrY, StartX, StartY;
double CurrX, CurrY, StartX, StartY, Conversion;
int PathLen;
QPtrList<PageItem> Elements;
QPtrStack<SvgStyle> m_gc;
/branches/Version13x/Scribus/scribus/scribus.h
331,6 → 331,7
/** Schaltet Raender ein/aus */
void ToggleMarks();
void ToggleFrames();
void ToggleTextLinks();
/** Schaltet Werkzeuge ein/aus */
void setTools(bool visible);
void ToggleTools();
531,6 → 532,7
int Guide;
int uGuide;
int Base;
int textLinks;
int toolbarMenuTools;
int toolbarMenuPDFTools;
int viewToolbars;
581,7 → 583,7
int ODup;
int OMDup;
bool PalettesStat[8];
bool GuidesStat[6];
bool GuidesStat[7];
bool tipsOn;
bool keyrep;
QPopupMenu *helpMenu;