Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 111 → Rev 112

/trunk/Scribus/ChangeLogCVS
1,4 → 1,8
Changes since Version 1.1.2
23.11.2003 Added a "Revert to Saved" Option to the File Menu.
Changed Behaviour of the Home and End Key in the Story Editor.
Fixed Item Name issues.
 
22.11.2003 Added Group/Ungroup Items to Right Mouse Click Context Menu.
The Fontsize is now a float, you can have now Fontsize like 12.3 pt
Managed Guides is now available for Template Pages too.
/trunk/Scribus/scribus/pdfopts.cpp
127,8 → 127,8
TextLabel1x->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
GroupBox1Layout->addWidget( TextLabel1x, 1, 0 );
ComboBind = new QComboBox( true, GroupBox1, "ComboBind" );
ComboBind->insertItem(tr("Left Margin"));
ComboBind->insertItem(tr("Right Margin"));
ComboBind->insertItem( tr("Left Margin"));
ComboBind->insertItem( tr("Right Margin"));
ComboBind->setEditable(false);
ComboBind->setCurrentItem(Optionen->Binding);
GroupBox1Layout->addMultiCellWidget( ComboBind, 1, 1, 1, 2, AlignLeft );
274,7 → 274,7
{
for (uint pg2 = 0; pg2 < vie->Pages.count(); ++pg2)
{
Pages->insertItem(tr("Page")+" "+tmp.setNum(pg2+1));
Pages->insertItem( tr("Page")+" "+tmp.setNum(pg2+1));
if (EffVal.count()-1 < pg2)
{
ef.EffektLen = 1;
291,7 → 291,7
{
for (uint pg = 0; pg < vie->Pages.count(); ++pg)
{
Pages->insertItem(tr("Page")+" "+tmp.setNum(pg+1));
Pages->insertItem( tr("Page")+" "+tmp.setNum(pg+1));
ef.EffektLen = 1;
ef.AnzeigeLen = 1;
ef.Effekt = 0;
1013,7 → 1013,7
{
for (uint pg = 0; pg < view->Pages.count(); pg++)
{
Pages->changeItem(tr("Page")+" "+tmp.setNum(pg+1), pg);
Pages->changeItem( tr("Page")+" "+tmp.setNum(pg+1), pg);
}
}
if (ci != -1)
/trunk/Scribus/scribus/align.cpp
7,7 → 7,7
: QDialog( parent, "al", true, 0 )
{
Anzahl = anz;
Anzahl > 2 ? setCaption(tr("Distribute/Align")) : setCaption(tr("Align"));
Anzahl > 2 ? setCaption( tr("Distribute/Align")) : setCaption( tr("Align"));
setIcon(loadIcon("AppIcon.png"));
AlignLayout = new QVBoxLayout( this );
AlignLayout->setSpacing( 0 );
31,9 → 31,9
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"));
VartH->insertItem( tr("Left Sides"));
VartH->insertItem( tr("Middles"));
VartH->insertItem( tr("Right Sides"));
VartH->setEditable(false);
ButtonGroup1Layout->addMultiCellWidget( VartH, 0, 0, 1, 2 );
NichtsH = new QRadioButton( ButtonGroup1, "NichtsH" );
79,9 → 79,9
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->insertItem( tr("Top Sides"));
VartV->insertItem( tr("Middles"));
VartV->insertItem( tr("Bottom Sides"));
VartV->setEditable(false);
ButtonGroup1_2Layout->addMultiCellWidget( VartV, 0, 0, 1, 2 );
NichtsV = new QRadioButton( ButtonGroup1_2, "NichtsH" );
/trunk/Scribus/scribus/customfdialog.cpp
148,7 → 148,7
if (au2 == "")
au2 = tr("Unknown");
Aut += au2;
setText(tr("Scribus-Document")+"\n\n"+Tit+Aut);
setText( tr("Scribus-Document")+"\n\n"+Tit+Aut);
}
else
setText(Buffer.left(200));
180,7 → 180,7
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
SaveZip = new QCheckBox(Layout, "test");
SaveZip->setText(tr("Compress File"));
SaveZip->setText( tr("Compress File"));
Layout1->addWidget(SaveZip);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
200,7 → 200,7
Layout1C->setSpacing( 0 );
Layout1C->setMargin( 4 );
TxCodeT = new QLabel(this);
TxCodeT->setText(tr("Encoding:"));
TxCodeT->setText( tr("Encoding:"));
TxCodeM = new QComboBox(true, LayoutC, "Cod");
TxCodeM->setEditable(false);
TxCodeM->insertItem("ISO 8859-1");
255,7 → 255,7
connect(SaveZip, SIGNAL(clicked()), this, SLOT(HandleComp()));
HomeB = new QToolButton(this);
HomeB->setIconSet(loadIcon("gohome.png"));
HomeB->setTextLabel(tr("Moves to your Document Directory.\nThis can be set in the Preferences."));
HomeB->setTextLabel( tr("Moves to your Document Directory.\nThis can be set in the Preferences."));
connect(HomeB, SIGNAL(clicked()), this, SLOT(slotHome()));
addToolButton(HomeB);
}
/trunk/Scribus/scribus/mpalette.cpp
425,10 → 425,10
layout41->addMultiCellWidget( Fonts, 0, 0, 0, 1 );
 
Text20 = new QLabel( page_3, "Text20" );
Text20->setText(tr("Size:"));
Text20->setText( tr("Size:"));
layout41->addWidget( Text20, 1, 0 );
Size = new MSpinBox( page_3, 1 );
Size->setPrefix( tr( "" ) );
Size->setPrefix( "" );
Size->setSuffix( tr( " pt" ) );
Size->setMaxValue( 3000 );
Size->setMinValue( -3000 );
437,7 → 437,7
 
layout22 = new QHBoxLayout( 0, 0, 5, "layout22");
ScaleTxt = new QLabel( page_3, "ScaleTxt" );
ScaleTxt->setText(tr("Width:"));
ScaleTxt->setText( tr("Width:"));
layout22->addWidget( ScaleTxt );
ChScale = new QSpinBox( page_3, "ChScale" );
ChScale->setMaxValue( 400 );
449,7 → 449,7
 
layout23 = new QHBoxLayout( 0, 0, 5, "layout23");
StrokeIcon = new QLabel( page_3, "StrokeIcon" );
StrokeIcon->setText( tr( "" ) );
StrokeIcon->setText("");
StrokeIcon->setPixmap(loadIcon("Stiftalt.xpm"));
StrokeIcon->setScaledContents( FALSE );
layout23->addWidget( StrokeIcon );
457,7 → 457,7
TxStroke->setEditable(false);
layout23->addWidget( TxStroke );
TxStrokeSh = new QPopupMenu();
TxStrokeSh->insertItem(tr("Other..."));
TxStrokeSh->insertItem( tr("Other..."));
TxStrokeSh->insertItem("0 %");
TxStrokeSh->insertItem("10 %");
TxStrokeSh->insertItem("20 %");
481,7 → 481,7
layout46->addLayout( layout23 );
layout24 = new QHBoxLayout( 0, 0, 5, "layout24");
FillIcon = new QLabel( page_3, "FillIcon" );
FillIcon->setText(tr(""));
FillIcon->setText("");
FillIcon->setPixmap(loadIcon("fill.png"));
FillIcon->setScaledContents( FALSE );
layout24->addWidget( FillIcon );
489,7 → 489,7
TxFill->setEditable(false);
layout24->addWidget( TxFill );
TxFillSh = new QPopupMenu();
TxFillSh->insertItem(tr("Other..."));
TxFillSh->insertItem( tr("Other..."));
TxFillSh->insertItem("0 %");
TxFillSh->insertItem("10 %");
TxFillSh->insertItem("20 %");
516,7 → 516,7
 
Underline = new QToolButton( page_3, "Underline" );
Underline->setMaximumSize( QSize( 22, 22 ) );
Underline->setText( tr( "" ) );
Underline->setText("");
Underline->setPixmap(loadIcon("Unter.xpm"));
Underline->setToggleButton( true );
Layout1->addWidget( Underline );
523,7 → 523,7
 
ButtonGroup1 = new QButtonGroup( page_3, "ButtonGroup1" );
ButtonGroup1->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup1->setTitle( tr( "" ) );
ButtonGroup1->setTitle("");
ButtonGroup1->setExclusive( true );
ButtonGroup1->setRadioButtonExclusive( false );
ButtonGroup1->setColumnLayout(0, Qt::Vertical );
534,7 → 534,7
 
Subs = new QToolButton( ButtonGroup1, "Subs" );
Subs->setMaximumSize( QSize( 22, 22 ) );
Subs->setText( tr( "" ) );
Subs->setText("");
Subs->setPixmap(loadIcon("Tief.xpm"));
Subs->setToggleButton( true );
ButtonGroup1Layout->addWidget( Subs );
541,7 → 541,7
 
Supers = new QToolButton( ButtonGroup1, "Supers" );
Supers->setMaximumSize( QSize( 22, 22 ) );
Supers->setText( tr( "" ) );
Supers->setText("");
Supers->setPixmap(loadIcon("Hoch.xpm"));
Supers->setToggleButton( true );
ButtonGroup1Layout->addWidget( Supers );
549,7 → 549,7
 
Kapital = new QToolButton( page_3, "Kapital" );
Kapital->setMaximumSize( QSize( 22, 22 ) );
Kapital->setText( tr( "" ) );
Kapital->setText("");
Kapital->setPixmap(loadIcon("Kapital.xpm"));
Kapital->setToggleButton( true );
Layout1->addWidget( Kapital );
556,7 → 556,7
 
Strike = new QToolButton( page_3, "Strike" );
Strike->setMaximumSize( QSize( 22, 22 ) );
Strike->setText( tr( "" ) );
Strike->setText("");
Strike->setPixmap(loadIcon("Strike.xpm"));
Strike->setToggleButton( true );
Layout1->addWidget( Strike );
563,7 → 563,7
 
Outlined = new QToolButton( page_3, "Outlined" );
Outlined->setMaximumSize( QSize( 22, 22 ) );
Outlined->setText( tr( "" ) );
Outlined->setText("");
Outlined->setPixmap(loadIcon("outlined.png"));
Outlined->setToggleButton( true );
Layout1->addWidget( Outlined );
570,7 → 570,7
 
Revert = new QToolButton( page_3, "Bold" );
Revert->setMaximumSize( QSize( 22, 22 ) );
Revert->setText( tr( "" ) );
Revert->setText("");
Revert->setPixmap(loadIcon("Revers.png"));
Revert->setToggleButton( true );
Layout1->addWidget( Revert );
582,7 → 582,7
 
GroupAlign = new QButtonGroup( page_3, "GroupAlign" );
GroupAlign->setFrameShape( QButtonGroup::NoFrame );
GroupAlign->setTitle( tr( "" ) );
GroupAlign->setTitle("");
GroupAlign->setExclusive( true );
GroupAlign->setColumnLayout(0, Qt::Vertical );
GroupAlign->layout()->setSpacing( 0 );
661,7 → 661,7
 
layoutLang = new QHBoxLayout( 0, 0, 5, "layout24");
SprachT = new QLabel( page_3, "Sprache" );
SprachT->setText(tr("Lang.:"));
SprachT->setText( tr("Lang.:"));
layoutLang->addWidget( SprachT );
LangCombo = new QComboBox( true, page_3, "Lang" );
LangCombo->setEditable(false);
809,7 → 809,7
pageLayout_5->addLayout( Layout12_2 );
 
StyledLine = new QListBox(page_5, "StyledL");
StyledLine->insertItem(tr("No Style"));
StyledLine->insertItem( tr("No Style"));
pageLayout_5->addWidget(StyledLine);
 
QSpacerItem* spacer11 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
2265,7 → 2265,7
StyledLine->clear();
if (dd != 0)
{
StyledLine->insertItem(tr("No Style"));
StyledLine->insertItem( tr("No Style"));
QMap<QString,multiLine>::Iterator it;
for (it = doc->MLineStyles.begin(); it != doc->MLineStyles.end(); ++it)
{
2301,8 → 2301,8
TxStroke->clear();
CListe::Iterator it;
QPixmap pm = QPixmap(15, 15);
TxFill->insertItem(tr("None"));
TxStroke->insertItem(tr("None"));
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());
2617,9 → 2617,12
}
else
{
CurItem->AnName = NameEdit->text();
CurItem->AutoName = false;
emit DocChanged();
if (CurItem->AnName != NameEdit->text())
{
CurItem->AnName = NameEdit->text();
CurItem->AutoName = false;
emit DocChanged();
}
}
}
 
/trunk/Scribus/scribus/edit1format.cpp
241,8 → 241,9
{
if (Name->text() == allV[x].Vname)
{
QMessageBox::information(this,tr("Warning"),tr("Name of the Style is not unique"),tr("OK"),0, 0, 0, 1);
QMessageBox::information(this, tr("Warning"), tr("Name of the Style is not unique"), tr("OK"),0, 0, 0, 1);
Name->selectAll();
Name->setFocus();
return;
}
}
255,8 → 256,9
{
if (Name->text() == allV[x].Vname)
{
QMessageBox::information(this,tr("Warning"),tr("Name of the Style is not unique"),tr("OK"),0, 0, 0, 1);
QMessageBox::information(this, tr("Warning"), tr("Name of the Style is not unique"), tr("OK"),0, 0, 0, 1);
Name->selectAll();
Name->setFocus();
return;
}
}
/trunk/Scribus/scribus/story.cpp
57,6 → 57,8
STable::STable(QWidget* parent) : QTable(parent)
{
setShowGrid(false);
HomeK = 0;
EndK = 0;
}
 
void STable::keyPressEvent(QKeyEvent *k)
71,7 → 73,11
{
tt = (SEditor*)cellWidget(r, 1);
if ((k->key() == Key_Prior) || (k->key() == Key_Next))
{
HomeK = 0;
EndK = 0;
return;
}
if ((k->key() == Key_Left)
|| (k->key() == Key_Right)
|| (k->key() == Key_Down)
84,14 → 90,42
switch (k->key())
{
case Key_Home:
tt = (SEditor*)cellWidget(0, 1);
setCurrentCell(0, 1);
move = QTextEdit::MoveLineStart;
EndK = 0;
HomeK++;
switch (HomeK)
{
case 1:
move = QTextEdit::MoveLineStart;
break;
case 2:
move = QTextEdit::MoveHome;
break;
case 3:
tt = (SEditor*)cellWidget(0, 1);
setCurrentCell(0, 1);
move = QTextEdit::MoveHome;
HomeK = 0;
break;
}
break;
case Key_End:
tt = (SEditor*)cellWidget(n-1, 1);
setCurrentCell(n-1, 1);
move = QTextEdit::MoveEnd;
HomeK = 0;
EndK++;
switch (EndK)
{
case 1:
move = QTextEdit::MoveLineEnd;
break;
case 2:
move = QTextEdit::MoveEnd;
break;
case 3:
tt = (SEditor*)cellWidget(n-1, 1);
setCurrentCell(n-1, 1);
move = QTextEdit::MoveEnd;
EndK = 0;
break;
}
break;
case Key_Left:
if ((i == 0) && (r > 0))
136,6 → 170,10
move = QTextEdit::MoveDown;
break;
}
if (k->key() != Key_Home)
HomeK = 0;
if (k->key() != Key_End)
EndK = 0;
tt->moveCursor(move, false);
tt->setFocus();
updateHeaderStates();
142,6 → 180,8
return;
}
}
HomeK = 0;
EndK = 0;
QTable::keyPressEvent(k);
}
 
166,11 → 206,11
Form1Layout = new QHBoxLayout( this, 5, 5, "Form1Layout");
edList.clear();
stList.clear();
style.append(tr("Left"));
style.append(tr("Center"));
style.append(tr("Right"));
style.append(tr("Block"));
style.append(tr("Forced"));
style.append( tr("Left"));
style.append( tr("Center"));
style.append( tr("Right"));
style.append( tr("Block"));
style.append( tr("Forced"));
if (doc->Vorlagen.count() > 5)
{
for (uint a = 5; a < doc->Vorlagen.count(); ++a)
182,14 → 222,14
 
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(Do_new()), CTRL+Key_N);
/* fmenu->insertItem(tr("Save as..."), this, SLOT(SaveAs()));
/* fmenu->insertItem( tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(LoadScript()));
fmenu->insertSeparator(); */
fmenu->insertItem(tr("Save and Exit"), this, SLOT(accept()));
fmenu->insertItem(tr("Exit without Saving"), this, SLOT(Do_leave()));
fmenu->insertItem( tr("Save and Exit"), this, SLOT(accept()));
fmenu->insertItem( tr("Exit without Saving"), this, SLOT(Do_leave()));
emenu = new QPopupMenu();
emenu->insertItem(tr("Undo"), this, SLOT(Do_undo()), CTRL+Key_Z);
emenu->insertItem(tr("Redo"), this, SLOT(Do_redo()));
emenu->insertItem( tr("Undo"), this, SLOT(Do_undo()), CTRL+Key_Z);
emenu->insertItem( tr("Redo"), this, SLOT(Do_redo()));
emenu->insertSeparator();
emenu->insertItem(loadIcon("editcut.png"), tr("Cut"), this, SLOT(Do_cut()), CTRL+Key_X);
emenu->insertItem(loadIcon("editcopy.png"), tr("Copy"), this, SLOT(Do_copy()), CTRL+Key_C);
196,10 → 236,11
emenu->insertItem(loadIcon("editpaste.png"), tr("Paste"), this, SLOT(Do_paste()), CTRL+Key_V);
emenu->insertItem(loadIcon("editdelete.png"), tr("Clear"), this, SLOT(Do_del()), CTRL+Key_V);
emenu->insertSeparator();
emenu->insertItem(tr("Update Textframe"), this, SLOT(updateTextFrame()));
emenu->insertItem( tr("Edit Styles..."), this , SLOT(slotEditStyles()));
emenu->insertItem( tr("Update Textframe"), this, SLOT(updateTextFrame()));
menuBar = new QMenuBar(this);
menuBar->insertItem(tr("File"), fmenu);
menuBar->insertItem(tr("Edit"), emenu);
menuBar->insertItem( tr("File"), fmenu);
menuBar->insertItem( tr("Edit"), emenu);
Form1Layout->setMenuBar( menuBar );
table1 = new STable( this );
table1->setNumCols( 2 );
367,6 → 408,40
emit DocChanged();
}
 
void StoryEditor::slotEditStyles()
{
int sty;
QComboBox *ct;
emit EditSt();
style.clear();
style.append( tr("Left"));
style.append( tr("Center"));
style.append( tr("Right"));
style.append( tr("Block"));
style.append( tr("Forced"));
if (doc->Vorlagen.count() > 5)
{
for (uint a = 5; a < doc->Vorlagen.count(); ++a)
{
style.append(doc->Vorlagen[a].Vname);
}
}
for (uint b = 0; b < stList.count(); ++b)
{
ct = stList.at(b);
sty = ct->currentItem();
if (sty > static_cast<int>(doc->Vorlagen.count()-1))
sty = 0;
disconnect(ct, SIGNAL(activated(int)), this, SLOT(styleChange(int)));
ct->clear();
ct->insertStringList(style);
connect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
ct->setCurrentItem(sty);
disconnect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
connect(ct, SIGNAL(activated(int)), this, SLOT(styleChange(int)));
}
}
 
void StoryEditor::styleChange(int st)
{
int r = stList.findRef((QComboBox*)sender());
437,6 → 512,8
void StoryEditor::modifiedText()
{
TextChanged = true;
table1->HomeK = 0;
table1->EndK = 0;
}
 
void StoryEditor::WrapHandler()
/trunk/Scribus/scribus/scrap.cpp
131,7 → 131,7
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(NewLib()), CTRL+Key_N);
fSave = fmenu->insertItem(loadIcon("DateiSave16.png"), tr("Save"), this, SLOT(Save()), CTRL+Key_S);
fmenu->insertItem(tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem( tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(Load()), CTRL+Key_O);
fmenu->insertItem(loadIcon("DateiClos16.png"), tr("Close"), this, SLOT(CloseWin()));
vmenu = new QPopupMenu();
151,8 → 151,8
break;
}
menuBar = new QMenuBar(this);
menuBar->insertItem(tr("File"), fmenu);
menuBar->insertItem(tr("Preview"), vmenu);
menuBar->insertItem( tr("File"), fmenu);
menuBar->insertItem( tr("Preview"), vmenu);
BiblioLayout->setMenuBar( menuBar );
 
Frame3 = new QFrame( this, "Frame3" );
211,7 → 211,7
void Biblio::Load()
{
Save();
QString fileName = QFileDialog::getOpenFileName(0,tr("Scrapbooks (*.scs);;All Files (*)"),this);
QString fileName = QFileDialog::getOpenFileName(0, tr("Scrapbooks (*.scs);;All Files (*)"),this);
if (!fileName.isEmpty())
{
BibWin->ReadContents(fileName);
266,7 → 266,7
{
QPopupMenu *pmenu = new QPopupMenu();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
del = pmenu->insertItem(tr("Delete"));
del = pmenu->insertItem( tr("Delete"));
mret = pmenu->exec(QCursor::pos());
if (mret == del)
DeleteObj(ite->text(), ite);
280,7 → 280,7
BibWin->Objekte.clear();
BibWin->clear();
ScFilename = "";
setCaption(tr("Scrapbook"));
setCaption( tr("Scrapbook"));
fmenu->setItemEnabled(fSave, 0);
}
 
/trunk/Scribus/scribus/picstatus.cpp
90,14 → 90,14
PicTable->setText(Zeilen2, 1, fi.dirPath());
PicTable->setText(Zeilen2, 2, tmp.setNum(p+1));
QToolButton *tb2 = new QToolButton(this, tmp.setNum(Zeilen2));
tb2->setText(tr("Goto"));
tb2->setText( tr("Goto"));
tb2->setEraseColor(white);
tb2->setEnabled(false);
PicTable->setColumnWidth(3, tb2->fontMetrics().width(tr("Goto"))+10);
PicTable->setColumnWidth(3, tb2->fontMetrics().width( tr("Goto"))+10);
PicTable->setCellWidget(Zeilen2, 3, tb2);
connect(tb2, SIGNAL(clicked()), this, SLOT(GotoPic()));
QCheckBox *cp2 = new QCheckBox(this, tmp.setNum(Zeilen2));
cp2->setText(tr("Yes"));
cp2->setText( tr("Yes"));
cp2->setChecked(view->MasterPages.at(p)->Items.at(i)->isPrintable);
cp2->setEraseColor(white);
FlagsPic.append(cp2);
108,8 → 108,8
else
PicTable->setText(Zeilen2, 5, tr("Missing"));
QToolButton *tb = new QToolButton(this, tmp.setNum(Zeilen2));
tb->setText(tr("Search"));
PicTable->setColumnWidth(6, tb2->fontMetrics().width(tr("Search"))+10);
tb->setText( tr("Search"));
PicTable->setColumnWidth(6, tb2->fontMetrics().width( tr("Search"))+10);
tb->setEraseColor(white);
PicTable->setCellWidget(Zeilen2, 6, tb);
connect(tb, SIGNAL(clicked()), this, SLOT(SearchPic()));
128,13 → 128,13
PicTable->setText(Zeilen2, 1, fi.dirPath());
PicTable->setText(Zeilen2, 2, tmp.setNum(p+1));
QToolButton *tb2 = new QToolButton(this, tmp.setNum(Zeilen2));
tb2->setText(tr("Goto"));
tb2->setText( tr("Goto"));
tb2->setEraseColor(white);
PicTable->setColumnWidth(3, tb2->fontMetrics().width(tr("Goto"))+10);
PicTable->setColumnWidth(3, tb2->fontMetrics().width( tr("Goto"))+10);
PicTable->setCellWidget(Zeilen2, 3, tb2);
connect(tb2, SIGNAL(clicked()), this, SLOT(GotoPic()));
QCheckBox *cp2 = new QCheckBox(this, tmp.setNum(Zeilen2));
cp2->setText(tr("Yes"));
cp2->setText( tr("Yes"));
cp2->setChecked(view->Pages.at(p)->Items.at(i)->isPrintable);
cp2->setEraseColor(white);
FlagsPic.append(cp2);
145,8 → 145,8
else
PicTable->setText(Zeilen2, 5, tr("Missing"));
QToolButton *tb = new QToolButton(this, tmp.setNum(Zeilen2));
tb->setText(tr("Search"));
PicTable->setColumnWidth(6, tb2->fontMetrics().width(tr("Search"))+10);
tb->setText( tr("Search"));
PicTable->setColumnWidth(6, tb2->fontMetrics().width( tr("Search"))+10);
tb->setEraseColor(white);
PicTable->setCellWidget(Zeilen2, 6, tb);
connect(tb, SIGNAL(clicked()), this, SLOT(SearchPic()));
/trunk/Scribus/scribus/mergedoc.cpp
108,7 → 108,7
PageNr->setEnabled(true);
PageNr->setValue(1);
PageNr->setMaxValue(Count);
Inform->setText(tr("Document contains: %1 Page(s)").arg(Count));
Inform->setText( tr("Document contains: %1 Page(s)").arg(Count));
}
delete ss;
}
121,7 → 121,7
PageNr->setEnabled(false);
PageNr->setValue(0);
PageNr->setMaxValue(Count);
Inform->setText(tr("Document contains: %1 Page(s)").arg(Count));
Inform->setText( tr("Document contains: %1 Page(s)").arg(Count));
}
}
 
/trunk/Scribus/scribus/seiten.cpp
78,7 → 78,7
{
QPopupMenu *pmen = new QPopupMenu();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
int px = pmen->insertItem(tr("Show Page Previews"), this, SLOT(ToggleTh()));
int px = pmen->insertItem( tr("Show Page Previews"), this, SLOT(ToggleTh()));
if (Thumb)
pmen->setItemChecked(px, true);
pmen->exec(QCursor::pos());
151,7 → 151,7
{
QPopupMenu *pmen = new QPopupMenu();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
int px = pmen->insertItem(tr("Show Template Names"), this, SLOT(ToggleNam()));
int px = pmen->insertItem( tr("Show Template Names"), this, SLOT(ToggleNam()));
if (Namen)
pmen->setItemChecked(px, true);
pmen->exec(QCursor::pos());
725,7 → 725,7
else
{
if (it.key() == "Normal")
TemplList->insertItem(tr("Normal"));
TemplList->insertItem( tr("Normal"));
else
TemplList->insertItem(it.key());
}
/trunk/Scribus/scribus/guidemanager.cpp
83,7 → 83,7
Layout6->addWidget( HorGroup );
GuideManagerLayout->addLayout( Layout6 );
Lock = new QCheckBox(this, "Lock");
Lock->setText(tr("Lock Guides"));
Lock->setText( tr("Lock Guides"));
Lock->setChecked(page->doku->GuideLock);
GuideManagerLayout->addWidget(Lock);
Layout5 = new QHBoxLayout( 0, 0, 6, "Layout5");
/trunk/Scribus/scribus/hysettings.cpp
14,11 → 14,11
 
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
Verbose = new QCheckBox(this, "Verbose");
Verbose->setText(tr("Fully Automatic"));
Verbose->setText( tr("Fully Automatic"));
Layout3->addMultiCellWidget(Verbose, 0, 0, 0, 1);
QToolTip::add( Verbose, tr( "If you uncheck this you will get a dialog\neverytime a possible Hyphenation is found." ) );
Input = new QCheckBox(this, "inp");
Input->setText(tr("Check during Typing"));
Input->setText( tr("Check during Typing"));
Layout3->addMultiCellWidget(Input, 1, 1, 0, 1);
QToolTip::add(Input, tr("Enables automatic checking of your text while typing."));
Language = new QComboBox( true, this, "Language" );
/trunk/Scribus/scribus/cpalette.cpp
50,7 → 50,7
Layout1->addItem( spacer );
Mode = 2;
ShaMenu = new QPopupMenu();
ShaMenu->insertItem(tr("Other..."));
ShaMenu->insertItem( tr("Other..."));
ShaMenu->insertItem("0 %");
ShaMenu->insertItem("10 %");
ShaMenu->insertItem("20 %");
77,12 → 77,12
GradCombo = new QComboBox( true, this, "GradCombo" );
GradCombo->setEditable(false);
GradCombo->setFont(fo);
GradCombo->insertItem(tr("Normal"));
GradCombo->insertItem(tr("Horizontal Gradient"));
GradCombo->insertItem(tr("Vertical Gradient"));
GradCombo->insertItem(tr("Diagonal Gradient"));
GradCombo->insertItem(tr("Cross Diagonal Gradient"));
GradCombo->insertItem(tr("Radial Gradient"));
GradCombo->insertItem( tr("Normal"));
GradCombo->insertItem( tr("Horizontal Gradient"));
GradCombo->insertItem( tr("Vertical Gradient"));
GradCombo->insertItem( tr("Diagonal Gradient"));
GradCombo->insertItem( tr("Cross Diagonal Gradient"));
GradCombo->insertItem( tr("Radial Gradient"));
GradCombo->setCurrentItem(0);
GradLayout->addWidget( GradCombo );
GradGroup = new QButtonGroup( this, "GradGroup" );
106,7 → 106,7
TransGroup = new QButtonGroup( this, "GradGroup" );
TransGroup->setFrameShape( QButtonGroup::NoFrame );
TransGroup->setFrameShadow( QButtonGroup::Plain );
TransGroup->setTitle( tr( "" ) );
TransGroup->setTitle("");
TransGroup->setColumnLayout(0, Qt::Vertical );
TransGroup->layout()->setSpacing( 5 );
TransGroup->layout()->setMargin( 0 );
119,7 → 119,7
TransSpin->setMinValue(0);
TransSpin->setMaxValue(100);
TransSpin->setLineStep(10);
TransSpin->setSuffix(tr(" %"));
TransSpin->setSuffix( tr(" %"));
TransSpin->setValue(100);
TransGroupLayout->addWidget( TransSpin );
GradLayout->addWidget( TransGroup );
190,7 → 190,7
CListe::Iterator it;
QPixmap pm = QPixmap(30, 15);
if ((!GradientMode) || (Mode == 1))
ListBox1->insertItem(tr("None"));
ListBox1->insertItem( tr("None"));
for (it = Farbliste.begin(); it != Farbliste.end(); ++it)
{
pm.fill(Farbliste[it.key()].getRGBColor());
/trunk/Scribus/scribus/scribusview.cpp
64,7 → 64,7
LA->setFont(fo);
Seitmen = new QPopupMenu(this);
Seitmen->setFont(fo);
LA->setText(tr("Page")+" 1");
LA->setText( tr("Page")+" 1");
LA->setPopup(Seitmen);
LA->setFocusPolicy(QWidget::NoFocus);
LY = new QPushButton(this);
71,7 → 71,7
LY->setFont(fo);
Laymen = new QPopupMenu(this);
Laymen->setFont(fo);
LY->setText(tr("Layer")+" 0");
LY->setText( tr("Layer")+" 0");
LY->setPopup(Laymen);
LY->setFocusPolicy(QWidget::NoFocus);
HR = new Hruler(this, Doc);
234,7 → 234,7
}
Doc->FirstAuto->Dirty = true;
}
LA->setText(tr("Page")+" "+QString::number(nr+1));
LA->setText( tr("Page")+" "+QString::number(nr+1));
fe->setMouseTracking(true);
connect(fe, SIGNAL(Hrule(int)), HR, SLOT(Draw(int)));
connect(fe, SIGNAL(Vrule(int)), VR, SLOT(Draw(int)));
260,7 → 260,7
Doc->UnDoValid = false;
Doc->PageC -= 1;
Doc->ActPage = Pages.at(0);
LA->setText(tr("Page")+" 1");
LA->setText( tr("Page")+" 1");
}
 
void ScribusView::movePage(int from, int to, int ziel, int art)
418,7 → 418,7
 
void ScribusView::setMenTxt(int Seite)
{
LA->setText(tr("Page")+" "+QString::number(Seite+1));
LA->setText( tr("Page")+" "+QString::number(Seite+1));
}
 
void ScribusView::setLayMenTxt(int l)
519,7 → 519,7
{
for (a=0; a < Pages.count(); a++)
{
Seitmen->insertItem(tr("Page")+" "+QString::number(a+1));
Seitmen->insertItem( tr("Page")+" "+QString::number(a+1));
}
}
}
561,7 → 561,7
{
Doc->ActPage = Pages.at(Seite);
setContentsPos(static_cast<int>(childX(Doc->ActPage->parentWidget())-10*Doc->Scale), static_cast<int>(childY(Doc->ActPage->parentWidget())-10*Doc->Scale));
LA->setText(tr("Page")+" "+QString::number(Seite+1));
LA->setText( tr("Page")+" "+QString::number(Seite+1));
}
 
/** Vergrößert die Ansicht */
/trunk/Scribus/scribus/druck.cpp
34,11 → 34,11
AdvOptionsLayout->setSpacing( 5 );
AdvOptionsLayout->setMargin( 10 );
MirrorH = new QCheckBox(this, "MirrorH");
MirrorH->setText(tr("Mirror Page(s) horizontal"));
MirrorH->setText( tr("Mirror Page(s) horizontal"));
MirrorH->setChecked(Hm);
AdvOptionsLayout->addWidget( MirrorH );
MirrorV = new QCheckBox(this, "MirrorV");
MirrorV->setText(tr("Mirror Page(s) vertical"));
MirrorV->setText( tr("Mirror Page(s) vertical"));
MirrorV->setChecked(Vm);
AdvOptionsLayout->addWidget( MirrorV );
#ifdef HAVE_CMS
45,7 → 45,7
if (CMSuse)
{
UseICC = new QCheckBox(this, "ICC");
UseICC->setText(tr("Apply ICC-Profiles"));
UseICC->setText( tr("Apply ICC-Profiles"));
UseICC->setChecked(Ic);
AdvOptionsLayout->addWidget( UseICC );
}
146,7 → 146,7
}
}
#endif
PrintDest->insertItem(tr("File"));
PrintDest->insertItem( tr("File"));
if (PDev == "")
{
Geraet = PrintDest->text(0);
185,7 → 185,7
 
OtherCom = new QCheckBox(Drucker, "Dc");
OtherCom->setChecked(false);
OtherCom->setText(tr("Alternative Printer Command"));
OtherCom->setText( tr("Alternative Printer Command"));
DruckerLayout->addWidget( OtherCom, 2, 0, Qt::AlignLeft);
LayoutCC = new QHBoxLayout;
LayoutCC->setSpacing( 6 );
348,7 → 348,7
 
ButtonGroup3_2 = new QButtonGroup( Optionen, "ButtonGroup3_2" );
ButtonGroup3_2->setFrameShape( QButtonGroup::NoFrame );
ButtonGroup3_2->setTitle( tr( "" ) );
ButtonGroup3_2->setTitle( "" );
ButtonGroup3_2->setColumnLayout(0, Qt::Vertical );
ButtonGroup3_2->layout()->setSpacing( 0 );
ButtonGroup3_2->layout()->setMargin( 0 );
369,7 → 369,7
MirrorV = false,
ICCinUse = false;
AdvOptButton = new QPushButton(ButtonGroup3_2, "Adv");
AdvOptButton->setText(tr("Advanced Options..."));
AdvOptButton->setText( tr("Advanced Options..."));
ButtonGroup3_2Layout->addWidget( AdvOptButton );
OptionenLayout->addWidget( ButtonGroup3_2, 0, 1 );
391,7 → 391,7
Layout2->addWidget( OKButton_2 );
 
DruckLayout->addLayout( Layout2 );
if ((PDev==tr("File")) || (PrintDest->count() == 1))
if ((PDev== tr("File")) || (PrintDest->count() == 1))
{
PrintDest->setCurrentItem(PrintDest->count()-1);
DateiT->setEnabled(true);
/trunk/Scribus/scribus/werktoolb.cpp
26,7 → 26,7
extern double PolyR;
extern QPixmap loadIcon(QString nam);
 
WerkToolB::WerkToolB(QMainWindow* parent) : QToolBar(tr("Tools"), parent)
WerkToolB::WerkToolB(QMainWindow* parent) : QToolBar( tr("Tools"), parent)
{
Select = new QToolButton(loadIcon("Kreuz.xpm"), tr("Select Items"), QString::null, this, SLOT(ModeFromTB()), this);
Select->setToggleButton(true);
34,33 → 34,33
Rotiere = new QToolButton(loadIcon("Rotieren.xpm"), tr("Rotate Item"), QString::null, this, SLOT(ModeFromTB()), this);
Rotiere->setToggleButton( true );
Rotiere->setEnabled(false);
Textedit = new QToolButton(loadIcon("Editm.xpm"),tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
Zoom = new QToolButton(loadIcon("Lupe.xpm"),tr("Zooms in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom = new QToolButton(loadIcon("Lupe.xpm"), tr("Zooms in or out"), QString::null, this, SLOT(ModeFromTB()), this);
Zoom->setToggleButton( true );
Texte = new QToolButton(loadIcon("Text.xpm"),tr("Insert Text Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Texte = new QToolButton(loadIcon("Text.xpm"), tr("Insert Text Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Texte->setToggleButton( true );
BildB = new QToolButton(loadIcon("Bild.xpm"),tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()), this);
BildB = new QToolButton(loadIcon("Bild.xpm"), tr("Insert Picture"), QString::null, this, SLOT(ModeFromTB()), this);
BildB->setToggleButton( true );
Rechteck = new QToolButton(loadIcon("Rechtecke.xpm"),tr("Insert Rectangles"), QString::null, this, SLOT(ModeFromTB()), this);
Rechteck = new QToolButton(loadIcon("Rechtecke.xpm"), tr("Insert Rectangles"), QString::null, this, SLOT(ModeFromTB()), this);
Rechteck->setToggleButton( true );
Kreis = new QToolButton(loadIcon("Kreise.xpm"),tr("Insert Ovals"), QString::null, this, SLOT(ModeFromTB()), this);
Kreis = new QToolButton(loadIcon("Kreise.xpm"), tr("Insert Ovals"), QString::null, this, SLOT(ModeFromTB()), this);
Kreis->setToggleButton( true );
PolyM = new QPopupMenu();
PolyM->insertItem(tr("Properties..."), this, SLOT(GetPolyProps()));
Polygon = new QToolButton(loadIcon("spline.png"),tr("Insert Polygons"), QString::null, this, SLOT(ModeFromTB()), this);
PolyM->insertItem( tr("Properties..."), this, SLOT(GetPolyProps()));
Polygon = new QToolButton(loadIcon("spline.png"), tr("Insert Polygons"), QString::null, this, SLOT(ModeFromTB()), this);
Polygon->setToggleButton( true );
Polygon->setPopup(PolyM);
Polygon->setPopupDelay(0);
Linien = new QToolButton(loadIcon("Stift.xpm"),tr("Insert Lines"), QString::null, this, SLOT(ModeFromTB()), this);
Linien = new QToolButton(loadIcon("Stift.xpm"), tr("Insert Lines"), QString::null, this, SLOT(ModeFromTB()), this);
Linien->setToggleButton( true );
PolyLin = new QToolButton(loadIcon("beziertool.png"),tr("Insert Bezier Curves"), QString::null, this, SLOT(ModeFromTB()), this);
PolyLin = new QToolButton(loadIcon("beziertool.png"), tr("Insert Bezier Curves"), QString::null, this, SLOT(ModeFromTB()), this);
PolyLin->setToggleButton( true );
KetteEin = new QToolButton(loadIcon("Lock.xpm"),tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"),tr("Break Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus = new QToolButton(loadIcon("Unlock.xpm"), tr("Break Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteAus->setToggleButton( true );
KetteAus->setEnabled(false);
setCloseMode(QDockWindow::Undocked);
178,7 → 178,7
}
}
 
WerkToolBP::WerkToolBP(QMainWindow* parent) : QToolBar(tr("PDF-Tools"), parent)
WerkToolBP::WerkToolBP(QMainWindow* parent) : QToolBar( tr("PDF-Tools"), parent)
{
PDFM = new QPopupMenu();
PDFM->insertItem(loadIcon("pushbutton.png"), tr("Button"));
186,7 → 186,7
PDFM->insertItem(loadIcon("checkbox.png"), tr("Check Box"));
PDFM->insertItem(loadIcon("combobox.png"), tr("Combo Box"));
PDFM->insertItem(loadIcon("listbox.png"), tr("List Box"));
PDFTool = new QToolButton(loadIcon("pushbutton.png"),tr("Insert PDF-Fields"), QString::null, this, SLOT(ModeFromTB()), this);
PDFTool = new QToolButton(loadIcon("pushbutton.png"), tr("Insert PDF-Fields"), QString::null, this, SLOT(ModeFromTB()), this);
PDFTool->setToggleButton(true);
PDFTool->setPopup(PDFM);
PDFTool->setPopupDelay(0);
194,7 → 194,7
PDFA = new QPopupMenu();
PDFA->insertItem(loadIcon("charset.png"), tr("Text"));
PDFA->insertItem(loadIcon("goto.png"), tr("Link"));
PDFaTool = new QToolButton(loadIcon("charset.png"),tr("Insert PDF-Annotations"), QString::null, this, SLOT(ModeFromTB()), this);
PDFaTool = new QToolButton(loadIcon("charset.png"), tr("Insert PDF-Annotations"), QString::null, this, SLOT(ModeFromTB()), this);
PDFaTool->setToggleButton(true);
PDFaTool->setPopup(PDFA);
PDFaTool->setPopupDelay(0);
/trunk/Scribus/scribus/missing.cpp
78,9 → 78,9
Layout1->setMargin( 0 );
TextLabel1 = new QLabel( this, "TextLabel1" );
if (miss)
TextLabel1->setText(tr("The Font %1 is not installed.").arg(fon));
TextLabel1->setText( tr("The Font %1 is not installed.").arg(fon));
else
TextLabel1->setText(tr("Select New Font:"));
TextLabel1->setText( tr("Select New Font:"));
Layout1->addMultiCellWidget( TextLabel1, 0, 0, 1, 2 );
if (miss)
{
/trunk/Scribus/scribus/muster.cpp
128,7 → 128,7
bool atf;
struct CLBuf Buffer;
NewTm *dia = new NewTm(this, "Name:", "New Template", Doc);
dia->Answer->setText(tr("Copy of ")+sMuster);
dia->Answer->setText( tr("Copy of ")+sMuster);
dia->Answer->selectAll();
if (dia->exec())
{
178,7 → 178,7
int nr;
bool atf;
NewTm *dia = new NewTm(this, "Name:", "New Template", Doc);
dia->Answer->setText(tr("New Template"));
dia->Answer->setText( tr("New Template"));
dia->Answer->selectAll();
if (dia->exec())
{
238,7 → 238,7
for (it = View->MasterNames.begin(); it != View->MasterNames.end(); ++it)
{
if (it.key() == "Normal")
ListBox1->insertItem(tr("Normal"));
ListBox1->insertItem( tr("Normal"));
else
ListBox1->insertItem(it.key());
}
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(22).arg("November").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(23).arg("November").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
51,7 → 51,7
bu += "*";
#endif
 
BuildID->setText(tr("Scribus Version %1\n%2 %3").arg(VERSION).arg(tr("Build-ID:")).arg(bu));
BuildID->setText( tr("Scribus Version %1\n%2 %3").arg(VERSION).arg( tr("Build-ID:")).arg(bu));
tabLayout1->addWidget( BuildID );
TabWidget2->insertTab( tab, tr( "About" ) );
tab_2 = new QWidget( TabWidget2, "tab_2" );
/trunk/Scribus/scribus/spalette.cpp
22,7 → 22,7
{
setMinimumSize(QSize(10,static_cast<int>(font().pointSize()*2.5)));
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
insertItem(tr("No Style"));
insertItem( tr("No Style"));
doc = 0;
connect(this, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
connect(this, SIGNAL(selected(int)), this, SIGNAL(EditSt()));
36,10 → 36,11
 
void Spalette::updateFList()
{
disconnect(this, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
clear();
if (doc != 0)
{
insertItem(tr("No Style"));
insertItem( tr("No Style"));
for (uint x = 5; x < doc->Vorlagen.count(); ++x)
{
insertItem(doc->Vorlagen[x].Vname);
46,6 → 47,7
}
setSelected(currentItem(), false);
}
connect(this, SIGNAL(clicked(QListBoxItem*)), this, SLOT(selFormat(QListBoxItem*)));
}
 
void Spalette::selFormat(QListBoxItem *c)
/trunk/Scribus/scribus/bookmwin.cpp
105,7 → 105,7
setAcceptDrops(true);
viewport()->setAcceptDrops(true);
setRootIsDecorated(true);
addColumn(tr("Bookmarks"));
addColumn( tr("Bookmarks"));
setResizeMode(QListView::AllColumns);
setSelectionMode(QListView::NoSelection);
setSorting(-1,1);
192,9 → 192,9
pp = pp->parent();
}
QPopupMenu *pmenu = new QPopupMenu();
mov = pmenu->insertItem(tr("Move Bookmark"));
ins = pmenu->insertItem(tr("Insert Bookmark"));
pmenu->insertItem(tr("Cancel"));
mov = pmenu->insertItem( tr("Move Bookmark"));
ins = pmenu->insertItem( tr("Insert Bookmark"));
pmenu->insertItem( tr("Cancel"));
mret = pmenu->exec(QCursor::pos());
if (mret == ins)
{
/trunk/Scribus/scribus/newfile.cpp
32,7 → 32,7
Layout9 = new QVBoxLayout(0, 0, 5, "Layout9");
 
ButtonGroup1_2 = new QButtonGroup(this, "ButtonGroup1_2" );
ButtonGroup1_2->setTitle(tr( "Page Size" ));
ButtonGroup1_2->setTitle( tr( "Page Size" ));
ButtonGroup1_2->setColumnLayout(0, Qt::Vertical);
ButtonGroup1_2->layout()->setSpacing(6);
ButtonGroup1_2->layout()->setMargin(10);
40,7 → 40,7
ButtonGroup1_2Layout->setAlignment(Qt::AlignTop);
Layout6 = new QGridLayout(0, 1, 1, 0, 6, "Layout6");
TextLabel1 = new QLabel( ButtonGroup1_2, "TextLabel1" );
TextLabel1->setText(tr( "Size:" ));
TextLabel1->setText( tr( "Size:" ));
Layout6->addWidget( TextLabel1, 0, 0 );
ComboBox1 = new QComboBox( true, ButtonGroup1_2, "ComboBox1" );
ComboBox1->insertItem("A0");
77,7 → 77,7
ComboBox1->setEditable(false);
Layout6->addWidget(ComboBox1, 0, 1 );
TextLabel2 = new QLabel( ButtonGroup1_2, "TextLabel2" );
TextLabel2->setText(tr( "Orientation:" ));
TextLabel2->setText( tr( "Orientation:" ));
Layout6->addWidget( TextLabel2, 1, 0 );
ComboBox2 = new QComboBox( true, ButtonGroup1_2, "ComboBox2" );
ComboBox2->insertItem( tr( "Portrait" ) );
/trunk/Scribus/scribus/helpbrowser.cpp
85,7 → 85,7
fi = QFileInfo(pfad2);
if (!fi.exists())
{
Anzeige->setText("<h2>"+tr("Sorry, no manual available!")+"</h2>");
Anzeige->setText("<h2>"+ tr("Sorry, no manual available!")+"</h2>");
Avail = false;
}
}
/trunk/Scribus/scribus/scribus.cpp
100,11 → 100,11
 
ScribusApp::ScribusApp(SplashScreen *splash)
{
setCaption(tr("Scribus " VERSION));
setCaption( tr("Scribus " VERSION));
setIcon(loadIcon("AppIcon.png"));
initMenuBar();
initStatusBar();
WerkTools2 = new QToolBar(tr("File"), this);
WerkTools2 = new QToolBar( tr("File"), this);
DatNeu = new QToolButton(loadIcon("DateiNeu.xpm"), tr("Creates a new Document"), QString::null, this, SLOT(slotFileNew()), WerkTools2);
DatOpe = new QToolButton(loadIcon("DateiOpen.xpm"), tr("Opens a Document"), QString::null, this, SLOT(slotDocOpen()), WerkTools2);
DatSav = new QToolButton(loadIcon("DateiSave.xpm"), tr("Saves the Current Document"), QString::null, this, SLOT(slotFileSave()), WerkTools2);
162,7 → 162,7
/** Erstelle Fontliste */
NoFonts = false;
BuFromApp = false;
splash->setStatus(tr("Searching for Fonts"));
splash->setStatus( tr("Searching for Fonts"));
GetAllFonts();
if (NoFonts)
{
335,22 → 335,22
SetKeyEntry(65, tr("Show Page Palette"), viewSepal, 0);
SetKeyEntry(66, tr("Lock/Unlock"), LockOb, CTRL+Key_H);
SetKeyEntry(67, tr("Non Breaking Space"), 0, CTRL+Key_Space);
splash->setStatus(tr("Reading Preferences"));
splash->setStatus( tr("Reading Preferences"));
ReadPrefs();
splash->setStatus(tr("Getting ICC-Profiles"));
splash->setStatus( tr("Getting ICC-Profiles"));
GetCMSProfiles();
splash->setStatus(tr("Init Hyphenator"));
splash->setStatus( tr("Init Hyphenator"));
InitHyphenator();
Mpal->Cpal->UseTrans(Prefs.PDFTransparency);
Mpal->Fonts->RebuildList(&Prefs);
Mpal->fillLangCombo(Sprachen);
DocDir = Prefs.DocDir;
splash->setStatus(tr(""));
splash->setStatus(tr("Setting up Shortcuts"));
splash->setStatus( tr(""));
splash->setStatus( tr("Setting up Shortcuts"));
SetShortCut();
if (CMSavail)
{
hymen->insertItem(tr("Color Management..."), this , SLOT(SetCMSPrefs()));
hymen->insertItem( tr("Color Management..."), this , SLOT(SetCMSPrefs()));
ProfilesL::Iterator ip;
if ((Prefs.DCMSset.DefaultInputProfile == "") || (!InputProfiles.contains(Prefs.DCMSset.DefaultInputProfile)))
{
379,7 → 379,7
IntentMonitor = Prefs.DCMSset.DefaultIntentMonitor;
#endif
}
splash->setStatus(tr("Reading Scrapbook"));
splash->setStatus( tr("Reading Scrapbook"));
QString SCf = PrefsPfad+"/scrap.scs";
QFileInfo SCfi = QFileInfo(SCf);
if (SCfi.exists())
389,7 → 389,7
}
ScBook->AdjustMenu();
HaveGS = system("gs -h > /dev/null 2>&1");
splash->setStatus(tr("Initializing Plugins"));
splash->setStatus( tr("Initializing Plugins"));
InitPlugs(splash);
ClipB = QApplication::clipboard();
connect(WerkTools, SIGNAL(NewMode(int)), this, SLOT(ModeFromTB(int)));
460,7 → 460,7
fileMenu=new QPopupMenu();
fid12 = fileMenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(slotFileNew()), CTRL+Key_N);
fid13 = fileMenu->insertItem(loadIcon("DateiOpen16.png"), tr("Open..."), this, SLOT(slotDocOpen()), CTRL+Key_O);
fid14 = fileMenu->insertItem(tr("Recent Documents"), recentMenu);
fid14 = fileMenu->insertItem( tr("Recent Documents"), recentMenu);
SetKeyEntry(0, tr("New"), fid12, CTRL+Key_N);
SetKeyEntry(1, tr("Open..."), fid13, CTRL+Key_O);
fileMenu->insertSeparator();
470,32 → 470,34
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( tr("Save as..."), this, SLOT(slotFileSaveAs()));
SetKeyEntry(4, tr("Save as..."), fid5, 0);
fileMenu->setItemEnabled(fid5, 0);
fid51 = fileMenu->insertItem(tr("Collect for Output..."), this, SLOT(Collect()));
fid52 = fileMenu->insertItem( tr("Revert to Saved"), this, SLOT(slotFileRevert()));
fileMenu->setItemEnabled(fid52, 0);
fid51 = fileMenu->insertItem( tr("Collect for Output..."), this, SLOT(Collect()));
fileMenu->setItemEnabled(fid51, 0);
fileMenu->insertSeparator();
importMenu = new QPopupMenu();
fid2 = importMenu->insertItem(tr("Get Text/Picture..."), this, SLOT(slotFileOpen()));
fid2 = importMenu->insertItem( tr("Get Text/Picture..."), this, SLOT(slotFileOpen()));
importMenu->setItemEnabled(fid2, 0);
fid2a = importMenu->insertItem(tr("Insert Page..."), this, SLOT(slotDocMerge()));
fid2a = importMenu->insertItem( tr("Insert Page..."), this, SLOT(slotDocMerge()));
importMenu->setItemEnabled(fid2a, 0);
fileMenu->insertItem(tr("Import..."), importMenu);
fileMenu->insertItem( tr("Import..."), importMenu);
exportMenu = new QPopupMenu();
fid3 = exportMenu->insertItem(tr("Save Text..."), this, SLOT(SaveText()));
fid3 = exportMenu->insertItem( tr("Save Text..."), this, SLOT(SaveText()));
exportMenu->setItemEnabled(fid3, 0);
fid8 = exportMenu->insertItem(tr("Save Page as EPS..."), this, SLOT(SaveAsEps()));
fid8 = exportMenu->insertItem( tr("Save Page as EPS..."), this, SLOT(SaveAsEps()));
exportMenu->setItemEnabled(fid8, 0);
fid10 = exportMenu->insertItem(tr("Save as PDF..."), this, SLOT(SaveAsPDF()));
fid10 = exportMenu->insertItem( tr("Save as PDF..."), this, SLOT(SaveAsPDF()));
exportMenu->setItemEnabled(fid10, 0);
fid11 = fileMenu->insertItem(tr("Export..."), exportMenu);
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( tr("Document Info..."), this, SLOT(InfoDoc()), CTRL+Key_I);
fileMenu->setItemEnabled(fid6, 0);
SetKeyEntry(5, tr("Document Info..."), fid6, CTRL+Key_I);
fid7 = fileMenu->insertItem(tr("Document Setup..."), this, SLOT(SetupDoc()));
fid7 = fileMenu->insertItem( tr("Document Setup..."), this, SLOT(SetupDoc()));
fileMenu->setItemEnabled(fid7, 0);
SetKeyEntry(6, tr("Document Setup..."), fid7, 0);
fid9 = fileMenu->insertItem(loadIcon("DateiPrint16.png"), tr("Print..."), this, SLOT(slotFilePrint()), CTRL+Key_P);
505,13 → 507,13
MenID = fileMenu->insertItem(loadIcon("exit.png"), tr("Quit"), this, SLOT(slotFileQuit()), CTRL+Key_Q);
SetKeyEntry(8, tr("Quit"), MenID, CTRL+Key_Q);
editMenu = new QPopupMenu();
edUndo = editMenu->insertItem(tr("Undo"), this, SLOT(UnDoAction()), CTRL+Key_Z);
edUndo = editMenu->insertItem( tr("Undo"), this, SLOT(UnDoAction()), CTRL+Key_Z);
editMenu->insertSeparator();
edid1 = editMenu->insertItem(loadIcon("editcut.png"), tr("Cut"), this , SLOT(slotEditCut()), CTRL+Key_X);
edid2 = editMenu->insertItem(loadIcon("editcopy.png"), tr("Copy"), this , SLOT(slotEditCopy()), CTRL+Key_C);
edid3 = editMenu->insertItem(loadIcon("editpaste.png"), tr("Paste"), this , SLOT(slotEditPaste()), CTRL+Key_V);
edid4 = editMenu->insertItem(loadIcon("editdelete.png"), tr("Clear"), this, SLOT(DeleteText()));
edid5 = editMenu->insertItem(tr("Select all"), this, SLOT(SelectAll()), CTRL+Key_A);
edid5 = editMenu->insertItem( tr("Select all"), this, SLOT(SelectAll()), CTRL+Key_A);
SetKeyEntry(9, tr("Cut"), edid1, CTRL+Key_X);
SetKeyEntry(10, tr("Copy"), edid2, CTRL+Key_C);
SetKeyEntry(11, tr("Paste"), edid3, CTRL+Key_V);
518,21 → 520,21
SetKeyEntry(12, tr("Clear"), edid4, 0);
SetKeyEntry(13, tr("Select all"), edid5, CTRL+Key_A);
editMenu->insertSeparator();
MenID = editMenu->insertItem(tr("Colors..."), this , SLOT(slotEditColors()));
MenID = editMenu->insertItem( tr("Colors..."), this , SLOT(slotEditColors()));
SetKeyEntry(14, tr("Colors..."), MenID, 0);
edid6 = editMenu->insertItem(tr("Styles..."), this , SLOT(slotEditStyles()));
edid6a = editMenu->insertItem(tr("Line Styles..."), this , SLOT(slotEditLineStyles()));
edid6 = editMenu->insertItem( tr("Styles..."), this , SLOT(slotEditStyles()));
edid6a = editMenu->insertItem( tr("Line Styles..."), this , SLOT(slotEditLineStyles()));
SetKeyEntry(15, tr("Styles..."), edid6, 0);
tman = editMenu->insertItem(tr("Templates..."), this, SLOT(ManageTemp()));
tman = editMenu->insertItem( tr("Templates..."), this, SLOT(ManageTemp()));
SetKeyEntry(16, tr("Templates..."), tman, 0);
jman = editMenu->insertItem(tr("Javascripts..."), this, SLOT(ManageJava()));
jman = editMenu->insertItem( tr("Javascripts..."), this, SLOT(ManageJava()));
hymen = new QPopupMenu();
MenID = hymen->insertItem(tr("General..."), this , SLOT(slotPrefsOrg()));
MenID = hymen->insertItem( tr("General..."), this , SLOT(slotPrefsOrg()));
SetKeyEntry(18, tr("Preferences..."), MenID, 0);
MenID = hymen->insertItem(tr("Fonts..."), this , SLOT(slotFontOrg()));
MenID = hymen->insertItem( tr("Fonts..."), this , SLOT(slotFontOrg()));
SetKeyEntry(17, tr("Fonts..."), MenID, 0);
hymen->insertItem(tr("Hyphenator..."), this, SLOT(configHyphenator()));
editMenu->insertItem(tr("Preferences"), hymen);
hymen->insertItem( tr("Hyphenator..."), this, SLOT(configHyphenator()));
editMenu->insertItem( tr("Preferences"), hymen);
editMenu->setItemEnabled(edUndo, 0);
editMenu->setItemEnabled(edid1, 0);
editMenu->setItemEnabled(edid2, 0);
546,40 → 548,40
StilMenu = new QPopupMenu();
ObjMenu = new QPopupMenu();
SetKeyEntry(19, tr("Select New Font"), 0, 0);
MenID = ObjMenu->insertItem(tr("Duplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
MenID = ObjMenu->insertItem( tr("Duplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
SetKeyEntry(20, tr("Duplicate"), MenID, CTRL+Key_D);
MenID = ObjMenu->insertItem(tr("Multiple Duplicate"), this, SLOT(ObjektDupM()));
MenID = ObjMenu->insertItem( tr("Multiple Duplicate"), this, SLOT(ObjektDupM()));
SetKeyEntry(21, tr("Multiple Duplicate"), MenID, 0);
Loesch = ObjMenu->insertItem(tr("Delete"), this, SLOT(DeleteObjekt()), CTRL+Key_K);
Loesch = ObjMenu->insertItem( tr("Delete"), this, SLOT(DeleteObjekt()), CTRL+Key_K);
SetKeyEntry(22, tr("Delete"), Loesch, CTRL+Key_K);
ObjMenu->insertSeparator();
Gr = ObjMenu->insertItem(tr("Group"), this, SLOT(GroupObj()), CTRL+Key_G);
Gr = ObjMenu->insertItem( tr("Group"), this, SLOT(GroupObj()), CTRL+Key_G);
SetKeyEntry(23, tr("Group"), Gr, CTRL+Key_G);
UnGr = ObjMenu->insertItem(tr("Un-group"), this, SLOT(UnGroupObj()),CTRL+Key_U);
UnGr = ObjMenu->insertItem( tr("Un-group"), this, SLOT(UnGroupObj()),CTRL+Key_U);
SetKeyEntry(24, tr("Un-group"), UnGr, CTRL+Key_U);
LockOb = ObjMenu->insertItem(tr("Lock"), this, SLOT(ToggleObjLock()), CTRL+Key_H);
LockOb = ObjMenu->insertItem( tr("Lock"), this, SLOT(ToggleObjLock()), CTRL+Key_H);
ObjMenu->insertSeparator();
OBack = ObjMenu->insertItem(tr("Send to Back"), this, SLOT(Objekt2Back()));
OBack = ObjMenu->insertItem( tr("Send to Back"), this, SLOT(Objekt2Back()));
SetKeyEntry(25, tr("Send to Back"), OBack, 0);
OFront = ObjMenu->insertItem(tr("Bring to Front"), this, SLOT(Objekt2Front()));
OFront = ObjMenu->insertItem( tr("Bring to Front"), this, SLOT(Objekt2Front()));
SetKeyEntry(26, tr("Bring to Front"), OFront, 0);
OLower = ObjMenu->insertItem(tr("Lower"), this, SLOT(ObjektLower()));
OLower = ObjMenu->insertItem( tr("Lower"), this, SLOT(ObjektLower()));
SetKeyEntry(27, tr("Lower"), OLower, 0);
ORaise = ObjMenu->insertItem(tr("Raise"), this, SLOT(ObjektRaise()));
ORaise = ObjMenu->insertItem( tr("Raise"), this, SLOT(ObjektRaise()));
SetKeyEntry(28, tr("Raise"), ORaise, 0);
DistM = ObjMenu->insertItem(tr("Distribute/Align..."), this, SLOT(ObjektAlign()));
DistM = ObjMenu->insertItem( tr("Distribute/Align..."), this, SLOT(ObjektAlign()));
SetKeyEntry(29, tr("Distribute/Align..."), DistM, 0);
ObjMenu->insertSeparator();
ShapeMenu = new QPopupMenu();
ShapeMenu->insertItem(tr("Rectangle"), this, SLOT(RectFrame()));
ShapeMenu->insertItem(tr("Rounded Rectangle"), this, SLOT(RoundedFrame()));
ShapeMenu->insertItem(tr("Oval"), this, SLOT(OvalFrame()));
ShapeEdit = ShapeMenu->insertItem(tr("Edit Frame"), this, SLOT(ToggleFrameEdit()));
ShapeM = ObjMenu->insertItem(tr("Shape"), ShapeMenu);
PfadT = ObjMenu->insertItem(tr("Attach Text to Path"), this, SLOT(Pfadtext()));
PfadV = ObjMenu->insertItem(tr("Combine Polygons"), this, SLOT(UniteOb()));
PfadS = ObjMenu->insertItem(tr("Split Polygons"), this, SLOT(SplitUniteOb()));
PfadTP = ObjMenu->insertItem(tr("Convert to Outlines"), this, SLOT(TraceText()));
ShapeMenu->insertItem( tr("Rectangle"), this, SLOT(RectFrame()));
ShapeMenu->insertItem( tr("Rounded Rectangle"), this, SLOT(RoundedFrame()));
ShapeMenu->insertItem( tr("Oval"), this, SLOT(OvalFrame()));
ShapeEdit = ShapeMenu->insertItem( tr("Edit Frame"), this, SLOT(ToggleFrameEdit()));
ShapeM = ObjMenu->insertItem( tr("Shape"), ShapeMenu);
PfadT = ObjMenu->insertItem( tr("Attach Text to Path"), this, SLOT(Pfadtext()));
PfadV = ObjMenu->insertItem( tr("Combine Polygons"), this, SLOT(UniteOb()));
PfadS = ObjMenu->insertItem( tr("Split Polygons"), this, SLOT(SplitUniteOb()));
PfadTP = ObjMenu->insertItem( tr("Convert to Outlines"), this, SLOT(TraceText()));
ObjMenu->setItemEnabled(ShapeM, 0);
ObjMenu->setItemEnabled(DistM, 0);
ObjMenu->setItemEnabled(Gr, 0);
590,46 → 592,46
ObjMenu->setItemEnabled(LockOb, 0);
ObjMenu->setItemEnabled(PfadTP, 0);
pageMenu = new QPopupMenu();
MenID = pageMenu->insertItem(tr("Insert..."), this, SLOT(slotNewPageM()));
MenID = pageMenu->insertItem( tr("Insert..."), this, SLOT(slotNewPageM()));
SetKeyEntry(30, tr("Insert..."), MenID, 0);
pgmd = pageMenu->insertItem(tr("Delete..."), this, SLOT(DeletePage()));
pgmd = pageMenu->insertItem( tr("Delete..."), this, SLOT(DeletePage()));
SetKeyEntry(31, tr("Delete..."), pgmd, 0);
MenID = pageMenu->insertItem(tr("Copy")+"...", this, SLOT(CopyPage()));
MenID = pageMenu->insertItem( tr("Copy")+"...", this, SLOT(CopyPage()));
SetKeyEntry(61, tr("Copy")+"...", MenID, 0);
pgmv = pageMenu->insertItem(tr("Move..."), this, SLOT(MovePage()));
pgmv = pageMenu->insertItem( tr("Move..."), this, SLOT(MovePage()));
SetKeyEntry(32, tr("Move..."), pgmv, 0);
MenID = pageMenu->insertItem(tr("Apply Template..."), this, SLOT(ApplyTemp()));
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);
viewMenu=new QPopupMenu();
MenID = viewMenu->insertItem(tr("Fit in Window"), this, SLOT(slotZoomFit()), CTRL+Key_0);
MenID = viewMenu->insertItem( tr("Fit in Window"), this, SLOT(slotZoomFit()), CTRL+Key_0);
SetKeyEntry(34, tr("Fit in Window"), MenID, CTRL+Key_0);
MenID = viewMenu->insertItem("50%", this, SLOT(slotZoom50()));
SetKeyEntry(35, tr("50%"), MenID, 0);
MenID = viewMenu->insertItem("75%", this, SLOT(slotZoom75()));
SetKeyEntry(36, tr("75%"), MenID, 0);
MenID = viewMenu->insertItem(tr("Actual Size"), this, SLOT(slotZoom100()), CTRL+Key_1);
MenID = viewMenu->insertItem( tr("Actual Size"), this, SLOT(slotZoom100()), CTRL+Key_1);
SetKeyEntry(37, tr("Actual Size"), MenID, CTRL+Key_1);
MenID = viewMenu->insertItem("200%", this, SLOT(slotZoom200()));
SetKeyEntry(38, tr("200%"), MenID, 0);
MenID = viewMenu->insertItem(tr("Thumbnails"), this, SLOT(slotZoom20()));
MenID = viewMenu->insertItem( tr("Thumbnails"), this, SLOT(slotZoom20()));
SetKeyEntry(39, tr("Thumbnails"), MenID, 0);
viewMenu->insertSeparator();
Markers = viewMenu->insertItem(tr("Hide Margins"), this, SLOT(ToggleMarks()));
Markers = viewMenu->insertItem( tr("Hide Margins"), this, SLOT(ToggleMarks()));
SetKeyEntry(40, tr("Hide Margins"), Markers, 0);
FrameDr = viewMenu->insertItem(tr("Hide Frames"), this, SLOT(ToggleFrames()));
FrameDr = viewMenu->insertItem( tr("Hide Frames"), this, SLOT(ToggleFrames()));
SetKeyEntry(41, tr("Hide Frames"), FrameDr, 0);
Bilder = viewMenu->insertItem(tr("Hide Images"), this, SLOT(TogglePics()));
Bilder = viewMenu->insertItem( tr("Hide Images"), this, SLOT(TogglePics()));
SetKeyEntry(42, tr("Hide Images"), Bilder, 0);
Ras = viewMenu->insertItem(tr("Show Grid"), this, SLOT(ToggleRaster()));
Ras = viewMenu->insertItem( tr("Show Grid"), this, SLOT(ToggleRaster()));
SetKeyEntry(43, tr("Show Grid"), Ras, 0);
uRas = viewMenu->insertItem(tr("Snap to Grid"), this, SLOT(ToggleURaster()));
uRas = viewMenu->insertItem( tr("Snap to Grid"), this, SLOT(ToggleURaster()));
SetKeyEntry(44, tr("Snap to Grid"), uRas, 0);
Guide = viewMenu->insertItem(tr("Hide Guides"), this, SLOT(ToggleGuides()));
uGuide = viewMenu->insertItem(tr("Snap to Guides"), this, SLOT(ToggleUGuides()));
Guide = viewMenu->insertItem( tr("Hide Guides"), this, SLOT(ToggleGuides()));
uGuide = viewMenu->insertItem( tr("Snap to Guides"), this, SLOT(ToggleUGuides()));
for (a=0; a<6; ++a)
{
viewMenu->setItemEnabled(viewMenu->idAt(a), 0);
642,22 → 644,22
viewMenu->setItemEnabled(Guide, 0);
viewMenu->setItemEnabled(uGuide, 0);
toolMenu=new QPopupMenu();
viewTools = toolMenu->insertItem(tr("Hide Tools"), this, SLOT(ToggleTools()));
viewTools = toolMenu->insertItem( tr("Hide Tools"), this, SLOT(ToggleTools()));
SetKeyEntry(45, tr("Hide Tools"), viewTools, 0);
viewToolsP = toolMenu->insertItem(tr("Hide PDF-Tools"), this, SLOT(TogglePDFTools()));
viewMpal = toolMenu->insertItem(tr("Show Properties"), this, SLOT(ToggleMpal()));
viewToolsP = toolMenu->insertItem( tr("Hide PDF-Tools"), this, SLOT(TogglePDFTools()));
viewMpal = toolMenu->insertItem( tr("Show Properties"), this, SLOT(ToggleMpal()));
SetKeyEntry(46, tr("Show Properties"), viewMpal, 0);
viewTpal = toolMenu->insertItem(tr("Show Outline"), this, SLOT(ToggleTpal()));
viewTpal = toolMenu->insertItem( tr("Show Outline"), this, SLOT(ToggleTpal()));
SetKeyEntry(47, tr("Show Outline"), viewTpal, 0);
viewBpal = toolMenu->insertItem(tr("Show Scrapbook"), this, SLOT(ToggleBpal()));
viewBpal = toolMenu->insertItem( tr("Show Scrapbook"), this, SLOT(ToggleBpal()));
SetKeyEntry(48, tr("Show Scrapbook"), viewBpal, 0);
viewLpal = toolMenu->insertItem(tr("Show Layers"), this, SLOT(ToggleLpal()));
viewSepal = toolMenu->insertItem(tr("Show Page Palette"), this, SLOT(ToggleSepal()));
viewBopal = toolMenu->insertItem(tr("Show Bookmarks"), this, SLOT(ToggleBookpal()));
viewLpal = toolMenu->insertItem( tr("Show Layers"), this, SLOT(ToggleLpal()));
viewSepal = toolMenu->insertItem( tr("Show Page Palette"), this, SLOT(ToggleSepal()));
viewBopal = toolMenu->insertItem( tr("Show Bookmarks"), this, SLOT(ToggleBookpal()));
extraMenu=new QPopupMenu();
MenID = extraMenu->insertItem(tr("Manage Pictures"), this, SLOT(StatusPic()));
MenID = extraMenu->insertItem( tr("Manage Pictures"), this, SLOT(StatusPic()));
SetKeyEntry(51, tr("Manage Pictures"), MenID, 0);
hyph = extraMenu->insertItem(tr("Hyphenate Text"), this, SLOT(doHyphenate()));
hyph = extraMenu->insertItem( tr("Hyphenate Text"), this, SLOT(doHyphenate()));
extraMenu->setItemEnabled(hyph, 0);
SetKeyEntry(50, tr("Hyphenate Text"), hyph, 0);
windowsMenu = new QPopupMenu();
664,42 → 666,42
windowsMenu->setCheckable( true );
connect(windowsMenu, SIGNAL(aboutToShow()), this, SLOT(windowsMenuAboutToShow()));
helpMenu=new QPopupMenu();
MenID = helpMenu->insertItem(tr("About Scribus"), this, SLOT(slotHelpAbout()));
MenID = helpMenu->insertItem( tr("About Scribus"), this, SLOT(slotHelpAbout()));
SetKeyEntry(52, tr("About Scribus"), MenID, 0);
MenID = helpMenu->insertItem(tr("About Qt"), this, SLOT(slotHelpAboutQt()));
MenID = helpMenu->insertItem( tr("About Qt"), this, SLOT(slotHelpAboutQt()));
SetKeyEntry(53, tr("About Qt"), MenID, 0);
helpMenu->insertSeparator();
MenID = helpMenu->insertItem(tr("Online-Help..."), this, SLOT(slotOnlineHelp()));
MenID = helpMenu->insertItem( tr("Online-Help..."), this, SLOT(slotOnlineHelp()));
SetKeyEntry(54, tr("Online-Help..."), MenID, 0);
tip = helpMenu->insertItem(tr("Tool-Tips"), this, SLOT(ToggleTips()));
tip = helpMenu->insertItem( tr("Tool-Tips"), this, SLOT(ToggleTips()));
SetKeyEntry(55, tr("Tool-Tips"), tip, 0);
tipsOn = true;
helpMenu->setItemChecked(tip, tipsOn);
// ObjMenu->insertItem(tr("Test"), this, SLOT(slotTest()));
// helpMenu->insertItem(tr("Test2"), this, SLOT(slotTest2()));
menuBar()->insertItem(tr("File"), fileMenu);
menuBar()->insertItem(tr("Edit"), editMenu);
Stm = menuBar()->insertItem(tr("Style"), StilMenu);
Obm = menuBar()->insertItem(tr("Item"), ObjMenu);
pgmm = menuBar()->insertItem(tr("Page"), pageMenu);
// ObjMenu->insertItem( tr("Test"), this, SLOT(slotTest()));
// helpMenu->insertItem( tr("Test2"), this, SLOT(slotTest2()));
menuBar()->insertItem( tr("File"), fileMenu);
menuBar()->insertItem( tr("Edit"), editMenu);
Stm = menuBar()->insertItem( tr("Style"), StilMenu);
Obm = menuBar()->insertItem( tr("Item"), ObjMenu);
pgmm = menuBar()->insertItem( tr("Page"), pageMenu);
menuBar()->setItemEnabled(Obm, 0);
menuBar()->setItemEnabled(pgmm, 0);
menuBar()->insertItem(tr("View"), viewMenu);
menuBar()->insertItem(tr("Tools"), toolMenu);
exmn = menuBar()->insertItem(tr("Extras"), extraMenu);
menuBar()->insertItem( tr("View"), viewMenu);
menuBar()->insertItem( tr("Tools"), toolMenu);
exmn = menuBar()->insertItem( tr("Extras"), extraMenu);
menuBar()->setItemEnabled(exmn, 0);
menuBar()->insertItem( tr("Windows"), windowsMenu );
menuBar()->insertSeparator();
menuBar()->insertItem(tr("Help"), helpMenu);
menuBar()->insertItem( tr("Help"), helpMenu);
AliMenu = new QPopupMenu();
AliMenu->insertItem(tr("Left"));
AliMenu->insertItem(tr("Center"));
AliMenu->insertItem(tr("Right"));
AliMenu->insertItem(tr("Block"));
AliMenu->insertItem(tr("Forced"));
AliMenu->insertItem( tr("Left"));
AliMenu->insertItem( tr("Center"));
AliMenu->insertItem( tr("Right"));
AliMenu->insertItem( tr("Block"));
AliMenu->insertItem( tr("Forced"));
ColorMenu = new QPopupMenu();
SizeTMenu = new QPopupMenu();
SizeTMenu->insertItem(tr("Other..."));
SizeTMenu->insertItem( tr("Other..."));
SizeTMenu->insertItem(" 7 pt");
SizeTMenu->insertItem(" 9 pt");
SizeTMenu->insertItem("10 pt");
712,7 → 714,7
SizeTMenu->insertItem("60 pt");
SizeTMenu->insertItem("72 pt");
ShadeMenu = new QPopupMenu();
ShadeMenu->insertItem(tr("Other..."));
ShadeMenu->insertItem( tr("Other..."));
ShadeMenu->insertItem("0 %");
ShadeMenu->insertItem("10 %");
ShadeMenu->insertItem("20 %");
726,18 → 728,18
ShadeMenu->insertItem("100 %");
FontMenu = new QPopupMenu();
TypeStyleMenu = new QPopupMenu();
TypeStyleMenu->insertItem(tr("Normal"));
TypeStyleMenu->insertItem( tr("Normal"));
tmp = qApp->font();
tmp = qApp->font();
tmp.setUnderline(true);
TypeStyleMenu->insertItem(new FmItem(tr("Underline"), tmp));
TypeStyleMenu->insertItem(new FmItem( tr("Underline"), tmp));
tmp = qApp->font();
tmp.setStrikeOut(true);
TypeStyleMenu->insertItem(new FmItem(tr("Strikethru"), tmp));
TypeStyleMenu->insertItem(tr("Small Caps"));
TypeStyleMenu->insertItem(tr("Superscript"));
TypeStyleMenu->insertItem(tr("Subscript"));
TypeStyleMenu->insertItem(tr("Outlined"));
TypeStyleMenu->insertItem(new FmItem( tr("Strikethru"), tmp));
TypeStyleMenu->insertItem( tr("Small Caps"));
TypeStyleMenu->insertItem( tr("Superscript"));
TypeStyleMenu->insertItem( tr("Subscript"));
TypeStyleMenu->insertItem( tr("Outlined"));
}
 
void ScribusApp::initStatusBar()
751,13 → 753,13
statusBar()->addWidget(FProg, 0, true);
FProg->reset();
XMess = new QLabel(statusBar(), "xt");
XMess->setText(tr("X-Pos:"));
XMess->setText( tr("X-Pos:"));
statusBar()->addWidget(XMess, 0, true);
XDat = new QLabel(statusBar(), "dt");
statusBar()->addWidget(XDat, 1, true);
XDat->setText(" ");
YMess = new QLabel(statusBar(), "yt");
YMess->setText(tr("Y-Pos:"));
YMess->setText( tr("Y-Pos:"));
statusBar()->addWidget(YMess, 0, true);
YDat = new QLabel(statusBar(), "ydt");
statusBar()->addWidget(YDat, 1, true);
1403,7 → 1405,7
}
ret = doFileNew(b, h, tpr, lr, rr, br, ab, sp, atf, fp, dia->ComboBox3->currentItem(),
dia->ErsteSeite->isChecked(), dia->Orient, dia->PgNr->value());
FMess->setText(tr("Ready"));
FMess->setText( tr("Ready"));
}
else
ret = false;
1591,8 → 1593,8
void ScribusApp::windowsMenuAboutToShow()
{
windowsMenu->clear();
int cascadeId = windowsMenu->insertItem(tr("Cascade"), wsp, SLOT(cascade() ) );
int tileId = windowsMenu->insertItem(tr("Tile"), wsp, SLOT(tile() ) );
int cascadeId = windowsMenu->insertItem( tr("Cascade"), wsp, SLOT(cascade() ) );
int tileId = windowsMenu->insertItem( tr("Tile"), wsp, SLOT(tile() ) );
if ( wsp->windowList().isEmpty() )
{
windowsMenu->setItemEnabled( cascadeId, false );
1706,7 → 1708,7
QPixmap pm = QPixmap(15, 15);
a = 0;
ColorMenu->clear();
ColorMenu->insertItem(tr("None"));
ColorMenu->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
1732,7 → 1734,7
#endif
Mpal->Cpal->SetColors(doc->PageColors);
Mpal->Cpal->ChooseGrad(0);
ActWin->setCaption(tr(doc->DocName));
ActWin->setCaption( tr(doc->DocName));
ShadeMenu->setItemChecked(ShadeMenu->idAt(11), true);
Mpal->SetDoc(doc);
Mpal->updateCList();
1766,6 → 1768,7
fileMenu->setItemEnabled(fid4, 0);
fileMenu->setItemEnabled(fid5, 0);
fileMenu->setItemEnabled(fid51, 0);
fileMenu->setItemEnabled(fid52, 0);
fileMenu->setItemEnabled(fid12, 0);
fileMenu->setItemEnabled(fid13, 0);
fileMenu->setItemEnabled(fid14, 0);
1783,6 → 1786,7
fileMenu->setItemEnabled(fid4, ActWin->MenuStat[2]);
fileMenu->setItemEnabled(fid5, ActWin->MenuStat[3]);
fileMenu->setItemEnabled(fid51, ActWin->MenuStat[3]);
fileMenu->setItemEnabled(fid52, 0);
fileMenu->setItemEnabled(fid12, 1);
fileMenu->setItemEnabled(fid13, 1);
fileMenu->setItemEnabled(fid14, 1);
1814,6 → 1818,7
fileMenu->setItemEnabled(fid4, 0);
fileMenu->setItemEnabled(fid5, 1);
fileMenu->setItemEnabled(fid51, 1);
fileMenu->setItemEnabled(fid52, 0);
fileMenu->setItemEnabled(fid6, 1);
fileMenu->setItemEnabled(fid7, 1);
exportMenu->setItemEnabled(fid8, 1);
1854,7 → 1859,7
QPixmap pm = QPixmap(15, 15);
a = 0;
ColorMenu->clear();
ColorMenu->insertItem(tr("None"));
ColorMenu->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
1867,7 → 1872,7
}
Mpal->Cpal->SetColors(doc->PageColors);
Mpal->Cpal->ChooseGrad(0);
ActWin->setCaption(tr(doc->DocName));
ActWin->setCaption( tr(doc->DocName));
ShadeMenu->setItemChecked(ShadeMenu->idAt(11), true);
Mpal->SetDoc(doc);
Mpal->updateCList();
1929,9 → 1934,9
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 0);
StilMenu->clear();
StilMenu->insertItem(tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Color"), ColorMenu);
if (b->isRaster)
StilMenu->insertItem(tr("Invert"), this, SLOT(InvertPict()));
StilMenu->insertItem( tr("Invert"), this, SLOT(InvertPict()));
WerkTools->KetteAus->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
WerkTools->Textedit->setEnabled(true);
1950,12 → 1955,12
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 1);
StilMenu->clear();
StilMenu->insertItem(tr("Font"), FontMenu);
StilMenu->insertItem(tr("Size"), SizeTMenu);
StilMenu->insertItem(tr("Style"), TypeStyleMenu);
StilMenu->insertItem(tr("Alignment"), AliMenu);
StilMenu->insertItem(tr("Color"), ColorMenu);
StilMenu->insertItem(tr("Shade"), ShadeMenu);
StilMenu->insertItem( tr("Font"), FontMenu);
StilMenu->insertItem( tr("Size"), SizeTMenu);
StilMenu->insertItem( tr("Style"), TypeStyleMenu);
StilMenu->insertItem( tr("Alignment"), AliMenu);
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Shade"), ShadeMenu);
WerkTools->Rotiere->setEnabled(true);
if ((b->NextBox != 0) || (b->BackBox != 0))
{
2003,11 → 2008,11
ObjMenu->setItemEnabled(ShapeM, 0);
ObjMenu->setItemEnabled(PfadTP, 0);
StilMenu->clear();
StilMenu->insertItem(tr("Font"), FontMenu);
StilMenu->insertItem(tr("Size"), SizeTMenu);
StilMenu->insertItem(tr("Style"), TypeStyleMenu);
StilMenu->insertItem(tr("Color"), ColorMenu);
StilMenu->insertItem(tr("Shade"), ShadeMenu);
StilMenu->insertItem( tr("Font"), FontMenu);
StilMenu->insertItem( tr("Size"), SizeTMenu);
StilMenu->insertItem( tr("Style"), TypeStyleMenu);
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Shade"), ShadeMenu);
WerkTools->Rotiere->setEnabled(true);
WerkTools->Textedit->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
2040,8 → 2045,8
extraMenu->setItemEnabled(hyph, 0);
menuBar()->setItemEnabled(Obm, 1);
StilMenu->clear();
StilMenu->insertItem(tr("Color"), ColorMenu);
StilMenu->insertItem(tr("Shade"), ShadeMenu);
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Shade"), ShadeMenu);
WerkTools->KetteAus->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
if (Nr != 5)
2134,7 → 2139,7
Tpal->slotUpdateElement(doc->ActPage->PageNr, doc->ActPage->SelItem.at(0)->ItemNr);
if (!doc->isModified())
doc->setModified();
ActWin->setCaption(tr(doc->DocName) + "*");
ActWin->setCaption( tr(doc->DocName) + "*");
if (!doc->TemplateMode)
{
fileMenu->setItemEnabled(fid4, 1);
2142,6 → 2147,8
DatClo->setEnabled(true);
fileMenu->setItemEnabled(fid5, 1);
fileMenu->setItemEnabled(fid51, 1);
if (doc->hasName)
fileMenu->setItemEnabled(fid52, 1);
}
ActWin->MenuStat[0] = DatSav->isEnabled();
ActWin->MenuStat[1] = fileMenu->isItemEnabled(fid1);
2190,9 → 2197,9
{
bool ret = false;
#ifdef HAVE_LIBZ
QString fileName = CFileDialog(tr("Open"),tr("Documents (*.sla *.sla.gz *.scd *.scd.gz);;All Files (*)"));
QString fileName = CFileDialog( tr("Open"), tr("Documents (*.sla *.sla.gz *.scd *.scd.gz);;All Files (*)"));
#else
QString fileName = CFileDialog(tr("Open"),tr("Documents (*.sla *.scd);;All Files (*)"));
QString fileName = CFileDialog( tr("Open"), tr("Documents (*.sla *.scd);;All Files (*)"));
#endif
qApp->setOverrideCursor(QCursor(waitCursor), true);
ret = LadeDoc(fileName);
2314,7 → 2321,7
doc->AutoCheck = Prefs.AutoCheck;
doc->OpenNodes.clear();
doc->loading = true;
FMess->setText(tr("Loading..."));
FMess->setText( tr("Loading..."));
FProg->reset();
ScribusWin* w = new ScribusWin(wsp, doc);
view = new ScribusView(w, doc, &Prefs);
2495,7 → 2502,7
ActWin->Last = BookPal->BView->Last;
doc->RePos = false;
UpdateRecent(fileName);
FMess->setText(tr("Ready"));
FMess->setText( tr("Ready"));
ret = true;
if ((wsp->windowList().isEmpty()) || (wsp->windowList().count() == 1))
w->showMaximized();
2534,8 → 2541,8
formats += "*."+form+" ";
}
formats += "*.tif";
QString fileName = CFileDialog(tr("Open"),tr("Images")+
" ("+formats+tr(");;Vector Files (*.eps *.pdf);;All Files (*)"), "", true);
QString fileName = CFileDialog( tr("Open"), tr("Images")+
" ("+formats+ tr(");;Vector Files (*.eps *.pdf);;All Files (*)"), "", true);
if (!fileName.isEmpty())
{
b->EmProfile = "";
2554,7 → 2561,7
if (b->PType == 4)
{
LoadEnc = "";
QString fileName = CFileDialog(tr("Open"),tr("Text Files (*.txt);;All Files(*)"), "", false, true, false, true);
QString fileName = CFileDialog( tr("Open"), tr("Text Files (*.txt);;All Files(*)"), "", false, true, false, true);
if (!fileName.isEmpty())
{
Serializer *ss = new Serializer(fileName);
2573,6 → 2580,22
}
}
 
void ScribusApp::slotFileRevert()
{
if ((doc->hasName) && (doc->isModified()) && (!doc->TemplateMode))
{
QString fn = doc->DocName;
QFileInfo fi(fn);
QDir::setCurrent(fi.dirPath(true));
doc->setUnModified();
slotFileClose();
qApp->processEvents();
qApp->setOverrideCursor(QCursor(waitCursor), true);
LadeDoc(fn);
qApp->setOverrideCursor(QCursor(arrowCursor), true);
}
}
 
void ScribusApp::slotAutoSaved()
{
if (ActWin == sender())
2609,9 → 2632,9
fna = di.currentDirPath()+"/"+doc->DocName+".sla";
}
#ifdef HAVE_LIBZ
QString fn = CFileDialog(tr("Save as"), tr("Documents (*.sla *.sla.gz *.scd *scd.gz);;All Files (*)"), fna, false, false, true);
QString fn = CFileDialog( tr("Save as"), tr("Documents (*.sla *.sla.gz *.scd *scd.gz);;All Files (*)"), fna, false, false, true);
#else
QString fn = CFileDialog(tr("Save as"), tr("Documents (*.sla *.scd);;All Files (*)"), fna, false, false, false);
QString fn = CFileDialog( tr("Save as"), tr("Documents (*.sla *.scd);;All Files (*)"), fna, false, false, false);
#endif
if (!fn.isEmpty())
{
2621,13 → 2644,13
QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
}
}
FMess->setText(tr("Ready"));
FMess->setText( tr("Ready"));
}
 
bool ScribusApp::DoFileSave(QString fn)
{
bool ret = true;
FMess->setText(tr("Saving..."));
FMess->setText( tr("Saving..."));
FProg->reset();
QFileInfo fi(fn);
QDir::setCurrent(fi.dirPath(true));
2641,6 → 2664,7
ActWin->setCaption(fn);
doc->DocName = fn;
fileMenu->setItemEnabled(fid4, 0);
fileMenu->setItemEnabled(fid52, 0);
DatSav->setEnabled(false);
UpdateRecent(fn);
doc->hasName = true;
2690,6 → 2714,7
fileMenu->setItemEnabled(fid4, 0);
fileMenu->setItemEnabled(fid5, 0);
fileMenu->setItemEnabled(fid51, 0);
fileMenu->setItemEnabled(fid52, 0);
fileMenu->setItemEnabled(fid6, 0);
fileMenu->setItemEnabled(fid7, 0);
exportMenu->setItemEnabled(fid8, 0);
2734,7 → 2759,7
ColorMenu->clear();
Mpal->Cpal->SetColors(Prefs.DColors);
Mpal->Cpal->ChooseGrad(0);
FMess->setText(tr("Ready"));
FMess->setText( tr("Ready"));
Tpal->PageObj.clear();
Tpal->Seiten.clear();
Tpal->ListView1->clear();
2770,7 → 2795,7
int Anf, Ende, Nr;
bool fil, sep, farbe, PSfile, mirrorH, mirrorV, useICC;
PSfile = false;
FMess->setText(tr("Printing..."));
FMess->setText( tr("Printing..."));
if (PrinterUsed)
{
prn = PDef.Pname;
2779,7 → 2804,7
else
{
prn = "";
if (!doc->DocName.startsWith(tr("Document")))
if (!doc->DocName.startsWith( tr("Document")))
{
QFileInfo fi(doc->DocName);
fna = fi.dirPath()+"/"+fi.baseName()+".ps";
2859,7 → 2884,7
}
}
delete printer;
FMess->setText(tr("Ready"));
FMess->setText( tr("Ready"));
}
 
void ScribusApp::slotFileQuit()
3173,7 → 3198,7
 
void ScribusApp::slotHelpAboutQt()
{
QMessageBox::aboutQt(this,tr("About Qt"));
QMessageBox::aboutQt(this, tr("About Qt"));
}
 
void ScribusApp::slotOnlineHelp()
3192,7 → 3217,7
void ScribusApp::SaveText()
{
LoadEnc = "";
QString fn = CFileDialog(tr("Save as"), tr("Text Files (*.txt);;All Files(*)"), "", false, false, false, true);
QString fn = CFileDialog( tr("Save as"), tr("Text Files (*.txt);;All Files(*)"), "", false, false, false, true);
if (!fn.isEmpty())
{
Serializer *se = new Serializer(fn);
4423,7 → 4448,15
for (uint a=0; a<doc->Vorlagen.count(); ++a)
{
if (doc->Vorlagen[a].Font != "")
SetNewFont(doc->Vorlagen[a].Font);
{
QString nf = doc->Vorlagen[a].Font;
if (!doc->UsedFonts.contains(nf))
{
doc->AddFont(nf, Prefs.AvailFonts[nf]->Font);
int ff = FontMenu->insertItem(new FmItem(nf, Prefs.AvailFonts[nf]->Font));
FontID.insert(ff, Prefs.AvailFonts[nf]->SCName);
}
}
}
Mpal->Spal->updateFList();
view->DrawNew();
4495,7 → 4528,7
ColorMenu->clear();
QPixmap pm = QPixmap(15, 15);
a = 0;
ColorMenu->insertItem(tr("None"));
ColorMenu->insertItem( tr("None"));
for (it = doc->PageColors.begin(); it != doc->PageColors.end(); ++it)
{
pm.fill(doc->PageColors[it.key()].getRGBColor());
4815,7 → 4848,7
int a;
QString b = " ";
SCFontsIterator it(Prefs.AvailFonts);
FontMenu->insertItem(tr("Other..."));
FontMenu->insertItem( tr("Other..."));
FontMenu->insertSeparator();
if (!HaveDoc)
{
5415,7 → 5448,7
void ScribusApp::SaveAsEps()
{
QString fna;
if (!doc->DocName.startsWith(tr("Document")))
if (!doc->DocName.startsWith( tr("Document")))
{
QFileInfo fi(doc->DocName);
fna = fi.dirPath()+"/"+fi.baseName()+".eps";
5425,7 → 5458,7
QDir di = QDir();
fna = di.currentDirPath()+"/"+doc->DocName+".eps";
}
QString fn = CFileDialog(tr("Save as"), tr("EPS-Files (*.eps);;All Files (*)"), "", false, false);
QString fn = CFileDialog( tr("Save as"), tr("EPS-Files (*.eps);;All Files (*)"), "", false, false);
if (!fn.isEmpty())
{
if (overwrite(this, fn))
5976,7 → 6009,7
pda.Datei = d[dc];
pda.Typ = ty;
PluginMap.insert(tr(nam), pda);
spl->setStatus(tr("Loading:")+" "+tr(nam));
spl->setStatus( tr("Loading:")+" "+tr(nam));
}
}
connect(extraMenu, SIGNAL(activated(int)), this, SLOT(RunPlug(int)));
6144,7 → 6177,7
if(dia->exec())
{
int cc = Prefs.DColors.count();
FMess->setText(tr("Adjusting Colors"));
FMess->setText( tr("Adjusting Colors"));
FProg->reset();
if (HaveDoc)
{
6214,7 → 6247,7
ColorMenu->clear();
QPixmap pm = QPixmap(15, 15);
int a = 0;
ColorMenu->insertItem(tr("None"));
ColorMenu->insertItem( tr("None"));
CMYKColor tmp;
tmp.fromQColor(doc->papColor);
tmp.RecalcRGB();
6853,8 → 6886,8
if ((b->PType == 2) && (art))
{
StilMenu->clear();
StilMenu->insertItem(tr("Color"), ColorMenu);
StilMenu->insertItem(tr("Invert"), this, SLOT(InvertPict()));
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Invert"), this, SLOT(InvertPict()));
}
}
}
6866,6 → 6899,7
PageItem *b = doc->ActPage->SelItem.at(0);
StoryEditor* dia = new StoryEditor(this, doc, b);
connect(dia, SIGNAL(DocChanged()), this, SLOT(slotDocCh()));
connect(dia, SIGNAL(EditSt()), this, SLOT(slotEditStyles()));
if (dia->exec())
{
if (dia->TextChanged)
/trunk/Scribus/scribus/annota.cpp
80,7 → 80,7
Destfile->setReadOnly(true);
GroupBox1Layout->addMultiCellWidget( Destfile, 0, 0, 0, 1 );
ChFile = new QPushButton(GroupBox1, "Change");
ChFile->setText(tr("Change..."));
ChFile->setText( tr("Change..."));
GroupBox1Layout->addWidget( ChFile, 0, 2 );
if ((item->AnActType != 7) && (item->AnActType != 8))
{
321,7 → 321,7
void Annota::GetFile()
{
QString fn;
CustomFDialog dia(this, tr("Open"),tr("PDF-Documents (*.pdf);;All Files (*)"));
CustomFDialog dia(this, tr("Open"), tr("PDF-Documents (*.pdf);;All Files (*)"));
if (Destfile->text() != "")
dia.setSelection(Destfile->text());
if (dia.exec() == QDialog::Accepted)
/trunk/Scribus/scribus/applytemplate.cpp
18,7 → 18,7
QMap<QString,int>::Iterator it;
for (it = view->MasterNames.begin(); it != view->MasterNames.end(); ++it)
{
it.key() == "Normal" ? Templ->insertItem(tr("Normal")) : Templ->insertItem(it.key());
it.key() == "Normal" ? Templ->insertItem( tr("Normal")) : Templ->insertItem(it.key());
}
layout3->addWidget( Templ );
ApplyTLayout->addLayout( layout3 );
/trunk/Scribus/scribus/libprefs/prefs.cpp
70,7 → 70,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;
83,7 → 83,7
GUICombo->setCurrentText(Vor->GUI);
ButtonGroup1Layout->addWidget( GUICombo, 0, 1, Qt::AlignRight );
TextGstil2 = new QLabel(ButtonGroup1, "dd");
TextGstil2->setText(tr("Font Size:"));
TextGstil2->setText( tr("Font Size:"));
ButtonGroup1Layout->addWidget( TextGstil2, 1, 0 );
GFsize = new QSpinBox(ButtonGroup1, "gfs" );
GFsize->setSuffix( tr( " pts" ) );
164,7 → 164,7
Recen->setValue( Vor->RecentDCount );
GroupBox20bLayout->addWidget( Recen, 0, 1 );
Shorty = new QPushButton(GroupBox20b, "SH");
Shorty->setText(tr("Keyboard Shortcuts..."));
Shorty->setText( tr("Keyboard Shortcuts..."));
GroupBox20bLayout->addMultiCellWidget( Shorty, 1, 1, 0, 1 );
tabLayout->addWidget( GroupBox20b, 1, 1 );
 
178,7 → 178,7
GroupBox200Layout->setSpacing( 0 );
GroupBox200Layout->setMargin( 5 );
PfadText = new QLabel( GroupBox200, "Pfadtext" );
PfadText->setText(tr("Documents:"));
PfadText->setText( tr("Documents:"));
GroupBox200Layout->addWidget( PfadText, 0, 0 );
Docs = new QLineEdit( GroupBox200, "Datei" );
Docs->setMinimumSize( QSize( 268, 22 ) );
189,7 → 189,7
FileC->setText( tr( "Change..." ) );
GroupBox200Layout->addWidget( FileC, 0, 2 );
PfadText2 = new QLabel( GroupBox200, "Pfadtext1" );
PfadText2->setText(tr("ICC-Profiles:"));
PfadText2->setText( tr("ICC-Profiles:"));
GroupBox200Layout->addWidget( PfadText2, 1, 0 );
ProPfad = new QLineEdit( GroupBox200, "Datei1" );
ProPfad->setMinimumSize( QSize( 268, 22 ) );
201,7 → 201,7
GroupBox200Layout->addWidget( FileC2, 1, 2 );
 
PfadText3 = new QLabel( GroupBox200, "Pfadtext1" );
PfadText3->setText(tr("Scripts:"));
PfadText3->setText( tr("Scripts:"));
GroupBox200Layout->addWidget( PfadText3, 2, 0 );
ScriptPfad = new QLineEdit( GroupBox200, "Datei1" );
ScriptPfad->setMinimumSize( QSize( 268, 22 ) );
402,7 → 402,7
ASTime = new QSpinBox( GroupAS, "Time" );
ASTime->setMaxValue( 60 );
ASTime->setMinValue( 1 );
ASTime->setSuffix( " "+tr("min") );
ASTime->setSuffix( " " + tr("min") );
ASTime->setValue(Vor->AutoSaveTime / 1000 / 60);
GroupASLayout->addWidget( ASTime, 1, 1 );
Layout21b->addWidget( GroupAS );
898,7 → 898,7
Layout15b->addWidget(TextLabelT26, 5, 0);
Foreground = new QComboBox( true, ToolFrame2, "Foreground" );
Foreground->setEditable(false);
Foreground->insertItem(tr("None"));
Foreground->insertItem( tr("None"));
if (Vor->Dpen == "None")
Foreground->setCurrentItem(Foreground->count()-1);
pm2 = QPixmap(15, 15);
920,7 → 920,7
Layout15b->addWidget(Shade2, 1, 1);
Background = new QComboBox( true, ToolFrame2, "Background" );
Background->setEditable(false);
Background->insertItem(tr("None"));
Background->insertItem( tr("None"));
if (Vor->Dbrush == "None")
Background->setCurrentItem(Background->count()-1);
for (itc = Vor->DColors.begin(); itc != Vor->DColors.end(); ++itc)
1173,7 → 1173,7
Layout15->addWidget( ShadeP, 6, 1 );
BackgroundP = new QComboBox( true, ToolFrame5, "BackgroundP" );
BackgroundP->setEditable(false);
BackgroundP->insertItem(tr("None"));
BackgroundP->insertItem( tr("None"));
if (Vor->DbrushPict == "None")
BackgroundP->setCurrentItem(BackgroundP->count()-1);
for (itc = Vor->DColors.begin(); itc != Vor->DColors.end(); ++itc)
/trunk/Scribus/scribus/javadocs.cpp
60,7 → 60,7
{
QString nam;
Query *dia = new Query(this, "tt", 1, 0, "New Script:", "New Script");
dia->Answer->setText(tr("New Script"));
dia->Answer->setText( tr("New Script"));
if (dia->exec())
{
nam = dia->Answer->text();
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
44,7 → 44,7
PPreview::PPreview( QWidget* parent, ScribusApp *pl) : QDialog( parent, "Preview", true, 0 )
{
QString tmp;
setCaption(tr("Print Preview"));
setCaption( tr("Print Preview"));
app = pl;
APage = 0;
MPage = app->doc->PageC;
55,16 → 55,16
Layout1->setMargin(0);
First = new QToolButton(this, "First");
First->setMaximumSize(QSize(24,24));
First->setText(tr(""));
First->setText("");
First->setPixmap(loadIcon("start.png"));
Layout1->addWidget(First);
Back = new QToolButton(this, "Back");
Back->setMaximumSize(QSize(24,24));
Back->setText(tr(""));
Back->setText("");
Back->setPixmap(loadIcon("back.png"));
Layout1->addWidget(Back);
Text1 = new QLabel(this);
Text1->setText(tr("Page:"));
Text1->setText( tr("Page:"));
Layout1->addWidget(Text1);
SeitenAusw = new QComboBox( true, this, "SeitenAusw" );
SeitenAusw->setEditable(false);
75,12 → 75,12
Layout1->addWidget(SeitenAusw);
Forward = new QToolButton(this, "Forward");
Forward->setMaximumSize(QSize(24,24));
Forward->setText(tr(""));
Forward->setText("");
Forward->setPixmap(loadIcon("forward.png"));
Layout1->addWidget(Forward);
Last = new QToolButton(this, "Last");
Last->setMaximumSize(QSize(24,24));
Last->setText(tr(""));
Last->setText("");
Last->setPixmap(loadIcon("finish.png"));
Layout1->addWidget(Last);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
89,11 → 89,11
Layout2->setSpacing(1);
Layout2->setMargin(0);
AliasText = new QCheckBox(this, "TextAntiAlias");
AliasText->setText(tr("Anti-alias Text"));
AliasText->setText( tr("Anti-alias Text"));
AliasText->setChecked(true);
Layout2->addWidget(AliasText);
AliasGr = new QCheckBox(this, "GraphicsAntiAlias");
AliasGr->setText(tr("Anti-alias Graphics"));
AliasGr->setText( tr("Anti-alias Graphics"));
AliasGr->setChecked(true);
Layout2->addWidget(AliasGr);
Layout1->addLayout(Layout2);
/trunk/Scribus/scribus/multiline.cpp
203,7 → 203,7
QString tmp, tmp2;
QPixmap pm = QPixmap(30, 15);
pm.fill(calcFarbe(TempVorl[CurLin].Color, TempVorl[CurLin].Shade));
tmp2 = " "+tmp.setNum(TempVorl[CurLin].Width)+tr(" pt ");
tmp2 = " "+tmp.setNum(TempVorl[CurLin].Width)+ tr(" pt ");
switch (static_cast<PenStyle>(TempVorl[CurLin].Dash))
{
case SolidLine:
283,7 → 283,7
for (multiLine::iterator it = TempVorl.begin(); it != TempVorl.end(); ++it)
{
pm2.fill(calcFarbe((*it).Color, (*it).Shade));
tmp2 = " "+tmp.setNum((*it).Width)+tr(" pt ");
tmp2 = " "+tmp.setNum((*it).Width)+ tr(" pt ");
switch (static_cast<PenStyle>((*it).Dash))
{
case SolidLine:
/trunk/Scribus/scribus/fontprefs.cpp
23,7 → 23,7
FontPrefsLayout->setSpacing( 5 );
FontPrefsLayout->setMargin( 10 );
TabWidget = new QTabWidget( this, "TabWidget" );
TabWidget->setMinimumSize(fontMetrics().width(tr( "Available Fonts" )+tr( "Font Substitutions" )+tr( "Additional Paths" ))+80, 200);
TabWidget->setMinimumSize(fontMetrics().width( tr( "Available Fonts" )+ tr( "Font Substitutions" )+ tr( "Additional Paths" ))+80, 200);
 
tab1 = new QWidget( TabWidget, "tab1" );
tab1Layout = new QVBoxLayout( tab1, 11, 6, "tab1Layout");
37,7 → 37,7
{
Table1->setText(a, 0, it.currentKey());
QCheckBox *cp = new QCheckBox(this, "use");
cp->setText(tr(" "));
cp->setText(" ");
cp->setChecked(it.current()->UseFont);
if (it.current()->UseFont)
UsedFonts.append(it.currentKey());
48,7 → 48,7
FlagsUse.append(cp);
Table1->setCellWidget(a, 1, cp);
QCheckBox *cp2 = new QCheckBox(this, "ps");
cp2->setText(tr("Postscript"));
cp2->setText( tr("Postscript"));
cp2->setChecked(it.current()->EmbedPS);
cp2->setEraseColor(white);
FlagsPS.append(cp2);
56,7 → 56,7
QFileInfo fi = QFileInfo(it.current()->Datei);
QString ext = fi.extension(false).lower();
QCheckBox *cp3 = new QCheckBox(this, "su");
cp3->setText(tr("Yes"));
cp3->setText( tr("Yes"));
if (ext == "otf")
{
cp3->setChecked(true); // Open Type Fonts are always Subsetted
367,7 → 367,7
{
Table1->setText(a, 0, it.currentKey());
QCheckBox *cp = new QCheckBox(this, "use");
cp->setText(tr(" "));
cp->setText(" ");
cp->setChecked(it.current()->UseFont);
if (it.current()->UseFont)
UsedFonts.append(it.currentKey());
378,7 → 378,7
FlagsUse.append(cp);
Table1->setCellWidget(a, 1, cp);
QCheckBox *cp2 = new QCheckBox(this, "ps");
cp2->setText(tr("Postscript"));
cp2->setText( tr("Postscript"));
cp2->setChecked(it.current()->EmbedPS);
cp2->setEraseColor(white);
FlagsPS.append(cp2);
386,7 → 386,7
QFileInfo fi = QFileInfo(it.current()->Datei);
QString ext = fi.extension(false).lower();
QCheckBox *cp3 = new QCheckBox(this, "su");
cp3->setText(tr("Yes"));
cp3->setText( tr("Yes"));
if (ext == "otf")
{
cp3->setChecked(true); // Open Type Fonts are always Subsetted
/trunk/Scribus/scribus/page.cpp
312,9 → 312,9
{
QPopupMenu *pmen = new QPopupMenu();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
pmen->insertItem(tr("Copy Here"));
pmen->insertItem(tr("Move Here"));
pmen->insertItem(tr("Cancel"));
pmen->insertItem( tr("Copy Here"));
pmen->insertItem( tr("Move Here"));
pmen->insertItem( tr("Cancel"));
re = pmen->indexOf(pmen->exec(QCursor::pos()));
delete pmen;
if (re == 1)
410,10 → 410,6
}
if (doku->Raster)
{
/* double stx = rd.x()/doku->Scale;
double endx = rd.x()/doku->Scale+e->rect().width()/doku->Scale;
double sty = rd.y()/doku->Scale;
double endy = rd.y()/doku->Scale+e->rect().height()/doku->Scale; */
double stx = rd.x()/doku->Scale;
double endx = rd.x()/doku->Scale+rd.width()/doku->Scale;
double sty = rd.y()/doku->Scale;
1925,46 → 1921,46
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
if (b->PType == 2)
{
pmen->insertItem(tr("Get Picture..."), this, SIGNAL(LoadPic()));
int px = pmen->insertItem(tr("Image Visible"), this, SLOT(TogglePic()));
pmen->insertItem( tr("Get Picture..."), this, SIGNAL(LoadPic()));
int px = pmen->insertItem( tr("Image Visible"), this, SLOT(TogglePic()));
pmen->setItemChecked(px, b->PicArt);
}
if (b->PType == 4)
{
pmen->insertItem(tr("Get Text..."), this, SIGNAL(LoadPic()));
pmen->insertItem(tr("Edit Text..."), this, SIGNAL(EditText()));
pmen->insertItem( tr("Get Text..."), this, SIGNAL(LoadPic()));
pmen->insertItem( tr("Edit Text..."), this, SIGNAL(EditText()));
if (PageNam == "")
{
int pxb = pmen->insertItem(tr("Is PDF-Bookmark"), this, SLOT(ToggleBookmark()));
int pxb = pmen->insertItem( tr("Is PDF-Bookmark"), this, SLOT(ToggleBookmark()));
pmen->setItemChecked(pxb, b->isBookmark);
pxb = pmen->insertItem(tr("Is PDF-Annotation"), this, SLOT(ToggleAnnotation()));
pxb = pmen->insertItem( tr("Is PDF-Annotation"), this, SLOT(ToggleAnnotation()));
pmen->setItemChecked(pxb, b->isAnnotation);
if (b->isAnnotation)
{
if ((b->AnType == 0) || (b->AnType == 1) || (b->AnType > 9))
pmen->insertItem(tr("Annotation Properties"), this, SIGNAL(AnnotProps()));
pmen->insertItem( tr("Annotation Properties"), this, SIGNAL(AnnotProps()));
else
pmen->insertItem(tr("Field Properties"), this, SIGNAL(AnnotProps()));
pmen->insertItem( tr("Field Properties"), this, SIGNAL(AnnotProps()));
}
}
}
if (b->PType == 8)
pmen->insertItem(tr("Edit Text..."), this, SIGNAL(EditText()));
pmen->insertItem( tr("Edit Text..."), this, SIGNAL(EditText()));
if (!b->Locked)
{
if (SelItem.count() > 1)
pmen->insertItem(tr("Group"), this, SIGNAL(DoGroup()));
pmen->insertItem( tr("Group"), this, SIGNAL(DoGroup()));
if (b->Groups.count() != 0)
pmen->insertItem(tr("Un-group"), this, SIGNAL(DoUnGroup()));
pmen->insertItem(tr("Lock"), this, SLOT(ToggleLock()));
pmen->insertItem(tr("Send to Back"), this, SLOT(ToBack()));
pmen->insertItem(tr("Bring to Front"), this, SLOT(ToFront()));
pmen->insertItem(tr("Lower"), this, SLOT(LowerItem()));
pmen->insertItem(tr("Raise"), this, SLOT(RaiseItem()));
pmen->insertItem( tr("Un-group"), this, SIGNAL(DoUnGroup()));
pmen->insertItem( tr("Lock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("Send to Back"), this, SLOT(ToBack()));
pmen->insertItem( tr("Bring to Front"), this, SLOT(ToFront()));
pmen->insertItem( tr("Lower"), this, SLOT(LowerItem()));
pmen->insertItem( tr("Raise"), this, SLOT(RaiseItem()));
}
else
pmen->insertItem(tr("Unlock"), this, SLOT(ToggleLock()));
pmen->insertItem(tr("Send to Scrapbook"), this, SLOT(sentToScrap()));
pmen->insertItem( tr("Unlock"), this, SLOT(ToggleLock()));
pmen->insertItem( tr("Send to Scrapbook"), this, SLOT(sentToScrap()));
if (doku->Layers.count() > 1)
{
for (uint lam=0; lam < doku->Layers.count(); ++lam)
1973,7 → 1969,7
if (static_cast<int>(lam) == doku->ActiveLayer)
pmen3->setItemEnabled(lai, 0);
}
pmen->insertItem(tr("Send to Layer"), pmen3);
pmen->insertItem( tr("Send to Layer"), pmen3);
}
connect(pmen3, SIGNAL(activated(int)), this, SLOT(sentToLayer(int)));
if ((b->PType == 4) || (b->PType == 2) || (b->PType == 6))
1980,28 → 1976,28
{
if (b->PType == 4)
{
pmen2->insertItem(tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem(tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
}
if (b->PType == 2)
{
pmen2->insertItem(tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem(tr("Polygon"), this, SLOT(ToPolyFrame()));
pmen2->insertItem( tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("Polygon"), this, SLOT(ToPolyFrame()));
}
if (b->PType == 6)
{
pmen2->insertItem(tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem(tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem(tr("Bezier Curve"), this, SLOT(ToBezierFrame()));
pmen2->insertItem( tr("Text Frame"), this, SLOT(ToTextFrame()));
pmen2->insertItem( tr("Picture Frame"), this, SLOT(ToPicFrame()));
pmen2->insertItem( tr("Bezier Curve"), this, SLOT(ToBezierFrame()));
}
pmen->insertItem(tr("Convert to"), pmen2);
pmen->insertItem( tr("Convert to"), pmen2);
}
pmen->insertSeparator();
if (!b->Locked)
pmen->insertItem(tr("Cut"), this, SIGNAL(CutItem()));
pmen->insertItem(tr("Copy"), this, SIGNAL(CopyItem()));
pmen->insertItem( tr("Cut"), this, SIGNAL(CutItem()));
pmen->insertItem( tr("Copy"), this, SIGNAL(CopyItem()));
if ((!b->Locked) && (doku->AppMode != 7))
pmen->insertItem(tr("Delete"), this, SLOT(DeleteItem()));
pmen->insertItem( tr("Delete"), this, SLOT(DeleteItem()));
pmen->exec(QCursor::pos());
delete pmen;
delete pmen2;
6220,8 → 6216,13
b->AnActType = Buffer->AnActType;
if ((Buffer->AnName != "") && (!drag))
{
b->AnName = Buffer->AnName;
b->AutoName = false;
if (b->AnName == Buffer->AnName)
b->AutoName = true;
else
{
b->AnName = Buffer->AnName;
b->AutoName = false;
}
}
b->AnToolTip = Buffer->AnToolTip;
b->AnBwid = Buffer->AnBwid;
/trunk/Scribus/scribus/annot.cpp
146,7 → 146,7
BorderC = new QComboBox( true, GroupBox20, "BorderC" );
CListe::Iterator cit;
QPixmap pm;
BorderC->insertItem(tr("None"));
BorderC->insertItem( tr("None"));
if (item->AnBColor == "None")
BorderC->setCurrentItem(BorderC->count()-1);
pm = QPixmap(15, 15);
265,7 → 265,7
OptIconsLayout = new QVBoxLayout( OptIcons->layout() );
OptIconsLayout->setAlignment( Qt::AlignTop );
UseIcons = new QCheckBox(OptIcons, "UIc");
UseIcons->setText(tr("Use Icons"));
UseIcons->setText( tr("Use Icons"));
UseIcons->setChecked(item->AnUseIcons);
OptIconsLayout->addWidget(UseIcons);
Layout17 = new QHBoxLayout( 0, 0, 6, "Layout17");
598,7 → 598,7
GroupBox11Layout->setSpacing( 6 );
GroupBox11Layout->setMargin( 11 );
LExtern = new QCheckBox(GroupBox11, "Extern");
LExtern->setText(tr("To File:"));
LExtern->setText( tr("To File:"));
GroupBox11Layout->addWidget( LExtern, 0, 0 );
Destfile = new QLineEdit(GroupBox11, "File");
Destfile->setText(item->An_Extern);
605,7 → 605,7
Destfile->setReadOnly(true);
GroupBox11Layout->addWidget( Destfile, 0, 1 );
ChFile = new QPushButton(GroupBox11, "Change");
ChFile->setText(tr("Change..."));
ChFile->setText( tr("Change..."));
GroupBox11Layout->addWidget( ChFile, 0, 2 );
TextLabel31 = new QLabel( GroupBox11, "TextLabel3" );
TextLabel31->setText( tr( "Page:" ) );
1185,7 → 1185,7
void Annot::GetNIcon()
{
QString fileName;
CustomFDialog dia(this, tr("Open"),tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
CustomFDialog dia(this, tr("Open"), tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
if (dia.exec() == QDialog::Accepted)
fileName = dia.selectedFile();
else
1216,7 → 1216,7
void Annot::GetPIcon()
{
QString fileName;
CustomFDialog dia(this, tr("Open"),tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
CustomFDialog dia(this, tr("Open"), tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
if (dia.exec() == QDialog::Accepted)
fileName = dia.selectedFile();
else
1235,7 → 1235,7
void Annot::GetRIcon()
{
QString fileName;
CustomFDialog dia(this, tr("Open"),tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
CustomFDialog dia(this, tr("Open"), tr("Images (*.tif *.png *.jpg *.xpm);;Postscript (*.eps);;All Files (*)"), "", true);
if (dia.exec() == QDialog::Accepted)
fileName = dia.selectedFile();
else
1343,7 → 1343,7
tmp = "M/d/yy h:mm ap";
if (ds == "m/d/yy HH:MM")
tmp = "M/d/yy hh:mm";
TextDa1->setText(tr("Example:")+" "+dt.toString(tmp));
TextDa1->setText( tr("Example:")+" "+dt.toString(tmp));
}
 
void Annot::DecodeVali()
2111,7 → 2111,7
void Annot::GetFile()
{
QString fn;
CustomFDialog dia(this, tr("Open"),tr("PDF-Documents (*.pdf);;All Files (*)"));
CustomFDialog dia(this, tr("Open"), tr("PDF-Documents (*.pdf);;All Files (*)"));
if (Destfile->text() != "")
dia.setSelection(Destfile->text());
if (dia.exec() == QDialog::Accepted)
/trunk/Scribus/scribus/scribus.h
207,6 → 207,7
void slotFileSave();
/** save a document under a different filename*/
void slotFileSaveAs();
void slotFileRevert();
/** Sichert den Text eines Elements */
void SaveText();
/** close the actual file */
457,6 → 458,7
int fid4;
int fid5;
int fid51;
int fid52;
int fid6;
int fid7;
int fid8;
/trunk/Scribus/scribus/tree.cpp
32,9 → 32,9
ListView1->setGeometry( QRect( 0, 0, 220, 240 ) );
ListView1->setMinimumSize( QSize( 220, 240 ) );
ListView1->setRootIsDecorated( TRUE );
ListView1->addColumn(tr("Element"));
ListView1->addColumn(tr("Type"));
ListView1->addColumn(tr("Information"));
ListView1->addColumn( tr("Element"));
ListView1->addColumn( tr("Type"));
ListView1->addColumn( tr("Information"));
ListView1->setSelectionMode(QListView::Single);
ListView1->setSorting(0,1);
 
/trunk/Scribus/scribus/cmykfw.cpp
150,7 → 150,7
Cyan->setMargin( 0 );
 
CyanT = new QLabel( Frame4, "Cyant" );
CyanT->setText(tr("C:"));
CyanT->setText( tr("C:"));
Cyan->addWidget(CyanT);
 
Layout1_2 = new QVBoxLayout;
184,7 → 184,7
Magenta->setMargin( 0 );
 
MagentaT = new QLabel( Frame4, "Cyant" );
MagentaT->setText(tr("M:"));
MagentaT->setText( tr("M:"));
Magenta->addWidget(MagentaT);
 
Layout1_2_2 = new QVBoxLayout;
218,7 → 218,7
Yellow->setMargin( 0 );
 
YellowT = new QLabel( Frame4, "Cyant" );
YellowT->setText(tr("Y:"));
YellowT->setText( tr("Y:"));
Yellow->addWidget(YellowT);
 
Layout1_2_3 = new QVBoxLayout;
252,7 → 252,7
Black->setMargin( 0 );
 
BlackT = new QLabel( Frame4, "Cyant" );
BlackT->setText(tr("K:"));
BlackT->setText( tr("K:"));
Black->addWidget(BlackT);
 
Layout1_2_4 = new QVBoxLayout;
312,8 → 312,8
{
QPopupMenu *pmen = new QPopupMenu();
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
int px = pmen->insertItem(tr("Dynamic Color Bars"), this, SLOT(ToggleSL()));
int py = pmen->insertItem(tr("Static Color Bars"), this, SLOT(ToggleSL()));
int px = pmen->insertItem( tr("Dynamic Color Bars"), this, SLOT(ToggleSL()));
int py = pmen->insertItem( tr("Static Color Bars"), this, SLOT(ToggleSL()));
pmen->setItemChecked((dynamic ? px : py) , true);
/*if (dynamic)
pmen->setItemChecked(px, true);
449,9 → 449,9
{
CMYKmode = true;
Wsave = false;
CyanT->setText(tr("C:"));
MagentaT->setText(tr("M:"));
YellowT->setText(tr("Y:"));
CyanT->setText( tr("C:"));
MagentaT->setText( tr("M:"));
YellowT->setText( tr("Y:"));
CyanP->setPixmap(SliderPix(180));
MagentaP->setPixmap(SliderPix(300));
YellowP->setPixmap(SliderPix(60));
467,9 → 467,9
{
CMYKmode = false;
Wsave = false;
CyanT->setText(tr("R:"));
MagentaT->setText(tr("G:"));
YellowT->setText(tr("B:"));
CyanT->setText( tr("R:"));
MagentaT->setText( tr("G:"));
YellowT->setText( tr("B:"));
CyanP->setPixmap(SliderPix(0));
MagentaP->setPixmap(SliderPix(120));
YellowP->setPixmap(SliderPix(240));
/trunk/Scribus/scribus/movepage.cpp
55,9 → 55,9
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->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 );
66,7 → 66,7
ActualPage->setValue( act );
ActualPage->setMaxValue( max );
Layout4->addWidget( ActualPage, 1, 3 );
Layout4->addColSpacing(0, TextLabel1->fontMetrics().width(tr( "Move Page(s):" )));
Layout4->addColSpacing(0, TextLabel1->fontMetrics().width( tr( "Move Page(s):" )));
DLayout->addLayout( Layout4 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
/trunk/Scribus/scribus/story.h
56,6 → 56,8
~STable() {};
void keyPressEvent(QKeyEvent *k);
void adjHeight(int r);
int HomeK;
int EndK;
};
 
class StoryEditor : public QDialog
90,6 → 92,7
void Do_cut();
void Do_del();
void updateTextFrame();
void slotEditStyles();
void styleChange(int st);
void modifiedText();
void WrapHandler();
100,6 → 103,7
 
signals:
void DocChanged();
void EditSt();
 
protected:
QHBoxLayout* Form1Layout;
/trunk/Scribus/scribus/cupsoptions.cpp
101,7 → 101,7
struct OpData Daten;
 
Table->setNumRows(Table->numRows()+1);
Table->setText(Table->numRows()-1, 0, QString(tr("Page Set")));
Table->setText(Table->numRows()-1, 0, QString( tr("Page Set")));
QComboBox *item4 = new QComboBox( true, this, "Replace" );
item4->setEditable(false);
FlagsOpt.append(item4);
108,14 → 108,14
Daten.Cnum = static_cast<int>(FlagsOpt.count()-1);
Daten.KeyW = "page-set";
KeyToText["Page Set"] = Daten;
item4->insertItem(tr("All Pages"));
item4->insertItem(tr("Even Pages only"));
item4->insertItem(tr("Odd Pages only"));
item4->insertItem( tr("All Pages"));
item4->insertItem( tr("Even Pages only"));
item4->insertItem( tr("Odd Pages only"));
item4->setCurrentItem(0);
KeyToDefault["Page Set"] = tr("All Pages");
Table->setCellWidget(Table->numRows()-1, 1, item4);
Table->setNumRows(Table->numRows()+1);
Table->setText(Table->numRows()-1, 0, QString(tr("Mirror")));
Table->setText(Table->numRows()-1, 0, QString( tr("Mirror")));
QComboBox *item2 = new QComboBox( true, this, "Replace" );
item2->setEditable(false);
FlagsOpt.append(item2);
122,13 → 122,13
Daten.Cnum = static_cast<int>(FlagsOpt.count()-1);
Daten.KeyW = "mirror";
KeyToText["Mirror"] = Daten;
item2->insertItem(tr("No"));
item2->insertItem(tr("Yes"));
item2->insertItem( tr("No"));
item2->insertItem( tr("Yes"));
item2->setCurrentItem(0);
KeyToDefault["Mirror"] = tr("No");
Table->setCellWidget(Table->numRows()-1, 1, item2);
Table->setNumRows(Table->numRows()+1);
Table->setText(Table->numRows()-1, 0, QString(tr("Orientation")));
Table->setText(Table->numRows()-1, 0, QString( tr("Orientation")));
QComboBox *item5 = new QComboBox( true, this, "Replace" );
item5->setEditable(false);
FlagsOpt.append(item5);
135,13 → 135,13
Daten.Cnum = static_cast<int>(FlagsOpt.count()-1);
Daten.KeyW = "orientation";
KeyToText["Orientation"] = Daten;
item5->insertItem(tr("Portrait"));
item5->insertItem(tr("Landscape"));
item5->insertItem( tr("Portrait"));
item5->insertItem( tr("Landscape"));
item5->setCurrentItem(0);
KeyToDefault["Orientation"] = tr("Portrait");
Table->setCellWidget(Table->numRows()-1, 1, item5);
Table->setNumRows(Table->numRows()+1);
Table->setText(Table->numRows()-1, 0, QString(tr("N-Up Printing")));
Table->setText(Table->numRows()-1, 0, QString( tr("N-Up Printing")));
QComboBox *item3 = new QComboBox( true, this, "Replace" );
item3->setEditable(false);
FlagsOpt.append(item3);
148,14 → 148,14
Daten.Cnum = static_cast<int>(FlagsOpt.count()-1);
Daten.KeyW = "number-up";
KeyToText["N-Up Printing"] = Daten;
item3->insertItem("1 "+tr("Page per Sheet"));
item3->insertItem("2 "+tr("Pages per Sheet"));
item3->insertItem("4 "+tr("Pages per Sheet"));
item3->insertItem("6 "+tr("Pages per Sheet"));
item3->insertItem("9 "+tr("Pages per Sheet"));
item3->insertItem("16 "+tr("Pages per Sheet"));
item3->insertItem("1 "+ tr("Page per Sheet"));
item3->insertItem("2 "+ tr("Pages per Sheet"));
item3->insertItem("4 "+ tr("Pages per Sheet"));
item3->insertItem("6 "+ tr("Pages per Sheet"));
item3->insertItem("9 "+ tr("Pages per Sheet"));
item3->insertItem("16 "+ tr("Pages per Sheet"));
item3->setCurrentItem(0);
KeyToDefault["N-Up Printing"] = "1 "+tr("Page per Sheet");
KeyToDefault["N-Up Printing"] = "1 "+ tr("Page per Sheet");
Table->setCellWidget(Table->numRows()-1, 1, item3);
#endif
Table->adjustColumn(0);
/trunk/Scribus/scribus/editor.cpp
18,14 → 18,14
 
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( tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(LoadScript()));
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);
32,10 → 32,10
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->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 ) );
56,7 → 56,7
 
void Editor::LoadScript()
{
QString fileName = QFileDialog::getOpenFileName(0,tr("Javascripts (*.js);;All Files (*)"),this);
QString fileName = QFileDialog::getOpenFileName(0, tr("Javascripts (*.js);;All Files (*)"),this);
if (!fileName.isEmpty())
{
QFile file( fileName );
/trunk/Scribus/scribus/scribuswin.cpp
63,7 → 63,7
{
int exit=QMessageBox::information(this,
tr("Warning"),
tr("Document:")+" "+doc->DocName+"\n"+tr("has been changed since the last save."),
tr("Document:")+" "+doc->DocName+"\n"+ tr("has been changed since the last save."),
tr("Save Now"),
tr("Cancel"),
tr("Leave Anyway"),
/trunk/Scribus/scribus/colorm.cpp
91,7 → 91,7
{
QString fileName;
#ifdef HAVE_LIBZ
CustomFDialog dia(this, tr("Open"),tr("Documents (*.sla *.sla.gz *.scd *.scd.gz);;All Files (*)"));
CustomFDialog dia(this, tr("Open"), tr("Documents (*.sla *.sla.gz *.scd *.scd.gz);;All Files (*)"));
#else
CustomFDialog dia(this, tr("Open"), tr("Documents (*.sla *.scd);;All Files (*)"));
#endif
137,7 → 137,7
{
QString nam;
Query *dia = new Query(this, "tt", 1, 0, "New Color:", "New Color");
dia->Answer->setText(tr("Copy of ")+sFarbe);
dia->Answer->setText( tr("Copy of ")+sFarbe);
if (dia->exec())
{
nam = dia->Answer->text();
/trunk/Scribus/scribus/newtemp.cpp
37,8 → 37,8
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
Links = new QComboBox( true, this, "links" );
Links->insertItem(tr("Left Page"));
Links->insertItem(tr("Right Page"));
Links->insertItem( tr("Left Page"));
Links->insertItem( tr("Right Page"));
Links->setEditable(false);
Layout3->addWidget( Links );
QueryLayout->addLayout( Layout3 );
/trunk/Scribus/scribus/inspage.cpp
32,9 → 32,9
TextLabel2->setText( tr( "page(s)" ) );
Layout4->addWidget( TextLabel2, 0, 2 );
Where = new QComboBox( true, this, "Where" );
Where->insertItem(tr("before Page"));
Where->insertItem(tr("after Page"));
Where->insertItem(tr("at End"));
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 );
43,7 → 43,7
ActualPage->setValue( act+1 );
ActualPage->setMaxValue(max);
Layout4->addWidget( ActualPage, 1, 2 );
Layout4->addColSpacing(0, TextLabel1->fontMetrics().width(tr( "Inserting" )));
Layout4->addColSpacing(0, TextLabel1->fontMetrics().width( tr( "Inserting" )));
DLayout->addLayout( Layout4 );
Layout4a = new QHBoxLayout;
Layout4a->setSpacing( 6 );
50,9 → 50,9
Layout4a->setMargin( 0 );
TextLabel3 = new QLabel(this, "text");
if (ds)
TextLabel3->setText(tr("Template (Left Page):"));
TextLabel3->setText( tr("Template (Left Page):"));
else
TextLabel3->setText(tr("Template:"));
TextLabel3->setText( tr("Template:"));
Layout4a->addWidget( TextLabel3 );
QSpacerItem* spacer3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4a->addItem( spacer3 );
62,7 → 62,7
for (it = view->MasterNames.begin(); it != view->MasterNames.end(); ++it)
{
if (it.key() == "Normal")
Based->insertItem(tr("Normal"));
Based->insertItem( tr("Normal"));
else
Based->insertItem(it.key());
}
74,7 → 74,7
Layout4b->setSpacing( 6 );
Layout4b->setMargin( 0 );
TextLabel3a = new QLabel(this, "texta");
TextLabel3a->setText(tr("Template (Right Page):"));
TextLabel3a->setText( tr("Template (Right Page):"));
Layout4b->addWidget( TextLabel3a );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout4b->addItem( spacer2 );
84,7 → 84,7
for (it2 = view->MasterNames.begin(); it2 != view->MasterNames.end(); ++it2)
{
if (it2.key() == "Normal")
Based2->insertItem(tr("Normal"));
Based2->insertItem( tr("Normal"));
else
Based2->insertItem(it2.key());
}