Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 723 → Rev 726

/branches/Version13x/Scribus/scribus/libprefs/prefs.cpp
763,28 → 763,14
Layout15a->setMargin( 0 );
 
FontComb = new FontCombo(ToolFrame, Vor);
if (ap->HaveDoc)
for (int fc=0; fc<FontComb->count(); ++fc)
{
for (int fc=0; fc<FontComb->count(); ++fc)
if (FontComb->text(fc) == Vor->DefFont)
{
if (FontComb->text(fc) == ap->doc->Dfont)
{
FontComb->setCurrentItem(fc);
break;
}
FontComb->setCurrentItem(fc);
break;
}
}
else
{
for (int fc=0; fc<FontComb->count(); ++fc)
{
if (FontComb->text(fc) == Vor->DefFont)
{
FontComb->setCurrentItem(fc);
break;
}
}
}
TextLabel1_3 = new QLabel( FontComb, tr( "Default &Font:" ), ToolFrame, "TextLabel1_3" );
TextLabel1_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_3->sizePolicy().hasHeightForWidth() ) );
797,22 → 783,11
for (uint s = 0; s < f_size; ++s)
SizeCombo->insertItem(ar_sizes[s] + tr(" pt"));
int a;
if (ap->HaveDoc)
for (a = 0; a < SizeCombo->count(); ++a)
{
for (a = 0; a < SizeCombo->count(); ++a)
{
if (SizeCombo->text(a).left(2).toInt() == ap->doc->Dsize / 10)
SizeCombo->setCurrentItem(a);
}
if (SizeCombo->text(a).left(2).toInt() == Vor->DefSize / 10)
SizeCombo->setCurrentItem(a);
}
else
{
for (a = 0; a < SizeCombo->count(); ++a)
{
if (SizeCombo->text(a).left(2).toInt() == Vor->DefSize / 10)
SizeCombo->setCurrentItem(a);
}
}
TextLabel2_2 = new QLabel( SizeCombo, tr( "Default &Size:" ), ToolFrame, "TextLabel2_2" );
TextLabel2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2_2->sizePolicy().hasHeightForWidth() ) );
840,7 → 815,7
TextColVal = new QSpinBox( ToolFrame, "TextColVal" );
TextColVal->setMaxValue( 100 );
TextColVal->setMinValue( 1 );
TextColVal->setValue(ap->HaveDoc ? ap->doc->DCols : Vor->DCols );
TextColVal->setValue(Vor->DCols );
TextCol = new QLabel(TextColVal, tr("Colu&mns:"), ToolFrame, "TextCol");
Layout15a->addWidget( TextCol, 3, 0 );
Layout15a->addWidget( TextColVal, 3, 1 );
847,7 → 822,7
TextGapVal = new MSpinBox( 0, 200, ToolFrame, decimals );
TextGapVal->setSuffix( tr( " pt" ) );
TextGapVal->setValue(ap->HaveDoc ? ap->doc->DGap : Vor->DGap);
TextGapVal->setValue(Vor->DGap);
TextGap = new QLabel(TextGapVal, tr("&Gap:"), ToolFrame, "TextCol");
Layout15a->addWidget( TextGap, 4, 0 );
Layout15a->addWidget( TextGapVal, 4, 1 );
/branches/Version13x/Scribus/scribus/reformdoc.cpp
2,20 → 2,22
#include "reformdoc.moc"
#include <qtooltip.h>
#include <qcolordialog.h>
#include "scribusdoc.h"
#include "fontcombo.h"
extern QPixmap loadIcon(QString nam);
extern QPixmap fontSamples(QString da, int s, QString ts, QColor back);
extern double UmReFaktor;
 
ReformDoc::ReformDoc( QWidget* parent, ScribusDoc* doc ) : PrefsDialogBase( parent )
ReformDoc::ReformDoc( QWidget* parent, ScribusDoc* doc, preV *prefsData ) : PrefsDialogBase( parent )
{
einheit = doc->Einheit;
fon = &prefsData->AvailFonts;
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];
int i=-1;
Breite = doc->PageB * UmReFaktor;
Hoehe = doc->PageH * UmReFaktor;
pageWidth = doc->PageB * UmReFaktor;
pageHeight = doc->PageH * UmReFaktor;
setCaption( tr( "Document Setup" ) );
tabPage = new QWidget( prefsWidgets, "tab" );
ReformDocLayout = new QVBoxLayout( tabPage );
64,7 → 66,7
widthQLabel = new QLabel( tr( "&Width:" ), dsGroupBox7, "widthLabel" );
widthMSpinBox->setEnabled( false );
widthMSpinBox->setSuffix(ein);
widthMSpinBox->setValue(Breite);
widthMSpinBox->setValue(pageWidth);
widthQLabel->setBuddy(widthMSpinBox);
dsLayout4->addWidget( widthQLabel, 1, 0 );
dsLayout4->addWidget( widthMSpinBox, 1, 1 );
72,7 → 74,7
heightQLabel = new QLabel( tr( "&Height:" ), dsGroupBox7, "heightLabel" );
heightMSpinBox->setEnabled( false );
heightMSpinBox->setSuffix(ein);
heightMSpinBox->setValue(Hoehe);
heightMSpinBox->setValue(pageHeight);
heightQLabel->setBuddy(heightMSpinBox);
dsLayout4->addWidget( heightQLabel, 1, 2 );
dsLayout4->addWidget( heightMSpinBox, 1, 3 );
90,59 → 92,59
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 0 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setSuffix( ein );
TopR->setDecimals( decimals );
TopR->setMaxValue(Hoehe);
TopR->setValue(doc->PageM.Top * UmReFaktor);
Layout4->addWidget( TopR, 0, 1 );
topR = new MSpinBox( GroupBox7, 4 );
topR->setSuffix( ein );
topR->setDecimals( decimals );
topR->setMaxValue(pageHeight);
topR->setValue(doc->PageM.Top * UmReFaktor);
Layout4->addWidget( topR, 0, 1 );
TextLabel5 = new QLabel( tr( "&Top:" ), GroupBox7, "TextLabel5" );
TextLabel5->setBuddy(TopR);
TextLabel5->setBuddy(topR);
Layout4->addWidget( TextLabel5, 0, 0 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setSuffix( ein );
LeftR->setDecimals( decimals );
LeftR->setMaxValue(Breite);
LeftR->setValue(doc->PageM.Left * UmReFaktor);
Layout4->addWidget( LeftR, 0, 3 );
leftR = new MSpinBox( GroupBox7, 4 );
leftR->setSuffix( ein );
leftR->setDecimals( decimals );
leftR->setMaxValue(pageWidth);
leftR->setValue(doc->PageM.Left * UmReFaktor);
Layout4->addWidget( leftR, 0, 3 );
Links = new QLabel( tr( "&Left:" ), GroupBox7, "Links" );
Links->setBuddy(LeftR);
Links->setBuddy(leftR);
Layout4->addWidget( Links, 0, 2 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setSuffix( ein );
BottomR->setDecimals( decimals );
BottomR->setMaxValue(Hoehe);
BottomR->setValue(doc->PageM.Bottom * UmReFaktor);
Layout4->addWidget( BottomR, 1, 1 );
bottomR = new MSpinBox( GroupBox7, 4 );
bottomR->setSuffix( ein );
bottomR->setDecimals( decimals );
bottomR->setMaxValue(pageHeight);
bottomR->setValue(doc->PageM.Bottom * UmReFaktor);
Layout4->addWidget( bottomR, 1, 1 );
TextLabel7 = new QLabel( tr( "&Bottom:" ), GroupBox7, "TextLabel7" );
TextLabel7->setBuddy(BottomR);
TextLabel7->setBuddy(bottomR);
Layout4->addWidget( TextLabel7, 1, 0 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setSuffix( ein );
RightR->setDecimals( decimals );
RightR->setMaxValue(Breite);
RightR->setValue(doc->PageM.Right * UmReFaktor);
Layout4->addWidget( RightR, 1, 3 );
rightR = new MSpinBox( GroupBox7, 4 );
rightR->setSuffix( ein );
rightR->setDecimals( decimals );
rightR->setMaxValue(pageWidth);
rightR->setValue(doc->PageM.Right * UmReFaktor);
Layout4->addWidget( rightR, 1, 3 );
Rechts = new QLabel( tr( "&Right:" ), GroupBox7, "Rechts" );
Rechts->setBuddy(RightR);
Rechts->setBuddy(rightR);
Layout4->addWidget( Rechts, 1, 2 );
Doppelseiten = new QCheckBox( tr( "&Facing Pages" ),GroupBox7, "Doppelseiten" );
Doppelseiten->setChecked( doc->PageFP );
Layout4->addMultiCellWidget( Doppelseiten, 2, 2, 0, 1 );
ErsteSeite = new QCheckBox( tr( "Left &Page First" ), GroupBox7, "n" );
ErsteSeite->setChecked( doc->FirstPageLeft );
Layout4->addMultiCellWidget( ErsteSeite, 2, 2, 2, 3 );
facingPages = new QCheckBox( tr( "&Facing Pages" ),GroupBox7, "facingPages" );
facingPages->setChecked( doc->PageFP );
Layout4->addMultiCellWidget( facingPages, 2, 2, 0, 1 );
firstPage = new QCheckBox( tr( "Left &Page First" ), GroupBox7, "n" );
firstPage->setChecked( doc->FirstPageLeft );
Layout4->addMultiCellWidget( firstPage, 2, 2, 2, 3 );
if (!doc->PageFP)
ErsteSeite->setEnabled(false);
firstPage->setEnabled(false);
setDS();
TextLabel1_3 = new QLabel( tr( "F&irst Page Number:" ), GroupBox7, "TextLabel1_3" );
Layout4->addMultiCellWidget( TextLabel1_3, 3, 3, 0, 1 );
PgNr = new QSpinBox( GroupBox7, "PgNr" );
PgNr->setMaxValue( 1000 );
PgNr->setMinValue( 1 );
PgNr->setValue(doc->FirstPnum);
Layout4->addWidget( PgNr, 3, 2, Qt::AlignRight );
TextLabel1_3->setBuddy(PgNr);
pageNumber = new QSpinBox( GroupBox7, "pageNumber" );
pageNumber->setMaxValue( 10000 );
pageNumber->setMinValue( 1 );
pageNumber->setValue(doc->FirstPnum);
Layout4->addWidget( pageNumber, 3, 2, Qt::AlignRight );
TextLabel1_3->setBuddy(pageNumber);
GroupBox7Layout->addLayout( Layout4 );
ReformDocLayout->addWidget( GroupBox7 );
addItem( tr("Page"), loadIcon("page.png"), tabPage);
376,9 → 378,9
subScaling->setMinValue( 1 );
subScaling->setValue( doc->VTiefSc );
subScaling->setSuffix( tr( " %" ) );
groupBox1aLayout->addWidget( subScaling, 1, 1 );
groupBox1aLayout->addWidget( subScaling, 0, 3 );
textLabel2a = new QLabel(subScaling, tr( "&Scaling:" ), groupBox1a, "textLabel2a" );
groupBox1aLayout->addWidget( textLabel2a, 1, 0 );
groupBox1aLayout->addWidget( textLabel2a, 0, 2 );
tabTypoLayout->addWidget( groupBox1a, 0, 0 );
groupBox2a = new QGroupBox( tabTypo, "groupBox2a" );
groupBox2a->setColumnLayout(0, Qt::Vertical );
399,9 → 401,9
superScaling->setMinValue( 1 );
superScaling->setValue( doc->VHochSc );
superScaling->setSuffix( tr( " %" ) );
groupBox2aLayout->addWidget( superScaling, 1, 1 );
groupBox2aLayout->addWidget( superScaling, 0, 3 );
textLabel4a = new QLabel(superScaling, tr( "S&caling:" ), groupBox2a, "textLabel4a" );
groupBox2aLayout->addWidget( textLabel4a, 1, 0 );
groupBox2aLayout->addWidget( textLabel4a, 0, 2 );
tabTypoLayout->addWidget( groupBox2a, 1, 0 );
groupBox3a = new QGroupBox( tabTypo, "groupBox3a" );
groupBox3a->setColumnLayout(0, Qt::Vertical );
418,7 → 420,7
groupBox3aLayout->addWidget( capsScaling, 0, 1 );
textLabel5a = new QLabel(capsScaling, tr( "Sc&aling:" ), groupBox3a, "textLabel5a" );
groupBox3aLayout->addWidget( textLabel5a, 0, 0 );
tabTypoLayout->addWidget( groupBox3a, 0, 1 );
tabTypoLayout->addWidget( groupBox3a, 2, 0 );
groupBox4a = new QGroupBox( tabTypo, "groupBox4a" );
groupBox4a->setColumnLayout(0, Qt::Vertical );
groupBox4a->layout()->setSpacing( 6 );
446,29 → 448,333
groupBox4aLayout->addWidget( autoLine, 2, 1 );
textLabel8a = new QLabel( autoLine, tr( "Automatic &Line Spacing:" ), groupBox4a, "textLabel8a" );
groupBox4aLayout->addWidget( textLabel8a, 2, 0 );
tabTypoLayout->addWidget( groupBox4a, 1, 1 );
tabTypoLayout->addWidget( groupBox4a, 3, 0 );
addItem( tr("Typography"), loadIcon("font.png"), tabTypo);
 
RightR->setMaxValue(Breite - LeftR->value());
LeftR->setMaxValue(Breite - RightR->value());
TopR->setMaxValue(Hoehe - BottomR->value());
BottomR->setMaxValue(Hoehe - TopR->value());
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->setExclusive( true );
buttonGroupTools->setRadioButtonExclusive( true );
buttonGroupTools->setColumnLayout(0, Qt::Vertical );
buttonGroupTools->layout()->setSpacing( 5 );
buttonGroupTools->layout()->setMargin( 5 );
buttonGroupTools->setTitle( QString::null );
buttonGroupToolsLayout = new QVBoxLayout( buttonGroupTools->layout() );
buttonGroupToolsLayout->setAlignment( Qt::AlignTop );
toolText = new QToolButton( buttonGroupTools, "toolText" );
toolText->setToggleButton( true );
toolText->setText( QString::null );
toolText->setIconSet( QIconSet( loadIcon("Text.xpm") ) );
buttonGroupToolsLayout->addWidget( toolText );
toolImage = new QToolButton( buttonGroupTools, "toolImage" );
toolImage->setToggleButton( true );
toolImage->setText( QString::null );
toolImage->setIconSet( QIconSet( loadIcon("Bild.xpm") ) );
buttonGroupToolsLayout->addWidget( toolImage );
toolShape = new QToolButton( buttonGroupTools, "toolShape" );
toolShape->setToggleButton( true );
toolShape->setText( QString::null );
toolShape->setIconSet( QIconSet( loadIcon("Rechtecke.xpm") ) );
buttonGroupToolsLayout->addWidget( toolShape);
toolPoly = new QToolButton( buttonGroupTools, "toolPoly" );
toolPoly->setToggleButton( true );
toolPoly->setText( QString::null );
toolPoly->setIconSet( QIconSet( loadIcon("spline.png") ) );
buttonGroupToolsLayout->addWidget( toolPoly );
toolLine = new QToolButton( buttonGroupTools, "toolLine" );
toolLine->setToggleButton( true );
toolLine->setText( QString::null );
toolLine->setIconSet( QIconSet( loadIcon("Stift.xpm") ) );
buttonGroupToolsLayout->addWidget( toolLine );
toolZoom = new QToolButton( buttonGroupTools, "toolZoom" );
toolZoom->setToggleButton( true );
toolZoom->setText( QString::null );
toolZoom->setIconSet( QIconSet( loadIcon("Lupe.xpm") ) );
buttonGroupToolsLayout->addWidget( toolZoom );
tabToolsLayout->addWidget( buttonGroupTools );
subStackTools = new QWidgetStack( tabTools, "subStackTools" );
subStackTools->setFrameShape( QWidgetStack::GroupBoxPanel );
subStackTools->setFrameShadow( QWidgetStack::Sunken );
subTabText = new QWidget( subStackTools, "subTabText" );
subTabTextLayout = new QGridLayout( subTabText, 1, 1, 11, 6, "subTabTextLayout");
textLabel3b = new QLabel( subTabText, "textLabel3b" );
textLabel3b->setText( tr( "Color:" ) );
subTabTextLayout->addWidget( textLabel3b, 2, 0 );
textLabel1b = new QLabel( subTabText, "textLabel1b" );
textLabel1b->setText( tr( "Font:" ) );
subTabTextLayout->addWidget( textLabel1b, 0, 0 );
textLabel2b = new QLabel( subTabText, "textLabel2b" );
textLabel2b->setText( tr( "Size:" ) );
subTabTextLayout->addWidget( textLabel2b, 1, 0 );
columnsText = new QSpinBox( subTabText, "columnsText" );
columnsText->setMinValue( 1 );
columnsText->setMaxValue(100);
columnsText->setValue(doc->DCols);
subTabTextLayout->addWidget( columnsText, 3, 1 );
textLabel4b = new QLabel(columnsText, tr("Colu&mns:"), subTabText, "TextCol");
subTabTextLayout->addWidget( textLabel4b, 3, 0 );
previewText = new QLabel( tr( "Woven silk pyjamas exchanged for blue quartz" ), subTabText, "previewText" );
previewText->setMinimumSize( QSize( 280, 70 ) );
previewText->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
subTabTextLayout->addMultiCellWidget( previewText, 4, 4, 0, 3 );
fontComboText = new FontCombo(subTabText, prefsData);
for (int fc=0; fc<fontComboText->count(); ++fc)
{
if (fontComboText->text(fc) == doc->Dfont)
{
fontComboText->setCurrentItem(fc);
break;
}
}
subTabTextLayout->addMultiCellWidget( fontComboText, 0, 0, 1, 3 );
sizeComboText = new QComboBox( true, subTabText, "SizeCombo" );
sizeComboText->setEditable(false);
QString ar_sizes[] = {" 7", " 9", "10", "11", "12", "14", "18", "24", "36", "48", "60", "72"};
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes);
for (uint s = 0; s < f_size; ++s)
sizeComboText->insertItem(ar_sizes[s] + tr(" pt"));
for (int a = 0; a < sizeComboText->count(); ++a)
{
if (sizeComboText->text(a).left(2).toInt() == doc->Dsize / 10)
sizeComboText->setCurrentItem(a);
}
subTabTextLayout->addMultiCellWidget( sizeComboText, 1, 1, 1, 3 );
colorComboText = new QComboBox( true, subTabText, "colorComboText" );
colorComboText->setEditable(false);
QPixmap pmT2;
pmT2 = QPixmap(15, 15);
CListe::Iterator itc;
for (itc = doc->PageColors.begin(); itc != doc->PageColors.end(); ++itc)
{
pmT2.fill(doc->PageColors[itc.key()].getRGBColor());
colorComboText->insertItem(pmT2, itc.key());
if (itc.key() == doc->DpenText)
colorComboText->setCurrentItem(colorComboText->count()-1);
}
subTabTextLayout->addMultiCellWidget( colorComboText, 2, 2, 1, 3 );
gapText = new MSpinBox( 0, 200, subTabText, decimals );
gapText->setSuffix( tr( " pt" ) );
gapText->setValue(doc->DGap);
subTabTextLayout->addWidget( gapText, 3, 3 );
textLabel5b = new QLabel(gapText, tr("&Gap:"), subTabText, "TextCol");
subTabTextLayout->addWidget( textLabel5b, 3, 2 );
subStackTools->addWidget( subTabText, 0 );
 
subTabShape = new QWidget( subStackTools, "subTabShape" );
subTabShapeLayout = new QGridLayout( subTabShape, 1, 1, 11, 6, "subTabShapeLayout");
textLabel9b = new QLabel( subTabShape, "textLabel9b" );
textLabel9b->setText( tr( "Fill Color:" ) );
subTabShapeLayout->addWidget( textLabel9b, 2, 0 );
textLabel10b = new QLabel( subTabShape, "textLabel10b" );
textLabel10b->setText( tr( "Shading:" ) );
subTabShapeLayout->addWidget( textLabel10b, 3, 0 );
lineWidthShape = new QSpinBox( subTabShape, "lineWidthShape" );
lineWidthShape->setMaxValue( 36 );
lineWidthShape->setSuffix( tr( " pt" ) );
subTabShapeLayout->addWidget( lineWidthShape, 5, 1 );
textLabel12b = new QLabel( subTabShape, "textLabel12b" );
textLabel12b->setText( tr( "Line Width:" ) );
subTabShapeLayout->addWidget( textLabel12b, 5, 0 );
textLabel11b = new QLabel( subTabShape, "textLabel11b" );
textLabel11b->setText( tr( "Line Style:" ) );
subTabShapeLayout->addWidget( textLabel11b, 4, 0 );
comboStyleShape = new QComboBox( FALSE, subTabShape, "comboStyleShape" );
subTabShapeLayout->addWidget( comboStyleShape, 4, 1 );
shadingFillShape = new QSpinBox( subTabShape, "shadingFillShape" );
shadingFillShape->setMaxValue( 100 );
shadingFillShape->setSuffix( tr( " %" ) );
subTabShapeLayout->addWidget( shadingFillShape, 3, 1 );
comboFillShape = new QComboBox( FALSE, subTabShape, "comboFillShape" );
subTabShapeLayout->addWidget( comboFillShape, 2, 1 );
shadingLineShape = new QSpinBox( subTabShape, "shadingLineShape" );
shadingLineShape->setMaxValue( 100 );
shadingLineShape->setSuffix( tr( " %" ) );
subTabShapeLayout->addWidget( shadingLineShape, 1, 1 );
textLabel7b = new QLabel( subTabShape, "textLabel7b" );
textLabel7b->setText( tr( "Line Color:" ) );
subTabShapeLayout->addWidget( textLabel7b, 0, 0 );
colorComboLineShape = new QComboBox( FALSE, subTabShape, "colorComboLineShape" );
subTabShapeLayout->addWidget( colorComboLineShape, 0, 1 );
textLabel8b = new QLabel( subTabShape, "textLabel8b" );
textLabel8b->setText( tr( "Shading:" ) );
subTabShapeLayout->addWidget( textLabel8b, 1, 0 );
subStackTools->addWidget( subTabShape, 1 );
subTabLine = new QWidget( subStackTools, "subTabLine" );
subTabLineLayout = new QGridLayout( subTabLine, 1, 1, 11, 6, "subTabLineLayout");
lineWidthLine = new QSpinBox( subTabLine, "lineWidthLine" );
lineWidthLine->setMaxValue( 36 );
lineWidthLine->setSuffix( tr( " pt" ) );
subTabLineLayout->addWidget( lineWidthLine, 3, 1 );
shadingLine = new QSpinBox( subTabLine, "shadingLine" );
shadingLine->setMaxValue( 100 );
shadingLine->setSuffix( tr( " %" ) );
subTabLineLayout->addWidget( shadingLine, 1, 1 );
colorComboLine = new QComboBox( FALSE, subTabLine, "colorComboLine" );
subTabLineLayout->addWidget( colorComboLine, 0, 1 );
textLabel13b = new QLabel( subTabLine, "textLabel13b" );
textLabel13b->setText( tr( "Line Color:" ) );
subTabLineLayout->addWidget( textLabel13b, 0, 0 );
textLabel14b = new QLabel( subTabLine, "textLabel14b" );
textLabel14b->setText( tr( "Shading:" ) );
subTabLineLayout->addWidget( textLabel14b, 1, 0 );
textLabel15b = new QLabel( subTabLine, "textLabel15b" );
textLabel15b->setText( tr( "Line Style:" ) );
subTabLineLayout->addWidget( textLabel15b, 2, 0 );
textLabel16b = new QLabel( subTabLine, "textLabel16b" );
textLabel16b->setText( tr( "Line Width:" ) );
subTabLineLayout->addWidget( textLabel16b, 3, 0 );
comboStyleLine = new QComboBox( FALSE, subTabLine, "comboStyleLine" );
subTabLineLayout->addWidget( comboStyleLine, 2, 1 );
subStackTools->addWidget( subTabLine, 2 );
subTabImage = new QWidget( subStackTools, "subTabImage" );
subTabImageLayout = new QGridLayout( subTabImage, 1, 1, 11, 6, "subTabImageLayout");
comboFillImage = new QComboBox( FALSE, subTabImage, "comboFillImage" );
subTabImageLayout->addWidget( comboFillImage, 1, 1 );
textLabel19b = new QLabel( subTabImage, "textLabel19b" );
textLabel19b->setText( tr( "Fill Color:" ) );
subTabImageLayout->addWidget( textLabel19b, 1, 0 );
shadingFillImage = new QSpinBox( subTabImage, "shadingFillImage" );
shadingFillImage->setMaxValue( 100 );
shadingFillImage->setSuffix( tr( " %" ) );
subTabImageLayout->addWidget( shadingFillImage, 2, 1 );
textLabel20b = new QLabel( subTabImage, "textLabel20b" );
textLabel20b->setText( tr( "Shading:" ) );
subTabImageLayout->addWidget( textLabel20b, 2, 0 );
buttonGroupImage = new QButtonGroup( subTabImage, "buttonGroupImage" );
buttonGroupImage->setFrameShape( QButtonGroup::NoFrame );
buttonGroupImage->setFrameShadow( QButtonGroup::Plain );
buttonGroupImage->setExclusive( TRUE );
buttonGroupImage->setColumnLayout(0, Qt::Vertical );
buttonGroupImage->layout()->setSpacing( 6 );
buttonGroupImage->layout()->setMargin( 0 );
buttonGroupImage->setTitle( QString::null );
buttonGroupImageLayout = new QVBoxLayout( buttonGroupImage->layout() );
buttonGroupImageLayout->setAlignment( Qt::AlignTop );
buttonGroup3 = new QButtonGroup( buttonGroupImage, "buttonGroup3" );
buttonGroup3->setCheckable( TRUE );
buttonGroup3->setColumnLayout(0, Qt::Vertical );
buttonGroup3->layout()->setSpacing( 6 );
buttonGroup3->layout()->setMargin( 11 );
buttonGroup3->setTitle( tr( "Free Scaling" ) );
buttonGroup3Layout = new QGridLayout( buttonGroup3->layout() );
buttonGroup3Layout->setAlignment( Qt::AlignTop );
textLabel17b = new QLabel( buttonGroup3, "textLabel17b" );
textLabel17b->setText( tr( "Horizontal Scaling:" ) );
buttonGroup3Layout->addWidget( textLabel17b, 0, 0 );
textLabel18b = new QLabel( buttonGroup3, "textLabel18b" );
textLabel18b->setText( tr( "Vertical Scaling:" ) );
buttonGroup3Layout->addWidget( textLabel18b, 1, 0 );
scalingHorizontal = new QSpinBox( buttonGroup3, "scalingHorizontal" );
scalingHorizontal->setMaxValue( 100 );
scalingHorizontal->setMinValue( 1 );
scalingHorizontal->setSuffix( tr( " %" ) );
buttonGroup3Layout->addWidget( scalingHorizontal, 0, 1 );
scalingVertical = new QSpinBox( buttonGroup3, "scalingVertical" );
scalingVertical->setMaxValue( 100 );
scalingVertical->setMinValue( 1 );
scalingVertical->setSuffix( tr( " %" ) );
buttonGroup3Layout->addWidget( scalingVertical, 1, 1 );
chainButton = new LinkButton( buttonGroup3 );
chainButton->setToggleButton( true );
chainButton->setAutoRaise(true);
buttonGroup3Layout->addMultiCellWidget( chainButton, 0, 1, 2, 2 );
buttonGroupImageLayout->addWidget( buttonGroup3 );
buttonGroup5 = new QButtonGroup( buttonGroupImage, "buttonGroup5" );
buttonGroup5->setCheckable( TRUE );
buttonGroup5->setChecked( FALSE );
buttonGroup5->setColumnLayout(0, Qt::Vertical );
buttonGroup5->layout()->setSpacing( 6 );
buttonGroup5->layout()->setMargin( 11 );
buttonGroup5->setTitle( tr( "Scale Picture to Frame Size" ) );
buttonGroup5Layout = new QHBoxLayout( buttonGroup5->layout() );
buttonGroup5Layout->setAlignment( Qt::AlignTop );
checkRatioImage = new QCheckBox( buttonGroup5, "checkRatioImage" );
checkRatioImage->setText( tr( "Keep Aspect Ratio" ) );
buttonGroup5Layout->addWidget( checkRatioImage );
buttonGroupImageLayout->addWidget( buttonGroup5 );
subTabImageLayout->addMultiCellWidget( buttonGroupImage, 0, 0, 0, 1 );
subStackTools->addWidget( subTabImage, 3 );
subTabPolygon = new QWidget( subStackTools, "subTabPolygon" );
subTabPolygonLayout = new QHBoxLayout( subTabPolygon, 11, 6, "subTabPolygonLayout");
textLabel16du = new QLabel( subTabPolygon, "textLabel16" );
textLabel16du->setText( tr( "<p align=\"center\">Dummy</p>" ) );
subTabPolygonLayout->addWidget( textLabel16du );
subStackTools->addWidget( subTabPolygon, 4 );
subTabZoom = new QWidget( subStackTools, "subTabZoom" );
subTabZoomLayout = new QGridLayout( subTabZoom, 1, 1, 11, 6, "subTabZoomLayout");
textLabel21b = new QLabel( subTabZoom, "textLabel21b" );
textLabel21b->setText( tr( "Minimum:" ) );
subTabZoomLayout->addWidget( textLabel21b, 0, 0 );
minimumZoom = new QSpinBox( subTabZoom, "minimumZoom" );
minimumZoom->setMaxValue( 3200 );
minimumZoom->setMinValue( 10 );
minimumZoom->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( minimumZoom, 0, 1 );
textLabel22b = new QLabel( subTabZoom, "textLabel22b" );
textLabel22b->setText( tr( "Maximum:" ) );
subTabZoomLayout->addWidget( textLabel22b, 1, 0 );
textLabel23b = new QLabel( subTabZoom, "textLabel23b" );
textLabel23b->setText( tr( "Stepping:" ) );
subTabZoomLayout->addWidget( textLabel23b, 2, 0 );
maximumZoom = new QSpinBox( subTabZoom, "maximumZoom" );
maximumZoom->setMaxValue( 3200 );
maximumZoom->setMinValue( 10 );
maximumZoom->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( maximumZoom, 1, 1 );
zoomStep = new QSpinBox( subTabZoom, "zoomStep" );
zoomStep->setMaxValue( 200 );
zoomStep->setMinValue( 1 );
zoomStep->setLineStep( 25 );
zoomStep->setValue( 25 );
zoomStep->setSuffix( tr( " %" ) );
subTabZoomLayout->addWidget( zoomStep, 2, 1 );
subStackTools->addWidget( subTabZoom, 5 );
tabToolsLayout->addWidget( subStackTools );
// buddies
textLabel3b->setBuddy( colorComboText );
textLabel1b->setBuddy( fontComboText );
textLabel2b->setBuddy( sizeComboText );
textLabel5b->setBuddy( gapText );
textLabel9b->setBuddy( comboFillShape );
textLabel10b->setBuddy( shadingFillShape );
textLabel12b->setBuddy( lineWidthShape );
textLabel11b->setBuddy( comboStyleShape );
textLabel7b->setBuddy( colorComboLineShape );
textLabel8b->setBuddy( shadingLineShape );
textLabel13b->setBuddy( colorComboLineShape );
textLabel14b->setBuddy( shadingLine );
textLabel15b->setBuddy( comboStyleLine );
textLabel16b->setBuddy( lineWidthLine );
textLabel19b->setBuddy( comboFillImage );
textLabel20b->setBuddy( shadingFillImage );
textLabel17b->setBuddy( scalingHorizontal );
textLabel18b->setBuddy( scalingVertical );
addItem( tr("Tools"), loadIcon("tools.png"), tabTools);
 
rightR->setMaxValue(pageWidth - leftR->value());
leftR->setMaxValue(pageWidth - rightR->value());
topR->setMaxValue(pageHeight - bottomR->value());
bottomR->setMaxValue(pageHeight - topR->value());
toolText->setOn(true);
SetSample();
//tooltips
QToolTip::add( Doppelseiten, tr( "Enable single or spread based layout" ) );
QToolTip::add( ErsteSeite, tr( "Make the first page the left page of the document" ) );
QToolTip::add( TopR, tr( "Distance between the top margin guide and the edge of the page" ) );
QToolTip::add( BottomR, tr( "Distance between the bottom margin guide and the edge of the page" ) );
QToolTip::add( LeftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( facingPages, tr( "Enable single or spread based layout" ) );
QToolTip::add( firstPage, tr( "Make the first page the left page of the document" ) );
QToolTip::add( topR, tr( "Distance between the top margin guide and the edge of the page" ) );
QToolTip::add( bottomR, tr( "Distance between the bottom margin guide and the edge of the page" ) );
QToolTip::add( leftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( rightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
 
// signals and slots connections
connect( Doppelseiten, SIGNAL( clicked() ), this, SLOT( setDS() ) );
connect( facingPages, SIGNAL( clicked() ), this, SLOT( setDS() ) );
connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
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)));
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)));
connect(majorGridColor, SIGNAL(clicked()), this, SLOT(changeMajorColor()));
connect(minorGridColor, SIGNAL(clicked()), this, SLOT(changeMinorColor()));
connect(baselineColor, SIGNAL(clicked()), this, SLOT(changeBaselineColor()));
475,11 → 781,60
connect(guideColor, SIGNAL(clicked()), this, SLOT(changeGuideColor()));
connect(marginColor, SIGNAL(clicked()), this, SLOT(changeMarginColor()));
connect(backColor, SIGNAL(clicked()), this, SLOT(changePaperColor()));
connect(toolShape, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(toolPoly, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(toolImage, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(toolText, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(toolLine, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(toolZoom, SIGNAL(clicked()), this, SLOT(SetTool()));
connect(fontComboText, SIGNAL(activated(int)), this, SLOT(SetSample()));
connect(sizeComboText, SIGNAL(activated(int)), this, SLOT(SetSample()));
prefsWidgets->raiseWidget(0);
resize( minimumSizeHint() );
clearWState( WState_Polished );
}
 
/*!
\fn void ReformDoc::SetSample()
\author Franz Schmid
\date
\brief ReformDoc (Tools, Text frame), Sets the sample text in selected font in text frame preferences
\param None
\retval None
*/
void ReformDoc::SetSample()
{
QString ts = tr( "Woven silk pyjamas exchanged for blue quartz" );
QString da = (*fon)[fontComboText->currentText()]->Datei;
int s = sizeComboText->currentText().left(2).toInt();
QPixmap pm = fontSamples(da, s, ts, paletteBackgroundColor());
previewText->setPixmap(pm);
}
 
/*!
\fn void ReformDoc::SetTool()
\author Franz Schmid
\date
\brief ReformDoc (Tools), Raises widget for selected Tool properties
\param None
\retval None
*/
void ReformDoc::SetTool()
{
if (toolText == sender())
subStackTools->raiseWidget(0);
if (toolShape == sender())
subStackTools->raiseWidget(1);
if (toolLine == sender())
subStackTools->raiseWidget(2);
if (toolImage == sender())
subStackTools->raiseWidget(3);
if (toolPoly == sender())
subStackTools->raiseWidget(4);
if (toolZoom == sender())
subStackTools->raiseWidget(5);
}
 
void ReformDoc::changeMajorColor()
{
QColor neu = QColor();
560,36 → 915,36
 
void ReformDoc::setTop(int )
{
BottomR->setMaxValue(Hoehe - TopR->value());
bottomR->setMaxValue(pageHeight - topR->value());
}
 
void ReformDoc::setBottom(int )
{
TopR->setMaxValue(Hoehe - BottomR->value());
topR->setMaxValue(pageHeight - bottomR->value());
}
 
void ReformDoc::setLeft(int )
{
RightR->setMaxValue(Breite - LeftR->value());
rightR->setMaxValue(pageWidth - leftR->value());
}
 
void ReformDoc::setRight(int )
{
LeftR->setMaxValue(Breite - RightR->value());
leftR->setMaxValue(pageWidth - rightR->value());
}
 
void ReformDoc::setDS()
{
if (Doppelseiten->isChecked())
if (facingPages->isChecked())
{
Links->setText( tr( "&Inside:" ) );
Rechts->setText( tr( "&Outside:" ) );
ErsteSeite->setEnabled(true);
firstPage->setEnabled(true);
}
else
{
Links->setText( tr( "&Left:" ) );
Rechts->setText( tr( "&Right:" ) );
ErsteSeite->setEnabled(false);
firstPage->setEnabled(false);
}
}
/branches/Version13x/Scribus/scribus/icons/tools.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: Scribus/scribus/icons/Makefile.am
===================================================================
--- Scribus/scribus/icons/Makefile.am (revision 723)
+++ Scribus/scribus/icons/Makefile.am (revision 726)
@@ -1,10 +1,11 @@
####### kdevelop will overwrite this part!!! (begin)##########
-EXTRA_DIST = 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 = 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)/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
$(INSTALL_DATA) $(srcdir)/font.png $(prefix)/share/scribus/icons/font.png
@@ -318,6 +319,7 @@
-rm -f $(prefix)/share/scribus/icons/guides.png
-rm -f $(prefix)/share/scribus/icons/font.png
-rm -f $(prefix)/share/scribus/icons/screen.png
+ -rm -f $(prefix)/share/scribus/icons/tools.png
####### kdevelop will overwrite this part!!! (end)############
/branches/Version13x/Scribus/scribus/reformdoc.h
10,10 → 10,14
#include <qlabel.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qtoolbutton.h>
#include <qcolor.h>
#include "linkbutton.h"
#include "mspinbox.h"
#include "prefsdialogbase.h"
class ScribusDoc;
#include "scfonts.h"
#include "scribusdoc.h"
class FontCombo;
 
class ReformDoc : public PrefsDialogBase
{
20,7 → 24,7
Q_OBJECT
 
public:
ReformDoc( QWidget* parent, ScribusDoc* doc );
ReformDoc( QWidget* parent, ScribusDoc* doc, preV *prefsData );
~ReformDoc() {};
QWidget* tabPage;
QGroupBox* GroupBox7;
28,15 → 32,15
QLabel* TextLabel5;
QLabel* TextLabel7;
QLabel* TextLabel1_3;
QSpinBox* PgNr;
MSpinBox* TopR;
MSpinBox* BottomR;
MSpinBox* LeftR;
MSpinBox* RightR;
QSpinBox* pageNumber;
MSpinBox* topR;
MSpinBox* bottomR;
MSpinBox* leftR;
MSpinBox* rightR;
MSpinBox* widthMSpinBox;
MSpinBox* heightMSpinBox;
QCheckBox* Doppelseiten;
QCheckBox* ErsteSeite;
QCheckBox* facingPages;
QCheckBox* firstPage;
QLabel* Links;
QLabel* Rechts;
QLabel* widthQLabel;
49,6 → 53,7
QWidget* tabGuides;
QWidget* tabView;
QWidget* tabTypo;
QWidget* tabTools;
QLabel* textLabel1;
QLabel* textLabel2;
QLabel* textLabel3;
102,9 → 107,77
MSpinBox* baseOffset;
QLabel* textLabel8a;
 
 
QButtonGroup* buttonGroupTools;
QToolButton* toolShape;
QToolButton* toolPoly;
QToolButton* toolImage;
QToolButton* toolText;
QToolButton* toolLine;
QToolButton* toolZoom;
QWidgetStack* subStackTools;
QWidget* subTabText;
QLabel* textLabel3b;
QLabel* textLabel1b;
QLabel* textLabel2b;
QLabel* textLabel4b;
QSpinBox* columnsText;
QLabel* previewText;
FontCombo* fontComboText;
QComboBox* sizeComboText;
QComboBox* colorComboText;
QLabel* textLabel5b;
MSpinBox* gapText;
QWidget* subTabShape;
QLabel* textLabel9b;
QLabel* textLabel10b;
QSpinBox* lineWidthShape;
QLabel* textLabel12b;
QLabel* textLabel11b;
QComboBox* comboStyleShape;
QSpinBox* shadingFillShape;
QComboBox* comboFillShape;
QSpinBox* shadingLineShape;
QLabel* textLabel7b;
QComboBox* colorComboLineShape;
QLabel* textLabel8b;
QWidget* subTabLine;
QSpinBox* lineWidthLine;
QSpinBox* shadingLine;
QComboBox* colorComboLine;
QLabel* textLabel13b;
QLabel* textLabel14b;
QLabel* textLabel15b;
QLabel* textLabel16b;
QComboBox* comboStyleLine;
QWidget* subTabImage;
QComboBox* comboFillImage;
QLabel* textLabel19b;
QSpinBox* shadingFillImage;
QLabel* textLabel20b;
QButtonGroup* buttonGroupImage;
QButtonGroup* buttonGroup3;
QLabel* textLabel17b;
QLabel* textLabel18b;
QSpinBox* scalingHorizontal;
QSpinBox* scalingVertical;
LinkButton* chainButton;
QButtonGroup* buttonGroup5;
QCheckBox* checkRatioImage;
QWidget* subTabPolygon;
QLabel* textLabel16du;
QWidget* subTabZoom;
QLabel* textLabel21b;
QSpinBox* minimumZoom;
QLabel* textLabel22b;
QLabel* textLabel23b;
QSpinBox* maximumZoom;
QSpinBox* zoomStep;
 
SCFonts *fon;
int einheit;
double Breite;
double Hoehe;
double pageWidth;
double pageHeight;
QColor colorMajorGrid;
QColor colorMinorGrid;
QColor colorBaselineGrid;
139,8 → 212,21
QGridLayout* groupBox2aLayout;
QGridLayout* groupBox3aLayout;
QGridLayout* groupBox4aLayout;
QHBoxLayout* tabToolsLayout;
QVBoxLayout* buttonGroupToolsLayout;
QGridLayout* subTabTextLayout;
QGridLayout* subTabShapeLayout;
QGridLayout* subTabLineLayout;
QGridLayout* subTabImageLayout;
QVBoxLayout* buttonGroupImageLayout;
QGridLayout* buttonGroup3Layout;
QHBoxLayout* buttonGroup5Layout;
QHBoxLayout* subTabPolygonLayout;
QGridLayout* subTabZoomLayout;
 
protected slots:
virtual void SetSample();
virtual void SetTool();
virtual void changeMajorColor();
virtual void changeMinorColor();
virtual void changePaperColor();
/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("22").arg("November").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("23").arg("November").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scribus.cpp
2402,17 → 2402,17
bool fp = doc->PageFP;
double tpr2, lr2, rr2, br2;
bool ret = false;
ReformDoc* dia = new ReformDoc(this, doc);
ReformDoc* dia = new ReformDoc(this, doc, &Prefs);
if (dia->exec())
{
tpr2 = dia->TopR->value() / UmReFaktor;
lr2 = dia->LeftR->value() / UmReFaktor;
rr2 = dia->RightR->value() / UmReFaktor;
br2 = dia->BottomR->value() / UmReFaktor;
fp = dia->Doppelseiten->isChecked();
tpr2 = dia->topR->value() / UmReFaktor;
lr2 = dia->leftR->value() / UmReFaktor;
rr2 = dia->rightR->value() / UmReFaktor;
br2 = dia->bottomR->value() / UmReFaktor;
fp = dia->facingPages->isChecked();
if (fp)
doc->FirstPageLeft = dia->ErsteSeite->isChecked();
doc->FirstPnum = dia->PgNr->value();
doc->FirstPageLeft = dia->firstPage->isChecked();
doc->FirstPnum = dia->pageNumber->value();
doc->resetPage(tpr2, lr2, rr2, br2, fp);
view->reformPages();
doc->MarginsShown = dia->checkMargin->isChecked();
2441,6 → 2441,13
doc->AutoLine = dia->autoLine->value();
doc->BaseGrid = dia->baseGrid->value() / UmReFaktor;
doc->BaseOffs = dia->baseOffset->value() / UmReFaktor;
doc->Dfont = dia->fontComboText->currentText();
doc->Dsize = dia->sizeComboText->currentText().left(2).toInt() * 10;
doc->DpenText = dia->colorComboText->currentText();
if (doc->DpenText == tr("None"))
doc->DpenText = "None";
doc->DCols = dia->columnsText->value();
doc->DGap = dia->gapText->value() / UmReFaktor;
viewMenu->setItemChecked(Markers, doc->MarginsShown);
viewMenu->setItemChecked(FrameDr, doc->FramesShown);
viewMenu->setItemChecked(Ras, doc->GridShown);