Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 347 → Rev 348

/trunk/Scribus/ChangeLogCVS
1,5 → 1,10
Changes since Version 1.1.7
 
27.07.2004
* bug #892: resizing imported svg with rotated elements hurts gradients
* feature #893: Polish Translation Update
* feature #894: Crash when hypenating Swedish Texts
 
26.07.2004
* bug #891: gradients position does not change when objects are re-sized
 
/trunk/Scribus/scribus/pdfopts.cpp
496,7 → 496,7
GroupBox9Layout = new QGridLayout( GroupBox9->layout() );
GroupBox9Layout->setAlignment( Qt::AlignTop );
EmbedProfs = new QCheckBox( GroupBox9, "EmbedProfs" );
EmbedProfs->setText( tr( "Use ICC-Profile" ) );
EmbedProfs->setText( tr( "Use ICC Profile" ) );
EmbedProfs->setChecked(Optionen->UseProfiles);
GroupBox9Layout->addMultiCellWidget( EmbedProfs, 0, 0, 0, 1 );
ProfsTxt1 = new QLabel(GroupBox9, "ProfsTxt1");
786,11 → 786,7
QToolTip::add( CopySec, tr( "Allow copying of text or graphics from the PDF. \nIf un-checked, text and graphics cannot be copied." ) );
QToolTip::add( AddSec, tr( "Allow adding annotations and fields to the PDF. \nIf un-checked, editing annotations and fileds is prevented." ) );
QToolTip::add( OutCombo, tr( "Color model for the output of your PDF.\nChoose Screen/Web for PDFs which are used for screen display and for printing on typical inkjets.\nChoose Printer when printing to a true 4 color CMYK printer." ) );
QToolTip::add( UseLPI, tr( "" ) );
QToolTip::add( LPIcolor, tr( "" ) );
QToolTip::add( LPIfreq, tr( "" ) );
QToolTip::add( LPIangle, tr( "" ) );
QToolTip::add( LPIfunc, tr( "" ) );
QToolTip::add( UseLPI, tr( "This is an advanced setting which is not enabled by default. This should only be enabled\nwhen specifically requested by your printer and they have given you the exact details needed.\nOtherwise, your exported PDF may not print properly and is truly not portable across systems." ) );
QToolTip::add( EmbedProfs, tr( "Embed a color profile for solid colors" ) );
QToolTip::add( SolidPr, tr( "Color profile for solid colors" ) );
QToolTip::add( IntendS, tr( "Rendering intent for solid colors" ) );
/trunk/Scribus/scribus/lineformats.cpp
155,8 → 155,8
int exit=QMessageBox::warning(this,
tr("Warning"),
tr("Do you really want do delete this Style?"),
tr("No"),
tr("Yes"),
tr("&No"),
tr("&Yes"),
0, 0, 0);
/* PFJ - 29.02.04 - Changed from 1 to QMessageBox::Yes */
/* FS - 12.05.04 the 1 is correct in this version of QMessageBox, it returns the Nr of the clicked Button either 0 or 1 or 2 */
/trunk/Scribus/scribus/mpalette.cpp
104,37 → 104,37
SGeom->setToggleButton( true );
SGeom->setOn( true );
SGeom->setFont(f);
SGeom->setText( tr( "X, Y, Z" ) );
SGeom->setText( tr( "X, Y, &Z" ) );
proppalButtonGrpLayout->addWidget( SGeom, 0, 0 );
 
SShape = new QToolButton( proppalButtonGrp, "toolButton25" );
SShape->setToggleButton( true );
SShape->setFont(f);
SShape->setText( tr( "Shape" ) );
SShape->setText( tr( "&Shape" ) );
proppalButtonGrpLayout->addWidget( SShape, 0, 1 );
 
SText = new QToolButton( proppalButtonGrp, "toolButton26" );
SText->setToggleButton( true );
SText->setFont(f);
SText->setText( tr( "Text" ) );
SText->setText( tr( "&Text" ) );
proppalButtonGrpLayout->addWidget( SText, 1, 0 );
 
SImage = new QToolButton( proppalButtonGrp, "toolButton27" );
SImage->setToggleButton( true );
SImage->setFont(f);
SImage->setText( tr( "Image" ) );
SImage->setText( tr( "&Image" ) );
proppalButtonGrpLayout->addWidget( SImage, 1, 1 );
 
SLine = new QToolButton( proppalButtonGrp, "toolButton28" );
SLine->setToggleButton( true );
SLine->setFont(f);
SLine->setText( tr( "Line" ) );
SLine->setText( tr( "&Line" ) );
proppalButtonGrpLayout->addWidget( SLine, 2, 0 );
 
SColor = new QToolButton( proppalButtonGrp, "toolButton29" );
SColor->setToggleButton( true );
SColor->setFont(f);
SColor->setText( tr( "Colors" ) );
SColor->setText( tr( "&Colors" ) );
proppalButtonGrpLayout->addWidget( SColor, 2, 1 );
 
MpalLayout->addWidget( proppalButtonGrp );
161,16 → 161,6
GeoGroupLayout = new QGridLayout( GeoGroup->layout() );
GeoGroupLayout->setAlignment( Qt::AlignTop );
 
xposLabel = new QLabel( tr( "X-Pos:" ), GeoGroup, "xposLabel" );
GeoGroupLayout->addWidget( xposLabel, 0, 0 );
yposLabel = new QLabel( tr( "Y-Pos:"), GeoGroup, "yposLabel" );
GeoGroupLayout->addWidget( yposLabel, 1, 0 );
widthLabel = new QLabel( tr( "Width:" ), GeoGroup, "widthLabel" );
 
GeoGroupLayout->addWidget( widthLabel, 2, 0 );
heightLabel = new QLabel( tr( "Height:" ), GeoGroup, "heightLabel" );
 
GeoGroupLayout->addWidget( heightLabel, 3, 0 );
Xpos = new MSpinBox( -3000, 3000, GeoGroup, 2 );
Xpos->setSuffix( tr( " pt" ) );
GeoGroupLayout->addWidget( Xpos, 0, 1 );
183,8 → 173,16
Height = new MSpinBox( GeoGroup, 2 );
Height->setSuffix( tr( " pt" ) );
GeoGroupLayout->addWidget( Height, 3, 1 );
rotationLabel = new QLabel( tr( "Rotation:" ), GeoGroup, "rotationLabel" );
GeoGroupLayout->addWidget( rotationLabel, 4, 0 );
 
xposLabel = new QLabel( Xpos, tr( "&X-Pos:" ), GeoGroup, "xposLabel" );
GeoGroupLayout->addWidget( xposLabel, 0, 0 );
yposLabel = new QLabel( Ypos, tr( "&Y-Pos:"), GeoGroup, "yposLabel" );
GeoGroupLayout->addWidget( yposLabel, 1, 0 );
widthLabel = new QLabel( Width, tr( "&Width:" ), GeoGroup, "widthLabel" );
GeoGroupLayout->addWidget( widthLabel, 2, 0 );
heightLabel = new QLabel( Height, tr( "&Height:" ), GeoGroup, "heightLabel" );
GeoGroupLayout->addWidget( heightLabel, 3, 0 );
 
Kette2 = new LinkButton( GeoGroup );
Kette2->setToggleButton( true );
Kette2->setAutoRaise( true );
193,6 → 191,8
Rot = new MSpinBox( GeoGroup, 2);
Rot->setSuffix( QString::fromUtf8(" °"));
Rot->setWrapping( true );
rotationLabel = new QLabel( Rot, tr( "&Rotation:" ), GeoGroup, "rotationLabel" );
GeoGroupLayout->addWidget( rotationLabel, 4, 0 );
GeoGroupLayout->addWidget( Rot, 4, 1 );
basepointLabel = new QLabel( tr( "Basepoint:" ), GeoGroup, "basepointLabel" );
GeoGroupLayout->addWidget( basepointLabel, 5, 0 );
329,13 → 329,13
pageLayout->addLayout( layout60 );
 
Textflow = new QCheckBox( page, "Textflow" );
Textflow->setText( tr( "Text flows around frame" ) );
Textflow->setText( tr( "Text &Flows Around Frame" ) );
pageLayout->addWidget( Textflow );
Textflow2 = new QCheckBox( page, "Textflow2" );
Textflow2->setText( tr( "Use Bounding Box" ) );
Textflow2->setText( tr( "Use &Bounding Box" ) );
pageLayout->addWidget( Textflow2 );
Textflow3 = new QCheckBox( page, "Textflow3" );
Textflow3->setText( tr( "Use Contour Line" ) );
Textflow3->setText( tr( "&Use Contour Line" ) );
pageLayout->addWidget( Textflow3 );
 
QSpacerItem* spacer13 = new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
360,16 → 360,15
pageLayout_2->addWidget( ShapeGroup );
 
EditShape = new QToolButton( page_2, "EditShape" );
EditShape->setText( tr( "Edit Shape..." ) );
EditShape->setText( tr( "&Edit Shape..." ) );
pageLayout_2->addWidget( EditShape );
 
Layout13 = new QHBoxLayout( 0, 0, 2, "Layout13");
 
rndcornersLabel = new QLabel( tr( "Round\nCorners:" ), page_2, "rndcornersLabel" );
Layout13->addWidget( rndcornersLabel );
 
RoundRect = new MSpinBox( page_2, 1 );
RoundRect->setSuffix( tr( " pt" ) );
rndcornersLabel = new QLabel( RoundRect, tr( "R&ound\nCorners:" ), page_2, "rndcornersLabel" );
Layout13->addWidget( rndcornersLabel );
Layout13->addWidget( RoundRect );
pageLayout_2->addLayout( Layout13 );
 
384,45 → 383,46
Distance->layout()->setMargin( 5 );
DistanceLayout = new QGridLayout( Distance->layout() );
DistanceLayout->setAlignment( Qt::AlignTop );
columnsLabel = new QLabel( tr( "Columns:" ), Distance, "columnsLabel" );
DistanceLayout->addWidget( columnsLabel, 0, 0 );
colgapLabel = new LabelButton( Distance, tr("Gap:"), tr("Width:"));
DistanceLayout->addWidget( colgapLabel, 1, 0 );
topLabel = new QLabel( tr( "Top:" ), Distance, "topLabel" );
DistanceLayout->addWidget( topLabel, 2, 0 );
bottomLabel = new QLabel( tr( "Bottom:" ), Distance, "bottomLabel" );
DistanceLayout->addWidget( bottomLabel, 3, 0 );
leftLabel = new QLabel( tr( "Left:" ), Distance, "leftLabel" );
DistanceLayout->addWidget( leftLabel, 4, 0 );
rightLabel = new QLabel( tr( "Right:" ), Distance, "rightLabel" );
DistanceLayout->addWidget( rightLabel, 5, 0 );
 
DCol = new QSpinBox(Distance, "Cols" );
DCol->setMaxValue( 3000 );
DCol->setMinValue( 1 );
columnsLabel = new QLabel( DCol, tr( "Colu&mns:" ), Distance, "columnsLabel" );
DistanceLayout->addWidget( columnsLabel, 0, 0 );
DistanceLayout->addWidget( DCol, 0, 1 );
 
DGap = new MSpinBox( 0, 300, Distance, 1 );
DGap->setSuffix( tr( " pt" ) );
colgapLabel = new LabelButton( Distance, tr("&Gap:"), tr("&Width:"));
colgapLabel->setBuddy(DGap);
DistanceLayout->addWidget( colgapLabel, 1, 0 );
DistanceLayout->addWidget( DGap, 1, 1 );
 
DTop = new MSpinBox( 0, 300, Distance, 1 );
DTop->setSuffix( tr( " pt" ) );
topLabel = new QLabel( DTop, tr( "To&p:" ), Distance, "topLabel" );
DistanceLayout->addWidget( topLabel, 2, 0 );
DistanceLayout->addWidget( DTop, 2, 1 );
 
DBottom = new MSpinBox( 0, 300, Distance, 1 );
DBottom->setSuffix( tr( " pt" ) );
bottomLabel = new QLabel( DBottom, tr( "&Bottom:" ), Distance, "bottomLabel" );
DistanceLayout->addWidget( bottomLabel, 3, 0 );
DistanceLayout->addWidget( DBottom, 3, 1 );
 
DLeft = new MSpinBox( 0, 300, Distance, 1 );
DLeft->setSuffix( tr( " pt" ) );
leftLabel = new QLabel( DLeft, tr( "&Left:" ), Distance, "leftLabel" );
DistanceLayout->addWidget( leftLabel, 4, 0 );
DistanceLayout->addWidget( DLeft, 4, 1 );
 
DRight = new MSpinBox( 0, 300, Distance, 1 );
DRight->setSuffix( tr( " pt" ) );
rightLabel = new QLabel( DRight, tr( "&Right:" ), Distance, "rightLabel" );
DistanceLayout->addWidget( rightLabel, 5, 0 );
DistanceLayout->addWidget( DRight, 5, 1 );
 
TabsButton = new QPushButton( Distance, "Tabul" );
TabsButton->setText( tr( "Tabulators..." ) );
TabsButton = new QPushButton( tr("T&abulators..."), Distance, "Tabul" );
TabsButton->setDefault( false );
TabsButton->setAutoDefault( false );
DistanceLayout->addMultiCellWidget( TabsButton, 6, 6, 0, 1 );
474,22 → 474,22
Fonts->setMaximumSize(190, 30);
layout41->addMultiCellWidget( Fonts, 0, 0, 0, 1 );
 
fontsizeLabel = new QLabel( tr("Font Size:"), page_3, "fontsizeLabel" );
layout41->addWidget( fontsizeLabel, 1, 0 );
Size = new MSpinBox( 1, 1024, page_3, 1 );
Size->setPrefix( "" );
Size->setSuffix( tr( " pt" ) );
fontsizeLabel = new QLabel( Size, tr("&Font Size:"), page_3, "fontsizeLabel" );
layout41->addWidget( fontsizeLabel, 1, 0 );
layout41->addWidget( Size, 1, 1 );
layout46->addLayout( layout41 );
 
layout22 = new QHBoxLayout( 0, 0, 5, "layout22");
ScaleTxt = new QLabel( tr("Width:"), page_3, "ScaleTxt" );
layout22->addWidget( ScaleTxt );
ChScale = new QSpinBox( page_3, "ChScale" );
ChScale->setMaxValue( 400 );
ChScale->setMinValue( 25 );
ChScale->setValue( 100 );
ChScale->setSuffix( tr( " %" ) );
ScaleTxt = new QLabel( ChScale, tr("&Width:"), page_3, "ScaleTxt" );
layout22->addWidget( ScaleTxt );
layout22->addWidget( ChScale );
layout46->addLayout( layout22 );
 
557,23 → 557,23
Extra->setSuffix( tr( " pt" ) );
GroupBox3Layout->addWidget( Extra, 0, 1 );
 
kerningLabel = new QLabel( tr( "Kerning:" ), GroupBox3, "kerningLabel" );
kerningLabel = new QLabel( Extra, tr( "&Kerning:" ), GroupBox3, "kerningLabel" );
GroupBox3Layout->addWidget( kerningLabel, 0, 0 );
 
linespacingLabel = new QLabel( tr( "Line Spacing:" ), GroupBox3, "linespacingLabel" );
linespacingLabel = new QLabel( LineSp, tr( "L&ine Spacing:" ), GroupBox3, "linespacingLabel" );
GroupBox3Layout->addWidget( linespacingLabel, 1, 0 );
 
pageLayout_3->addWidget( GroupBox3 );
 
GroupBox3aLayout = new QGridLayout( 0, 1, 1, 0, 5, "Layout25");
styleLabel = new QLabel( tr("Style:"), page_3, "styleLabel" );
Spal = new Spalette(page_3);
styleLabel = new QLabel( Spal, tr("St&yle:"), page_3, "styleLabel" );
GroupBox3aLayout->addWidget( styleLabel, 0, 0 );
Spal = new Spalette(page_3);
GroupBox3aLayout->addWidget( Spal, 0, 1 );
langLabel = new QLabel( tr("Language:"), page_3, "langLabel" );
GroupBox3aLayout->addWidget( langLabel, 1, 0 );
langCombo = new QComboBox( true, page_3, "Lang" );
langCombo->setEditable(false);
langLabel = new QLabel( langCombo, tr("Lan&guage:"), page_3, "langLabel" );
GroupBox3aLayout->addWidget( langLabel, 1, 0 );
GroupBox3aLayout->addWidget( langCombo, 1, 1 );
pageLayout_3->addLayout(GroupBox3aLayout);
 
584,31 → 584,30
page_4 = new QWidget( TabStack, "page_4" );
pageLayout_4 = new QVBoxLayout( page_4, 0, 5, "pageLayout_4");
 
FreeScale = new QRadioButton( page_4, "FreeScale" );
FreeScale->setText( tr( "Free Scaling" ) );
FreeScale = new QRadioButton( tr( "&Free Scaling" ), page_4, "FreeScale" );
FreeScale->setChecked( true );
pageLayout_4->addWidget( FreeScale );
 
layout43 = new QGridLayout( 0, 1, 1, 0, 5, "layout43");
xposImgLabel = new QLabel( tr( "X-Pos.:" ), page_4, "xposImgLabel" );
layout43->addWidget( xposImgLabel, 0, 0 );
LXpos = new MSpinBox( page_4, 2 );
LXpos->setSuffix( tr( " pt" ) );
xposImgLabel = new QLabel( LXpos, tr( "&X-Pos:" ), page_4, "xposImgLabel" );
layout43->addWidget( xposImgLabel, 0, 0 );
layout43->addWidget( LXpos, 0, 1 );
yposImgLabel = new QLabel( tr( "Y-Pos.:" ), page_4, "yposImgLabel" );
layout43->addWidget( yposImgLabel, 1, 0 );
LYpos = new MSpinBox( page_4, 2 );
LYpos->setSuffix( tr( " pt" ) );
yposImgLabel = new QLabel( LYpos, tr( "&Y-Pos:" ), page_4, "yposImgLabel" );
layout43->addWidget( yposImgLabel, 1, 0 );
layout43->addWidget( LYpos, 1, 1 );
xscaleLabel = new QLabel( tr( "X-Scale:" ), page_4, "xscaleLabel" );
layout43->addWidget( xscaleLabel, 2, 0 );
ScaleX = new MSpinBox( page_4, 1 );
ScaleX->setSuffix( tr( " %" ) );
xscaleLabel = new QLabel( ScaleX, tr( "X-Sc&ale:" ), page_4, "xscaleLabel" );
layout43->addWidget( xscaleLabel, 2, 0 );
layout43->addWidget( ScaleX, 2, 1 );
yscaleLabel = new QLabel( tr( "Y-Scale:" ), page_4, "yscaleLabel" );
layout43->addWidget( yscaleLabel, 3, 0 );
ScaleY = new MSpinBox( page_4, 1 );
ScaleY->setSuffix( tr( " %" ) );
yscaleLabel = new QLabel( ScaleY, tr( "Y-Scal&e:" ), page_4, "yscaleLabel" );
layout43->addWidget( yscaleLabel, 3, 0 );
layout43->addWidget( ScaleY, 3, 1 );
Kette = new LinkButton( page_4 );
Kette->setToggleButton( true );
620,7 → 619,7
Layout24 = new QVBoxLayout( 0, 0, 3, "Layout24");
 
FrameScale = new QRadioButton( page_4, "FixedScale" );
FrameScale->setText( tr( "Scale to Frame Size" ) );
FrameScale->setText( tr( "Scale &To Frame Size" ) );
Layout24->addWidget( FrameScale );
 
Layout18 = new QHBoxLayout( 0, 0, 6, "Layout18");
634,7 → 633,7
 
Aspect = new QCheckBox( page_4, "Aspect" );
Aspect->setEnabled( false );
Aspect->setText( tr( "Proportional" ) );
Aspect->setText( tr( "P&roportional" ) );
Aspect->setChecked( true );
 
Layout18->addWidget( Aspect );
673,12 → 672,12
pageLayout_5 = new QVBoxLayout( page_5, 0, 5, "pageLayout_5");
 
Layout13_2 = new QHBoxLayout( 0, 0, 4, "Layout13_2");
LineModeT = new QLabel( tr( "Basepoint:" ), page_5, "LModeText" );
Layout13_2->addWidget( LineModeT );
LineMode = new QComboBox( true, page_5, "LMode" );
LineMode->setEditable(false);
LineMode->insertItem( tr( "Left Point" ) );
LineMode->insertItem( tr( "End Points" ) );
LineModeT = new QLabel( LineMode, tr( "&Basepoint:" ), page_5, "LModeText" );
Layout13_2->addWidget( LineModeT );
Layout13_2->addWidget( LineMode );
LMode = false;
QSpacerItem* spacer10 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
686,30 → 685,30
pageLayout_5->addLayout( Layout13_2 );
 
Layout12_2 = new QGridLayout( 0, 1, 1, 0, 3, "Layout12_2");
linetypeLabel = new QLabel( tr( "Type of Line:" ), page_5, "linetypeLabel" );
LStyle = new LineCombo(page_5);
linetypeLabel = new QLabel( LStyle, tr( "T&ype of Line:" ), page_5, "linetypeLabel" );
Layout12_2->addWidget( linetypeLabel, 0, 0 );
LStyle = new LineCombo(page_5);
Layout12_2->addWidget( LStyle, 1, 0 );
linewidthLabel = new QLabel(tr( "Line Width:" ), page_5, "linewidthLabel" );
Layout12_2->addWidget( linewidthLabel, 2, 0 );
LSize = new MSpinBox( page_5, 1 );
LSize->setSuffix( tr( " pt" ) );
linewidthLabel = new QLabel(LSize, tr( "Line &Width:" ), page_5, "linewidthLabel" );
Layout12_2->addWidget( linewidthLabel, 2, 0 );
Layout12_2->addWidget( LSize, 3, 0 );
edgesLabel = new QLabel( tr( "Edges:" ), page_5, "edgesLabel" );
Layout12_2->addWidget( edgesLabel, 4, 0 );
LJoinStyle = new QComboBox( true, page_5, "LJoin" );
LJoinStyle->setEditable(false);
LJoinStyle->insertItem(loadIcon("MiterJoin.png"), tr( "Miter Join" ) );
LJoinStyle->insertItem(loadIcon("BevelJoin.png"), tr( "Bevel Join" ) );
LJoinStyle->insertItem(loadIcon("RoundJoin.png"), tr( "Round Join" ) );
edgesLabel = new QLabel( LJoinStyle, tr( "Ed&ges:" ), page_5, "edgesLabel" );
Layout12_2->addWidget( edgesLabel, 4, 0 );
Layout12_2->addWidget( LJoinStyle, 5, 0 );
endingsLabel = new QLabel( tr( "Endings:" ), page_5, "endingsLabel" );
Layout12_2->addWidget( endingsLabel, 6, 0 );
LEndStyle = new QComboBox( true, page_5, "LCap" );
LEndStyle->setEditable(false);
LEndStyle->insertItem(loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
LEndStyle->insertItem(loadIcon("SquareCap.png"), tr( "Square Cap" ) );
LEndStyle->insertItem(loadIcon("RoundCap.png"), tr( "Round Cap" ) );
endingsLabel = new QLabel( LEndStyle, tr( "&Endings:" ), page_5, "endingsLabel" );
Layout12_2->addWidget( endingsLabel, 6, 0 );
Layout12_2->addWidget( LEndStyle, 7, 0 );
pageLayout_5->addLayout( Layout12_2 );
 
1116,16 → 1115,16
}
 
if ((i->PType == 5) && LMode) {
xposLabel->setText( tr( "X1:" ) );
widthLabel->setText( tr( "X2:" ) );
yposLabel->setText( tr( "Y1:" ) );
heightLabel->setText( tr( "Y2:" ) );
xposLabel->setText( tr( "&X1:" ) );
widthLabel->setText( tr( "X&2:" ) );
yposLabel->setText( tr( "Y&1:" ) );
heightLabel->setText( tr( "&Y2:" ) );
Rot->setEnabled(false);
} else {
xposLabel->setText( tr( "X-Pos:" ) );
widthLabel->setText( tr( "Width:" ) );
yposLabel->setText( tr( "Y-Pos:" ) );
heightLabel->setText( tr( "Height:" ) );
xposLabel->setText( tr( "&X-Pos:" ) );
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
Rot->setEnabled(true);
}
 
1179,10 → 1178,10
doc->ActPage->RCenter = FPoint(gx, gy + gh);
if (BottomRight->isChecked())
doc->ActPage->RCenter = FPoint(gx + gw, gy + gh);
xposLabel->setText( tr( "X-Pos:" ) );
widthLabel->setText( tr( "Width:" ) );
yposLabel->setText( tr( "Y-Pos:" ) );
heightLabel->setText( tr( "Height:" ) );
xposLabel->setText( tr( "&X-Pos:" ) );
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
HaveItem = false;
Xpos->setValue(0);
Ypos->setValue(0);
1226,10 → 1225,10
switch (nr)
{
case -1:
xposLabel->setText( tr( "X-Pos:" ) );
widthLabel->setText( tr( "Width:" ) );
yposLabel->setText( tr( "Y-Pos:" ) );
heightLabel->setText( tr( "Height:" ) );
xposLabel->setText( tr( "&X-Pos:" ) );
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
Rot->setEnabled(true);
Height->setEnabled(true);
HaveItem = false;
2324,10 → 2323,10
return;
if (LineMode->currentItem() == 0)
{
xposLabel->setText( tr( "X-Pos:" ) );
widthLabel->setText( tr( "Width:" ) );
yposLabel->setText( tr( "Y-Pos:" ) );
heightLabel->setText( tr( "Height:" ) );
xposLabel->setText( tr( "&X-Pos:" ) );
widthLabel->setText( tr( "&Width:" ) );
yposLabel->setText( tr( "&Y-Pos:" ) );
heightLabel->setText( tr( "&Height:" ) );
Rot->setEnabled(true);
Height->setEnabled(false);
LMode = false;
2334,10 → 2333,10
}
else
{
xposLabel->setText( tr( "X1:" ) );
widthLabel->setText( tr( "X2:" ) );
yposLabel->setText( tr( "Y1:" ) );
heightLabel->setText( tr( "Y2:" ) );
xposLabel->setText( tr( "&X1:" ) );
widthLabel->setText( tr( "X&2:" ) );
yposLabel->setText( tr( "Y&1:" ) );
heightLabel->setText( tr( "&Y2:" ) );
Rot->setEnabled(false);
Height->setEnabled(true);
LMode = true;
/trunk/Scribus/scribus/edit1format.cpp
17,8 → 17,7
EditStyleLayout->setSpacing( 6 );
EditStyleLayout->setMargin( 10 );
 
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Name:" ) );
TextLabel1 = new QLabel( tr( "&Name:" ), this, "TextLabel1" );
EditStyleLayout->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
 
Name = new QLineEdit( this, "Name" );
26,18 → 25,17
Name->setText( vor->Vname );
OldName = vor->Vname;
IsNew = neu;
TextLabel1->setBuddy(Name);
EditStyleLayout->addMultiCellWidget( Name, 1, 1, 0, 1 );
 
GroupFont = new QGroupBox( this, "GroupFont" );
GroupFont->setTitle( tr( "Character" ) );
GroupFont = new QGroupBox( tr( "Character" ), this, "GroupFont" );
GroupFont->setColumnLayout(0, Qt::Vertical );
GroupFont->layout()->setSpacing( 5 );
GroupFont->layout()->setMargin( 10 );
GroupFontLayout = new QGridLayout( GroupFont->layout() );
GroupFontLayout->setAlignment( Qt::AlignTop );
TextF1 = new QLabel( GroupFont, "TextF1" );
TextF1 = new QLabel( tr( "&Font:"), GroupFont, "TextF1" );
TextF1->setMinimumSize( QSize( 50, 22 ) );
TextF1->setText( tr( "Face:" ) );
GroupFontLayout->addWidget( TextF1, 0, 0 );
FontC = new FontCombo(GroupFont, Prefs);
for (int fc=0; fc<FontC->count(); ++fc)
48,59 → 46,55
break;
}
}
TextF1->setBuddy(FontC);
GroupFontLayout->addMultiCellWidget( FontC, 0, 0, 1, 4 );
TextF2 = new QLabel( GroupFont, "TextF2" );
TextF2->setMinimumSize( QSize( 50, 22 ) );
TextF2->setText( tr( "Size:" ) );
GroupFontLayout->addWidget( TextF2, 1, 0 );
SizeC = new MSpinBox( 1, 1024, GroupFont, 1 );
SizeC->setMinimumSize( QSize( 70, 22 ) );
SizeC->setSuffix( tr( " pt" ) );
SizeC->setValue(vor->FontSize / 10.0);
TextF2 = new QLabel( SizeC, tr("Si&ze:") ,GroupFont, "TextF2" );
TextF2->setMinimumSize( QSize( 50, 22 ) );
GroupFontLayout->addWidget( TextF2, 1, 0 );
GroupFontLayout->addWidget( SizeC, 1, 1 );
EffeLabel = new QLabel( GroupFont, "EffeLabel" );
EffeLabel->setText( tr("Effect:"));
GroupFontLayout->addWidget( EffeLabel, 1, 2 );
 
EffeS = new StyleSelect(GroupFont);
EffeS->setStyle(vor->FontEffect);
EffeLabel = new QLabel( tr("Effect:"), GroupFont, "EffeLabel" );
GroupFontLayout->addWidget( EffeLabel, 1, 2 );
GroupFontLayout->addMultiCellWidget( EffeS, 1, 1, 3, 4, Qt::AlignLeft );
AligLabel = new QLabel( GroupFont, "AligLabel" );
AligLabel->setText( tr("Alignment:"));
GroupFontLayout->addWidget( AligLabel, 2, 0 );
 
AligS = new AlignSelect(GroupFont);
AligS->setStyle(vor->Ausri);
AligLabel = new QLabel( AligS, tr("&Alignment:"), GroupFont, "AligLabel" );
GroupFontLayout->addWidget( AligLabel, 2, 0 );
GroupFontLayout->addWidget( AligS, 2, 1, Qt::AlignLeft );
 
DropCaps = new QCheckBox( GroupFont, "DropCaps" );
DropCaps->setText( tr( "Drop Caps" ) );
DropCaps = new QCheckBox( tr("&Drop Caps"), GroupFont, "DropCaps" );
DropCaps->setChecked(vor->Drop);
GroupFontLayout->addWidget( DropCaps, 2, 2 );
CapLabel = new QLabel( GroupFont, "CapLabel" );
CapLabel->setText( tr("Lines:"));
GroupFontLayout->addWidget( CapLabel, 2, 3, Qt::AlignRight );
DropLines = new QSpinBox( GroupFont, "DropLines" );
DropLines->setMinValue( 2 );
DropLines->setMaxValue( 20 );
DropLines->setValue(vor->DropLin);
CapLabel = new QLabel( DropLines, tr("&Lines:"), GroupFont, "CapLabel" );
GroupFontLayout->addWidget( CapLabel, 2, 3, Qt::AlignRight );
GroupFontLayout->addWidget( DropLines, 2, 4 );
bool enable = vor->Drop ? true : false;
DropLines->setEnabled(enable);
CapLabel->setEnabled(enable);
 
FillIcon = new QLabel( GroupFont, "FillIcon" );
FillIcon->setText( tr("Fill Color:"));
GroupFontLayout->addWidget( FillIcon, 3, 0 );
TxFill = new QComboBox( true, GroupFont, "TxFill" );
TxFill->setEditable(false);
FillIcon = new QLabel( TxFill, tr( "F&ill Color:" ), GroupFont, "FillIcon" );
GroupFontLayout->addWidget( FillIcon, 3, 0 );
GroupFontLayout->addWidget( TxFill, 3, 1 );
PM2 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM2, 3, 2, Qt::AlignLeft );
 
StrokeIcon = new QLabel( GroupFont, "StrokeIcon" );
StrokeIcon->setText( tr("Stroke Color:"));
GroupFontLayout->addWidget( StrokeIcon, 4, 0 );
TxStroke = new QComboBox( true, GroupFont, "TxStroke" );
TxStroke->setEditable(false);
StrokeIcon = new QLabel( TxStroke, tr("St&roke Color:"), GroupFont, "StrokeIcon" );
GroupFontLayout->addWidget( StrokeIcon, 4, 0 );
GroupFontLayout->addWidget( TxStroke, 4, 1 );
PM1 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM1, 4, 2, Qt::AlignLeft );
126,8 → 120,7
 
EditStyleLayout->addWidget( GroupFont, 2, 0 );
AbstandV = new QGroupBox( this, "AbstandV" );
AbstandV->setTitle( tr( "Vertical Spaces" ) );
AbstandV = new QGroupBox( tr("Vertical Spaces"), this, "AbstandV" );
AbstandV->setColumnLayout(0, Qt::Vertical );
AbstandV->layout()->setSpacing( 0 );
AbstandV->layout()->setMargin( 0 );
136,8 → 129,7
AbstandVLayout->setSpacing( 5 );
AbstandVLayout->setMargin( 10 );
 
BaseGrid = new QCheckBox( AbstandV, "BaseGrid" );
BaseGrid->setText( tr( "Adjust to Baseline Grid" ) );
BaseGrid = new QCheckBox( tr("Adjust to Baseline &Grid"), AbstandV, "BaseGrid" );
BaseGrid->setChecked(vor->BaseAdj);
AbstandVLayout->addMultiCellWidget( BaseGrid, 0, 0, 0, 1 );
AboveV = new MSpinBox( 0, 300, AbstandV, 1 );
154,28 → 146,24
LineSpVal->setValue(vor->LineSpa);
AbstandVLayout->addWidget( LineSpVal, 3, 1 );
 
TextLabel3 = new QLabel( AbstandV, "TextLabel3" );
TextLabel3 = new QLabel( LineSpVal, tr("Line &Spacing:"), AbstandV, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel3->sizePolicy().hasHeightForWidth() ) );
TextLabel3->setMinimumSize( QSize( 90, 22 ) );
TextLabel3->setText( tr( "Line Spacing:" ) );
AbstandVLayout->addWidget( TextLabel3, 3, 0 );
TextLabel1_2_2 = new QLabel( AbstandV, "TextLabel1_2_2" );
TextLabel1_2_2 = new QLabel( AboveV, tr("Abo&ve:"), AbstandV, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_2->setText( tr( "Above:" ) );
AbstandVLayout->addWidget( TextLabel1_2_2, 1, 0 );
TextLabel1_2_3 = new QLabel( AbstandV, "TextLabel1_2_3" );
TextLabel1_2_3 = new QLabel( BelowV, tr("&Below:"), AbstandV, "TextLabel1_2_3" );
TextLabel1_2_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_3->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_3->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_3->setText( tr( "Below:" ) );
AbstandVLayout->addWidget( TextLabel1_2_3, 2, 0 );
EditStyleLayout->addWidget( AbstandV, 2, 1 );
 
GroupBox10 = new QGroupBox( this, "GroupBox10" );
GroupBox10->setTitle( tr( "Tabulators and Indentation" ) );
GroupBox10 = new QGroupBox( tr("Tabulators and Indentation"), this, "GroupBox10" );
GroupBox10->setColumnLayout(0, Qt::Vertical );
GroupBox10->layout()->setSpacing( 0 );
GroupBox10->layout()->setMargin( 0 );
197,17 → 185,11
Layout17->setMargin( 0 );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer2 );
OkButton = new QPushButton( this, "OkButton" );
OkButton->setText( tr( "OK" ) );
OkButton = new QPushButton( tr( "&OK" ), this, "OkButton" );
Layout17->addWidget( OkButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
OkButton->setDefault( true );
Layout17->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer_3 );
EditStyleLayout->addMultiCellLayout( Layout17, 4, 4, 0, 1 );
werte = vor;
allV = v;
/trunk/Scribus/scribus/icons/DateiSave.xpm
File deleted
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/icons/DateiClos.xpm
===================================================================
--- Scribus/scribus/icons/DateiClos.xpm (revision 347)
+++ Scribus/scribus/icons/DateiClos.xpm (nonexistent)
@@ -1,78 +0,0 @@
-/* XPM */
-static const char* DateiClos[] = {
-"22 22 53 1",
-". c None",
-"Y c #080808",
-"W c #080c08",
-"V c #100c10",
-"R c #101010",
-"X c #101410",
-"O c #181418",
-"K c #181818",
-"U c #181c18",
-"F c #201c20",
-"v c #202020",
-"Q c #202420",
-"l c #292429",
-"e c #292829",
-"N c #292c29",
-"E c #313031",
-"d c #313431",
-"u c #393439",
-"c c #393839",
-"D c #393c39",
-"M c #413c41",
-"b c #414041",
-"a c #414441",
-"t c #4a444a",
-"# c #4a484a",
-"T c #4a4c4a",
-"f c #524c52",
-"g c #525052",
-"k c #525552",
-"m c #5a555a",
-"J c #5a595a",
-"C c #625d62",
-"j c #626162",
-"s c #6a656a",
-"i c #6a696a",
-"B c #6a6d6a",
-"r c #737173",
-"h c #737573",
-"I c #7b757b",
-"S c #7b797b",
-"A c #7b7d7b",
-"q c #837d83",
-"p c #838583",
-"n c #8b858b",
-"o c #8b898b",
-"P c #948d94",
-"w c #949594",
-"z c #9c959c",
-"y c #9c999c",
-"x c #9c9d9c",
-"H c #a4a1a4",
-"G c #aca5ac",
-"L c #ffffff",
-"......................",
-"......................",
-"........#abcde........",
-"......fghhijk#el......",
-".....mnoopqrsktuv.....",
-"....kowxyzoABC#DEF....",
-"...gnwGyyHzpIJ#bueK...",
-"...goxyLLyyoiLLMENO...",
-"..#IoyyLLLPALLLDueQR..",
-"..bhpzHyLLLLLL#bEevR..",
-"..bBqozxPLLLLkfDEevR..",
-"..cjBApoSLLLLTauelUV..",
-"..dmsBIBLLLLLLuEevUW..",
-"..e#gCkLLLgTLLLlvFXY..",
-"...etT#LL#tMuLLvvKV...",
-"...ldDMMcbcuNlvvKXY...",
-"....vEuEuEENeQvKOY....",
-".....FeNeeQlvFKXY.....",
-"......KKQvvUUXVY......",
-"........RRVVYY........",
-"......................",
-"......................"};
/Scribus/scribus/icons/DateiClos.xpm
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/icons/DateiSave16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Scribus/scribus/icons/filesaveas.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Scribus/scribus/icons/filesaveas.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/icons/documentinfo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Scribus/scribus/icons/documentinfo.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/icons/DateiClose.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Scribus/scribus/icons/DateiClose.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/icons/DateiClos16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Scribus/scribus/icons/Makefile.am
===================================================================
--- Scribus/scribus/icons/Makefile.am (revision 347)
+++ Scribus/scribus/icons/Makefile.am (revision 348)
@@ -1,7 +1,7 @@
####### kdevelop will overwrite this part!!! (begin)##########
-EXTRA_DIST = 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 DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm 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
+EXTRA_DIST = 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
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
@@ -29,11 +29,11 @@
$(INSTALL_DATA) $(srcdir)/Stift.xpm $(prefix)/share/scribus/icons/Stift.xpm
$(INSTALL_DATA) $(srcdir)/Text.xpm $(prefix)/share/scribus/icons/Text.xpm
$(INSTALL_DATA) $(srcdir)/Unlock.xpm $(prefix)/share/scribus/icons/Unlock.xpm
- $(INSTALL_DATA) $(srcdir)/DateiClos.xpm $(prefix)/share/scribus/icons/DateiClos.xpm
+ $(INSTALL_DATA) $(srcdir)/DateiClos.png $(prefix)/share/scribus/icons/DateiClose.png
$(INSTALL_DATA) $(srcdir)/DateiNeu.xpm $(prefix)/share/scribus/icons/DateiNeu.xpm
$(INSTALL_DATA) $(srcdir)/DateiOpen.xpm $(prefix)/share/scribus/icons/DateiOpen.xpm
$(INSTALL_DATA) $(srcdir)/DateiPrint.xpm $(prefix)/share/scribus/icons/DateiPrint.xpm
- $(INSTALL_DATA) $(srcdir)/DateiSave.xpm $(prefix)/share/scribus/icons/DateiSave.xpm
+ $(INSTALL_DATA) $(srcdir)/DateiSave.png $(prefix)/share/scribus/icons/DateiSave2.png
$(INSTALL_DATA) $(srcdir)/AppIcon2.png $(prefix)/share/scribus/icons/AppIcon2.png
$(INSTALL_DATA) $(srcdir)/AppIcon.png $(prefix)/share/scribus/icons/AppIcon.png
$(INSTALL_DATA) $(srcdir)/LupeZ.xpm $(prefix)/share/scribus/icons/LupeZ.xpm
@@ -144,6 +144,9 @@
$(INSTALL_DATA) $(srcdir)/NoPrint.png $(prefix)/share/scribus/icons/NoPrint.png
$(INSTALL_DATA) $(srcdir)/scribusdoc.png $(prefix)/share/scribus/icons/scribusdoc.png
$(INSTALL_DATA) $(srcdir)/signature.png $(prefix)/share/scribus/icons/signature.png
+ $(INSTALL_DATA) $(srcdir)/documentinfo.png $(prefix)/share/scribus/icons/documentinfo.png
+ $(INSTALL_DATA) $(srcdir)/filesaveas.png $(prefix)/share/scribus/icons/filesaveas.png
+ $(INSTALL_DATA) $(srcdir)/revert.png $(prefix)/share/scribus/icons/revert.png
uninstall-local:
@@ -160,11 +163,11 @@
-rm -f $(prefix)/share/scribus/icons/Stift.xpm
-rm -f $(prefix)/share/scribus/icons/Text.xpm
-rm -f $(prefix)/share/scribus/icons/Unlock.xpm
- -rm -f $(prefix)/share/scribus/icons/DateiClos.xpm
+ -rm -f $(prefix)/share/scribus/icons/DateiClose.png
-rm -f $(prefix)/share/scribus/icons/DateiNeu.xpm
-rm -f $(prefix)/share/scribus/icons/DateiOpen.xpm
-rm -f $(prefix)/share/scribus/icons/DateiPrint.xpm
- -rm -f $(prefix)/share/scribus/icons/DateiSave.xpm
+ -rm -f $(prefix)/share/scribus/icons/DateiSave2.png
-rm -f $(prefix)/share/scribus/icons/AppIcon2.png
-rm -f $(prefix)/share/scribus/icons/AppIcon.png
-rm -f $(prefix)/share/scribus/icons/LupeZ.xpm
@@ -286,6 +289,9 @@
-rm -f $(prefix)/share/scribus/icons/tab.png
-rm -f $(prefix)/share/scribus/icons/view.png
-rm -f $(prefix)/share/scribus/icons/scribusdoc.png
+ -rm -f $(prefix)/share/scribus/icons/documentinfo.png
+ -rm -f $(prefix)/share/scribus/icons/filesaveas.png
+ -rm -f $(prefix)/share/scribus/icons/revert.png
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/icons/DateiSave2.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/revert.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Scribus/scribus/icons/revert.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/scrap.cpp
===================================================================
--- Scribus/scribus/scrap.cpp (revision 347)
+++ Scribus/scribus/scrap.cpp (revision 348)
@@ -375,7 +375,7 @@
{
QString nam, tmp;
nam = tr("Object") + tmp.setNum(BibWin->Objekte.count());
- Query *dia = new Query(this, "tt", 1, 0, tr("Name:"), tr("New Entry"));
+ Query *dia = new Query(this, "tt", 1, 0, tr("&Name:"), tr("New Entry"));
dia->Answer->setText(nam);
dia->Answer->selectAll();
if (dia->exec())
Index: Scribus/scribus/tabruler.cpp
===================================================================
--- Scribus/scribus/tabruler.cpp (revision 347)
+++ Scribus/scribus/tabruler.cpp (revision 348)
@@ -469,31 +469,28 @@
layout2->addWidget( RulerScrollR );
tabrulerLayout->addLayout( layout2 );
layout1 = new QHBoxLayout( 0, 0, 6, "layout1");
- Label1 = new QLabel( this, "Label1" );
- Label1->setText( tr( "Position:" ) );
- layout1->addWidget( Label1 );
TabSpin = new MSpinBox( this, 1 );
TabSpin->setMaxValue( ww );
TabSpin->setMinValue( 0 );
TabSpin->setValue(0);
+ Label1 = new QLabel( TabSpin, tr("&Position:"), this, "Label1" );
+ layout1->addWidget( Label1 );
layout1->addWidget( TabSpin );
if (haveFirst)
{
- Label2 = new QLabel( this, "Label2" );
- Label2->setText( tr( "First Line:" ) );
- layout1->addWidget( Label2 );
FirstSpin = new MSpinBox( this, 1);
FirstSpin->setMaxValue( ww );
FirstSpin->setMinValue( -30000 );
FirstSpin->setValue(0);
+ Label2 = new QLabel( FirstSpin, tr( "First &Line:"), this, "Label2" );
+ layout1->addWidget( Label2 );
layout1->addWidget( FirstSpin );
- Label3 = new QLabel( this, "Label3" );
- Label3->setText( tr( "Indent:" ) );
- layout1->addWidget( Label3 );
IndentSpin = new MSpinBox( this, 1 );
IndentSpin->setMaxValue( ww );
IndentSpin->setMinValue( 0 );
IndentSpin->setValue(0);
+ Label3 = new QLabel( IndentSpin, tr( "Ind&ent:" ), this, "Label3" );
+ layout1->addWidget( Label3 );
layout1->addWidget( IndentSpin );
}
ClearButton = new QPushButton( this, "ClearButton" );
Index: Scribus/scribus/cmsprefs.cpp
===================================================================
--- Scribus/scribus/cmsprefs.cpp (revision 347)
+++ Scribus/scribus/cmsprefs.cpp (revision 348)
@@ -162,14 +162,8 @@
OK = new QPushButton( tr( "&OK" ), this, "OK" );
OK->setDefault( true );
Layout1->addWidget( OK );
-
- QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout1->addItem( spacer_2 );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Layout1->addWidget( Cancel );
-
- QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
- Layout1->addItem( spacer_3 );
CMSPrefsLayout->addLayout( Layout1 );
QToolTip::add( InputP, tr( "Default color profile for imported images" ) );
/trunk/Scribus/scribus/guidemanager.cpp
163,12 → 163,11
GuideManagerLayout->addLayout(Layout6);
Layout5 = new QHBoxLayout(0, 0, 6, "Layout5");
Lock = new QCheckBox( tr( "&Lock Guides" ), this, "Lock");
Lock->setChecked(LocLocked);
GuideManagerLayout->addWidget(Lock);
Layout5->addWidget(Lock);
Layout5 = new QHBoxLayout(0, 0, 6, "Layout5");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer);
175,17 → 174,10
OK = new QPushButton( tr( "&OK" ), this, "OK");
OK->setDefault(true);
Layout5->addWidget(OK );
QSpacerItem* spacer_2 = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
Layout5->addItem(spacer_2);
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel");
Cancel->setAccel(QKeySequence("Esc"));
Layout5->addWidget(Cancel);
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout5->addItem(spacer_3);
GuideManagerLayout->addLayout(Layout5);
/* Initialise the units */
/trunk/Scribus/scribus/hysettings.cpp
49,12 → 49,8
OK = new QPushButton( tr( "&OK" ), this, "OK" );
OK->setDefault( true );
Layout1->addWidget( OK );
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_2 );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Layout1->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_3 );
HySettingsLayout->addLayout( Layout1 );
QToolTip::add( Verbose, tr( "If you uncheck this you will get a dialog\neverytime a possible Hyphenation is found." ) );
/trunk/Scribus/scribus/druck.cpp
39,30 → 39,25
AdvOptionsLayout = new QVBoxLayout( this );
AdvOptionsLayout->setSpacing( 5 );
AdvOptionsLayout->setMargin( 10 );
MirrorH = new QCheckBox(this, "MirrorH");
MirrorH->setText( tr("Mirror Page(s) horizontal"));
MirrorH = new QCheckBox( tr("Mirror Page(s) &Horizontal"), this, "MirrorH");
MirrorH->setChecked(Hm);
AdvOptionsLayout->addWidget( MirrorH );
MirrorV = new QCheckBox(this, "MirrorV");
MirrorV->setText( tr("Mirror Page(s) vertical"));
MirrorV = new QCheckBox( tr("Mirror Page(s) &Vertical"), this, "MirrorV");
MirrorV->setChecked(Vm);
AdvOptionsLayout->addWidget( MirrorV );
GcR = new QCheckBox(this, "GCR");
GcR->setText( tr("Appy Under Color Removal"));
GcR = new QCheckBox( tr("Appy Under Color &Removal"), this, "GCR");
GcR->setChecked(DoGcr);
AdvOptionsLayout->addWidget( GcR );
#ifdef HAVE_CMS
if (CMSuse)
{
UseICC = new QCheckBox(this, "ICC");
UseICC->setText( tr("Apply ICC-Profiles"));
UseICC = new QCheckBox( tr("Apply &ICC Profiles"), this, "ICC");
UseICC->setChecked(Ic);
AdvOptionsLayout->addWidget( UseICC );
}
#endif
ButtonGroupP = new QButtonGroup( this, "ButtonGroup5" );
ButtonGroupP = new QButtonGroup( "", this, "ButtonGroup5" );
ButtonGroupP->setFrameShape( QButtonGroup::NoFrame );
ButtonGroupP->setTitle( "" );
ButtonGroupP->setColumnLayout(0, Qt::Vertical );
ButtonGroupP->layout()->setSpacing( 0 );
ButtonGroupP->layout()->setMargin( 0 );
69,15 → 64,10
ButtonGroupPLayout = new QVBoxLayout( ButtonGroupP->layout() );
ButtonGroupPLayout->setSpacing( 6 );
ButtonGroupPLayout->setMargin( 0 );
PS3 = new QRadioButton( ButtonGroupP, "RadioButton1" );
PS3->setText( tr( "PostScript Level 3" ) );
PS1 = new QRadioButton( tr( "PostScript Level &1" ), ButtonGroupP, "RadioButton1" );
PS2 = new QRadioButton( tr( "PostScript Level &2" ), ButtonGroupP, "RadioButton1" );
PS3 = new QRadioButton( tr( "PostScript Level &3" ), ButtonGroupP, "RadioButton1" );
PS3->setChecked( true );
ButtonGroupPLayout->addWidget( PS3 );
PS2 = new QRadioButton( ButtonGroupP, "RadioButton1" );
PS2->setText( tr( "PostScript Level 2" ) );
ButtonGroupPLayout->addWidget( PS2 );
PS1 = new QRadioButton( ButtonGroupP, "RadioButton1" );
PS1->setText( tr( "PostScript Level 1" ) );
if (ps == 3)
PS3->setChecked( true );
if (ps == 2)
85,6 → 75,8
if (ps == 1)
PS1->setChecked( true );
ButtonGroupPLayout->addWidget( PS1 );
ButtonGroupPLayout->addWidget( PS2 );
ButtonGroupPLayout->addWidget( PS3 );
AdvOptionsLayout->addWidget( ButtonGroupP );
 
Layout2 = new QHBoxLayout;
92,13 → 84,11
Layout2->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "OK" ) );
PushButton1 = new QPushButton( tr( "&OK" ), this, "PushButton1" );
Layout2->addWidget( PushButton1 );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer2 );
PushButton2 = new QPushButton( this, "PushButton1_2" );
PushButton2->setText( tr( "Cancel" ) );
PushButton2 = new QPushButton( tr( "&Cancel" ), this, "PushButton1_2" );
PushButton2->setDefault( true );
PushButton2->setFocus();
Layout2->addWidget( PushButton2 );
124,7 → 114,7
DruckLayout->setMargin( 10 );
 
Drucker = new QGroupBox( this, "Drucker" );
Drucker->setTitle( tr( "Print destination" ) );
Drucker->setTitle( tr( "Print Destination" ) );
Drucker->setColumnLayout(0, Qt::Vertical );
Drucker->layout()->setSpacing( 0 );
Drucker->layout()->setMargin( 0 );
192,8 → 182,7
Layout1x->addWidget( PrintDest );
 
#ifdef HAVE_CUPS
OptButton = new QPushButton(Drucker, "Optionen" );
OptButton->setText( tr( "Options..." ) );
OptButton = new QPushButton( tr( "&Options..." ), Drucker, "Optionen" );
Layout1x->addWidget( OptButton );
#endif
QSpacerItem* spacerDR = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
202,45 → 191,39
Layout1 = new QHBoxLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
DateiT = new QLabel( Drucker, "DateiT" );
LineEdit1 = new QLineEdit( PDatei, Drucker, "LineEdit1" );
LineEdit1->setMinimumSize( QSize( 240, 22 ) );
LineEdit1->setEnabled(false);
DateiT = new QLabel( LineEdit1, tr( "&File:" ), Drucker, "DateiT" );
DateiT->setEnabled( false );
DateiT->setText( tr( "File:" ) );
Layout1->addWidget( DateiT );
LineEdit1 = new QLineEdit( Drucker, "LineEdit1" );
LineEdit1->setMinimumSize( QSize( 240, 22 ) );
LineEdit1->setEnabled(false);
LineEdit1->setText(PDatei);
Layout1->addWidget( LineEdit1 );
ToolButton1 = new QToolButton( Drucker, "ToolButton1" );
ToolButton1->setText( tr( "C&hange..." ) );
ToolButton1->setMinimumSize( QSize( 80, 22 ) );
ToolButton1->setText( tr( "Change..." ) );
ToolButton1->setEnabled(false);
ToolButton1->setFocusPolicy( QToolButton::TabFocus );
Layout1->addWidget( ToolButton1 );
DruckerLayout->addLayout( Layout1, 1, 0 );
 
OtherCom = new QCheckBox(Drucker, "Dc");
OtherCom = new QCheckBox(tr("A&lternative Printer Command"), Drucker, "Dc");
OtherCom->setChecked(false);
OtherCom->setText( tr("Alternative Printer Command"));
DruckerLayout->addWidget( OtherCom, 2, 0, Qt::AlignLeft);
LayoutCC = new QHBoxLayout;
LayoutCC->setSpacing( 6 );
LayoutCC->setMargin( 0 );
OthText = new QLabel( Drucker, "DateiTc" );
Command = new QLineEdit( PCom, Drucker, "LineEdit12" );
Command->setMinimumSize( QSize( 240, 22 ) );
Command->setEnabled(false);
OthText = new QLabel( Command, tr( "Co&mmand:" ), Drucker, "DateiTc" );
OthText->setEnabled( false );
OthText->setText( tr( "Command:" ) );
LayoutCC->addWidget( OthText );
Command = new QLineEdit( Drucker, "LineEdit12" );
Command->setMinimumSize( QSize( 240, 22 ) );
Command->setEnabled(false);
Command->setText(PCom);
LayoutCC->addWidget( Command );
DruckerLayout->addLayout( LayoutCC, 3, 0 );
DruckLayout->addWidget( Drucker );
 
 
Umfang = new QButtonGroup( this, "Umfang" );
Umfang->setTitle( tr( "Range:" ) );
Umfang = new QButtonGroup( tr( "Range" ), this, "Umfang" );
Umfang->setColumnLayout(0, Qt::Vertical );
Umfang->layout()->setSpacing( 0 );
Umfang->layout()->setMargin( 0 );
249,9 → 232,8
UmfangLayout->setSpacing( 6 );
UmfangLayout->setMargin( 5 );
 
ButtonGroup5 = new QButtonGroup( Umfang, "ButtonGroup5" );
ButtonGroup5 = new QButtonGroup( "", Umfang, "ButtonGroup5" );
ButtonGroup5->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup5->setTitle( "" );
ButtonGroup5->setColumnLayout(0, Qt::Vertical );
ButtonGroup5->layout()->setSpacing( 0 );
ButtonGroup5->layout()->setMargin( 0 );
259,15 → 241,12
ButtonGroup5Layout->setAlignment( Qt::AlignTop );
ButtonGroup5Layout->setSpacing( 6 );
ButtonGroup5Layout->setMargin( 5 );
RadioButton1 = new QRadioButton( ButtonGroup5, "RadioButton1" );
RadioButton1->setText( tr( "Print all" ) );
RadioButton1 = new QRadioButton( tr( "Print &All" ), ButtonGroup5, "RadioButton1" );
RadioButton1->setChecked( true );
ButtonGroup5Layout->addMultiCellWidget( RadioButton1, 0, 0, 0, 1 );
CurrentPage = new QRadioButton( ButtonGroup5, "RadioButton2" );
CurrentPage->setText( tr( "Print current page" ) );
CurrentPage = new QRadioButton( tr( "Print Current Pa&ge" ), ButtonGroup5, "RadioButton2" );
ButtonGroup5Layout->addMultiCellWidget( CurrentPage, 1, 1, 0, 1 );
RadioButton2 = new QRadioButton( ButtonGroup5, "RadioButton2" );
RadioButton2->setText( tr( "Print range" ) );
RadioButton2 = new QRadioButton( tr( "Print &Range" ), ButtonGroup5, "RadioButton2" );
ButtonGroup5Layout->addMultiCellWidget( RadioButton2, 2, 2, 0, 1 );
PageNr = new QLineEdit( ButtonGroup5, "PageNr" );
PageNr->setEnabled(false);
288,11 → 267,7
ButtonGroup4Layout->setSpacing( 6 );
ButtonGroup4Layout->setMargin( 5 );
 
TextLabel3 = new QLabel( ButtonGroup4, "TextLabel3" );
TextLabel3->setText( tr( "Number of copies:" ) );
 
ButtonGroup4Layout->addWidget( TextLabel3, 0, 0 );
 
Copies = new QSpinBox( ButtonGroup4, "Copies" );
Copies->setEnabled( true );
Copies->setMinimumSize( QSize( 70, 22 ) );
299,7 → 274,8
Copies->setMinValue( 1 );
Copies->setMaxValue(1000);
Copies->setValue(1);
 
TextLabel3 = new QLabel( Copies, tr( "N&umber of Copies:" ), ButtonGroup4, "TextLabel3" );
ButtonGroup4Layout->addWidget( TextLabel3, 0, 0 );
ButtonGroup4Layout->addWidget( Copies, 0, 1 );
UmfangLayout->addWidget( ButtonGroup4 );
DruckLayout->addWidget( Umfang );
326,13 → 302,11
ButtonGroup3Layout->setSpacing( 5 );
ButtonGroup3Layout->setMargin( 5 );
 
NormalP = new QRadioButton( ButtonGroup3, "NormalP" );
NormalP->setText( tr( "Print Normal" ) );
NormalP = new QRadioButton( tr( "Print &Normal" ), ButtonGroup3, "NormalP" );
NormalP->setChecked( true );
ButtonGroup3Layout->addWidget( NormalP );
 
PrintSep = new QRadioButton( ButtonGroup3, "PrintSep" );
PrintSep->setText( tr( "Print Separations" ) );
PrintSep = new QRadioButton( tr( "Print &Separations" ), ButtonGroup3, "PrintSep" );
PrintSep->setFocusPolicy( QRadioButton::TabFocus );
ButtonGroup3Layout->addWidget( PrintSep );
ToSeparation = false;
363,14 → 337,12
ButtonGroup3_2Layout->setSpacing( 5 );
ButtonGroup3_2Layout->setMargin( 5 );
 
PrintGray = new QRadioButton( ButtonGroup3_2, "PrintGray" );
PrintGray->setText( tr( "Print in color if available" ) );
PrintGray = new QRadioButton( tr( "Pr&int In Color If Available" ), ButtonGroup3_2, "PrintGray" );
PrintGray->setChecked( true );
PrintGray->setFocusPolicy( QRadioButton::TabFocus );
ButtonGroup3_2Layout->addWidget( PrintGray );
 
PrintGray2 = new QRadioButton( ButtonGroup3_2, "PrintGray2" );
PrintGray2->setText( tr( "Print in grayscale" ) );
PrintGray2 = new QRadioButton( tr( "Print In Gra&yscale" ), ButtonGroup3_2, "PrintGray2" );
ButtonGroup3_2Layout->addWidget( PrintGray2 );
MirrorH = false;
MirrorV = false,
377,8 → 349,7
ICCinUse = false;
DoGCR = gcr;
PSLevel = 3;
AdvOptButton = new QPushButton(ButtonGroup3_2, "Adv");
AdvOptButton->setText( tr("Advanced Options..."));
AdvOptButton = new QPushButton( tr("Ad&vanced Options..."), ButtonGroup3_2, "Adv");
ButtonGroup3_2Layout->addWidget( AdvOptButton );
 
OptionenLayout->addWidget( ButtonGroup3_2, 0, 1 );
390,12 → 361,10
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
 
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "Print" ) );
OKButton = new QPushButton( tr( "&Print" ), this, "OKButton" );
OKButton->setDefault( true );
Layout2->addWidget( OKButton );
OKButton_2 = new QPushButton( this, "OKButton_2" );
OKButton_2->setText( tr( "Cancel" ) );
OKButton_2 = new QPushButton( tr( "&Cancel" ), this, "OKButton_2" );
OKButton_2->setDefault( false );
Layout2->addWidget( OKButton_2 );
 
599,7 → 568,7
void Druck::setMinMax(int min, int max, int cur)
{
QString tmp, tmp2;
CurrentPage->setText(tr( "Print current page" )+" ("+tmp.setNum(cur)+")");
CurrentPage->setText(tr( "Print Current Pa&ge" )+" ("+tmp.setNum(cur)+")");
PageNr->setText(tmp.setNum(min)+"-"+tmp2.setNum(max));
}
 
/trunk/Scribus/scribus/muster.cpp
86,8 → 86,8
int exit=QMessageBox::warning(this,
tr("Warning"),
tr("Do you really want do delete this Template?"),
tr("No"),
tr("Yes"),
tr("&No"),
tr("&Yes"),
0, QMessageBox::No, QMessageBox::Yes);
if (exit == 1)
{
114,7 → 114,7
int nr;
bool atf;
struct CLBuf Buffer;
NewTm *dia = new NewTm(this, tr("Name:"), tr("New Template"), Doc);
NewTm *dia = new NewTm(this, tr("&Name:"), tr("New Template"), Doc);
dia->Answer->setText( tr("Copy of %1").arg(sMuster));
dia->Answer->selectAll();
if (dia->exec())
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("25").arg("July").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("26").arg("July").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/query.cpp
31,26 → 31,23
Layout2 = new QHBoxLayout;
Layout2->setSpacing( 6 );
Layout2->setMargin( 0 );
Frage = new QLabel( this, "Frage" );
Answer = new QLineEdit( this, "Answer" );
Frage = new QLabel( Answer, text, this, "Frage" );
Frage->setFrameShape( QLabel::MShape );
Frage->setFrameShadow( QLabel::MShadow );
Frage->setText( text );
Frage->adjustSize();
Layout2->addWidget( Frage );
Answer = new QLineEdit( this, "Answer" );
Layout2->addWidget( Answer );
QueryLayout->addLayout( Layout2 );
Layout1 = new QHBoxLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "OK" ) );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
PushButton1 = new QPushButton( tr( "&OK" ), this, "PushButton1" );
PushButton1->setDefault( true );
Layout1->addWidget( PushButton1 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
PushButton2 = new QPushButton( this, "PushButton2" );
PushButton2->setText( tr( "Cancel" ) );
PushButton2 = new QPushButton( tr( "&Cancel"), this, "PushButton2" );
Layout1->addWidget( PushButton2 );
QueryLayout->addLayout( Layout1 );
setMaximumSize(sizeHint());
/trunk/Scribus/scribus/search.cpp
254,13 → 254,11
}
 
OptsLayout = new QHBoxLayout( 0, 0, 6, "OptsLayout");
Word = new QCheckBox( this, "Word" );
Word = new QCheckBox( tr( "&Whole Word" ), this, "Word" );
if (mode)
Word->setEnabled(false);
Word->setText( tr( "Whole Word" ) );
OptsLayout->addWidget( Word );
CaseIgnore = new QCheckBox( this, "CaseIgnore" );
CaseIgnore->setText( tr( "Ignore Case" ) );
CaseIgnore = new QCheckBox( tr( "&Ignore Case" ), this, "CaseIgnore" );
if (mode)
CaseIgnore->setEnabled(false);
OptsLayout->addWidget( CaseIgnore );
267,20 → 265,16
SearchReplaceLayout->addLayout( OptsLayout );
 
ButtonsLayout = new QHBoxLayout( 0, 0, 4, "ButtonsLayout");
DoSearch = new QPushButton( this, "DoSearch" );
DoSearch->setText( tr( "Search" ) );
DoSearch = new QPushButton( tr( "&Search" ), this, "DoSearch" );
DoSearch->setDefault( true );
ButtonsLayout->addWidget( DoSearch );
DoReplace = new QPushButton( this, "DoReplace" );
DoReplace->setText( tr( "Replace" ) );
DoReplace = new QPushButton( tr( "&Replace" ), this, "DoReplace" );
DoReplace->setEnabled(false);
ButtonsLayout->addWidget( DoReplace );
AllReplace = new QPushButton( this, "DoReplace" );
AllReplace->setText( tr( "Replace All" ) );
AllReplace = new QPushButton( tr( "Replace &All" ), this, "DoReplace" );
AllReplace->setEnabled(false);
ButtonsLayout->addWidget( AllReplace );
Leave = new QPushButton( this, "Leave" );
Leave->setText( tr( "Leave" ) );
Leave = new QPushButton( tr( "&Close" ), this, "Leave" );
ButtonsLayout->addWidget( Leave );
SearchReplaceLayout->addLayout( ButtonsLayout );
 
/trunk/Scribus/scribus/scribus.cpp
153,8 → 153,8
WerkTools2 = new QToolBar( tr("File"), this);
DatNeu = new QToolButton(loadIcon("DateiNeu.xpm"), tr("Create a new Document"), QString::null, this, SLOT(slotFileNew()), WerkTools2);
DatOpe = new QToolButton(loadIcon("DateiOpen.xpm"), tr("Open a Document"), QString::null, this, SLOT(slotDocOpen()), WerkTools2);
DatSav = new QToolButton(loadIcon("DateiSave.xpm"), tr("Save the current Document"), QString::null, this, SLOT(slotFileSave()), WerkTools2);
DatClo = new QToolButton(loadIcon("DateiClos.xpm"), tr("Close the current Document"), QString::null, this, SLOT(slotFileClose()), WerkTools2);
DatSav = new QToolButton(loadIcon("DateiSave2.png"), tr("Save the current Document"), QString::null, this, SLOT(slotFileSave()), WerkTools2);
DatClo = new QToolButton(loadIcon("DateiClose.png"), tr("Close the current Document"), QString::null, this, SLOT(slotFileClose()), WerkTools2);
DatPri = new QToolButton(loadIcon("DateiPrint.xpm"), tr("Print the current Document"), QString::null, this, SLOT(slotFilePrint()), WerkTools2);
DatPDF = new QToolButton(loadIcon("acrobat.png"), tr("Save the current Document as PDF"), QString::null, this, SLOT(SaveAsPDF()), WerkTools2);
DatSav->setEnabled(false);
450,7 → 450,7
ReadPrefs();
if (Prefs.DefFont == "")
Prefs.DefFont = it.currentKey();
splash->setStatus( tr("Getting ICC-Profiles"));
splash->setStatus( tr("Getting ICC Profiles"));
GetCMSProfiles();
splash->setStatus( tr("Init Hyphenator"));
InitHyphenator();
612,10 → 612,10
fid4 = fileMenu->insertItem(loadIcon("DateiSave16.png"), tr("&Save"), this, SLOT(slotFileSave()), CTRL+Key_S);
SetKeyEntry(3, tr("Save"), fid4, CTRL+Key_S);
fileMenu->setItemEnabled(fid4, 0);
fid5 = fileMenu->insertItem( tr("Save &As..."), this, SLOT(slotFileSaveAs()));
fid5 = fileMenu->insertItem( loadIcon("filesaveas.png"), tr("Save &As..."), this, SLOT(slotFileSaveAs()));
SetKeyEntry(4, tr("Save as..."), fid5, 0);
fileMenu->setItemEnabled(fid5, 0);
fid52 = fileMenu->insertItem( tr("Re&vert to Saved"), this, SLOT(slotFileRevert()));
fid52 = fileMenu->insertItem(loadIcon("revert.png"), tr("Re&vert to Saved"), this, SLOT(slotFileRevert()));
fileMenu->setItemEnabled(fid52, 0);
fid51 = fileMenu->insertItem( tr("Collect for O&utput..."), this, SLOT(Collect()));
fileMenu->setItemEnabled(fid51, 0);
639,7 → 639,7
fid11 = fileMenu->insertItem( tr("&Export"), exportMenu);
fileMenu->setItemEnabled(fid11, 0);
fileMenu->insertSeparator();
fid6 = fileMenu->insertItem( tr("Document &Info..."), this, SLOT(InfoDoc()), CTRL+Key_I);
fid6 = fileMenu->insertItem(loadIcon("documentinfo.png"), tr("Document &Info..."), this, SLOT(InfoDoc()), CTRL+Key_I);
fileMenu->setItemEnabled(fid6, 0);
MenuItemsFile.append(fid6);
SetKeyEntry(5, tr("Document Info..."), fid6, CTRL+Key_I);
748,7 → 748,7
SetKeyEntry(32, tr("Move..."), pgmv, 0);
MenID = pageMenu->insertItem( tr("&Apply Template..."), this, SLOT(ApplyTemp()));
SetKeyEntry(33, tr("Apply Template..."), MenID, 0);
MenID = pageMenu->insertItem( tr("&Manage Guides..."), this, SLOT(ManageGuides()));
MenID = pageMenu->insertItem( tr("Manage &Guides..."), this, SLOT(ManageGuides()));
SetKeyEntry(49, tr("Manage Guides..."), MenID, 0);
pageMenu->setItemEnabled(pgmd, 0);
pageMenu->setItemEnabled(pgmv, 0);
5518,7 → 5518,7
}
else
{
Query* dia = new Query(this, "New", 1, 0, tr("Size:"), tr("Size"));
Query* dia = new Query(this, "New", 1, 0, tr("&Size:"), tr("Size"));
if (dia->exec())
{
c = qRound(dia->Answer->text().toDouble(&ok) * 10);
5578,7 → 5578,7
}
else
{
Query* dia = new Query(this, "New", 1, 0, tr("Shade:"), tr("Shade"));
Query* dia = new Query(this, "New", 1, 0, tr("&Shade:"), tr("Shade"));
if (dia->exec())
{
c = dia->Answer->text().toInt(&ok);
/trunk/Scribus/scribus/applytemplate.cpp
73,12 → 73,8
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout4->addWidget( OKButton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_2 );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout4->addWidget( CancelB );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_3 );
ApplyTLayout->addLayout( Layout4 );
connect( CancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
/trunk/Scribus/scribus/libprefs/prefs.cpp
1469,13 → 1469,9
buttonOK->setDefault( true );
buttonOK->setFocus();
Layout3->addWidget( buttonOK );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_2 );
buttonCancel = new QPushButton( tr( "&Cancel" ), this, "buttonCancel" );
buttonCancel->setDefault( false );
Layout3->addWidget( buttonCancel );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer_3 );
PrefsLayout->addLayout( Layout3 );
setDS();
//tab order
/trunk/Scribus/scribus/javadocs.cpp
56,7 → 56,7
void JavaDocs::slotAdd()
{
QString nam;
Query *dia = new Query(this, "tt", 1, 0, tr("New Script:"), tr("New Script"));
Query *dia = new Query(this, "tt", 1, 0, tr("&New Script:"), tr("New Script"));
dia->Answer->setText( tr("New Script"));
if (dia->exec())
{
97,8 → 97,8
int exit=QMessageBox::warning(this,
tr("Warning"),
tr("Do you really want do delete this Script?"),
tr("No"),
tr("Yes"),
tr("&No"),
tr("&Yes"),
0, 0, 0);
if (exit == 1)
{
/trunk/Scribus/scribus/plugins/pixmapexport/dialog.cpp
175,13 → 175,19
void ExportForm::languageChange()
{
setCaption(tr("Export as Image"));
TextLabel1->setText(tr("Export to directory:"));
OutputDirectoryButton->setText(tr("&Change..."));
OutputDirectoryButton->setText(tr("C&hange..."));
OutputDirectoryButton->setAccel(QKeySequence(tr("Alt+C")));
TextLabel2->setText(tr("Image type:"));
textLabel1->setText(tr("Quality :"));
TextLabel1->setText(tr("&Export to Directory:"));
TextLabel2->setText(tr("Image &Type:"));
textLabel1->setText(tr("&Quality:"));
textLabel2->setText(tr("%"));
textLabel3->setText(tr("Size:"));
textLabel3->setText(tr("&Size:"));
 
TextLabel1->setBuddy(OutputDirectory);
TextLabel2->setBuddy(BitmapType);
textLabel1->setBuddy(QualityBox);
textLabel3->setBuddy(SizeBox);
ButtonGroup1->setTitle(tr("Export "));
OnePageRadio->setText(tr("&One page"));
OnePageRadio->setAccel(QKeySequence(tr("Alt+O")));
/trunk/Scribus/scribus/plugins/libchar/charselect.cpp
221,18 → 221,10
 
Einf = new QPushButton(tr( "&Insert" ), this, "Einf" );
Layout1->addWidget( Einf );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_2 );
 
Delete = new QPushButton(tr("C&lear"), this, "Delete" );
Layout1->addWidget( Delete );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_3 );
 
Close = new QPushButton(tr("&Close"), this, "Close" );
Layout1->addWidget( Close );
QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_4 );
ZAuswahlLayout->addLayout( Layout1 );
Zeichen->setMaximumSize(width(), 50);
DelEdit();
/trunk/Scribus/scribus/multiline.cpp
117,14 → 117,12
 
layout3 = new QHBoxLayout( 0, 0, 6, "layout3");
 
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK = new QPushButton( tr( "&OK" ), this, "OK" );
OK->setAutoDefault(false);
OK->setDefault(false);
layout3->addWidget( OK );
 
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Cancel->setAutoDefault(false);
Cancel->setDefault(false);
layout3->addWidget( Cancel );
/trunk/Scribus/scribus/page.cpp
2500,7 → 2500,7
void Page::scaleGroup(double scx, double scy)
{
PageItem *bb;
double gx, gy, gh, gw;
double gx, gy, gh, gw, x, y;
uint aa;
FPoint n;
getGroupRect(&gx, &gy, &gw, &gh);
2518,6 → 2518,9
oldRot = bb->Rot;
oldLocalX = bb->LocalX;
oldLocalY = bb->LocalY;
FPointArray gr;
gr.addPoint(bb->GrStartX, bb->GrStartY);
gr.addPoint(bb->GrEndX, bb->GrEndY);
g = FPoint(gx, gy);
b = transformPoint(FPoint(0, 0), bb->Xpos, bb->Ypos, bb->Rot, 1, 1);
b -= g;
2538,26 → 2541,26
}
else
{
FPoint oldPos = FPoint(bb->Xpos, bb->Ypos);
QWMatrix ma;
ma.rotate(bb->Rot);
bb->PoLine.map(ma);
QWMatrix ma2;
ma2.translate(gx-bb->Xpos, gy-bb->Ypos);
ma2.scale(scx, scy);
bb->PoLine.map(ma2);
bb->Rot = 0;
bb->ClipEdited = true;
AdjustItemSize(bb);
QWMatrix ma3;
ma3.translate(gx, gy);
ma3.scale(scx, scy);
n = FPoint(gx-oldPos.x(), gy-oldPos.y());
double x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
double y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
MoveItem(gx-x, gy-y, bb, true);
if (oldRot != 0)
{
FPoint oldPos = FPoint(bb->Xpos, bb->Ypos);
QWMatrix ma;
ma.rotate(bb->Rot);
bb->PoLine.map(ma);
QWMatrix ma2;
ma2.translate(gx-bb->Xpos, gy-bb->Ypos);
ma2.scale(scx, scy);
bb->PoLine.map(ma2);
bb->Rot = 0;
bb->ClipEdited = true;
AdjustItemSize(bb);
QWMatrix ma3;
ma3.translate(gx, gy);
ma3.scale(scx, scy);
n = FPoint(gx-oldPos.x(), gy-oldPos.y());
x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
MoveItem(gx-x, gy-y, bb, true);
if (oldRot != 0)
{
bb->Rot = atan2(t1.y()-b1.y(),t1.x()-b1.x())*(180.0/M_PI);
QWMatrix ma;
ma.rotate(-bb->Rot);
2578,17 → 2581,15
bb->LocalY = oldLocalY;
bb->OldB2 = bb->Width;
bb->OldH2 = bb->Height;
FPointArray gr;
gr.addPoint(bb->GrStartX, bb->GrStartY);
gr.addPoint(bb->GrEndX, bb->GrEndY);
QWMatrix ma4;
ma4.rotate(oldRot);
ma4.scale(scx, scy);
gr.map(ma4);
bb->ContourLine.map(ma4);
bb->GrStartX = gr.point(0).x();
bb->GrStartY = gr.point(0).y();
bb->GrEndX = gr.point(1).x();
bb->GrEndY = gr.point(0).y();
bb->ContourLine.map(ma4);
bb->GrEndY = gr.point(1).y();
updateGradientVectors(bb);
}
setGroupRect();
/trunk/Scribus/scribus/reformdoc.cpp
86,11 → 86,11
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
OKButton = new QPushButton(tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout3->addWidget( OKButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
CancelB->setAutoDefault( false );
Layout3->addWidget( CancelB );
151,4 → 151,4
Rechts->setText( tr( "&Right:" ) );
ErsteSeite->setEnabled(false);
}
}
}
/trunk/Scribus/scribus/shadebutton.cpp
35,7 → 35,7
b = (c-1) * 10;
if (c == 0)
{
Query* dia = new Query(this, "New", 1, 0, tr("Shade:"), tr("Shade"));
Query* dia = new Query(this, "New", 1, 0, tr("&Shade:"), tr("Shade"));
if (dia->exec())
{
c = dia->Answer->text().toInt(&ok);
/trunk/Scribus/scribus/delpages.cpp
10,7 → 10,7
#include "delpages.moc"
extern QPixmap loadIcon(QString nam);
 
/*
/*
* Constructs a DelPages which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
18,69 → 18,67
* TRUE to construct a modal dialog.
*/
DelPages::DelPages( QWidget* parent, int act, int max )
: QDialog( parent, "DelPages", true, 0 )
: QDialog( parent, "DelPages", true, 0 )
{
setCaption( tr( "Delete Pages" ) );
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
Layout4 = new QHBoxLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Delete from:" ) );
Layout4->addWidget( TextLabel1 );
FromPage = new QSpinBox( this, "FromPage" );
FromPage->setMinValue( 1 );
FromPage->setValue( act );
FromPage->setMaxValue( max );
Layout4->addWidget( FromPage );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "to:" ) );
Layout4->addWidget( TextLabel2 );
ToPage = new QSpinBox( this, "ToPage" );
ToPage->setMinValue( 1 );
ToPage->setValue( act );
ToPage->setMaxValue( max );
Layout4->addWidget( ToPage );
DLayout->addLayout( Layout4 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout3->addWidget(OK);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel->setDefault( false );
Layout3->addWidget(Cancel);
DLayout->addLayout( Layout3 );
setMaximumSize(sizeHint());
setCaption( tr( "Delete Pages" ) );
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
Layout4 = new QHBoxLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Delete from:" ) );
Layout4->addWidget( TextLabel1 );
FromPage = new QSpinBox( this, "FromPage" );
FromPage->setMinValue( 1 );
FromPage->setValue( act );
FromPage->setMaxValue( max );
Layout4->addWidget( FromPage );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "to:" ) );
Layout4->addWidget( TextLabel2 );
ToPage = new QSpinBox( this, "ToPage" );
ToPage->setMinValue( 1 );
ToPage->setValue( act );
ToPage->setMaxValue( max );
Layout4->addWidget( ToPage );
DLayout->addLayout( Layout4 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
OK = new QPushButton( tr( "&OK" ), this, "OK" );
OK->setDefault( true );
Layout3->addWidget(OK);
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Cancel->setDefault( false );
Layout3->addWidget(Cancel);
DLayout->addLayout( Layout3 );
setMaximumSize(sizeHint());
 
// signals and slots connections
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( FromPage, SIGNAL( valueChanged(int) ), this, SLOT( FromChanged(int) ) );
connect( ToPage, SIGNAL( valueChanged(int) ), this, SLOT( ToChanged(int) ) );
// signals and slots connections
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( FromPage, SIGNAL( valueChanged(int) ), this, SLOT( FromChanged(int) ) );
connect( ToPage, SIGNAL( valueChanged(int) ), this, SLOT( ToChanged(int) ) );
}
 
void DelPages::FromChanged(int nr)
{
if (nr > ToPage->value())
ToPage->setValue(nr);
if ((nr == 1) && (ToPage->value() == ToPage->maxValue()))
ToPage->setValue(ToPage->maxValue()-1);
if (nr > ToPage->value())
ToPage->setValue(nr);
if ((nr == 1) && (ToPage->value() == ToPage->maxValue()))
ToPage->setValue(ToPage->maxValue()-1);
}
 
void DelPages::ToChanged(int nr)
{
if (nr < FromPage->value())
FromPage->setValue(nr);
if ((FromPage->value() == 1) && (nr == ToPage->maxValue()))
FromPage->setValue(2);
if (nr < FromPage->value())
FromPage->setValue(nr);
if ((FromPage->value() == 1) && (nr == ToPage->maxValue()))
FromPage->setValue(2);
}
 
/trunk/Scribus/scribus/dicts/hyph_fi.dic
1,17 → 1,4
ISO8859-1
% First release January -86 by Kauko Saarinen,
% Computing Centre, University of Jyvaskyla, Finland
%
% Completely rewritten January -88. The new patterns make
% much less mistakes with foreign and compound words.
% The article "Automatic Hyphenation of Finnish"
% by Professor Fred Karlsson is also referred
%
% 8th March -89 (vers. 2.2), some vowel triples by Fred Karlsson added.
% 9th January - 95: added \uccode and \lccode by Thomas Esser
% 3rd November - 04: converted to ALTLinux LibHnj format by Jarno Elonen
%
% Patterns may be freely distributed
c1ha
char1se
1ba
/trunk/Scribus/scribus/dicts/hyph_hu.dic
1,9 → 1,4
ISO8859-2
% Huhyphn - hungarian hyphenation patterns v20031107
%
% Copyright (C) 2003, NAGY Bence <huhyphn@tipogral.hu>
% This file can be distributed under the terms of the
% GNU General Public License version 2.
.a2
.adás1s2
.a1dá
/trunk/Scribus/scribus/dicts/hyph_sv.dic
1,4 → 1,4
charset ISO8859-1
ISO8859-1
.a4b
.ab5i
.ab5ol
/trunk/Scribus/scribus/frameedit.cpp
152,39 → 152,33
ButtonGroup4Layout->addItem( spacer_2 ); */
NodePaletteLayout->addWidget( ButtonGroup1 );
 
AbsMode = new QCheckBox( this, "Textflow" );
AbsMode->setText( tr( "Absolute Coordinates" ) );
AbsMode = new QCheckBox( tr( "&Absolute Coordinates" ), this, "Textflow" );
AbsMode->setChecked(false);
NodePaletteLayout->addWidget( AbsMode );
 
Layout2 = new QGridLayout( 0, 1, 1, 0, 5, "Layout2");
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "X-Pos:" ) );
Layout2->addWidget( TextLabel1, 0, 0 );
YSpin = new MSpinBox( this, 2 );
YSpin->setMaxValue(3000);
YSpin->setEnabled(false);
Layout2->addWidget( YSpin, 1, 1 );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "Y-Pos:" ) );
Layout2->addWidget( TextLabel2, 1, 0 );
XSpin = new MSpinBox( this, 2 );
XSpin->setMaxValue(3000);
XSpin->setEnabled(false);
TextLabel1 = new QLabel( XSpin, tr( "&X-Pos:" ), this, "TextLabel1" );
TextLabel2 = new QLabel( YSpin, tr( "&Y-Pos:"), this, "TextLabel2" );
Layout2->addWidget( TextLabel1, 0, 0 );
Layout2->addWidget( TextLabel2, 1, 0 );
Layout2->addWidget( XSpin, 0, 1 );
Layout2->addWidget( YSpin, 1, 1 );
NodePaletteLayout->addLayout( Layout2 );
 
EditCont = new QCheckBox( this, "EditCont" );
EditCont->setText( tr( "Edit Contour Line" ) );
EditCont = new QCheckBox( tr("Edit &Contour Line"), this, "EditCont" );
EditCont->setChecked(false);
NodePaletteLayout->addWidget( EditCont );
 
ResetCont = new QPushButton( this, "PushButton1" );
ResetCont->setText( tr( "Reset Contour Line" ) );
ResetCont = new QPushButton( tr("&Reset Contour Line"), this, "PushButton1" );
NodePaletteLayout->addWidget( ResetCont );
 
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "End Editing" ) );
PushButton1 = new QPushButton( tr( "&End Editing"), this, "PushButton1" );
PushButton1->setDefault(true);
NodePaletteLayout->addWidget( PushButton1 );
QToolTip::add( MoveNode, tr( "Move Nodes" ) );
/trunk/Scribus/scribus/cmykfw.cpp
53,19 → 53,18
Layout23->setSpacing( 7 );
Layout23->setMargin( 0 );
 
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1 = new QLabel( tr( "&Name:" ), this, "TextLabel1" );
TextLabel1->setMinimumSize( QSize( 200, 22 ) );
TextLabel1->setText( tr( "Name:" ) );
Layout23->addWidget( TextLabel1 );
 
Farbname = new QLineEdit( this, "Farbname" );
Farbname->setMinimumSize( QSize( 200, 22 ) );
Farbname->setText( name );
TextLabel1->setBuddy( Farbname );
Layout23->addWidget( Farbname );
 
TextLabel3 = new QLabel( this, "TextLabel3" );
TextLabel3 = new QLabel( tr( "Color &Model" ), this, "TextLabel3" );
TextLabel3->setMinimumSize( QSize( 100, 22 ) );
TextLabel3->setText( tr( "Color Model" ) );
Layout23->addWidget( TextLabel3 );
 
ComboBox1 = new QComboBox( true, this, "ComboBox1" );
74,6 → 73,7
ComboBox1->insertItem( tr( "RGB" ) );
ComboBox1->insertItem( tr( "Web Safe RGB" ) );
ComboBox1->setMinimumSize( QSize( 200, 22 ) );
TextLabel3->setBuddy( ComboBox1 );
Layout23->addWidget( ComboBox1 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
Layout23->addItem( spacer );
86,19 → 86,17
Layout2->setSpacing( 6 );
Layout2->setMargin( 0 );
 
TextLabel5_2 = new QLabel( this, "TextLabel5_2" );
TextLabel5_2 = new QLabel( tr( "New" ), this, "TextLabel5_2" );
TextLabel5_2->setMinimumSize( QSize( 50, 22 ) );
TextLabel5_2->setMaximumSize( QSize( 100, 22 ) );
TextLabel5_2->setText( tr( "New" ) );
 
Layout2->addWidget( TextLabel5_2, 0, 1 );
 
OldC = new QLabel( this, "OldC" );
OldC = new QLabel( "", this, "OldC" );
OldC->setMinimumSize( QSize( 50, 50 ) );
OldC->setMaximumSize( QSize( 50, 50 ) );
OldC->setFrameShape( QLabel::WinPanel );
OldC->setFrameShadow( QLabel::Sunken );
OldC->setText( "" );
OldC->setScaledContents( true );
OldC->setAlignment( int( QLabel::AlignCenter ) );
OldC->setPixmap( imageA );
105,19 → 103,17
 
Layout2->addWidget( OldC, 1, 0 );
 
TextLabel5 = new QLabel( this, "TextLabel5" );
TextLabel5 = new QLabel( tr( "Old" ), this, "TextLabel5" );
TextLabel5->setMinimumSize( QSize( 50, 22 ) );
TextLabel5->setMaximumSize( QSize( 100, 22 ) );
TextLabel5->setText( tr( "Old" ) );
 
Layout2->addWidget( TextLabel5, 0, 0 );
 
NewC = new QLabel( this, "NewC" );
NewC = new QLabel( "", this, "NewC" );
NewC->setMinimumSize( QSize( 50, 50 ) );
NewC->setMaximumSize( QSize( 50, 50 ) );
NewC->setFrameShape( QLabel::WinPanel );
NewC->setFrameShadow( QLabel::Sunken );
NewC->setText( "" );
NewC->setScaledContents( true );
NewC->setAlignment( int( QLabel::AlignCenter ) );
NewC->setPixmap( imageN );
129,12 → 125,10
Layout21->setSpacing( 20 );
Layout21->setMargin( 10 );
 
Cancel_2 = new QPushButton( this, "Cancel_2" );
Cancel_2->setText( tr( "OK" ) );
Cancel_2 = new QPushButton( tr( "&OK" ), this, "Cancel_2" );
Cancel_2->setDefault( true );
Layout21->addWidget( Cancel_2 );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Layout21->addWidget( Cancel );
Layout23->addLayout( Layout21 );
CMYKFarbenLayout->addLayout( Layout23 );
204,8 → 198,7
Layout2x->setSpacing( 6 );
Layout2x->setMargin( 0 );
 
CyanT = new QLabel( Frame4, "Cyant" );
CyanT->setText( tr("C:"));
CyanT = new QLabel( tr( "C:" ), Frame4, "Cyant" );
Layout2x->addWidget(CyanT, 0, 0);
 
Layout1_2 = new QVBoxLayout;
235,8 → 228,7
CyanSp->setValue(ccd);
CyanSL->setValue(qRound(ccd));
 
MagentaT = new QLabel( Frame4, "Cyant" );
MagentaT->setText( tr("M:"));
MagentaT = new QLabel( tr( "M:" ), Frame4, "Cyant" );
Layout2x->addWidget(MagentaT, 1, 0);
 
Layout1_2_2 = new QVBoxLayout;
266,8 → 258,7
MagentaSp->setValue(cmd);
MagentaSL->setValue(qRound(cmd));
 
YellowT = new QLabel( Frame4, "Cyant" );
YellowT->setText( tr("Y:"));
YellowT = new QLabel( tr( "Y:" ), Frame4, "Cyant" );
Layout2x->addWidget(YellowT, 2, 0);
 
Layout1_2_3 = new QVBoxLayout;
297,8 → 288,7
YellowSp->setValue(cyd);
YellowSL->setValue(qRound(cyd));
 
BlackT = new QLabel( Frame4, "Cyant" );
BlackT->setText( tr("K:"));
BlackT = new QLabel( tr( "K:" ), Frame4, "Cyant" );
Layout2x->addWidget(BlackT, 3, 0);
 
Layout1_2_4 = new QVBoxLayout;
/trunk/Scribus/scribus/movepage.cpp
10,7 → 10,7
#include "movepage.moc"
extern QPixmap loadIcon(QString nam);
 
/*
/*
* Constructs a MovePages which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
18,71 → 18,69
* TRUE to construct a modal dialog.
*/
MovePages::MovePages( QWidget* parent, int act, int max, bool art )
: QDialog( parent, "MovePages", true, 0 )
: QDialog( parent, "MovePages", true, 0 )
{
Wie = art;
setCaption (art ? tr("Move Pages") : tr("Copy Page"));
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText(art ? tr("Move Page(s):") : tr("Copy Page") + ":");
Layout4->addWidget( TextLabel1, 0, 0);
FromPage = new QSpinBox( this, "FromPage" );
FromPage->setMinValue( 1 );
FromPage->setValue( act );
FromPage->setMaxValue( max );
Layout4->addWidget( FromPage, 0, 1);
if (art)
{
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "to:" ) );
Layout4->addWidget( TextLabel2, 0, 2);
ToPage = new QSpinBox( this, "ToPage" );
ToPage->setMinValue( 1 );
ToPage->setValue( act );
ToPage->setMaxValue( max );
Layout4->addWidget( ToPage, 0, 3);
}
Where = new QComboBox( true, this, "Where" );
Where->insertItem( tr("before Page"));
Where->insertItem( tr("after Page"));
Where->insertItem( tr("at End"));
Where->setEditable(false);
Where->setCurrentItem(2);
Layout4->addWidget( TextLabel1, 0, 0);
FromPage = new QSpinBox( this, "FromPage" );
FromPage->setMinValue( 1 );
FromPage->setValue( act );
FromPage->setMaxValue( max );
Layout4->addWidget( FromPage, 0, 1);
if (art)
{
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "to:" ) );
Layout4->addWidget( TextLabel2, 0, 2);
ToPage = new QSpinBox( this, "ToPage" );
ToPage->setMinValue( 1 );
ToPage->setValue( act );
ToPage->setMaxValue( max );
Layout4->addWidget( ToPage, 0, 3);
}
Where = new QComboBox( true, this, "Where" );
Where->insertItem( tr("before Page"));
Where->insertItem( tr("after Page"));
Where->insertItem( tr("at End"));
Where->setEditable(false);
Where->setCurrentItem(2);
Layout4->addMultiCellWidget( Where, 1, 1, 0, 1 );
ActualPage = new QSpinBox( this, "ActualPage" );
ActualPage->setMinValue( 1 );
ActualPage->setValue( act );
ActualPage->setMaxValue( max );
ActualPage = new QSpinBox( this, "ActualPage" );
ActualPage->setMinValue( 1 );
ActualPage->setValue( act );
ActualPage->setMaxValue( max );
Layout4->addWidget( ActualPage, 1, 3 );
Layout4->addColSpacing(0, TextLabel1->fontMetrics().width( tr( "Move Page(s):" )));
DLayout->addLayout( Layout4 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout3->addWidget(OK);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Layout3->addWidget(Cancel);
DLayout->addLayout( Layout3 );
setMaximumSize(sizeHint());
DLayout->addLayout( Layout4 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
OK = new QPushButton( tr( "&OK" ), this, "OK" );
OK->setDefault( true );
Layout3->addWidget(OK);
Cancel = new QPushButton( tr( "&Cancel" ), this, "Cancel" );
Layout3->addWidget(Cancel);
DLayout->addLayout( Layout3 );
setMaximumSize(sizeHint());
 
// signals and slots connections
if (art)
connect( ToPage, SIGNAL( valueChanged(int) ), this, SLOT( ToChanged(int) ) );
connect( FromPage, SIGNAL( valueChanged(int) ), this, SLOT( FromChanged(int) ) );
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
// signals and slots connections
if (art)
connect( ToPage, SIGNAL( valueChanged(int) ), this, SLOT( ToChanged(int) ) );
connect( FromPage, SIGNAL( valueChanged(int) ), this, SLOT( FromChanged(int) ) );
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
}
 
void MovePages::FromChanged(int nr)
89,18 → 87,18
{
if (Wie)
{
if (nr > ToPage->value())
ToPage->setValue(nr);
if ((nr == 1) && (ToPage->value() == ToPage->maxValue()))
ToPage->setValue(ToPage->maxValue()-1);
}
if (nr > ToPage->value())
ToPage->setValue(nr);
if ((nr == 1) && (ToPage->value() == ToPage->maxValue()))
ToPage->setValue(ToPage->maxValue()-1);
}
}
 
void MovePages::ToChanged(int nr)
{
if (nr < FromPage->value())
FromPage->setValue(nr);
if ((FromPage->value() == 1) && (nr == ToPage->maxValue()))
FromPage->setValue(2);
if (nr < FromPage->value())
FromPage->setValue(nr);
if ((FromPage->value() == 1) && (nr == ToPage->maxValue()))
FromPage->setValue(2);
}
 
/trunk/Scribus/scribus/editor.cpp
17,25 → 17,25
EditTex = new QTextEdit( this, "EditTex" );
 
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), EditTex, SLOT(clear()), CTRL+Key_N);
fmenu->insertItem( tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(LoadScript()));
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("&New"), EditTex, SLOT(clear()), CTRL+Key_N);
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("&Open..."), this, SLOT(OpenScript()));
fmenu->insertItem( tr("Save &As..."), this, SLOT(SaveAs()));
fmenu->insertSeparator();
fmenu->insertItem( tr("Save and Exit"), this, SLOT(accept()));
fmenu->insertItem( tr("Exit without Saving"), this, SLOT(reject()));
fmenu->insertItem( tr("&Save and Exit"), this, SLOT(accept()));
fmenu->insertItem( tr("&Exit without Saving"), this, SLOT(reject()));
emenu = new QPopupMenu();
emenu->insertItem( tr("Undo"), EditTex, SLOT(undo()), CTRL+Key_Z);
emenu->insertItem( tr("Redo"), EditTex, SLOT(redo()));
emenu->insertItem( tr("&Undo"), EditTex, SLOT(undo()), CTRL+Key_Z);
emenu->insertItem( tr("&Redo"), EditTex, SLOT(redo()));
emenu->insertSeparator();
emenu->insertItem(loadIcon("editcut.png"), tr("Cut"), EditTex, SLOT(cut()), CTRL+Key_X);
emenu->insertItem(loadIcon("editcopy.png"), tr("Copy"), EditTex, SLOT(copy()), CTRL+Key_C);
emenu->insertItem(loadIcon("editpaste.png"), tr("Paste"), EditTex, SLOT(paste()), CTRL+Key_V);
emenu->insertItem(loadIcon("editdelete.png"), tr("Clear"), EditTex, SLOT(del()), CTRL+Key_V);
emenu->insertItem(loadIcon("editcut.png"), tr("Cu&t"), EditTex, SLOT(cut()), CTRL+Key_X);
emenu->insertItem(loadIcon("editcopy.png"), tr("&Copy"), EditTex, SLOT(copy()), CTRL+Key_C);
emenu->insertItem(loadIcon("editpaste.png"), tr("&Paste"), EditTex, SLOT(paste()), CTRL+Key_V);
emenu->insertItem(loadIcon("editdelete.png"), tr("C&lear"), EditTex, SLOT(del()), CTRL+Key_V);
emenu->insertSeparator();
emenu->insertItem( tr("Get Field Names"), this, SLOT(GetFieldN()));
emenu->insertItem( tr("&Get Field Names"), this, SLOT(GetFieldN()));
menuBar = new QMenuBar(this);
menuBar->insertItem( tr("File"), fmenu);
menuBar->insertItem( tr("Edit"), emenu);
menuBar->insertItem( tr("&File"), fmenu);
menuBar->insertItem( tr("&Edit"), emenu);
EditorLayout->setMenuBar( menuBar );
 
EditTex->setMinimumSize( QSize( 400, 400 ) );
54,7 → 54,7
}
}
 
void Editor::LoadScript()
void Editor::OpenScript()
{
QString fileName = QFileDialog::getOpenFileName(0, tr("Javascripts (*.js);;All Files (*)"),this);
if (!fileName.isEmpty())
/trunk/Scribus/scribus/cupsoptions.cpp
176,14 → 176,12
Layout2->setMargin( 0 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer );
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "OK" ) );
PushButton1 = new QPushButton( tr("&OK"), this, "PushButton1" );
PushButton1->setDefault( true );
Layout2->addWidget( PushButton1 );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout2->addItem( spacer2 );
PushButton2 = new QPushButton( this, "PushButton1_2" );
PushButton2->setText( tr( "Cancel" ) );
PushButton2 = new QPushButton( tr("&Cancel"), this, "PushButton1_2" );
PushButton2->setDefault( false );
PushButton1->setFocus();
Layout2->addWidget( PushButton2 );
/trunk/Scribus/scribus/colorm.cpp
164,7 → 164,7
{
QString Cpfad = QDir::convertSeparators(QDir::homeDirPath()+"/.scribus/");
QString Name = LoadColSet->text();
Query* dia = new Query(this, "Name", 1, 0, tr("Name:"), tr("Choose a Name"));
Query* dia = new Query(this, "Name", 1, 0, tr("&Name:"), tr("Choose a Name"));
if ((Name == "Scribus Small") || (Name == "X11 RGB-Set")
|| (Name == "X11 Grey-Set") || (Name == "Gnome-Set") || (Name == "SVG-Set"))
dia->Answer->setText("");
/trunk/Scribus/scribus/po/scribus.pl_PL.ts
244,6 → 244,10
<translation>Tworzy tylko PostScript Level 2.
Uwaga: pliki mogą być bardzo duże</translation>
</message>
<message>
<source>Appy Under Color Removal</source>
<translation>Zastosuj UCR (usuwanie koloru neutralnego)</translation>
</message>
</context>
<context>
<name>Align</name>
261,7 → 265,7
</message>
<message>
<source>between:</source>
<translation>między:</translation>
<translation type="obsolete">między:</translation>
</message>
<message>
<source>Left Sides</source>
277,15 → 281,15
</message>
<message>
<source>Don&apos;t change</source>
<translation>Nie zmieniaj</translation>
<translation type="obsolete">Nie zmieniaj</translation>
</message>
<message>
<source>Displacement</source>
<translation>Przesunięcie</translation>
<translation type="obsolete">Przesunięcie</translation>
</message>
<message>
<source>Distribute evenly</source>
<translation>Rozmieść równomiernie</translation>
<translation type="obsolete">Rozmieść równomiernie</translation>
</message>
<message>
<source>Vertical</source>
339,6 → 343,42
<source>&amp;Cancel</source>
<translation>&amp;Anuluj</translation>
</message>
<message>
<source>&amp;Between:</source>
<translation>&amp;Pomiędzy:</translation>
</message>
<message>
<source>A&amp;lign</source>
<translation>&amp;Wyrównaj</translation>
</message>
<message>
<source>Di&amp;splacement</source>
<translation>P&amp;rzesunięcie</translation>
</message>
<message>
<source>Distribute &amp;Evenly</source>
<translation>Roz&amp;mieść równomiernie</translation>
</message>
<message>
<source>Bet&amp;ween:</source>
<translation>m&amp;iędzy:</translation>
</message>
<message>
<source>Do &amp;Not Change</source>
<translation>&amp;Nie zmieniaj</translation>
</message>
<message>
<source>Al&amp;ign</source>
<translation>W&amp;yrównaj</translation>
</message>
<message>
<source>Dis&amp;placement</source>
<translation>Prze&amp;sunięcie</translation>
</message>
<message>
<source>Distribute E&amp;venly</source>
<translation>Rozmi&amp;eść równomiernie</translation>
</message>
</context>
<context>
<name>AlignSelect</name>
1302,7 → 1342,7
</message>
<message>
<source>Rendering Intents</source>
<translation>Metody generowania rastra</translation>
<translation>Metody konwersji przestrzeni kolorów</translation>
</message>
<message>
<source>Perceptual</source>
1310,15 → 1350,15
</message>
<message>
<source>Relative Colorimetric</source>
<translation>Względnie kolorometryczna</translation>
<translation>Względna kolorymetryczna</translation>
</message>
<message>
<source>Saturation</source>
<translation>Nasycenie </translation>
<translation>Nasyceniowa</translation>
</message>
<message>
<source>Absolute Colorimetric</source>
<translation>Całkowicie kolorometryczna</translation>
<translation>Bezwzględna kolorymetryczna</translation>
</message>
<message>
<source>Simulate Printer on the Screen</source>
1393,14 → 1433,14
<message>
<source>Default rendering intent for your monitor. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation>Domyślna metoda generowania rastra dla twojego monitora. Wybierz metodę
względnie kolorometryczną lub spostrzeżeniową, chyba że wiesz, dlaczego chcesz to zmienić.</translation>
<translation>Domyślna metoda konwersji przestrzeni kolorów dla twojego monitora. Wybierz metodę
względnie kolorymetryczną lub spostrzeżeniową, chyba że wiesz, dlaczego chcesz to zmienić.</translation>
</message>
<message>
<source>Default rendering intent for your printer. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation>Domyślna metoda generowania rastra dla twojej drukarki. Wybierz metodę
względnie kolorometryczną lub spostrzeżeniową, chyba że wiesz, dlaczego chcesz to zmienić.</translation>
<translation>Domyślna metoda konwersji przestrzeni kolorów dla twojej drukarki. Wybierz metodę
względnie kolorymetryczną lub spostrzeżeniową, chyba że wiesz, dlaczego chcesz to zmienić.</translation>
</message>
<message>
<source>Enable &apos;soft proofing&apos; of how your document colors will print,
1448,7 → 1488,7
</message>
<message>
<source>Mark Colors out of &amp;Gamut</source>
<translation>&amp;Zaznacz kolory spoza palety barw</translation>
<translation>&amp;Zaznacz kolory spoza przestrzeni kolorów</translation>
</message>
<message>
<source>Use &amp;Blackpoint Compensation</source>
1946,7 → 1986,7
</message>
<message>
<source>Descri&amp;ption:</source>
<translation>&amp;Opis:</translation>
<translation>O&amp;pis:</translation>
</message>
<message>
<source>P&amp;ublisher:</source>
1954,7 → 1994,7
</message>
<message>
<source>&amp;Contributors:</source>
<translation>Inni &amp;autorzy:</translation>
<translation>I&amp;nni autorzy:</translation>
</message>
<message>
<source>Dat&amp;e:</source>
1982,7 → 2022,7
</message>
<message>
<source>&amp;Relation:</source>
<translation>&amp;Odniesienie:</translation>
<translation>Odnie&amp;sienie:</translation>
</message>
<message>
<source>Co&amp;verage:</source>
4105,7 → 4145,7
</message>
<message>
<source>Rendering Intent:</source>
<translation>Metoda generowania rastra:</translation>
<translation>Metoda konwersji przestrzeni kolorów:</translation>
</message>
<message>
<source>Perceptual</source>
4113,15 → 4153,15
</message>
<message>
<source>Relative Colorimetric</source>
<translation>Względnie kolorometryczna</translation>
<translation>Względna kolorymetryczna</translation>
</message>
<message>
<source>Saturation</source>
<translation>Nasycenie </translation>
<translation>Nasyceniowa</translation>
</message>
<message>
<source>Absolute Colorimetric</source>
<translation>Całkowicie kolorometryczna</translation>
<translation>Bezwzględna kolorymetryczna</translation>
</message>
<message>
<source>Left Point</source>
4603,7 → 4643,7
</message>
<message>
<source>Rendering intent for the image</source>
<translation>Metoda generowania rastra dla obrazka</translation>
<translation>Metoda konwersji przestrzeni kolorów dla obrazka</translation>
</message>
<message>
<source>Style:</source>
5075,7 → 5115,7
</message>
<message>
<source>Left &amp;Page First</source>
<translation>Lewa strona &amp;najpierw</translation>
<translation>Lewa strona naj&amp;pierw</translation>
</message>
<message>
<source>&amp;Left:</source>
5123,7 → 5163,7
</message>
<message>
<source>&amp;Inside:</source>
<translation>Wewnąt&amp;rz:</translation>
<translation>W&amp;ewnątrz:</translation>
</message>
<message>
<source>&amp;Outside:</source>
5131,7 → 5171,7
</message>
<message>
<source>Orie&amp;ntation:</source>
<translation>O&amp;rientacja:</translation>
<translation>Or&amp;ientacja:</translation>
</message>
<message>
<source>F&amp;irst Page Number:</source>
5593,7 → 5633,7
</message>
<message>
<source>Rendering-Intent:</source>
<translation>Metoda generowania rastra:</translation>
<translation>Metoda konwersji przestrzeni kolorów:</translation>
</message>
<message>
<source>Perceptual</source>
5601,15 → 5641,15
</message>
<message>
<source>Relative Colorimetric</source>
<translation>Względnie kolorometryczna</translation>
<translation>Względna kolorymetryczna</translation>
</message>
<message>
<source>Saturation</source>
<translation>Nasycenie </translation>
<translation>Nasyceniowa </translation>
</message>
<message>
<source>Absolute Colorimetric</source>
<translation>Całkowicie kolorometryczna</translation>
<translation>Bezwzględna kolorymetryczna</translation>
</message>
<message>
<source>Images:</source>
5637,7 → 5677,7
</message>
<message>
<source>Trim Box</source>
<translation>Przycinanie</translation>
<translation>Krawędzie spadu</translation>
</message>
<message>
<source>OK</source>
5925,19 → 5965,19
</message>
<message>
<source>Distance for bleed from the top of the physical page</source>
<translation>Ostęp spadu od górnej krawędzi fizycznej strony</translation>
<translation>Wielkość spadu mierzona od górnej krawędzi fizycznej strony</translation>
</message>
<message>
<source>Distance for bleed from the bottom of the physical page</source>
<translation>Ostęp spadu od dolnej krawędzi fizycznej strony</translation>
<translation>Wielkość spadu mierzona od dolnej krawędzi fizycznej strony</translation>
</message>
<message>
<source>Distance for bleed from the left of the physical page</source>
<translation>Ostęp spadu od lewej krawędzi fizycznej strony</translation>
<translation>Wielkość spadu mierzona od lewej krawędzi fizycznej strony</translation>
</message>
<message>
<source>Distance for bleed from the right of the physical page</source>
<translation>Ostęp spadu od prawej krawędzi fizycznej strony</translation>
<translation>Wielkość spadu mierzona od prawej krawędzi fizycznej strony</translation>
</message>
<message>
<source>Determines the PDF compatibility. The default is Acrobat 4.0 which gives the widest compatibility.
6078,7 → 6118,7
</message>
<message>
<source>Rendering intent for solid colors</source>
<translation>Metoda generowania rastra dla jednolitych kolorów</translation>
<translation>Metoda konwersji przestrzeni kolorów dla jednolitych kolorów</translation>
</message>
<message>
<source>Color profile for images</source>
6086,7 → 6126,7
</message>
<message>
<source>Rendering intent for images</source>
<translation>Metoda generowania rastra dla obrazków</translation>
<translation>Metoda konwersji przestrzeni kolorów dla obrazków</translation>
</message>
<message>
<source>Output profile for printing. If possible, get some guidance from your printer on profile selection.</source>
6235,11 → 6275,11
</message>
<message>
<source>&amp;All Pages</source>
<translation>&amp;Wszystkie strony</translation>
<translation>Wszys&amp;tkie strony</translation>
</message>
<message>
<source>C&amp;hoose Pages</source>
<translation>&amp;Wybierz strony</translation>
<translation>Wybierz stro&amp;ny</translation>
</message>
<message>
<source>Compatibilit&amp;y:</source>
6255,7 → 6295,7
</message>
<message>
<source>Save &amp;Linked Text Frames as PDF Articles</source>
<translation>Zapisz połączone ramki tekstowe jako artykuły PD&amp;F</translation>
<translation>Zapisz połączone ramki tekstowe jako artykuły &amp;PDF</translation>
</message>
<message>
<source>&amp;Include Bookmarks</source>
6267,7 → 6307,7
</message>
<message>
<source>Com&amp;press Text and Vector Graphics</source>
<translation>Kompres&amp;ja tekstu i grafiki wektorowej</translation>
<translation>Kompre&amp;sja tekstu i grafiki wektorowej</translation>
</message>
<message>
<source>&amp;Method:</source>
6279,7 → 6319,7
</message>
<message>
<source>&amp;Downsample Images to:</source>
<translation>&amp;Rozdzielczość obrazków:</translation>
<translation>Rozdzie&amp;lczość obrazków:</translation>
</message>
<message>
<source>&amp;Embed all Fonts</source>
6295,7 → 6335,7
</message>
<message>
<source>Enable &amp;Presentation Effects</source>
<translation>&amp;Włącz efekty prezentacyjne</translation>
<translation>Włącz e&amp;fekty prezentacyjne</translation>
</message>
<message>
<source>Show Page Pre&amp;views</source>
6343,19 → 6383,19
</message>
<message>
<source>Allow &amp;Printing the Document</source>
<translation>Dozwo&amp;lone drukowanie dokumentu</translation>
<translation>Dozwolo&amp;ne drukowanie dokumentu</translation>
</message>
<message>
<source>Allow &amp;Changing the Document</source>
<translation>Dozwo&amp;lona zmiana dokumentu</translation>
<translation>Dozwolona z&amp;miana dokumentu</translation>
</message>
<message>
<source>Allow Cop&amp;ying Text and Graphics</source>
<translation>Dozwo&amp;lone kopiowanie tekstu i grafik</translation>
<translation>Dozwolone kopiowanie &amp;tekstu i grafik</translation>
</message>
<message>
<source>Allow Adding &amp;Annotations and Fields</source>
<translation>Dozwo&amp;lone dodawanie adnotacji i pól</translation>
<translation>Dozwolone dodawanie adnotacji i &amp;pól</translation>
</message>
<message>
<source>S&amp;ecurity</source>
6367,7 → 6407,7
</message>
<message>
<source>&amp;Use Custom Rendering Settings</source>
<translation>&amp;Zastosuj własne opcje generowania rastra</translation>
<translation>Za&amp;stosuj własne opcje generowania rastra</translation>
</message>
<message>
<source>Fre&amp;quency:</source>
6375,11 → 6415,11
</message>
<message>
<source>&amp;Angle:</source>
<translation>Ką&amp;t:</translation>
<translation>Kąt&amp;:</translation>
</message>
<message>
<source>S&amp;pot Function:</source>
<translation>Kształt &amp;rastra/punktu:</translation>
<translation>Kształt punktu &amp;rastrowego:</translation>
</message>
<message>
<source>Use ICC Profile</source>
6395,7 → 6435,7
</message>
<message>
<source>Output &amp;Profile:</source>
<translation>Profil &amp;wyjściowy:</translation>
<translation>&amp;Profil wyjściowy:</translation>
</message>
<message>
<source>PDF/X-&amp;3</source>
6478,7 → 6518,7
</message>
<message>
<source>Shows transparency and transparent items in your document. Requires Ghostscript 7.07 or later</source>
<translation>Wyświetla przezroczystość i przezroczyste obiekty zawarte w dokumentcie. Wymaga Ghostscriptu w wersji 7.07 lub późniejszej</translation>
<translation>Wyświetla przezroczystość i przezroczyste obiekty zawarte w dokumencie. Wymaga Ghostscriptu w wersji 7.07 lub późniejszej</translation>
</message>
<message>
<source>Gives a print preview using simulations of generic CMYK inks, instead of RGB colors</source>
6532,6 → 6572,10
<source>&amp;K</source>
<translation>&amp;K</translation>
</message>
<message>
<source>&amp;Under Color Removal</source>
<translation>Zastosuj &amp;UCR (usuwanie koloru neutralnego)</translation>
</message>
</context>
<context>
<name>Page</name>
6917,7 → 6961,7
</message>
<message>
<source>&amp;Get Text...</source>
<translation>Pobierz &amp;tekst...</translation>
<translation>&amp;Pobierz tekst...</translation>
</message>
<message>
<source>&amp;Append Text...</source>
6925,7 → 6969,7
</message>
<message>
<source>&amp;Edit Text...</source>
<translation>Edyt&amp;uj tekst...</translation>
<translation>&amp;Edytuj tekst...</translation>
</message>
<message>
<source>&amp;Insert Sample Text</source>
6949,7 → 6993,7
</message>
<message>
<source>&amp;PDF Options</source>
<translation>Opcje PD&amp;F</translation>
<translation>&amp;Opcje PDF</translation>
</message>
<message>
<source>&amp;Lock</source>
6961,7 → 7005,7
</message>
<message>
<source>Lock Object &amp;Size</source>
<translation>Za&amp;bezpiecz rozmiary obiektu</translation>
<translation>Zabezpiecz roz&amp;miary obiektu</translation>
</message>
<message>
<source>Unlock Object &amp;Size</source>
6985,7 → 7029,7
</message>
<message>
<source>Le&amp;vel</source>
<translation>Po&amp;ziom</translation>
<translation>Poz&amp;iom</translation>
</message>
<message>
<source>Send to &amp;Back</source>
7045,7 → 7089,7
</message>
<message>
<source>Show P&amp;roperties...</source>
<translation>&amp;Wyświetlaj właściwości...</translation>
<translation>Wyświet&amp;laj właściwości...</translation>
</message>
<message>
<source>Hide P&amp;roperties...</source>
8159,7 → 8203,7
</message>
<message>
<source>C&amp;hange...</source>
<translation>&amp;Zmień...</translation>
<translation>Z&amp;mień...</translation>
</message>
<message>
<source>&amp;Scripts:</source>
8167,7 → 8211,7
</message>
<message>
<source>Ch&amp;ange...</source>
<translation>&amp;Zmień...</translation>
<translation>Zmi&amp;eń...</translation>
</message>
<message>
<source>&amp;Size:</source>
8175,7 → 8219,7
</message>
<message>
<source>Orie&amp;ntation:</source>
<translation>O&amp;rientacja:</translation>
<translation>Ori&amp;entacja:</translation>
</message>
<message>
<source>&amp;Width:</source>
8183,7 → 8227,7
</message>
<message>
<source>&amp;Height:</source>
<translation>&amp;Wysokość:</translation>
<translation>W&amp;ysokość:</translation>
</message>
<message>
<source>&amp;Facing Pages</source>
8227,7 → 8271,7
</message>
<message>
<source>Guide &amp;Snap Distance:</source>
<translation>Zasięg &amp;chwytu linii pomocniczej:</translation>
<translation>&amp;Zasięg chwytu linii pomocniczej:</translation>
</message>
<message>
<source>Min&amp;or Grid Color:</source>
8239,7 → 8283,7
</message>
<message>
<source>&amp;User Guides Color:</source>
<translation>&amp;Kolor linii pomocniczych:</translation>
<translation>Kolor linii &amp;pomocniczych:</translation>
</message>
<message>
<source>Base&amp;line Grid Color:</source>
8247,7 → 8291,7
</message>
<message>
<source>In the &amp;Background</source>
<translation>W t&amp;le</translation>
<translation>&amp;W tle</translation>
</message>
<message>
<source>In the Fore&amp;ground</source>
8271,19 → 8315,19
</message>
<message>
<source>D&amp;isplacement:</source>
<translation>P&amp;rzesunięcie:</translation>
<translation>Przesu&amp;nięcie:</translation>
</message>
<message>
<source>S&amp;caling:</source>
<translation>&amp;Rozmiar:</translation>
<translation>Ro&amp;zmiar:</translation>
</message>
<message>
<source>Sc&amp;aling:</source>
<translation>&amp;Rozmiar:</translation>
<translation>Roz&amp;miar:</translation>
</message>
<message>
<source>Baseline &amp;Grid:</source>
<translation>Siatka linii &amp;pisma:</translation>
<translation>&amp;Siatka linii pisma:</translation>
</message>
<message>
<source>Baseline &amp;Offset:</source>
8323,11 → 8367,11
</message>
<message>
<source>&amp;Fill Color:</source>
<translation>&amp;Kolor wypełnienia:</translation>
<translation>Kolor &amp;wypełnienia:</translation>
</message>
<message>
<source>S&amp;hading:</source>
<translation>&amp;Cieniowanie:</translation>
<translation>C&amp;ieniowanie:</translation>
</message>
<message>
<source>&amp;Type of Line:</source>
8359,7 → 8403,7
</message>
<message>
<source>&amp;Vertical Scaling:</source>
<translation>Skalowanie w &amp;pionie:</translation>
<translation>Ska&amp;lowanie w pionie:</translation>
</message>
<message>
<source>&amp;Scale Picture to Frame Size</source>
8423,11 → 8467,11
</message>
<message>
<source>&amp;Adjust Display Size</source>
<translation>Dopasuj wielkość &amp;widoku</translation>
<translation>&amp;Dopasuj wielkość widoku</translation>
</message>
<message>
<source>&amp;Name of Executable:</source>
<translation>Nazwa &amp;programu:</translation>
<translation>&amp;Nazwa programu:</translation>
</message>
<message>
<source>Antialias &amp;Text</source>
8443,7 → 8487,7
</message>
<message>
<source>Clip to Page &amp;Margins</source>
<translation>&amp;Przytnij do marginesów</translation>
<translation>&amp;Przycinaj do krawędzi strony</translation>
</message>
<message>
<source>&amp;OK</source>
8461,6 → 8505,10
<source>O&amp;utside:</source>
<translation>&amp;Na zewnątrz:</translation>
</message>
<message>
<source>Apply &amp;Under Color Removal</source>
<translation>Zastosuj &amp;UCR (usuwanie koloru neutralnego)</translation>
</message>
</context>
<context>
<name>QColorDialog</name>
/trunk/Scribus/scribus/tabmanager.cpp
33,12 → 33,8
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
layout10->addWidget( OKButton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer_2 );
CancelButton = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
layout10->addWidget( CancelButton );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
layout10->addItem( spacer_3 );
TabManagerLayout->addLayout( layout10 );
resize( minimumSizeHint() );
connect( OKButton, SIGNAL( clicked() ), this, SLOT( exitOK() ) );
/trunk/Scribus/scribus/newtemp.cpp
23,13 → 23,12
Layout2 = new QHBoxLayout;
Layout2->setSpacing( 6 );
Layout2->setMargin( 0 );
Frage = new QLabel( this, "Frage" );
Answer = new QLineEdit( this, "Answer" );
Frage = new QLabel( Answer, text, this, "Frage" );
Frage->setFrameShape( QLabel::MShape );
Frage->setFrameShadow( QLabel::MShadow );
Frage->setText( text );
Frage->adjustSize();
Layout2->addWidget( Frage );
Answer = new QLineEdit( this, "Answer" );
Layout2->addWidget( Answer );
QueryLayout->addLayout( Layout2 );
if (doc->PageFP)
47,14 → 46,12
Layout1 = new QHBoxLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
PushButton1 = new QPushButton( this, "PushButton1" );
PushButton1->setText( tr( "OK" ) );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
PushButton1 = new QPushButton( tr( "&OK" ), this, "PushButton1" );
PushButton1->setDefault( true );
Layout1->addWidget( PushButton1 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
PushButton2 = new QPushButton( this, "PushButton2" );
PushButton2->setText( tr( "Cancel" ) );
PushButton2 = new QPushButton( tr( "&Cancel" ), this, "PushButton2" );
Layout1->addWidget( PushButton2 );
QueryLayout->addLayout( Layout1 );
setMaximumSize(sizeHint());
/trunk/Scribus/scribus/keymanager.cpp
86,13 → 86,9
OKButton = new QPushButton( tr( "&OK" ), this, "OKButton" );
OKButton->setDefault( true );
Layout4->addWidget( OKButton );
QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_2 );
CancelB = new QPushButton( tr( "&Cancel" ), this, "CancelB" );
Layout4->addWidget( CancelB );
 
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4->addItem( spacer_3 );
KeyManagerLayout->addLayout( Layout4 );
DispKey(0);
// signals and slots connections
/trunk/Scribus/scribus/inspage.cpp
22,15 → 22,13
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 5 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Inserting" ) );
Layout4->addWidget( TextLabel1, 0, 0 );
NumPages = new QSpinBox( this, "NumPages" );
NumPages->setMinValue( 1 );
NumPages->setValue( 1 );
TextLabel1 = new QLabel( NumPages, tr( "&Inserting" ), this, "TextLabel1" );
Layout4->addWidget( TextLabel1, 0, 0 );
Layout4->addWidget( NumPages, 0, 1 );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setText( tr( "page(s)" ) );
TextLabel2 = new QLabel( tr( "Page(s)" ), this, "TextLabel2" );
Layout4->addWidget( TextLabel2, 0, 2 );
Where = new QComboBox( true, this, "Where" );
Where->insertItem( tr("before Page"));
50,7 → 48,7
Layout4a->setSpacing( 6 );
Layout4a->setMargin( 0 );
TextLabel3 = new QLabel(this, "text");
TextLabel3->setText(ds ? tr("Template (Left Page):") : tr("Template:"));
TextLabel3->setText(ds ? tr("&Template (Left Page):") : tr("&Template:"));
/* if (ds)
TextLabel3->setText( tr("Template (Left Page):"));
else
68,6 → 66,7
else
Based->insertItem(it.key());
}*/
TextLabel3->setBuddy(Based);
Layout4a->addWidget(Based);
DLayout->addLayout(Layout4a);
if (ds)
97,14 → 96,12
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 5 );
PushButton4 = new QPushButton( this, "PushButton4" );
PushButton4->setText( tr( "OK" ) );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
PushButton4 = new QPushButton( tr( "&OK" ), this, "PushButton4" );
PushButton4->setDefault( true );
Layout3->addWidget( PushButton4 );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
PushButton4_2 = new QPushButton( this, "PushButton4_2" );
PushButton4_2->setText( tr( "Cancel" ) );
PushButton4_2 = new QPushButton( tr( "&Cancel" ), this, "PushButton4_2" );
Layout3->addWidget( PushButton4_2 );
DLayout->addLayout( Layout3 );
setMaximumSize(sizeHint());
/trunk/Scribus/scribus/editor.h
24,7 → 24,7
ScribusView* view;
 
private slots:
void LoadScript();
void OpenScript();
void SaveAs();
void GetFieldN();
 
/trunk/Scribus/scribus/qm/scribus.pl.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream