Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 260 → Rev 261

/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.6
17.04.2004 Fixed minor error in PDF-Export with Tables.
Transparent areas in EPS-Images are handled now correct in PDF-Export.
 
16.04.2004 Updated the German and Finnish Translation.
Fixed recognition of en_GB locale.
 
/trunk/Scribus/scribus/druck.cpp
182,6 → 182,7
ToolButton1->setMinimumSize( QSize( 80, 22 ) );
ToolButton1->setText( tr( "Change..." ) );
ToolButton1->setEnabled(false);
ToolButton1->setFocusPolicy( QToolButton::TabFocus );
Layout1->addWidget( ToolButton1 );
DruckerLayout->addLayout( Layout1, 1, 0 );
 
238,6 → 239,7
To->setMinValue(1);
To->setMaxValue(1000);
To->setValue(1);
To->setFocusPolicy( QSpinBox::TabFocus );
ButtonGroup5Layout->addWidget( To, 3, 1 );
 
From = new QSpinBox( ButtonGroup5, "From" );
246,6 → 248,7
From->setMinValue(1);
From->setMaxValue(1000);
From->setValue(1);
From->setFocusPolicy( QSpinBox::TabFocus );
 
ButtonGroup5Layout->addWidget( From, 2, 1 );
 
280,6 → 283,7
 
FirstPlast = new QRadioButton( ButtonGroup4, "FirstPlast" );
FirstPlast->setText( tr( "Print last page first" ) );
FirstPlast->setFocusPolicy( QRadioButton::TabFocus );
 
ButtonGroup4Layout->addMultiCellWidget( FirstPlast, 1, 1, 0, 1 );
 
286,6 → 290,7
FirstPfirst = new QRadioButton( ButtonGroup4, "FirstPfirst" );
FirstPfirst->setText( tr( "Print first page first" ) );
FirstPfirst->setChecked( true );
FirstPfirst->setFocusPolicy( QRadioButton::TabFocus );
 
ButtonGroup4Layout->addMultiCellWidget( FirstPfirst, 0, 0, 0, 1 );
 
300,6 → 305,7
Copies->setMinValue( 1 );
Copies->setMaxValue(1000);
Copies->setValue(1);
Copies->setFocusPolicy( QSpinBox::TabFocus );
 
ButtonGroup4Layout->addWidget( Copies, 2, 1 );
UmfangLayout->addWidget( ButtonGroup4 );
334,6 → 340,7
 
PrintSep = new QRadioButton( ButtonGroup3, "PrintSep" );
PrintSep->setText( tr( "Print Separations" ) );
PrintSep->setFocusPolicy( QRadioButton::TabFocus );
ButtonGroup3Layout->addWidget( PrintSep );
ToSeparation = false;
 
366,6 → 373,7
PrintGray = new QRadioButton( ButtonGroup3_2, "PrintGray" );
PrintGray->setText( tr( "Print in color if available" ) );
PrintGray->setChecked( true );
PrintGray->setFocusPolicy( QRadioButton::TabFocus );
ButtonGroup3_2Layout->addWidget( PrintGray );
 
PrintGray2 = new QRadioButton( ButtonGroup3_2, "PrintGray2" );
373,7 → 381,7
ButtonGroup3_2Layout->addWidget( PrintGray2 );
MirrorH = false;
MirrorV = false,
ICCinUse = false;
ICCinUse = false;
AdvOptButton = new QPushButton(ButtonGroup3_2, "Adv");
AdvOptButton->setText( tr("Advanced Options..."));
ButtonGroup3_2Layout->addWidget( AdvOptButton );
431,7 → 439,7
setTabOrder( PrintGray2, AdvOptButton );
setTabOrder( AdvOptButton, OKButton );
setTabOrder( OKButton, OKButton_2 );
setTabOrder( OKButton_2, PrintDest );
// setTabOrder( OKButton_2, PrintDest );
PrintDest->setFocus();
// signals and slots connections
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("14").arg("April").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("17").arg("April").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/libprefs/prefs.cpp
92,7 → 92,7
ButtonGroup1Layout->setSpacing( 6 );
ButtonGroup1Layout->setMargin( 10 );
TextGstil = new QLabel(ButtonGroup1, "dd");
TextGstil->setText( tr("Theme"));
TextGstil->setText( tr("Theme:"));
ButtonGroup1Layout->addWidget( TextGstil, 0, 0 );
GUICombo = new QComboBox( true, ButtonGroup1, "GUICombo" );
QStringList STtest;
145,7 → 145,7
TextLabel1_2 = new QLabel( Mouse, "TextLabel1_2" );
TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2->setText( tr( "Wheel-Jump" ) );
TextLabel1_2->setText( tr( "Wheel-Jump:" ) );
Layout5->addWidget( TextLabel1_2, 0, 0 );
SpinBox3 = new QSpinBox( Mouse, "SpinBox3" );
SpinBox3->setMaxValue( 1000 );
156,7 → 156,7
TextLabel1_2_2 = new QLabel( Mouse, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setText( tr( "Grab-Radius" ) );
TextLabel1_2_2->setText( tr( "Grab-Radius:" ) );
Layout5->addWidget( TextLabel1_2_2, 1, 0 );
SpinBox3_2 = new QSpinBox( Mouse, "SpinBox3_2" );
SpinBox3_2->setMaxValue( 1000 );
1135,12 → 1135,12
TextLabelT51 = new QLabel( ToolFrame5, "TextLabelT51" );
TextLabelT51->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT51->sizePolicy().hasHeightForWidth() ) );
TextLabelT51->setText( tr( "Horizontal Scaling" ) );
TextLabelT51->setText( tr( "Horizontal Scaling:" ) );
Layout15->addWidget( TextLabelT51, 1, 1 );
TextLabelT52 = new QLabel( ToolFrame5, "TextLabelT52" );
TextLabelT52->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabelT52->sizePolicy().hasHeightForWidth() ) );
TextLabelT52->setText( tr( "Vertical Scaling" ) );
TextLabelT52->setText( tr( "Vertical Scaling:" ) );
Layout15->addWidget( TextLabelT52, 2, 1 );
TextLabelT53 = new QLabel( ToolFrame5, "TextLabelT53" );
TextLabelT53->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
34,7 → 34,7
*/
QString Name()
{
return QObject::tr("Import SVG-Image");
return QObject::tr("Import SVG-Image...");
}
 
/*!
/trunk/Scribus/scribus/libpdf/pdflib.cpp
1205,7 → 1205,6
{
if ((ite->TopLine) || (ite->RightLine) || (ite->BottomLine) || (ite->LeftLine))
{
PutPage("h\n");
if (ite->TopLine)
{
PutPage("0 0 m\n");
1648,7 → 1647,6
{
if ((ite->TopLine) || (ite->RightLine) || (ite->BottomLine) || (ite->LeftLine))
{
PutPage("h\n");
if (ite->TopLine)
{
PutPage("0 0 m\n");
3088,6 → 3086,20
{
QImage image;
image.load(tmpFile);
image = image.convertDepth(32);
image.setAlphaBuffer(true);
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
{
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
}
img = image.convertDepth(32);
unlink(tmpFile);
}
3136,8 → 3148,20
QImage image;
image.load(tmpFile);
image = image.convertDepth(32);
img = image.copy(static_cast<int>(x2), 0, static_cast<int>(b-x2),
static_cast<int>(h-y2));
image.setAlphaBuffer(true);
int wi = image.width();
int hi = image.height();
for( int yi=0; yi < hi; ++yi )
{
QRgb *s = (QRgb*)(image.scanLine( yi ));
for(int xi=0; xi < wi; ++xi )
{
if((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
s++;
}
}
img = image.copy(static_cast<int>(x2), 0, static_cast<int>(b-x2), static_cast<int>(h-y2));
unlink(tmpFile);
}
}