Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 733 → Rev 734

/branches/Version13x/Scribus/scribus/fileloader.cpp
163,6 → 163,8
app->doc->PolyR = app->Prefs.PolyR;
app->doc->PolyFd = app->Prefs.PolyFd;
app->doc->PolyS = app->Prefs.PolyS;
app->doc->AutoSave = app->Prefs.AutoSave;
app->doc->AutoSaveTime = app->Prefs.AutoSaveTime;
switch (FileType)
{
case 0:
335,6 → 337,12
doc->PolyR = QStodouble(dc.attribute("POLYR", "0"));
doc->PolyFd = QStoInt(dc.attribute("POLYFD", "0"));
doc->PolyS = static_cast<bool>(QStoInt(dc.attribute("POLYS", "0")));
doc->AutoSave = static_cast<bool>(QStoInt(dc.attribute("AutoSave","0")));
doc->AutoSaveTime = QStoInt(dc.attribute("AutoSaveTime","600000"));
doc->ScratchBottom = QStodouble(dc.attribute("ScratchBottom"));
doc->ScratchLeft = QStodouble(dc.attribute("ScatchLeft"));
doc->ScratchRight = QStodouble(dc.attribute("ScratchRight"));
doc->ScratchTop = QStodouble(dc.attribute("ScratchTop"));
QDomNode PAGE=DOC.firstChild();
counter = 0;
while(!PAGE.isNull())
/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp
1245,7 → 1245,7
GroupBox10Layout->setSpacing( 6 );
GroupBox10Layout->setMargin( 11 );
SidebySide = new QCheckBox( tr( "Display Pages &Side by Side" ), GroupBox10, "SidebySide" );
SidebySide->setChecked(ap->HaveDoc ? ap->doc->PagesSbS : Vor->PagesSbS);
SidebySide->setChecked(Vor->PagesSbS);
GroupBox10Layout->addWidget( SidebySide );
 
Layout_6b = new QHBoxLayout();
2096,9 → 2096,6
Breite->getValues(&oldB, &oldBM, &decimals, &val);
oldB /= AltUmrech;
oldBM /= AltUmrech;
Breite->getValues(&oldB, &oldBM, &decimals, &val);
oldB /= AltUmrech;
oldBM /= AltUmrech;
Hoehe->getValues(&oldH, &oldHM, &decimals, &val);
oldH /= AltUmrech;
oldHM /= AltUmrech;
2204,6 → 2201,11
iter2 = 120.0;
maxi = 240.0;
break;
default:
iter = 10.0;
iter2 = iter * 10.0;
maxi = 200.0;
break;
}
QPixmap pm(static_cast<int>(maxi*DisScale+30), 21);
pm.fill();
/branches/Version13x/Scribus/scribus/reformdoc.cpp
11,11 → 11,13
ReformDoc::ReformDoc( QWidget* parent, ScribusDoc* doc, preV *prefsData ) : PrefsDialogBase( parent )
{
einheit = doc->Einheit;
docc = doc;
fon = &prefsData->AvailFonts;
Umrech = UmReFaktor;
QString units[] = { tr(" pt"), tr(" mm"), tr(" in"), tr(" p")};
QString ein = units[doc->Einheit];
int dp[] = {100, 1000, 10000, 100};
int decimals = dp[doc->Einheit];
decimals = dp[doc->Einheit];
int i=-1;
pageWidth = doc->PageB * UmReFaktor;
pageHeight = doc->PageH * UmReFaktor;
129,25 → 131,39
Rechts = new QLabel( tr( "&Right:" ), GroupBox7, "Rechts" );
Rechts->setBuddy(rightR);
Layout4->addWidget( Rechts, 1, 2 );
facingPages = new QCheckBox( tr( "&Facing Pages" ),GroupBox7, "facingPages" );
GroupBox7Layout->addLayout( Layout4 );
ReformDocLayout->addWidget( GroupBox7 );
GroupBox7a = new QGroupBox( tabPage, "GroupBox7" );
GroupBox7a->setTitle( tr( "Layout" ) );
GroupBox7a->setColumnLayout(0, Qt::Vertical );
GroupBox7a->layout()->setSpacing( 0 );
GroupBox7a->layout()->setMargin( 0 );
GroupBox7aLayout = new QHBoxLayout( GroupBox7a->layout() );
GroupBox7aLayout->setAlignment( Qt::AlignTop );
GroupBox7aLayout->setSpacing( 0 );
GroupBox7aLayout->setMargin( 10 );
Layout4a = new QGridLayout;
Layout4a->setSpacing( 6 );
Layout4a->setMargin( 0 );
facingPages = new QCheckBox( tr( "&Facing Pages" ),GroupBox7a, "facingPages" );
facingPages->setChecked( doc->PageFP );
Layout4->addMultiCellWidget( facingPages, 2, 2, 0, 1 );
firstPage = new QCheckBox( tr( "Left &Page First" ), GroupBox7, "n" );
Layout4a->addMultiCellWidget( facingPages, 2, 2, 0, 1 );
firstPage = new QCheckBox( tr( "Left &Page First" ), GroupBox7a, "n" );
firstPage->setChecked( doc->FirstPageLeft );
Layout4->addMultiCellWidget( firstPage, 2, 2, 2, 3 );
Layout4a->addMultiCellWidget( firstPage, 2, 2, 2, 3 );
if (!doc->PageFP)
firstPage->setEnabled(false);
setDS();
TextLabel1_3 = new QLabel( tr( "F&irst Page Number:" ), GroupBox7, "TextLabel1_3" );
Layout4->addMultiCellWidget( TextLabel1_3, 3, 3, 0, 1 );
pageNumber = new QSpinBox( GroupBox7, "pageNumber" );
TextLabel1_3 = new QLabel( tr( "F&irst Page Number:" ), GroupBox7a, "TextLabel1_3" );
Layout4a->addMultiCellWidget( TextLabel1_3, 3, 3, 0, 1 );
pageNumber = new QSpinBox( GroupBox7a, "pageNumber" );
pageNumber->setMaxValue( 10000 );
pageNumber->setMinValue( 1 );
pageNumber->setValue(doc->FirstPnum);
Layout4->addWidget( pageNumber, 3, 2, Qt::AlignRight );
Layout4a->addWidget( pageNumber, 3, 2, Qt::AlignRight );
TextLabel1_3->setBuddy(pageNumber);
GroupBox7Layout->addLayout( Layout4 );
ReformDocLayout->addWidget( GroupBox7 );
GroupBox7aLayout->addLayout( Layout4a );
ReformDocLayout->addWidget( GroupBox7a );
addItem( tr("Page"), loadIcon("page.png"), tabPage);
 
tabGuides = new QWidget( prefsWidgets, "tabView" );
338,6 → 354,54
checkUnprintable->setChecked( doc->RandFarbig );
pageBackgroundLayout->addWidget( checkUnprintable );
tabViewLayout->addWidget( pageBackground );
 
groupScratch = new QGroupBox( tabView, "GroupBox7" );
groupScratch->setTitle( tr( "Scratch Space" ) );
groupScratch->setColumnLayout(0, Qt::Vertical );
groupScratch->layout()->setSpacing( 0 );
groupScratch->layout()->setMargin( 0 );
groupScratchLayout = new QHBoxLayout( groupScratch->layout() );
groupScratchLayout->setAlignment( Qt::AlignTop );
groupScratchLayout->setSpacing( 0 );
groupScratchLayout->setMargin( 10 );
Layout4s = new QGridLayout;
Layout4s->setSpacing( 6 );
Layout4s->setMargin( 0 );
topScratch = new MSpinBox( groupScratch, 4 );
topScratch->setSuffix( ein );
topScratch->setDecimals( decimals );
topScratch->setMaxValue(1000);
topScratch->setValue(doc->ScratchTop * UmReFaktor);
Layout4s->addWidget( topScratch, 0, 1 );
TextLabel5s = new QLabel(topScratch, tr( "&Top:" ), groupScratch, "TextLabel5" );
Layout4s->addWidget( TextLabel5s, 0, 0 );
leftScratch = new MSpinBox( groupScratch, 4 );
leftScratch->setSuffix( ein );
leftScratch->setDecimals( decimals );
leftScratch->setMaxValue(1000);
leftScratch->setValue(doc->ScratchLeft * UmReFaktor);
Layout4s->addWidget( leftScratch, 0, 3 );
Linkss = new QLabel(leftScratch, tr( "&Left:" ), groupScratch, "Links" );
Layout4s->addWidget( Linkss, 0, 2 );
bottomScratch = new MSpinBox( groupScratch, 4 );
bottomScratch->setSuffix( ein );
bottomScratch->setDecimals( decimals );
bottomScratch->setMaxValue(1000);
bottomScratch->setValue(doc->ScratchBottom * UmReFaktor);
Layout4s->addWidget( bottomScratch, 1, 1 );
TextLabel7s = new QLabel(bottomScratch, tr( "&Bottom:" ), groupScratch, "TextLabel7" );
Layout4s->addWidget( TextLabel7s, 1, 0 );
rightScratch = new MSpinBox( groupScratch, 4 );
rightScratch->setSuffix( ein );
rightScratch->setDecimals( decimals );
rightScratch->setMaxValue(1000);
rightScratch->setValue(doc->ScratchRight * UmReFaktor);
Layout4s->addWidget( rightScratch, 1, 3 );
Rechtss = new QLabel(rightScratch, tr( "&Right:" ), groupScratch, "Rechts" );
Layout4s->addWidget( Rechtss, 1, 2 );
groupScratchLayout->addLayout( Layout4s );
tabViewLayout->addWidget( groupScratch );
 
buttonGroup1 = new QButtonGroup( tabView, "buttonGroup1" );
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
455,7 → 519,7
tabTools = new QWidget( prefsWidgets, "tabTools" );
tabToolsLayout = new QHBoxLayout( tabTools, 11, 6, "tabToolsLayout");
buttonGroupTools = new QButtonGroup( tabTools, "buttonGroupTools" );
buttonGroupTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)5, 0, 0, buttonGroupTools->sizePolicy().hasHeightForWidth() ) );
buttonGroupTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, buttonGroupTools->sizePolicy().hasHeightForWidth() ) );
buttonGroupTools->setExclusive( true );
buttonGroupTools->setRadioButtonExclusive( true );
buttonGroupTools->setColumnLayout(0, Qt::Vertical );
496,6 → 560,7
buttonGroupToolsLayout->addWidget( toolZoom );
tabToolsLayout->addWidget( buttonGroupTools );
subStackTools = new QWidgetStack( tabTools, "subStackTools" );
subStackTools->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)5, 0, 0, subStackTools->sizePolicy().hasHeightForWidth() ) );
subStackTools->setFrameShape( QWidgetStack::GroupBoxPanel );
subStackTools->setFrameShadow( QWidgetStack::Sunken );
subTabText = new QWidget( subStackTools, "subTabText" );
559,7 → 624,7
subTabTextLayout->addMultiCellWidget( colorComboText, 2, 2, 1, 3 );
gapText = new MSpinBox( 0, 200, subTabText, decimals );
gapText->setSuffix( tr( " pt" ) );
gapText->setValue(doc->DGap);
gapText->setValue(doc->DGap * UmReFaktor);
subTabTextLayout->addWidget( gapText, 3, 3 );
textLabel5b = new QLabel(gapText, tr("&Gap:"), subTabText, "TextCol");
subTabTextLayout->addWidget( textLabel5b, 3, 2 );
817,6 → 882,44
tabToolsLayout->addWidget( subStackTools );
addItem( tr("Tools"), loadIcon("tools.png"), tabTools);
 
tabMisc = new QWidget( prefsWidgets, "tabMisc" );
tabMiscLayout = new QVBoxLayout( tabMisc, 11, 6, "tabMiscLayout");
groupAutoSave = new QGroupBox( tabMisc, "groupAutoSave" );
groupAutoSave->setTitle( tr( "Autosave" ) );
groupAutoSave->setCheckable( true );
groupAutoSave->setChecked( doc->AutoSave );
groupAutoSave->setColumnLayout(0, Qt::Vertical );
groupAutoSave->layout()->setSpacing( 6 );
groupAutoSave->layout()->setMargin( 11 );
groupAutoSaveLayout = new QHBoxLayout( groupAutoSave->layout() );
groupAutoSaveLayout->setAlignment( Qt::AlignTop );
autoSaveTime = new QSpinBox( groupAutoSave, "autoSaveTime" );
autoSaveTime->setMinValue( 1 );
autoSaveTime->setMaxValue( 60 );
autoSaveTime->setSuffix( " " + tr("min") );
autoSaveTime->setValue(doc->AutoSaveTime / 1000 / 60);
groupAutoSaveLayout->addWidget( autoSaveTime );
textLabel1m = new QLabel(autoSaveTime, tr( "&Interval:" ), groupAutoSave, "textLabel1m" );
groupAutoSaveLayout->addWidget( textLabel1m );
tabMiscLayout->addWidget( groupAutoSave );
groupUnit = new QGroupBox( tabMisc, "groupUnit" );
groupUnit->setTitle( tr( "Units" ) );
groupUnit->setColumnLayout(0, Qt::Vertical );
groupUnit->layout()->setSpacing( 6 );
groupUnit->layout()->setMargin( 11 );
groupUnitLayout = new QHBoxLayout( groupUnit->layout() );
groupUnitLayout->setAlignment( Qt::AlignTop );
unitCombo = new QComboBox( true, groupUnit, "unitCombo" );
unitCombo->insertItem( tr( "Points (pt)" ) );
unitCombo->insertItem( tr( "Millimetres (mm)" ) );
unitCombo->insertItem( tr( "Inches (in)" ) );
unitCombo->insertItem( tr( "Picas (p)" ) );
unitCombo->setEditable(false);
unitCombo->setCurrentItem(doc->Einheit);
groupUnitLayout->addWidget( unitCombo );
tabMiscLayout->addWidget( groupUnit );
addItem( tr("Misc."), loadIcon("misc.png"), tabMisc);
 
rightR->setMaxValue(pageWidth - leftR->value());
leftR->setMaxValue(pageWidth - rightR->value());
topR->setMaxValue(pageHeight - bottomR->value());
858,6 → 961,7
connect(chainButton, SIGNAL(clicked()), this, SLOT(toggleChain()));
connect(scalingHorizontal, SIGNAL(valueChanged(int)), this, SLOT(hChange()));
connect(scalingVertical, SIGNAL(valueChanged(int)), this, SLOT(vChange()));
connect(unitCombo, SIGNAL(activated(int)), this, SLOT(unitChange()));
 
prefsWidgets->raiseWidget(0);
resize( minimumSizeHint() );
864,6 → 968,100
clearWState( WState_Polished );
}
 
void ReformDoc::unitChange()
{
disconnect(topR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
disconnect(bottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
disconnect(leftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
disconnect(rightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
int decimalsOld;
double AltUmrech = Umrech;
double oldMin, oldMax, val;
QString einh;
einheit = unitCombo->currentItem();
switch (unitCombo->currentItem())
{
case 0:
Umrech = 1.0;
decimals = 100;
einh = tr( " pt" );
break;
case 1:
Umrech = 0.3527777;
decimals = 1000;
einh = tr( " mm" );
break;
case 2:
Umrech = 1.0 / 72.0;
decimals = 10000;
einh = tr( " in" );
break;
case 3:
Umrech = 1.0 / 12.0;
decimals = 100;
einh = tr( " p" );
break;
}
widthMSpinBox->getValues(&oldMin, &oldMax, &decimalsOld, &val);
widthMSpinBox->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, docc->PageB * Umrech);
widthMSpinBox->setSuffix(einh);
heightMSpinBox->getValues(&oldMin, &oldMax, &decimalsOld, &val);
heightMSpinBox->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, docc->PageH * Umrech);
heightMSpinBox->setSuffix(einh);
topR->getValues(&oldMin, &oldMax, &decimalsOld, &val);
topR->setValues(0, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
topR->setSuffix(einh);
bottomR->getValues(&oldMin, &oldMax, &decimalsOld, &val);
bottomR->setValues(0, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
bottomR->setSuffix(einh);
leftR->getValues(&oldMin, &oldMax, &decimalsOld, &val);
leftR->setValues(0, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
leftR->setSuffix(einh);
rightR->getValues(&oldMin, &oldMax, &decimalsOld, &val);
rightR->setValues(0, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
rightR->setSuffix(einh);
minorSpace->getValues(&oldMin, &oldMax, &decimalsOld, &val);
minorSpace->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
minorSpace->setSuffix(einh);
majorSpace->getValues(&oldMin, &oldMax, &decimalsOld, &val);
majorSpace->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
majorSpace->setSuffix(einh);
snapDistance->getValues(&oldMin, &oldMax, &decimalsOld, &val);
snapDistance->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
snapDistance->setSuffix(einh);
baseGrid->getValues(&oldMin, &oldMax, &decimalsOld, &val);
baseGrid->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
baseGrid->setSuffix(einh);
baseOffset->getValues(&oldMin, &oldMax, &decimalsOld, &val);
baseOffset->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
baseOffset->setSuffix(einh);
gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val);
gapText->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
gapText->setSuffix(einh);
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
topScratch->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
topScratch->setSuffix(einh);
bottomScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
bottomScratch->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
bottomScratch->setSuffix(einh);
leftScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
leftScratch->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
leftScratch->setSuffix(einh);
rightScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
rightScratch->setValues(oldMin / AltUmrech * Umrech, oldMax / AltUmrech * Umrech, decimals, val / AltUmrech * Umrech);
rightScratch->setSuffix(einh);
pageWidth = docc->PageB * Umrech;
pageHeight = docc->PageH * Umrech;
rightR->setMaxValue(pageWidth - leftR->value());
leftR->setMaxValue(pageWidth - rightR->value());
topR->setMaxValue(pageHeight - bottomR->value());
bottomR->setMaxValue(pageHeight - topR->value());
connect(topR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
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)));
}
 
/*!
\fn void ReformDoc::ToggleKette()
\author Franz Schmid
/branches/Version13x/Scribus/scribus/scribusXml.cpp
2440,6 → 2440,12
dc.setAttribute("POLYR", doc->PolyR);
dc.setAttribute("POLYFD", doc->PolyFd);
dc.setAttribute("POLYS", static_cast<int>(doc->PolyS));
dc.setAttribute("AutoSave", static_cast<int>(doc->AutoSave));
dc.setAttribute("AutoSaveTime", doc->AutoSaveTime);
dc.setAttribute("ScratchBottom", doc->ScratchBottom);
dc.setAttribute("ScatchLeft", doc->ScratchLeft);
dc.setAttribute("ScratchRight", doc->ScratchRight);
dc.setAttribute("ScratchTop", doc->ScratchTop);
QMap<QString,multiLine>::Iterator itMU;
for (itMU = doc->MLineStyles.begin(); itMU != doc->MLineStyles.end(); ++itMU)
{
/branches/Version13x/Scribus/scribus/icons/Makefile.am
1,10 → 1,11
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png 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 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 signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png
EXTRA_DIST = misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png 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 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 signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/misc.png $(prefix)/share/scribus/icons/misc.png
$(INSTALL_DATA) $(srcdir)/tools.png $(prefix)/share/scribus/icons/tools.png
$(INSTALL_DATA) $(srcdir)/page.png $(prefix)/share/scribus/icons/page.png
$(INSTALL_DATA) $(srcdir)/guides.png $(prefix)/share/scribus/icons/guides.png
320,6 → 321,7
-rm -f $(prefix)/share/scribus/icons/font.png
-rm -f $(prefix)/share/scribus/icons/screen.png
-rm -f $(prefix)/share/scribus/icons/tools.png
-rm -f $(prefix)/share/scribus/icons/misc.png
 
 
####### kdevelop will overwrite this part!!! (end)############
/branches/Version13x/Scribus/scribus/icons/misc.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: branches/Version13x/Scribus/scribus/reformdoc.h
===================================================================
--- branches/Version13x/Scribus/scribus/reformdoc.h (revision 733)
+++ branches/Version13x/Scribus/scribus/reformdoc.h (revision 734)
@@ -30,9 +30,13 @@
~ReformDoc() {};
QWidget* tabPage;
QGroupBox* GroupBox7;
+ QGroupBox* GroupBox7a;
QGroupBox* dsGroupBox7;
+ QGroupBox* groupScratch;
QLabel* TextLabel5;
QLabel* TextLabel7;
+ QLabel* TextLabel5s;
+ QLabel* TextLabel7s;
QLabel* TextLabel1_3;
QSpinBox* pageNumber;
MSpinBox* topR;
@@ -41,10 +45,16 @@
MSpinBox* rightR;
MSpinBox* widthMSpinBox;
MSpinBox* heightMSpinBox;
+ MSpinBox* topScratch;
+ MSpinBox* bottomScratch;
+ MSpinBox* leftScratch;
+ MSpinBox* rightScratch;
QCheckBox* facingPages;
QCheckBox* firstPage;
QLabel* Links;
QLabel* Rechts;
+ QLabel* Linkss;
+ QLabel* Rechtss;
QLabel* widthQLabel;
QLabel* heightQLabel;
QLabel* sizeQLabel;
@@ -56,6 +66,7 @@
QWidget* tabView;
QWidget* tabTypo;
QWidget* tabTools;
+ QWidget* tabMisc;
QLabel* textLabel1;
QLabel* textLabel2;
QLabel* textLabel3;
@@ -174,9 +185,17 @@
QLabel* textLabel23b;
QSpinBox* maximumZoom;
QSpinBox* zoomStep;
+ QGroupBox* groupAutoSave;
+ QLabel* textLabel1m;
+ QSpinBox* autoSaveTime;
+ QGroupBox* groupUnit;
+ QComboBox* unitCombo;
+ ScribusDoc* docc;
SCFonts *fon;
int einheit;
+ int decimals;
+ double Umrech;
double pageWidth;
double pageHeight;
QColor colorMajorGrid;
@@ -190,8 +209,12 @@
QVBoxLayout* ReformDocLayout;
QHBoxLayout* dsGroupBox7Layout;
QHBoxLayout* GroupBox7Layout;
+ QHBoxLayout* GroupBox7aLayout;
+ QHBoxLayout* groupScratchLayout;
QGridLayout* dsLayout4;
QGridLayout* Layout4;
+ QGridLayout* Layout4a;
+ QGridLayout* Layout4s;
QHBoxLayout* Layout3;
QVBoxLayout* tabGuidesLayout;
QVBoxLayout* tabViewLayout;
@@ -223,8 +246,12 @@
QHBoxLayout* buttonGroup5Layout;
QHBoxLayout* subTabPolygonLayout;
QGridLayout* subTabZoomLayout;
+ QVBoxLayout* tabMiscLayout;
+ QHBoxLayout* groupAutoSaveLayout;
+ QHBoxLayout* groupUnitLayout;
protected slots:
+ virtual void unitChange();
virtual void toggleChain();
virtual void hChange();
virtual void vChange();
/branches/Version13x/Scribus/scribus/scribusdoc.h
715,6 → 715,7
bool hasName;
int RotMode;
bool AutoSave;
int AutoSaveTime;
QTimer *ASaveTimer;
FT_Library library;
QMap<QString,FT_Face> FFonts;
/branches/Version13x/Scribus/scribus/prefsdialogbase.cpp
18,7 → 18,7
prefsSelection = new QIconView( this, "prefsSelection" );
prefsSelection->setHScrollBarMode( QIconView::AlwaysOff );
prefsSelection->setVScrollBarMode( QIconView::Auto );
prefsSelection->setArrangement(QIconView::TopToBottom);
prefsSelection->setArrangement(QIconView::LeftToRight);
prefsSelection->setItemsMovable(false);
prefsSelection->setAutoArrange( true );
prefsSelection->setSorting( false );
32,11 → 32,11
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout4->addItem( spacer );
buttonOk = new QPushButton( this, "buttonOk" );
buttonOk->setAutoDefault( TRUE );
buttonOk->setDefault( TRUE );
buttonOk->setAutoDefault( true );
buttonOk->setDefault( true );
layout4->addWidget( buttonOk );
buttonCancel = new QPushButton( this, "buttonCancel" );
buttonCancel->setAutoDefault( TRUE );
buttonCancel->setAutoDefault( true );
layout4->addWidget( buttonCancel );
prefsLayout->addLayout( layout4 );
languageChange();
49,6 → 49,7
prefsWidgets->addWidget(tab, counter);
itemMap.insert(ic, counter);
counter++;
// prefsSelection->arrangeItemsInGrid();
}
 
void PrefsDialogBase::itemSelected(QIconViewItem* ic)
/branches/Version13x/Scribus/scribus/scribus.cpp
2288,6 → 2288,7
connect(doc->ASaveTimer, SIGNAL(timeout()), w, SLOT(slotAutoSave()));
connect(w, SIGNAL(AutoSaved()), this, SLOT(slotAutoSaved()));
doc->AutoSave = Prefs.AutoSave;
doc->AutoSaveTime = Prefs.AutoSaveTime;
if (doc->AutoSave)
doc->ASaveTimer->start(Prefs.AutoSaveTime);
DatSav->setEnabled(false);
2410,7 → 2411,6
doc->FirstPageLeft = dia->firstPage->isChecked();
doc->FirstPnum = dia->pageNumber->value();
doc->resetPage(tpr2, lr2, rr2, br2, fp);
view->reformPages();
doc->MarginsShown = dia->checkMargin->isChecked();
doc->FramesShown = dia->checkFrame->isChecked();
doc->GridShown = dia->checkGrid->isChecked();
2506,21 → 2506,18
doc->ScaleType = dia->buttonGroup3->isChecked();
doc->AspectRatio = dia->checkRatioImage->isChecked();
dia->polyWidget->getValues(&doc->PolyC, &doc->PolyFd, &doc->PolyF, &doc->PolyS, &doc->PolyR);
/* if (HaveDoc)
doc->ScratchBottom = dia->bottomScratch->value();
doc->ScratchLeft = dia->leftScratch->value();
doc->ScratchRight = dia->rightScratch->value();
doc->ScratchTop = dia->topScratch->value();
doc->AutoSave = dia->groupAutoSave->isChecked();
doc->AutoSaveTime = dia->autoSaveTime->value() * 60 * 1000;
if (doc->AutoSave)
{
slotChangeUnit(dia->UnitCombo->currentItem(), false);
doc->GrabRad = dia->SpinBox3_2->value();
doc->AutoSave = dia->ASon->isChecked();
if (doc->AutoSave)
{
doc->ASaveTimer->stop();
doc->ASaveTimer->start(dia->ASTime->value() * 60 * 1000);
}
view->reformPages();
view->DrawNew();
doc->ASaveTimer->stop();
doc->ASaveTimer->start(doc->AutoSaveTime);
}
else
{ */
slotChangeUnit(dia->unitCombo->currentItem(), false);
viewMenu->setItemChecked(Markers, doc->MarginsShown);
viewMenu->setItemChecked(FrameDr, doc->FramesShown);
viewMenu->setItemChecked(Ras, doc->GridShown);
2533,6 → 2530,7
if (doc->Items.at(b)->PType == 2)
doc->Items.at(b)->PicArt = doc->ShowPic;
}
view->reformPages();
view->GotoPage(doc->ActPage->PageNr);
view->DrawNew();
// Sepal->RebuildPage();
3707,9 → 3705,8
newActWin(w);
connect(doc->ASaveTimer, SIGNAL(timeout()), w, SLOT(slotAutoSave()));
connect(w, SIGNAL(AutoSaved()), this, SLOT(slotAutoSaved()));
doc->AutoSave = Prefs.AutoSave;
if (doc->AutoSave)
doc->ASaveTimer->start(Prefs.AutoSaveTime);
doc->ASaveTimer->start(doc->AutoSaveTime);
DatSav->setEnabled(false);
fileMenu->setItemEnabled(fid4, 0);
}