Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 222 → Rev 223

/trunk/Scribus/scribus/align.cpp
31,9 → 31,12
VartH = new QComboBox( true, ButtonGroup1, "VartH" );
VartH->setEnabled( true );
VartH->setMinimumSize( QSize( 100, 22 ) );
VartH->insertItem( tr("Left Sides"));
VartH->insertItem( tr("Middles"));
VartH->insertItem( tr("Right Sides"));
/* PFJ - 28/2/04 - altered the single line inserts for the faster way I've
used before. sides is used later on in this method */
QString sides[] = { tr("Left Sides"), tr("Middles"), tr("Right Sides")};
size_t tempSides = sizeof(sides) / sizeof(*sides);
for (uint propogate = 0; propogate < tempSides; ++propogate)
VartH->insertItem(sides[propogate]);
VartH->setEditable(false);
ButtonGroup1Layout->addMultiCellWidget( VartH, 0, 0, 1, 2 );
NichtsH = new QRadioButton( ButtonGroup1, "NichtsH" );
79,10 → 82,10
VartV = new QComboBox( true, ButtonGroup1_2, "VartH" );
VartV->setEnabled( true );
VartV->setMinimumSize( QSize( 100, 22 ) );
VartV->insertItem( tr("Top Sides"));
VartV->insertItem( tr("Middles"));
VartV->insertItem( tr("Bottom Sides"));
VartV->setEditable(false);
VartV->insertItem(tr("Top Sides"));
VartV->insertItem(tr("Middles"));
VartV->insertItem(tr("Bottom Sides"));
ButtonGroup1_2Layout->addMultiCellWidget( VartV, 0, 0, 1, 2 );
NichtsV = new QRadioButton( ButtonGroup1_2, "NichtsH" );
NichtsV->setText( tr( "Don't change" ) );
/trunk/Scribus/scribus/edit1format.cpp
97,11 → 97,11
TxFill->insertItem( tr("None"));
TxStroke->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
TxFill->insertItem(pm, it.key());
TxStroke->insertItem(pm, it.key());
}
}
StrokeIcon->setEnabled(false);
TxStroke->setEnabled(false);
TxFill->setCurrentText(vor->FColor);
243,25 → 243,15
FirstLin->setDecimals(10);
AboveV->setDecimals(10);
BelowV->setDecimals(10);
QString ein;
switch (dEin)
/* PFJ - 29.02.04 - Altered switch so only case 2 is tested */
QString ein, measure[] = {" pt", " mm", " in", " p"};
ein = measure[dEin];
if (dEin == 2)
{
case 0:
ein = " pt";
break;
case 1:
ein = " mm";
break;
case 2:
ein = " in";
LeftInd->setDecimals(10000);
FirstLin->setDecimals(10000);
AboveV->setDecimals(10000);
BelowV->setDecimals(10000);
break;
case 3:
ein = " p";
break;
LeftInd->setDecimals(10000);
FirstLin->setDecimals(10000);
AboveV->setDecimals(10000);
BelowV->setDecimals(10000);
}
LeftInd->setSuffix(ein);
FirstLin->setSuffix(ein);
/trunk/Scribus/scribus/autoform.cpp
16,7 → 16,8
Autoforms::Autoforms( QWidget* parent ) : QToolButton( parent, "auto" )
{
buttonGroup1 = new QButtonGroup();
buttonGroup1->setExclusive( TRUE );
/* PFJ - 28/02/04 - altered from true to true */
buttonGroup1->setExclusive( true );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
buttonGroup1->layout()->setSpacing( 0 );
buttonGroup1->layout()->setMargin( 0 );
23,80 → 24,97
buttonGroup1Layout = new QGridLayout( buttonGroup1->layout() );
buttonGroup1Layout->setAlignment( Qt::AlignTop );
toolButton1 = new QToolButton( buttonGroup1, "toolButton1" );
toolButton1->setToggleButton( TRUE );
toolButton1->setPixmap(getIconPixmap(0));
/* PFJ - 28/02/04 - altered from true to true */
toolButton1->setToggleButton( true );
toolButton1->setPixmap(getIconPixmap(0));
buttonGroup1Layout->addWidget( toolButton1, 0, 0 );
toolButton2 = new QToolButton( buttonGroup1, "toolButton2" );
toolButton2->setToggleButton( TRUE );
toolButton2->setPixmap(getIconPixmap(1));
/* PFJ - 28/02/04 - altered from true to true */
toolButton2->setToggleButton( true );
toolButton2->setPixmap(getIconPixmap(1));
buttonGroup1Layout->addWidget( toolButton2, 0, 1 );
toolButton3 = new QToolButton( buttonGroup1, "toolButton3" );
toolButton3->setToggleButton( TRUE );
toolButton3->setPixmap(getIconPixmap(2));
/* PFJ - 28/02/04 - altered from true to true */
toolButton3->setToggleButton( true );
toolButton3->setPixmap(getIconPixmap(2));
buttonGroup1Layout->addWidget( toolButton3, 0, 2 );
toolButton4 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton4->setToggleButton( TRUE );
toolButton4->setPixmap(getIconPixmap(3));
toolButton4->setToggleButton( true );
toolButton4->setPixmap(getIconPixmap(3));
buttonGroup1Layout->addWidget( toolButton4, 0, 3 );
 
toolButton5 = new QToolButton( buttonGroup1, "toolButton3" );
toolButton5->setToggleButton( TRUE );
toolButton5->setPixmap(getIconPixmap(4));
/* PFJ - 28/02/04 - altered from true to true */
toolButton5->setToggleButton( true );
toolButton5->setPixmap(getIconPixmap(4));
buttonGroup1Layout->addWidget( toolButton5, 1, 0 );
toolButton6 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton6->setToggleButton( TRUE );
toolButton6->setPixmap(getIconPixmap(5));
/* PFJ - 28/02/04 - altered from true to true */
toolButton6->setToggleButton( true );
toolButton6->setPixmap(getIconPixmap(5));
buttonGroup1Layout->addWidget( toolButton6, 1, 1 );
toolButton7 = new QToolButton( buttonGroup1, "toolButton3" );
toolButton7->setToggleButton( TRUE );
toolButton7->setPixmap(getIconPixmap(6));
/* PFJ - 28/02/04 - altered from true to true */
toolButton7->setToggleButton( true );
toolButton7->setPixmap(getIconPixmap(6));
buttonGroup1Layout->addWidget( toolButton7, 1, 2 );
toolButton8 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton8->setToggleButton( TRUE );
toolButton8->setPixmap(getIconPixmap(7));
/* PFJ - 28/02/04 - altered from true to true */
toolButton8->setToggleButton( true );
toolButton8->setPixmap(getIconPixmap(7));
buttonGroup1Layout->addWidget( toolButton8, 1, 3 );
 
toolButton9 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton9->setToggleButton( TRUE );
toolButton9->setPixmap(getIconPixmap(8));
/* PFJ - 28/02/04 - altered from true to true */
toolButton9->setToggleButton( true );
toolButton9->setPixmap(getIconPixmap(8));
buttonGroup1Layout->addWidget( toolButton9, 2, 0 );
toolButton10 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton10->setToggleButton( TRUE );
toolButton10->setPixmap(getIconPixmap(9));
/* PFJ - 28/02/04 - altered from true to true */
toolButton10->setToggleButton( true );
toolButton10->setPixmap(getIconPixmap(9));
buttonGroup1Layout->addWidget( toolButton10, 2, 1 );
toolButton11 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton11->setToggleButton( TRUE );
toolButton11->setPixmap(getIconPixmap(10));
/* PFJ - 28/02/04 - altered from true to true */
toolButton11->setToggleButton( true );
toolButton11->setPixmap(getIconPixmap(10));
buttonGroup1Layout->addWidget( toolButton11, 2, 2 );
toolButton12 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton12->setToggleButton( TRUE );
toolButton12->setPixmap(getIconPixmap(11));
/* PFJ - 28/02/04 - altered from true to true */
toolButton12->setToggleButton( true );
toolButton12->setPixmap(getIconPixmap(11));
buttonGroup1Layout->addWidget( toolButton12, 2, 3 );
 
toolButton13 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton13->setToggleButton( TRUE );
toolButton13->setPixmap(getIconPixmap(12));
/* PFJ - 28/02/04 - altered from true to true */
toolButton13->setToggleButton( true );
toolButton13->setPixmap(getIconPixmap(12));
buttonGroup1Layout->addWidget( toolButton13, 3, 0 );
toolButton14 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton14->setToggleButton( TRUE );
toolButton14->setPixmap(getIconPixmap(13));
/* PFJ - 28/02/04 - altered from true to true */
toolButton14->setToggleButton( true );
toolButton14->setPixmap(getIconPixmap(13));
buttonGroup1Layout->addWidget( toolButton14, 3, 1 );
/* PFJ - 28/02/04 - altered from true to true */
toolButton15 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton15->setToggleButton( TRUE );
toolButton15->setPixmap(getIconPixmap(14));
toolButton15->setToggleButton( true );
toolButton15->setPixmap(getIconPixmap(14));
buttonGroup1Layout->addWidget( toolButton15, 3, 2 );
toolButton16 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton16->setToggleButton( TRUE );
toolButton16->setPixmap(getIconPixmap(15));
/* PFJ - 28/02/04 - altered from true to true */
toolButton16->setToggleButton( true );
toolButton16->setPixmap(getIconPixmap(15));
buttonGroup1Layout->addWidget( toolButton16, 3, 3 );
 
toolButton17 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton17->setToggleButton( TRUE );
toolButton17->setPixmap(getIconPixmap(16));
/* PFJ - 28/02/04 - altered from true to true */
toolButton17->setToggleButton( true );
toolButton17->setPixmap(getIconPixmap(16));
buttonGroup1Layout->addWidget( toolButton17, 4, 0 );
toolButton18 = new QToolButton( buttonGroup1, "toolButton4" );
toolButton18->setToggleButton( TRUE );
toolButton18->setPixmap(getIconPixmap(17));
/* PFJ - 28/02/04 - altered from true to true */
toolButton18->setToggleButton( true );
toolButton18->setPixmap(getIconPixmap(17));
buttonGroup1Layout->addWidget( toolButton18, 4, 1 );
 
Men = new QPopupMenu();
103,7 → 121,7
Men->insertItem(buttonGroup1);
setPopup(Men);
setPopupDelay(10);
setPixmap(getIconPixmap(0));
setPixmap(getIconPixmap(0));
connect(buttonGroup1, SIGNAL(clicked(int)), this, SLOT(selForm(int)));
}
 
113,8 → 131,11
static double AutoShapes0[] = {0.0, 0.0, 0.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0,
0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
static double AutoShapes1[] = {100.0, 50.0, 100.0, 77.615235, 50.0, 100.0, 77.615235, 100.0, 50.0, 100.0, 22.385765, 100.0,
0.0, 50.0, 0.0, 77.615235, 0.0, 50.0, 0.0, 22.385765, 50.0, 0.0, 22.385765, 0.0,
static double AutoShapes1[] = {100.0, 50.0, 100.0, 77.615235, 50.0, 100.0,
77.615235, 100.0, 50.0, 100.0,
22.385765, 100.0,
0.0, 50.0, 0.0, 77.615235, 0.0, 50.0, 0.0, 22.385765, 50.0, 0.0,
22.385765, 0.0,
50.0, 0.0, 77.615235, 0.0, 100.0, 50.0, 100.0, 22.385765};
static double AutoShapes2[] = {0.0, 0.0, 0.0, 0.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0,
0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0};
147,11 → 168,15
100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 100.0, 50.0, 50.0, 100.0, 50.0, 100.0,
50.0, 100.0, 50.0, 100.0, 0.0, 50.0, 0.0, 50.0};
static double AutoShapes8[] = {0.0, 50.0, 0.0, 22.385765, 100.0, 0.0, 44.77716, 0.0, 100.0, 0.0, 100.0, 0.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 44.77716, 100.0, 0.0, 50.0, 0.0, 77.615235};
static double AutoShapes9[] = {100.0, 50.0, 100.0, 77.615235, 0.0, 100.0, 55.22284, 100.0, 0.0, 100.0, 0.0, 100.0,
100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 44.77716, 100.0, 0.0, 50.0,
0.0, 77.615235};
static double AutoShapes9[] = {100.0, 50.0, 100.0, 77.615235, 0.0, 100.0,
55.22284, 100.0, 0.0, 100.0, 0.0, 100.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.22281, 0.0, 100.0, 50.0, 100.0, 22.385765};
static double AutoShapes10[] = {100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 44.7715,
50.0, 0.0, 22.3858, 0.0, 50.0, 0.0, 77.6152, 0.0, 100.0, 100.0, 100.0, 44.7715};
static double AutoShapes10[] = {100.0, 100.0, 100.0, 100.0, 0.0, 100.0, 0.0,
100.0, 0.0, 100.0, 0.0, 44.7715,
50.0, 0.0, 22.3858, 0.0, 50.0, 0.0, 77.6152, 0.0, 100.0, 100.0, 100.0,
44.7715};
static double AutoShapes11[] = {100.0, 0.0, 100.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 55.2285, 50.0, 100.0,
22.3858, 100.0, 50.0, 100.0, 77.6152, 100.0, 100.0, 0.0, 100.0, 55.2285};
static double AutoShapes12[] = {0.0, 50.0, 0.0, 50.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0, 100.0, 0.0,
272,12 → 297,12
Path.resize(0);
AutoShapes = getShapeData(nr, &count);
for (int a = 0; a < count-3; a += 4)
{
if (AutoShapes[a] < 0)
{
if (AutoShapes[a] < 0)
{
Path.setMarker();
continue;
}
}
double x1 = 16 * AutoShapes[a] / 100.0;
double y1 = 16 * AutoShapes[a+1] / 100.0;
double x2 = 16 * AutoShapes[a+2] / 100.0;
284,7 → 309,7
double y2 = 16 * AutoShapes[a+3] / 100.0;
Path.addPoint(x1, y1);
Path.addPoint(x2, y2);
}
}
ScPainter *painter = new ScPainter(&Ico, 22, 22);
painter->setBrush(qRgb(230, 230, 230));
painter->setPen(qRgb(0, 0, 0));
303,15 → 328,15
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++;
}
}
}
}
Ico.convertFromImage(image);
// Ico.setMask( Ico.createHeuristicMask() );
return Ico;
/trunk/Scribus/scribus/cmsprefs.cpp
125,10 → 125,12
RenderLayout->addWidget( Text22, 1, 0 );
 
MonitorI = new QComboBox( true, Render, "MonitorI" );
QString tmp_mp[] = { tr("Perceptual"), tr("Relative Colorimetric"), tr("Saturation"), tr("Absolute Colorimetric")};
QString tmp_mp[] = { tr("Perceptual"), tr("Relative Colorimetric"),
tr("Saturation"), tr("Absolute Colorimetric")};
size_t array = sizeof(tmp_mp) / sizeof(*tmp_mp);
for (uint a = 0; a < array; ++a)
MonitorI->insertItem(tmp_mp[a]);
/* PFJ - 29.02.04 - Changed from uint to int and var name */
for (uint prop = 0; prop < array; ++prop)
MonitorI->insertItem(tmp_mp[prop]);
MonitorI->setMinimumSize( QSize( 190, 22 ) );
MonitorI->setEditable(false);
MonitorI->setCurrentItem(Vor->DefaultIntentMonitor);
136,8 → 138,9
RenderLayout->addWidget( MonitorI, 0, 1 );
 
PrinterI = new QComboBox( true, Render, "PrinterI" );
for (uint a = 0; a < array; ++a)
PrinterI->insertItem(tmp_mp[a]);
/* PFJ - 29.02.04 - Changed from uint to int and varname */
for (int prop = 0; prop < array; ++prop)
PrinterI->insertItem(tmp_mp[prop]);
PrinterI->setMinimumSize( QSize( 190, 22 ) );
PrinterI->setEditable(false);
PrinterI->setCurrentItem(Vor->DefaultIntentPrinter);
/trunk/Scribus/scribus/buttonicon.cpp
17,8 → 17,9
QString tmp_pla[] = { tr("Caption only"), tr("Icon only"), tr("Caption below Icon"), tr("Caption above Icon"),
tr("Caption right to Icon"), tr("Caption left to Icon"), tr("Caption overlays Icon")};
size_t array_pla = sizeof(tmp_pla) / sizeof(*tmp_pla);
for (uint a = 0; a < array_pla; ++a)
Place->insertItem(tmp_pla[a]);
/* PFJ - 29/02/04 - Changed from uint to int and var name */
for (uint prop = 0; prop < array_pla; ++prop)
Place->insertItem(tmp_pla[prop]);
Place->setEditable(false);
Layout1->addWidget( Place, 0, 1 );
TextLabel1 = new QLabel( this, "TextLabel1" );
25,10 → 26,13
TextLabel1->setText( tr( "Scale:" ) );
Layout1->addWidget( TextLabel1, 1, 0 );
ScaleW = new QComboBox( true, this, "ScaleW" );
ScaleW->insertItem( tr( "Always" ) );
ScaleW->insertItem( tr( "When Icon is too small" ) );
ScaleW->insertItem( tr( "When Icon is too big" ) );
ScaleW->insertItem( tr( "Never" ) );
/* PFJ - 29/02/04 - Changed to QString/size_t/for style. It saves a small
of time during the setup */
QString scalew[] = {tr("Always"), tr("When Icon it too small"),
tr("When Icon is too big"), tr("Never")};
size_t scalewArray = sizeof(scalew) / sizeof(*scalew);
for (uint prop = 0; prop < scalewArray; ++prop)
ScaleW->insertItem(scalew[prop]);
ScaleW->setEditable(false);
Layout1->addWidget( ScaleW, 1, 1 );
TextLabel2 = new QLabel( this, "TextLabel2" );
/trunk/Scribus/scribus/druck.cpp
338,11 → 338,12
ToSeparation = false;
 
SepArt = new QComboBox( true, ButtonGroup3, "SepArt" );
SepArt->insertItem( tr( "All" ) );
SepArt->insertItem( tr("Cyan"));
SepArt->insertItem( tr("Magenta"));
SepArt->insertItem( tr("Yellow"));
SepArt->insertItem( tr("Black"));
/* PFJ - 29.02.04 - Altered to QString, size_t, for */
QString sep[] = {tr("All"), tr("Cyan"), tr("Magenta"), tr("Yellow"),
tr("Black")};
size_t sepArray = sizeof(sep) / sizeof(*sep);
for (uint prop = 0; prop < sepArray; ++prop)
SepArt->insertItem(sep[prop]);
SepArt->setEnabled( false );
SepArt->setEditable( false );
ButtonGroup3Layout->addWidget( SepArt );
498,14 → 499,16
 
void Druck::SelComm()
{
/* PFJ - 29.02.04 - removed OthText, Command and PrintDest from switch */
bool test = OtherCom->isChecked() ? true : false;
OthText->setEnabled(test);
Command->setEnabled(test);
PrintDest->setEnabled(!test);
if (OtherCom->isChecked())
{
OthText->setEnabled(true);
Command->setEnabled(true);
DateiT->setEnabled(false);
LineEdit1->setEnabled(false);
ToolButton1->setEnabled(false);
PrintDest->setEnabled(false);
ToFile = false;
#ifdef HAVE_CUPS
OptButton->setEnabled(false);
513,9 → 516,6
}
else
{
OthText->setEnabled(false);
Command->setEnabled(false);
PrintDest->setEnabled(true);
SelPrinter(PrintDest->currentText());
#ifdef HAVE_CUPS
if (Geraet != tr("File"))
/trunk/Scribus/scribus/hruler.cpp
62,7 → 62,8
switch (doku->Einheit)
{
case 0:
if (sc > 1)
/* PFJ - 29.02.04 - Altered so the if isn't executed twice. Repeated */
if (sc > 1 && sc <= 4)
cor = 2;
if (sc > 4)
cor = 10;
78,34 → 79,34
case 2:
iter = 18.0;
iter2 = 72.0;
if (sc > 1)
{
if (sc > 1 && sc <= 4)
{
cor = 2;
iter = 9.0;
iter2 = 36.0;
}
}
if (sc > 4)
{
{
iter = 9.0;
iter2 = 18.0;
cor = 4;
}
}
break;
case 3:
iter = 12.0;
iter2 = 120.0;
if (sc > 1)
{
if (sc > 1 && sc <= 4)
{
cor = 1;
iter = 12.0;
iter2 = 60.0;
}
}
if (sc > 4)
{
{
cor = 2;
iter = 6.0;
iter2 = 12.0;
}
}
break;
}
QPainter p;
/trunk/Scribus/scribus/annota.cpp
50,18 → 50,19
Layout1->addWidget( TextLabel1 );
 
ComboBox1 = new QComboBox( true, this, "ComboBox1" );
ComboBox1->insertItem( tr( "Text" ) );
ComboBox1->insertItem( tr( "Link" ) );
ComboBox1->insertItem( tr( "External Link" ) );
ComboBox1->insertItem( tr( "External Web-Link" ) );
/* PFJ - 28/02/04 - Changed to QString/size_t/for style */
QString combo[] = { tr("Text"), tr("Link"), tr("External Link"),
tr("External Web-Link")};
size_t comboArray = sizeof(combo)/sizeof(*combo);
for (uint prop = 0; prop < comboArray; ++prop)
ComboBox1->insertItem(combo[prop]);
ComboBox1->setEditable(false);
Layout1->addWidget( ComboBox1 );
AnnotLayout->addLayout( Layout1 );
item->AnType < 2 ? ComboBox1->setCurrentItem(item->AnType) : ComboBox1->setCurrentItem(item->AnType-10);
if (item->AnActType == 7)
ComboBox1->setCurrentItem(2);
if (item->AnActType == 8)
ComboBox1->setCurrentItem(3);
item->AnType < 2 ? ComboBox1->setCurrentItem(item->AnType):
ComboBox1->setCurrentItem(item->AnType-10);
if ((item->AnActType == 7) || (item->AnActType == 8))
ComboBox1->setCurrentItem(item->AnActType - 5);
Fram = new QWidgetStack(this);
AnnotLayout->addWidget( Fram );
 
200,34 → 201,37
QString tmp, tmp2;
item->AnZiel = SpinBox1->value()-1;
item->AnType = ComboBox1->currentItem()+10;
if (item->AnType == 10)
item->AnActType = 0;
if (item->AnType == 11)
switch (item->AnType)
{
item->AnAction = tmp.setNum(SpinBox2->value())+" "+tmp2.setNum(Hoehe-SpinBox3->value())+" 0";
item->An_Extern = "";
item->AnActType = 2;
case 10:
item->AnActType = 0;
break;
case 11:
item->AnAction = tmp.setNum(SpinBox2->value())+" "+
tmp2.setNum(Hoehe-SpinBox3->value())+" 0";
item->An_Extern = "";
item->AnActType = 2;
break;
case 12:
item->AnAction = tmp.setNum(SpinBox2->value())+" "+
tmp2.setNum(Hoehe-SpinBox3->value())+" 0";
if (Destfile->text() != "")
{
item->An_Extern = Destfile->text();
item->AnActType = 7;
}
item->AnType = 11;
break;
case 13:
item->AnAction = "";
if (Destfile->text() != "")
{
item->An_Extern = Destfile->text();
item->AnActType = 8;
}
item->AnType = 11;
break;
}
if (item->AnType == 12)
{
item->AnAction = tmp.setNum(SpinBox2->value())+" "+tmp2.setNum(Hoehe-SpinBox3->value())+" 0";
if (Destfile->text() != "")
{
item->An_Extern = Destfile->text();
item->AnActType = 7;
}
item->AnType = 11;
}
if (item->AnType == 13)
{
item->AnAction = "";
if (Destfile->text() != "")
{
item->An_Extern = Destfile->text();
item->AnActType = 8;
}
item->AnType = 11;
}
accept();
}
 
/trunk/Scribus/scribus/applytemplate.cpp
37,7 → 37,8
buttonGroup1Layout->setAlignment( Qt::AlignTop );
 
SinglePage = new QRadioButton( buttonGroup1, "radioButton1" );
SinglePage->setChecked( TRUE );
/* PFJ - 28/02/04 - altered from TRUE to true */
SinglePage->setChecked( true );
SinglePage->setText( tr( "Apply to Current Page" ) );
buttonGroup1Layout->addWidget( SinglePage );
 
/trunk/Scribus/scribus/fontprefs.cpp
91,7 → 91,8
Table1->setLeftMargin(0);
Table1->verticalHeader()->hide();
Header = Table1->horizontalHeader();
QString tmp_head[] = { tr("Font Name"), tr("Use Font"), tr("Embed in:"), tr("Subset"), tr("Type"), tr("Path to Font File")};
QString tmp_head[] = { tr("Font Name"), tr("Use Font"), tr("Embed in:"),
tr("Subset"), tr("Type"), tr("Path to Font File")};
size_t array_head = sizeof(tmp_head) / sizeof(*tmp_head);
for (uint a = 0; a < array_head; ++a)
Header->setLabel(a, tmp_head[a]);
/trunk/Scribus/scribus/cmykcolor.cpp
15,6 → 15,11
* *
***************************************************************************/
 
/* PFJ - 29.02.04 - Added iostream, iomanip and sstream for CMYK::name */
/*
#include <iostream>
#include <iomanip>
#include <sstream> */
#include "cmykcolor.h"
 
#if (_MSC_VER >= 1200)
97,6 → 102,17
 
QString CMYKColor::name()
{
/* PFJ - 29.02.04 - rewritten to use setw and setfill */
// doesn't compile here, so i replaced it with the old code F.S.
/* QString tmp2;
std::ostringstream tmp;
tmp << std::setw(2) << std::setfill('0') << C
<< std::setw(2) << M
<< std::setw(2) << Y
<< std::setw(2) << K;
tmp2 = "#" + tmp.str();
return tmp2;
*/
QString tmp, tmp2;
tmp2 = "#";
tmp.setNum(C, 16);
/trunk/Scribus/scribus/editformats.cpp
87,13 → 87,13
void StilFormate::selFormat(QListBoxItem *c)
{
for (uint x = 5; x < TempVorl.count(); ++x)
{
if (TempVorl[x].Vname == c->text())
{
if (TempVorl[x].Vname == c->text())
{
sFnumber = x;
break;
}
}
}
EditB->setEnabled(true);
DublicateB->setEnabled(true);
DeleteB->setEnabled(true);
176,7 → 176,8
tr("No"),
tr("Yes"),
0, QMessageBox::No, QMessageBox::Yes);
if (exit == 1)
/* PFJ - 29.02.04 - Altered to use the correct QMessageBox value. It was 1 */
if (exit == QMessageBox::Yes)
{
ListBox1->removeItem(sFnumber);
TempVorl.remove(TempVorl.at(sFnumber));
250,6 → 251,7
EditB->setEnabled(false);
DeleteB->setEnabled(false);
}
ListBox1->sort( TRUE );
/* PFJ - 29.02.04 - Altered from TRUE to true */
ListBox1->sort( true );
ListBox1->setSelected(ListBox1->currentItem(), false);
}
/trunk/Scribus/scribus/cupsoptions.cpp
79,7 → 79,8
Marked = "";
struct OpData Daten;
opts.clear();
for (j = option->num_choices, choice = option->choices; j > 0; j --, ++choice)
for (j = option->num_choices, choice = option->choices;
j > 0; j --, ++choice)
{
opts.append(QString(choice->choice));
if (choice->marked)