Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 248 → Rev 249

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 1.1.6
10.04.2004 Panning Mode is now toggled by pressing Space. Works only when not editing a Textframe.
Pressing Shift+Return inserts now a new line into a paragraph, does not count as a paragraph seperator.
Improved behaviour of the hyphenation, you can set now the number of hyphenations allowed to follow each other.
Added more Tooltips.
 
09.04.2004 Made various adjustments to Dialog Buttons.
Improved Panning.
 
/trunk/Scribus/scribus/hyphenator.cpp
49,6 → 49,7
MinWordLen = doc->MinWordLen;
Automatic = doc->Automatic;
AutoCheck = doc->AutoCheck;
HyCount = doc->HyCount;
QString pfad = PREL;
if (Sap->Sprachen.contains(doc->Language))
Language = doc->Language;
142,14 → 143,16
\param ACheck AutoCheck flag.
\retval None
*/
void Hyphenator::slotNewSettings(int Wordlen, bool Autom, bool ACheck)
void Hyphenator::slotNewSettings(int Wordlen, bool Autom, bool ACheck, int Num)
{
MinWordLen = Wordlen;
Automatic = Autom;
AutoCheck = ACheck;
HyCount = Num;
doc->MinWordLen = Wordlen;
doc->Automatic = Autom;
doc->AutoCheck = AutoCheck;
doc->HyCount = Num;
}
 
/*!
/trunk/Scribus/scribus/edit1format.cpp
4,91 → 4,92
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
#include <qmessagebox.h>
#include <qtooltip.h>
 
EditStyle::EditStyle( QWidget* parent, struct StVorL *vor, QValueList<StVorL> v, bool neu, preV *Prefs, double au, int dEin, ScribusDoc *doc)
: QDialog( parent, "EditST", true, 0)
: QDialog( parent, "EditST", true, 0)
{
setCaption( tr( "Edit Style" ) );
setCaption( tr( "Edit Style" ) );
setIcon(loadIcon("AppIcon.png"));
AutoVal = au;
DocsEin = dEin;
EditStyleLayout = new QGridLayout( this );
EditStyleLayout->setSpacing( 6 );
EditStyleLayout->setMargin( 10 );
EditStyleLayout = new QGridLayout( this );
EditStyleLayout->setSpacing( 6 );
EditStyleLayout->setMargin( 10 );
 
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Name:" ) );
EditStyleLayout->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setText( tr( "Name:" ) );
EditStyleLayout->addMultiCellWidget( TextLabel1, 0, 0, 0, 1 );
 
Name = new QLineEdit( this, "Name" );
Name->setMinimumSize( QSize( 200, 22 ) );
Name->setText( vor->Vname );
OldName = vor->Vname;
IsNew = neu;
EditStyleLayout->addMultiCellWidget( Name, 1, 1, 0, 1 );
Name = new QLineEdit( this, "Name" );
Name->setMinimumSize( QSize( 200, 22 ) );
Name->setText( vor->Vname );
OldName = vor->Vname;
IsNew = neu;
EditStyleLayout->addMultiCellWidget( Name, 1, 1, 0, 1 );
 
GroupFont = new QGroupBox( this, "GroupFont" );
GroupFont->setTitle( tr( "Character" ) );
GroupFont->setColumnLayout(0, Qt::Vertical );
GroupFont->layout()->setSpacing( 5 );
GroupFont->layout()->setMargin( 10 );
GroupFontLayout = new QGridLayout( GroupFont->layout() );
GroupFontLayout->setAlignment( Qt::AlignTop );
TextF1 = new QLabel( GroupFont, "TextF1" );
TextF1->setMinimumSize( QSize( 50, 22 ) );
TextF1->setText( tr( "Face:" ) );
GroupFontLayout->addWidget( TextF1, 0, 0 );
FontC = new FontCombo(GroupFont, Prefs);
for (int fc=0; fc<FontC->count(); ++fc)
{
if (FontC->text(fc) == vor->Font)
{
FontC->setCurrentItem(fc);
break;
}
}
GroupFontLayout->addMultiCellWidget( FontC, 0, 0, 1, 2 );
TextF2 = new QLabel( GroupFont, "TextF2" );
TextF2->setMinimumSize( QSize( 50, 22 ) );
TextF2->setText( tr( "Size:" ) );
GroupFontLayout->addWidget( TextF2, 1, 0 );
SizeC = new MSpinBox( GroupFont, 1 );
SizeC->setMinimumSize( QSize( 70, 22 ) );
SizeC->setSuffix( tr( " pt" ) );
GroupFont = new QGroupBox( this, "GroupFont" );
GroupFont->setTitle( tr( "Character" ) );
GroupFont->setColumnLayout(0, Qt::Vertical );
GroupFont->layout()->setSpacing( 5 );
GroupFont->layout()->setMargin( 10 );
GroupFontLayout = new QGridLayout( GroupFont->layout() );
GroupFontLayout->setAlignment( Qt::AlignTop );
TextF1 = new QLabel( GroupFont, "TextF1" );
TextF1->setMinimumSize( QSize( 50, 22 ) );
TextF1->setText( tr( "Face:" ) );
GroupFontLayout->addWidget( TextF1, 0, 0 );
FontC = new FontCombo(GroupFont, Prefs);
for (int fc=0; fc<FontC->count(); ++fc)
{
if (FontC->text(fc) == vor->Font)
{
FontC->setCurrentItem(fc);
break;
}
}
GroupFontLayout->addMultiCellWidget( FontC, 0, 0, 1, 2 );
TextF2 = new QLabel( GroupFont, "TextF2" );
TextF2->setMinimumSize( QSize( 50, 22 ) );
TextF2->setText( tr( "Size:" ) );
GroupFontLayout->addWidget( TextF2, 1, 0 );
SizeC = new MSpinBox( GroupFont, 1 );
SizeC->setMinimumSize( QSize( 70, 22 ) );
SizeC->setSuffix( tr( " pt" ) );
SizeC->setMinValue(1);
SizeC->setMaxValue(1024);
SizeC->setValue(vor->FontSize / 10.0);
GroupFontLayout->addWidget( SizeC, 1, 1 );
EffeLabel = new QLabel( GroupFont, "EffeLabel" );
GroupFontLayout->addWidget( SizeC, 1, 1 );
EffeLabel = new QLabel( GroupFont, "EffeLabel" );
EffeLabel->setText( tr("Effect:"));
GroupFontLayout->addWidget( EffeLabel, 2, 0 );
GroupFontLayout->addWidget( EffeLabel, 2, 0 );
EffeS = new StyleSelect(GroupFont);
EffeS->setStyle(vor->FontEffect);
GroupFontLayout->addWidget( EffeS, 2, 1, Qt::AlignLeft );
AligLabel = new QLabel( GroupFont, "AligLabel" );
GroupFontLayout->addWidget( EffeS, 2, 1, Qt::AlignLeft );
AligLabel = new QLabel( GroupFont, "AligLabel" );
AligLabel->setText( tr("Alignment:"));
GroupFontLayout->addWidget( AligLabel, 3, 0 );
GroupFontLayout->addWidget( AligLabel, 3, 0 );
AligS = new AlignSelect(GroupFont);
AligS->setStyle(vor->Ausri);
GroupFontLayout->addWidget( AligS, 3, 1, Qt::AlignLeft );
GroupFontLayout->addWidget( AligS, 3, 1, Qt::AlignLeft );
 
FillIcon = new QLabel( GroupFont, "FillIcon" );
FillIcon = new QLabel( GroupFont, "FillIcon" );
FillIcon->setText( tr("Fill Color:"));
GroupFontLayout->addWidget( FillIcon, 4, 0 );
TxFill = new QComboBox( true, GroupFont, "TxFill" );
GroupFontLayout->addWidget( FillIcon, 4, 0 );
TxFill = new QComboBox( true, GroupFont, "TxFill" );
TxFill->setEditable(false);
GroupFontLayout->addWidget( TxFill, 4, 1 );
GroupFontLayout->addWidget( TxFill, 4, 1 );
PM2 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM2, 4, 2, Qt::AlignLeft );
GroupFontLayout->addWidget( PM2, 4, 2, Qt::AlignLeft );
 
StrokeIcon = new QLabel( GroupFont, "StrokeIcon" );
StrokeIcon->setText( tr("Stroke Color:"));
GroupFontLayout->addWidget( StrokeIcon, 5, 0 );
TxStroke = new QComboBox( true, GroupFont, "TxStroke" );
StrokeIcon = new QLabel( GroupFont, "StrokeIcon" );
StrokeIcon->setText( tr("Stroke Color:"));
GroupFontLayout->addWidget( StrokeIcon, 5, 0 );
TxStroke = new QComboBox( true, GroupFont, "TxStroke" );
TxStroke->setEditable(false);
GroupFontLayout->addWidget( TxStroke, 5, 1 );
GroupFontLayout->addWidget( TxStroke, 5, 1 );
PM1 = new ShadeButton(GroupFont);
GroupFontLayout->addWidget( PM1, 5, 2, Qt::AlignLeft );
GroupFontLayout->addWidget( PM1, 5, 2, Qt::AlignLeft );
 
TxFill->clear();
TxStroke->clear();
109,140 → 110,156
PM2->setValue(vor->FShade);
PM1->setValue(vor->SShade);
 
DropCaps = new QCheckBox( GroupFont, "DropCaps" );
DropCaps->setText( tr( "Drop Caps" ) );
DropCaps = new QCheckBox( GroupFont, "DropCaps" );
DropCaps->setText( tr( "Drop Caps" ) );
DropCaps->setChecked(vor->Drop);
GroupFontLayout->addMultiCellWidget( DropCaps, 6, 6, 0, 2 );
CapLabel = new QLabel( GroupFont, "CapLabel" );
GroupFontLayout->addMultiCellWidget( DropCaps, 6, 6, 0, 2 );
CapLabel = new QLabel( GroupFont, "CapLabel" );
CapLabel->setText( tr("Lines:"));
GroupFontLayout->addWidget( CapLabel, 7, 0 );
DropLines = new QSpinBox( GroupFont, "DropLines" );
DropLines->setMinValue( 2 );
DropLines->setMaxValue( 20 );
DropLines->setValue(vor->DropLin);
GroupFontLayout->addWidget( DropLines, 7, 1 );
GroupFontLayout->addWidget( CapLabel, 7, 0 );
DropLines = new QSpinBox( GroupFont, "DropLines" );
DropLines->setMinValue( 2 );
DropLines->setMaxValue( 20 );
DropLines->setValue(vor->DropLin);
GroupFontLayout->addWidget( DropLines, 7, 1 );
bool enable = vor->Drop ? true : false;
DropLines->setEnabled(enable);
CapLabel->setEnabled(enable);
 
EditStyleLayout->addMultiCellWidget( GroupFont, 2, 3, 0, 0 );
EditStyleLayout->addMultiCellWidget( GroupFont, 2, 3, 0, 0 );
 
GroupBox10 = new QGroupBox( this, "GroupBox10" );
GroupBox10->setTitle( tr( "Indentation" ) );
GroupBox10->setColumnLayout(0, Qt::Vertical );
GroupBox10->layout()->setSpacing( 0 );
GroupBox10->layout()->setMargin( 0 );
GroupBox10Layout = new QGridLayout( GroupBox10->layout() );
GroupBox10Layout->setAlignment( Qt::AlignTop );
GroupBox10Layout->setSpacing( 5 );
GroupBox10Layout->setMargin( 10 );
TextLabel1_2 = new QLabel( GroupBox10, "TextLabel1_2" );
TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2->setText( tr( "Left Indent:" ) );
GroupBox10Layout->addWidget( TextLabel1_2, 1, 0 );
TextLabel2 = new QLabel( GroupBox10, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2->setMinimumSize( QSize( 90, 22 ) );
TextLabel2->setText( tr( "First Line:" ) );
GroupBox10Layout->addWidget( TextLabel2, 0, 0 );
GroupBox10 = new QGroupBox( this, "GroupBox10" );
GroupBox10->setTitle( tr( "Indentation" ) );
GroupBox10->setColumnLayout(0, Qt::Vertical );
GroupBox10->layout()->setSpacing( 0 );
GroupBox10->layout()->setMargin( 0 );
GroupBox10Layout = new QGridLayout( GroupBox10->layout() );
GroupBox10Layout->setAlignment( Qt::AlignTop );
GroupBox10Layout->setSpacing( 5 );
GroupBox10Layout->setMargin( 10 );
TextLabel1_2 = new QLabel( GroupBox10, "TextLabel1_2" );
TextLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2->setText( tr( "Left Indent:" ) );
GroupBox10Layout->addWidget( TextLabel1_2, 1, 0 );
TextLabel2 = new QLabel( GroupBox10, "TextLabel2" );
TextLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel2->sizePolicy().hasHeightForWidth() ) );
TextLabel2->setMinimumSize( QSize( 90, 22 ) );
TextLabel2->setText( tr( "First Line:" ) );
GroupBox10Layout->addWidget( TextLabel2, 0, 0 );
 
LeftInd = new MSpinBox( GroupBox10, 1 );
LeftInd->setMaxValue( 300 );
LeftInd->setMinValue( -300 );
GroupBox10Layout->addWidget( LeftInd, 1, 1 );
LeftInd = new MSpinBox( GroupBox10, 1 );
LeftInd->setMaxValue( 300 );
LeftInd->setMinValue( -300 );
GroupBox10Layout->addWidget( LeftInd, 1, 1 );
 
FirstLin = new MSpinBox( GroupBox10, 1);
FirstLin->setMaxValue( 300 );
FirstLin->setMinValue( -300 );
GroupBox10Layout->addWidget( FirstLin, 0, 1 );
FirstLin = new MSpinBox( GroupBox10, 1);
FirstLin->setMaxValue( 300 );
FirstLin->setMinValue( -300 );
GroupBox10Layout->addWidget( FirstLin, 0, 1 );
TabsButton = new QPushButton( GroupBox10, "Tabul" );
TabsButton->setText( tr( "Tabulators..." ) );
GroupBox10Layout->addMultiCellWidget( TabsButton, 2, 2, 0, 1 );
EditStyleLayout->addWidget( GroupBox10, 3, 1 );
EditStyleLayout->addWidget( GroupBox10, 3, 1 );
 
AbstandV = new QGroupBox( this, "AbstandV" );
AbstandV->setTitle( tr( "Vertical Spaces" ) );
AbstandV->setColumnLayout(0, Qt::Vertical );
AbstandV->layout()->setSpacing( 0 );
AbstandV->layout()->setMargin( 0 );
AbstandVLayout = new QGridLayout( AbstandV->layout() );
AbstandVLayout->setAlignment( Qt::AlignTop );
AbstandVLayout->setSpacing( 5 );
AbstandVLayout->setMargin( 10 );
AbstandV = new QGroupBox( this, "AbstandV" );
AbstandV->setTitle( tr( "Vertical Spaces" ) );
AbstandV->setColumnLayout(0, Qt::Vertical );
AbstandV->layout()->setSpacing( 0 );
AbstandV->layout()->setMargin( 0 );
AbstandVLayout = new QGridLayout( AbstandV->layout() );
AbstandVLayout->setAlignment( Qt::AlignTop );
AbstandVLayout->setSpacing( 5 );
AbstandVLayout->setMargin( 10 );
 
BaseGrid = new QCheckBox( AbstandV, "BaseGrid" );
BaseGrid->setText( tr( "Adjust to Baseline Grid" ) );
BaseGrid = new QCheckBox( AbstandV, "BaseGrid" );
BaseGrid->setText( tr( "Adjust to Baseline Grid" ) );
BaseGrid->setChecked(vor->BaseAdj);
AbstandVLayout->addMultiCellWidget( BaseGrid, 0, 0, 0, 1 );
AboveV = new MSpinBox( AbstandV, 1 );
AboveV->setMinimumSize( QSize( 70, 22 ) );
AboveV->setMaxValue( 300 );
AboveV->setMinValue( 0 );
AbstandVLayout->addWidget( AboveV, 1, 1 );
AboveV = new MSpinBox( AbstandV, 1 );
AboveV->setMinimumSize( QSize( 70, 22 ) );
AboveV->setMaxValue( 300 );
AboveV->setMinValue( 0 );
AbstandVLayout->addWidget( AboveV, 1, 1 );
 
BelowV = new MSpinBox( AbstandV, 1 );
BelowV->setMinimumSize( QSize( 70, 22 ) );
BelowV->setMaxValue( 300 );
BelowV->setMinValue( 0 );
BelowV = new MSpinBox( AbstandV, 1 );
BelowV->setMinimumSize( QSize( 70, 22 ) );
BelowV->setMaxValue( 300 );
BelowV->setMinValue( 0 );
AbstandVLayout->addWidget( BelowV, 2, 1 );
 
LineSpVal = new MSpinBox( AbstandV, 1 );
LineSpVal->setMinimumSize( QSize( 70, 22 ) );
LineSpVal->setSuffix( tr( " pt" ) );
LineSpVal->setMaxValue( 300 );
LineSpVal->setMinValue( 1 );
LineSpVal->setValue(vor->LineSpa);
AbstandVLayout->addWidget( LineSpVal, 3, 1 );
LineSpVal = new MSpinBox( AbstandV, 1 );
LineSpVal->setMinimumSize( QSize( 70, 22 ) );
LineSpVal->setSuffix( tr( " pt" ) );
LineSpVal->setMaxValue( 300 );
LineSpVal->setMinValue( 1 );
LineSpVal->setValue(vor->LineSpa);
AbstandVLayout->addWidget( LineSpVal, 3, 1 );
 
TextLabel3 = new QLabel( AbstandV, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel3->sizePolicy().hasHeightForWidth() ) );
TextLabel3->setMinimumSize( QSize( 90, 22 ) );
TextLabel3->setText( tr( "Line Spacing" ) );
AbstandVLayout->addWidget( TextLabel3, 3, 0 );
TextLabel1_2_2 = new QLabel( AbstandV, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_2->setText( tr( "Above:" ) );
AbstandVLayout->addWidget( TextLabel1_2_2, 1, 0 );
TextLabel1_2_3 = new QLabel( AbstandV, "TextLabel1_2_3" );
TextLabel1_2_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_3->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_3->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_3->setText( tr( "Below:" ) );
AbstandVLayout->addWidget( TextLabel1_2_3, 2, 0 );
EditStyleLayout->addWidget( AbstandV, 2, 1 );
TextLabel3 = new QLabel( AbstandV, "TextLabel3" );
TextLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel3->sizePolicy().hasHeightForWidth() ) );
TextLabel3->setMinimumSize( QSize( 90, 22 ) );
TextLabel3->setText( tr( "Line Spacing" ) );
AbstandVLayout->addWidget( TextLabel3, 3, 0 );
TextLabel1_2_2 = new QLabel( AbstandV, "TextLabel1_2_2" );
TextLabel1_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_2->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_2->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_2->setText( tr( "Above:" ) );
AbstandVLayout->addWidget( TextLabel1_2_2, 1, 0 );
TextLabel1_2_3 = new QLabel( AbstandV, "TextLabel1_2_3" );
TextLabel1_2_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)1,
TextLabel1_2_3->sizePolicy().hasHeightForWidth() ) );
TextLabel1_2_3->setMinimumSize( QSize( 90, 22 ) );
TextLabel1_2_3->setText( tr( "Below:" ) );
AbstandVLayout->addWidget( TextLabel1_2_3, 2, 0 );
EditStyleLayout->addWidget( AbstandV, 2, 1 );
 
Layout17 = new QHBoxLayout;
Layout17->setSpacing( 6 );
Layout17->setMargin( 0 );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer2 );
OkButton = new QPushButton( this, "OkButton" );
OkButton->setText( tr( "OK" ) );
Layout17->addWidget( OkButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
OkButton->setDefault( true );
Layout17->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer_3 );
EditStyleLayout->addMultiCellLayout( Layout17, 4, 4, 0, 1 );
werte = vor;
allV = v;
// signals and slots connections
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OkButton, SIGNAL( clicked() ), this, SLOT( Verlassen() ) );
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect( DropCaps, SIGNAL( clicked() ), this, SLOT( ManageDrops() ) );
connect(SizeC, SIGNAL(valueChanged(int)), this, SLOT(FontChange()));
connect(EffeS, SIGNAL(State(int)), this, SLOT(ColorChange()));
Layout17 = new QHBoxLayout;
Layout17->setSpacing( 6 );
Layout17->setMargin( 0 );
QSpacerItem* spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer2 );
OkButton = new QPushButton( this, "OkButton" );
OkButton->setText( tr( "OK" ) );
Layout17->addWidget( OkButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
OkButton->setDefault( true );
Layout17->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout17->addItem( spacer_3 );
EditStyleLayout->addMultiCellLayout( Layout17, 4, 4, 0, 1 );
werte = vor;
allV = v;
// tooltips
QToolTip::add( Name, tr( "Name of your paragraph style" ) );
QToolTip::add( FontC, tr( "Font of selected text or object" ) );
QToolTip::add( SizeC, tr( "Font Size" ) );
QToolTip::add( TxFill, tr( "Color of text fill" ) );
QToolTip::add( TxStroke, tr( "Color of text stroke" ) );
QToolTip::add( DropCaps, tr( "Provides an oversized first letter for a paragraph. Used for stylistic effect" ) );
QToolTip::add( DropLines, tr( "Determines the overall height, in line numbers, of the Drop Caps" ) );
QToolTip::add( BaseGrid, tr( "Align text to baseline grid" ) );
QToolTip::add( AboveV, tr( "Spacing above the paragraph" ) );
QToolTip::add( BelowV, tr( "Spacing below the paragraph" ) );
QToolTip::add( LineSpVal, tr( "Line Spacing" ) );
QToolTip::add( FirstLin, tr( "Indentation for first line of the paragraph" ) );
QToolTip::add( LeftInd, tr( "Indentation from the left for the whole paragraph" ) );
QToolTip::add( TabsButton, tr( "Edit tab settings of text frame..." ) );
 
// signals and slots connections
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect( OkButton, SIGNAL( clicked() ), this, SLOT( Verlassen() ) );
connect( TabsButton, SIGNAL( clicked() ), this, SLOT( ManageTabs() ) );
connect( DropCaps, SIGNAL( clicked() ), this, SLOT( ManageDrops() ) );
connect(SizeC, SIGNAL(valueChanged(int)), this, SLOT(FontChange()));
connect(EffeS, SIGNAL(State(int)), this, SLOT(ColorChange()));
LeftInd->setDecimals(10);
FirstLin->setDecimals(10);
AboveV->setDecimals(10);
254,17 → 271,17
{
LeftInd->setDecimals(10000);
FirstLin->setDecimals(10000);
AboveV->setDecimals(10000);
BelowV->setDecimals(10000);
AboveV->setDecimals(10000);
BelowV->setDecimals(10000);
}
LeftInd->setSuffix(ein);
FirstLin->setSuffix(ein);
AboveV->setSuffix(ein);
BelowV->setSuffix(ein);
BelowV->setValue(vor->Anach * UmReFaktor);
AboveV->setValue(vor->Avor * UmReFaktor);
FirstLin->setValue(vor->First * UmReFaktor);
LeftInd->setValue(vor->Indent * UmReFaktor);
LeftInd->setSuffix(ein);
FirstLin->setSuffix(ein);
AboveV->setSuffix(ein);
BelowV->setSuffix(ein);
BelowV->setValue(vor->Anach * UmReFaktor);
AboveV->setValue(vor->Avor * UmReFaktor);
FirstLin->setValue(vor->First * UmReFaktor);
LeftInd->setValue(vor->Indent * UmReFaktor);
ColorChange();
}
 
305,9 → 322,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, QMessageBox::Ok);
Name->selectAll();
QMessageBox::information(this, tr("Warning"), tr("Name of the Style is not unique"), tr("OK"),
0, 0, 0, QMessageBox::Ok);
Name->selectAll();
Name->setFocus();
return;
}
321,9 → 338,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, QMessageBox::Ok);
Name->selectAll();
QMessageBox::information(this, tr("Warning"), tr("Name of the Style is not unique"),
tr("OK"),0, 0, 0, QMessageBox::Ok);
Name->selectAll();
Name->setFocus();
return;
}
/trunk/Scribus/scribus/scfonts.cpp
421,6 → 421,7
t->EmbedPS = true;
t->UseFont = true;
t->CharWidth[13] = 0;
t->CharWidth[28] = 0;
t->CharWidth[9] = 1;
t->Family = QString(face->family_name);
}
/trunk/Scribus/scribus/pageitem.cpp
253,6 → 253,7
bool RTab = false;
uint StartRT, StartRT2;
int TabCode = 0;
int HyphenCount = 0;
QValueList<double> tTabValues;
bool DropCmode = false;
bool AbsHasDrop = false;
993,16 → 994,17
LastSP = BuPos;
}
}
if ((hl->ch == "-") && (!outs))
if (((hl->cstyle & 128) || (hl->ch == "-")) && (!outs))
{
LastXp = CurX;
LastSP = BuPos;
if ((HyphenCount < Doc->HyCount) || (Doc->HyCount == 0))
{
if (hl->ch == "-")
LastXp = CurX;
else
LastXp = CurX + Cwidth(Doc, hl->cfont, "-", hl->csize);
LastSP = BuPos;
}
}
if ((hl->cstyle & 128) && (!outs))
{
LastXp = CurX + Cwidth(Doc, hl->cfont, "-", hl->csize);
LastSP = BuPos;
}
LiList.append(Zli);
if (RTab)
{
1046,7 → 1048,7
cm = QRegion(pf2.xForm(tcli));
cl = cl.subtract(cm);
}
if ((hl->ch == QChar(13)) || (outs))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(28)) || (outs))
{
RTab = false;
TabCode = 0;
1058,6 → 1060,7
a++;
if (Ptext.at(a)->cstyle & 128)
{
HyphenCount++;
Zli = new ZZ;
Zli->Zeich = "-";
Zli->Farb = Ptext.at(a)->ccolor;
1076,6 → 1079,8
LiList.insert(LastSP+1, Zli);
LastSP += 1;
}
else
HyphenCount = 0;
BuPos = LastSP+1;
if (Doc->Vorlagen[absa].Ausri != 0)
{
1191,11 → 1196,11
BuPos2 = a;
BuPos2++;
uint BuPos3 = BuPos;
if ((outs) || (hl->ch == QChar(13)))
if ((outs) || (hl->ch == QChar(13)) || (hl->ch == QChar(28)))
{
if ((outs) && (CurX+RExtra+lineCorr < ColBound.y()))
{
if ((hl->ch == QChar(13)) && (AbsHasDrop))
if (((hl->ch == QChar(13)) || (hl->ch == QChar(28))) && (AbsHasDrop))
{
AbsHasDrop = false;
if (CurY < maxDY)
1247,7 → 1252,7
}
else
{
if ((hl->ch == QChar(13)) && (AbsHasDrop))
if (((hl->ch == QChar(13)) || (hl->ch == QChar(28))) && (AbsHasDrop))
{
AbsHasDrop = false;
if (CurY < maxDY)
1507,7 → 1512,7
CurY = 0;
hl = Ptext.at(a);
chx = hl->ch;
if ((chx == QChar(30)) || (chx == QChar(13)) || (chx == QChar(9)))
if ((chx == QChar(30)) || (chx == QChar(13)) || (chx == QChar(9)) || (chx == QChar(28)))
continue;
chs = hl->csize;
SetZeichAttr(hl, &chs, &chx);
1876,7 → 1881,7
void PageItem::DrawZeichenS(ScPainter *p, struct ZZ *hl)
{
QString ccx = hl->Zeich;
if ((ccx == QChar(13)) || (ccx == QChar(9)))
if ((ccx == QChar(13)) || (ccx == QChar(9)) || (ccx == QChar(28)))
return;
if (ccx == QChar(29))
ccx = " ";
/trunk/Scribus/scribus/hysettings.cpp
5,66 → 5,63
extern QPixmap loadIcon(QString nam);
 
HySettings::HySettings( QWidget* parent, QMap<QString,QString>* langs )
: QDialog( parent, "Settings", true, 0 )
: QDialog( parent, "Settings", true, 0 )
{
QStringList lada;
resize( 218, 103 );
setCaption( tr( "Hyphenator Settings" ) );
setIcon(loadIcon("AppIcon.png"));
HySettingsLayout = new QVBoxLayout( this, 11, 6, "HySettingsLayout");
 
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
Verbose = new QCheckBox(this, "Verbose");
resize( 218, 103 );
setCaption( tr( "Hyphenator Settings" ) );
setIcon(loadIcon("AppIcon.png"));
HySettingsLayout = new QVBoxLayout( this, 11, 6, "HySettingsLayout");
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
Verbose = new QCheckBox(this, "Verbose");
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");
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"));
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" );
QToolTip::add(Input, tr("Enables automatic checking of your text while typing."));
Language = new QComboBox( true, this, "Language" );
QMap<QString,QString>::Iterator it;
for (it = langs->begin(); it != langs->end(); ++it)
for (it = langs->begin(); it != langs->end(); ++it)
lada.append(it.key());
lada.sort();
Language->insertStringList(lada);
Language->setEditable(false);
Layout3->addWidget( Language, 2, 1 );
 
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Language:" ) );
 
Layout3->addWidget( Text1, 2, 0 );
 
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Smallest Word:" ) );
 
Layout3->addWidget( Text2, 3, 0 );
 
WordLen = new QSpinBox( this, "WordLen" );
WordLen->setMinValue( 3 );
QToolTip::add( WordLen, tr( "Length of the smallest word to be hyphenated." ) );
 
Layout3->addWidget( WordLen, 3, 1 );
HySettingsLayout->addLayout( Layout3 );
 
Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
 
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout1->addWidget( OK );
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_2 );
 
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Layout1->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_3 );
HySettingsLayout->addLayout( Layout1 );
Layout3->addWidget( Language, 2, 1 );
Text1 = new QLabel( this, "Text1" );
Text1->setText( tr( "Language:" ) );
Layout3->addWidget( Text1, 2, 0 );
Text2 = new QLabel( this, "Text2" );
Text2->setText( tr( "Smallest Word:" ) );
Layout3->addWidget( Text2, 3, 0 );
WordLen = new QSpinBox( this, "WordLen" );
WordLen->setMinValue( 3 );
QToolTip::add( WordLen, tr( "Length of the smallest word to be hyphenated." ) );
Layout3->addWidget( WordLen, 3, 1 );
Text3 = new QLabel(this, "Text3");
Text3->setText( tr("Number of Hypenations allowed:"));
Layout3->addWidget( Text3, 4, 0 );
MaxCount = new QSpinBox( this, "MaxCount" );
QToolTip::add( MaxCount, tr( "Maximum number of Hyphenations following each other." ) );
Layout3->addWidget( MaxCount, 4, 1);
MaxCount->setMinValue( 0 );
HySettingsLayout->addLayout( Layout3 );
Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1");
QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout1->addWidget( OK );
QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_2 );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Layout1->addWidget( Cancel );
QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout1->addItem( spacer_3 );
HySettingsLayout->addLayout( Layout1 );
connect(OK, SIGNAL(clicked()), this, SLOT(accept()));
connect(Cancel, SIGNAL(clicked()), this, SLOT(reject()));
}
/trunk/Scribus/scribus/scribusdoc.h
432,6 → 432,7
bool ScaleType;
bool AspectRatio;
int MinWordLen;
int HyCount;
QString Language;
bool Automatic;
bool AutoCheck;
622,6 → 623,7
int TotalItems;
Hyphenator *Trenner;
int MinWordLen;
int HyCount;
QString Language;
bool Automatic;
bool AutoCheck;
/trunk/Scribus/scribus/scribusview.cpp
1152,7 → 1152,7
for (uint d = 0; d < ite->MaxChars; ++d)
{
hl = ite->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
if (hl->yp == 0)
break;
1639,7 → 1639,7
QString cc;
for (d = 0; d < c->Ptext.count(); ++d)
{
if ((c->Ptext.at(d)->ch == QChar(13)) || (c->Ptext.at(d)->ch == QChar(10)))
if ((c->Ptext.at(d)->ch == QChar(13)) || (c->Ptext.at(d)->ch == QChar(10)) || (c->Ptext.at(d)->ch == QChar(28)))
break;
bm += "\\"+cc.setNum(QMAX(c->Ptext.at(d)->ch.at(0).unicode(), 32), 8);
}
1697,7 → 1697,7
for (d = 0; d < c->MaxChars; ++d)
{
hl = c->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
if (hl->yp == 0)
break;
2098,7 → 2098,7
for (d = 0; d < c->MaxChars; ++d)
{
hl = c->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(30)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(30)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
tsz = hl->csize;
chx = hl->ch;
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("09").arg("April").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("10").arg("April").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/hyphenator.h
22,6 → 22,8
/*! There are languages having rule not to hyphen word shorter than
MinWordLen */
int MinWordLen;
/*! Maximum number of hyphenations allowed following each other */
int HyCount;
/*! Language in use */
QString Language;
/*! Flag - if user set auto hyphen processing.*/
42,7 → 44,7
 
public slots:
void slotNewDict(QString name);
void slotNewSettings(int Wordlen, bool Autom, bool ACheck);
void slotNewSettings(int Wordlen, bool Autom, bool ACheck, int Num);
void slotHyphenateWord(PageItem* it, QString text, int firstC);
void slotHyphenate(PageItem *it);
};
/trunk/Scribus/scribus/newfile.cpp
1,5 → 1,6
#include "newfile.h"
#include "newfile.moc"
#include <qtooltip.h>
extern QPixmap loadIcon(QString nam);
 
NewDoc::NewDoc( QWidget* parent, preV *Vor )
217,7 → 218,7
Layout2->setSpacing( 6 );
Layout2->setMargin( 5 );
TextLabel4 = new QLabel( GroupBox4, "TextLabel4" );
TextLabel4->setText( tr( "Gutter Width:" ) );
TextLabel4->setText( tr( "Gap:" ) );
Layout2->addWidget( TextLabel4, 1, 0 );
TextLabel3 = new QLabel( GroupBox4, "TextLabel3" );
TextLabel3->setText( tr( "Columns:" ) );
258,6 → 259,22
//tab order
QWidget::setTabOrder ( AutoFrame, SpinBox10 );
QWidget::setTabOrder ( SpinBox10, Distance );
//tooltips
QToolTip::add( ComboBox1, tr( "Document page size, either a standard size or a custom size" ) );
QToolTip::add( ComboBox2, tr( "Orientation of the document's pages" ) );
QToolTip::add( Breite, tr( "Width of the document's pages, editable if you have chosen a custom page size" ) );
QToolTip::add( Hoehe, tr( "Height of the document's pages, editable if you have chosen a custom page size" ) );
QToolTip::add( Doppelseiten, tr( "Enable single or spread based layout" ) );
QToolTip::add( ErsteSeite, tr( "Make the first page the left page of the document" ) );
QToolTip::add( TopR, tr( "Distance between the top margin guide and the edge of the page" ) );
QToolTip::add( BottomR, tr( "Distance between the bottom margin guide and the edge of the page" ) );
QToolTip::add( LeftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( PgNr, tr( "First page number of the document" ) );
QToolTip::add( ComboBox3, tr( "Default unit of measurement for document editing" ) );
QToolTip::add( AutoFrame, tr( "Create text frames automatically when new pages are added" ) );
QToolTip::add( SpinBox10, tr( "Number of columns to create in text frames\non automatically created pages" ) );
QToolTip::add( Distance, tr( "Distance between automatically created columns" ) );
 
// signals and slots connections
connect( OKButton, SIGNAL( clicked() ), this, SLOT( ExitOK() ) );
/trunk/Scribus/scribus/scribus.cpp
220,6 → 220,7
ScriptRunning = false;
view = NULL;
doc = NULL;
Buffer2 = "";
BuildFontMenu();
SCFontsIterator it(Prefs.AvailFonts);
Prefs.DefFont = it.currentKey();
365,6 → 366,7
Prefs.ScaleType = true;
Prefs.AspectRatio = true;
Prefs.MinWordLen = 3;
Prefs.HyCount = 2;
Prefs.Language = "";
Prefs.Automatic = true;
Prefs.AutoCheck = false;
1075,6 → 1077,14
{
switch (kk)
{
case Key_Space:
keyrep = false;
if (doc->AppMode == 23)
setAppMode(1);
else
setAppMode(23);
return;
break;
case Key_Prior:
view->scrollBy(0, -Prefs.Wheelval);
keyrep = false;
1495,6 → 1505,12
}
}
}
while (b->Ptext.at(b->CPos)->cstyle & 256)
{
b->CPos--;
if (b->CPos == 0)
break;
}
if ( b->HasSel )
doc->ActPage->RefreshItem(b);
setTBvals(b);
1597,11 → 1613,16
b->Dirty = true;
doc->ActPage->RefreshItem(b);
}
if ((kk == Key_Tab) || ((kk + KeyMod) == Prefs.KeyActions[60].KeyID) || ((kk + KeyMod) == Prefs.KeyActions[67].KeyID))
if ((kk == Key_Tab)
|| ((kk == Key_Return) && (buttonState & ShiftButton))
|| ((kk + KeyMod) == Prefs.KeyActions[60].KeyID)
|| ((kk + KeyMod) == Prefs.KeyActions[67].KeyID))
{
hg = new Pti;
if ((kk + KeyMod) == Prefs.KeyActions[60].KeyID)
hg->ch = QString(QChar(30));
else if (kk == Key_Return)
hg->ch = QString(QChar(28));
else if (kk == Key_Tab)
hg->ch = QString(QChar(9));
else
1915,6 → 1936,7
doc->AppMode = 1;
doc->Language = Prefs.Language;
doc->MinWordLen = Prefs.MinWordLen;
doc->HyCount = Prefs.HyCount;
doc->Automatic = Prefs.Automatic;
doc->AutoCheck = Prefs.AutoCheck;
doc->PageColors = Prefs.DColors;
2190,7 → 2212,6
{
pageMenu->setItemEnabled(pageMenu->idAt(a), 0);
}
// menuBar()->setItemEnabled(pgmm, 0);
editMenu->setItemEnabled(tman, 0);
DatNeu->setEnabled(false);
DatSav->setEnabled(false);
2260,7 → 2281,10
fileMenu->setItemEnabled(fid11, 1);
editMenu->setItemEnabled(edid1, 0);
editMenu->setItemEnabled(edid2, 0);
editMenu->setItemEnabled(edid3, 0);
if (Buffer2 != "")
editMenu->setItemEnabled(edid3, 1);
else
editMenu->setItemEnabled(edid3, 0);
editMenu->setItemEnabled(edid6, 1);
editMenu->setItemEnabled(edid6a, 1);
for (a=0; a<6; ++a)
2303,7 → 2327,6
}
Mpal->Cpal->SetColors(doc->PageColors);
Mpal->Cpal->ChooseGrad(0);
// ActWin->setCaption( QString::fromLocal8Bit(doc->DocName) );
ActWin->setCaption(doc->DocName);
ShadeMenu->setItemChecked(ShadeMenu->idAt(11), true);
Mpal->SetDoc(doc);
2827,6 → 2850,7
doc->ActiveLayer = 0;
doc->Language = Prefs.Language;
doc->MinWordLen = Prefs.MinWordLen;
doc->HyCount = Prefs.HyCount;
doc->Automatic = Prefs.Automatic;
doc->AutoCheck = Prefs.AutoCheck;
doc->BaseGrid = Prefs.BaseGrid;
2983,7 → 3007,7
for (uint azz=0; azz<view->MasterPages.at(az)->Items.count(); ++azz)
{
PageItem *ite = view->MasterPages.at(az)->Items.at(azz);
if (ite->PType == 4)
if ((ite->PType == 4) || (ite->PType == 8))
ite->DrawObj(painter, rd);
}
}
2993,7 → 3017,7
for (uint azz=0; azz<view->Pages.at(az)->Items.count(); ++azz)
{
PageItem *ite = view->Pages.at(az)->Items.at(azz);
if (ite->PType == 4)
if ((ite->PType == 4) || (ite->PType == 8))
ite->DrawObj(painter, rd);
if (doc->OldBM)
{
6533,21 → 6557,26
{
if (doc == docc)
NoFrameEdit();
ScriXmlDoc *ss = new ScriXmlDoc();
if(ss->ReadElem(Name, Prefs.AvailFonts, docc, x, y, art, loca, Prefs.GFontSub, &Prefs))
{
docc->ActPage->update();
ScriXmlDoc *ss = new ScriXmlDoc();
if(ss->ReadElem(Name, Prefs.AvailFonts, docc, x, y, art, loca, Prefs.GFontSub, &Prefs))
{
docc->ActPage->update();
docc->UnDoValid = false;
if (doc == docc)
{
BuildFontMenu();
{
doc->OpenNodes = Tpal->buildReopenVals();
BuildFontMenu();
Mpal->Cpal->SetColors(docc->PageColors);
Mpal->updateCList();
Mpal->Spal->updateFList();
Mpal->SetLineFormats(docc);
slotDocCh();
Tpal->BuildTree(view);
Tpal->reopenTree(doc->OpenNodes);
slotDocCh();
CanUndo();
}
}
}
delete ss;
delete ss;
}
 
void ScribusApp::slotChangeUnit(int art, bool draw)
7479,6 → 7508,7
dia->Input->setChecked(doc->Trenner->AutoCheck);
dia->Language->setCurrentText(doc->Trenner->Language);
dia->WordLen->setValue(doc->Trenner->MinWordLen);
dia->MaxCount->setValue(doc->Trenner->HyCount);
}
else
{
7486,6 → 7516,7
dia->Input->setChecked(Prefs.AutoCheck);
dia->Language->setCurrentText(Prefs.Language);
dia->WordLen->setValue(Prefs.MinWordLen);
dia->MaxCount->setValue(Prefs.HyCount);
}
if (dia->exec())
{
7492,7 → 7523,7
if (HaveDoc)
{
doc->Trenner->slotNewDict(dia->Language->currentText());
doc->Trenner->slotNewSettings(dia->WordLen->value(), dia->Verbose->isChecked(), dia->Input->isChecked());
doc->Trenner->slotNewSettings(dia->WordLen->value(), dia->Verbose->isChecked(), dia->Input->isChecked(),dia->MaxCount->value());
}
else
{
7500,6 → 7531,7
Prefs.Language = dia->Language->currentText();
Prefs.Automatic = dia->Verbose->isChecked();
Prefs.AutoCheck = dia->Input->isChecked();
Prefs.HyCount = dia->MaxCount->value();
}
}
delete dia;
7729,6 → 7761,12
fn = s + doc->DocName+".sla";
if (!DoFileSave(fn))
QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
QMap<QString,QFont>::Iterator it3;
for (it3 = doc->UsedFonts.begin(); it3 != doc->UsedFonts.end(); ++it3)
{
QFileInfo itf = QFileInfo(Prefs.AvailFonts[it3.key()]->Datei);
copyFile(Prefs.AvailFonts[it3.key()]->Datei, s + itf.fileName());
}
}
}
}
/trunk/Scribus/scribus/libprefs/prefs.cpp
1661,7 → 1661,7
QToolTip::add( GSName, tr( "Filesystem location for the Ghostscript interpreter" ) );
QToolTip::add( GSantiText, tr( "Antialias text for EPS and PDF onscreen rendering" ) );
QToolTip::add( GSantiGraph, tr( "Antialias graphics for EPS and PDF onscreen rendering" ) );
QToolTip::add( GimpName, tr( "Filesystem location for editing graphics" ) );
QToolTip::add( GimpName, tr( "Filesystem location for graphics editor" ) );
 
QToolTip::add( ClipMarg, tr( "Do not show objects outside the margins on the printed page or exported file" ) );
 
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
448,7 → 448,7
for (d = 0; d < Item->MaxChars; d++)
{
hl = Item->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
if (hl->yp == 0)
break;
508,7 → 508,7
for (d = 0; d < Item->MaxChars; d++)
{
hl = Item->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
if (hl->ch == QChar(29))
chx = " ";
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
21,6 → 21,7
#include <qcursor.h>
#include <qpainter.h>
#include <qcolor.h>
#include <qtooltip.h>
 
extern QPixmap loadIcon(QString nam);
extern void ReOrderText(ScribusDoc *doc, ScribusView *view);
174,6 → 175,17
PLayout->addWidget(Anzeige);
int w = Anz->width() + 20;
resize(QMIN(QApplication::desktop()->width(),w), 500);
//tooltips
QToolTip::add( AliasText, tr( "Provides a more pleasant view of text items in the viewer, at the expense\nof a slight slowdown in previewing. This only affects Type 1 fonts" ) );
QToolTip::add( AliasGr, tr( "Provides a more pleasant view of True Type Fonts, Open Type Fonts, EPS, PDF and\nvector graphics in the preview, at the expense of a slight slowdown in previewing" ) );
QToolTip::add( AliasTr, tr( "Shows transparency and transparent items in your document. Requires Ghostscript 7.07 or later" ) );
QToolTip::add( EnableCMYK, tr( "Gives a print preview using simulations of generic CMYK inks, instead of RGB colors" ) );
QToolTip::add( EnableCMYK_C, tr( "Enable/disable the C (Cyan) ink plate" ) );
QToolTip::add( EnableCMYK_M, tr( "Enable/disable the M (Magenta) ink plate" ) );
QToolTip::add( EnableCMYK_Y, tr( "Enable/disable the Y (Yellow) ink plate" ) );
QToolTip::add( EnableCMYK_K, tr( "Enable/disable the K (Black) ink plate" ) );
 
//signals and slots
connect(AliasText, SIGNAL(clicked()), this, SLOT(ToggleTextAA()));
connect(AliasGr, SIGNAL(clicked()), this, SLOT(ToggleGr()));
connect(AliasTr, SIGNAL(clicked()), this, SLOT(ToggleTr()));
/trunk/Scribus/scribus/page.cpp
2250,6 → 2250,10
return;
}
}
if (doku->AppMode == 23)
{
return;
}
if (doku->AppMode == 22)
{
if ((SelItem.count() == 0) && (HaveSelRect) && (!MidButt))
3640,9 → 3644,8
else
BlockLeave = false;
}
if (Mpressed && (m->state() & ControlButton) && (SelItem.count() == 0))
if (Mpressed && (doku->AppMode == 23))
{
qApp->setOverrideCursor(QCursor(loadIcon("HandC.xpm")), true);
int scroX = m->x() - qRound((Mxp * sc));
int scroY = m->y() - qRound((Myp * sc));
Anz->scrollBy(-scroX, -scroY);
5145,6 → 5148,9
case 22:
Deselect(false);
break;
case 23:
qApp->setOverrideCursor(QCursor(loadIcon("HandC.xpm")), true);
break;
}
}
 
5974,7 → 5980,7
if (b->CPos > 0)
{
offs = QMIN(b->CPos-1, static_cast<int>(b->Ptext.count()-1));
if (b->Ptext.at(offs)->cstyle & 256)
if (b->Ptext.at(offs+1)->cstyle & 256)
{
b->CPos++;
return;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
1773,7 → 1773,7
for (uint d = 0; d < ite->MaxChars; ++d)
{
hl = ite->Ptext.at(d);
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)))
if ((hl->ch == QChar(13)) || (hl->ch == QChar(10)) || (hl->ch == QChar(9)) || (hl->ch == QChar(28)))
continue;
if (ite->PType == 8)
{
/trunk/Scribus/scribus/reformdoc.cpp
1,128 → 1,137
#include "reformdoc.h"
#include "reformdoc.moc"
#include <qtooltip.h>
extern QPixmap loadIcon(QString nam);
extern double UmReFaktor;
 
ReformDoc::ReformDoc( QWidget* parent, double t, double l, double r, double b, double Pagebr, double Pageho, bool fp, bool fpe, int Einh)
: QDialog( parent, "r", true, 0 )
: QDialog( parent, "r", true, 0 )
{
QString ein;
QString ein;
int decimals;
einheit = Einh;
switch (Einh)
{
case 0:
ein = " pt";
decimals = 100;
break;
case 1:
ein = " mm";
decimals = 1000;
break;
case 2:
ein = " in";
decimals = 10000;
break;
case 3:
ein = " p";
decimals = 100;
break;
}
{
case 0:
ein = " pt";
decimals = 100;
break;
case 1:
ein = " mm";
decimals = 1000;
break;
case 2:
ein = " in";
decimals = 10000;
break;
case 3:
ein = " p";
decimals = 100;
break;
}
Breite = Pagebr * UmReFaktor;
Hoehe = Pageho * UmReFaktor;
setCaption( tr( "Document Setup" ) );
setIcon(loadIcon("AppIcon.png"));
ReformDocLayout = new QVBoxLayout( this );
ReformDocLayout->setSpacing( 6 );
ReformDocLayout->setMargin( 10 );
GroupBox7 = new QGroupBox( this, "GroupBox7" );
GroupBox7->setTitle( tr( "Margin Guides" ) );
GroupBox7->setColumnLayout(0, Qt::Vertical );
GroupBox7->layout()->setSpacing( 0 );
GroupBox7->layout()->setMargin( 0 );
GroupBox7Layout = new QHBoxLayout( GroupBox7->layout() );
GroupBox7Layout->setAlignment( Qt::AlignTop );
GroupBox7Layout->setSpacing( 0 );
GroupBox7Layout->setMargin( 10 );
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 0 );
TextLabel5 = new QLabel( GroupBox7, "TextLabel5" );
TextLabel5->setText( tr( "Top:" ) );
Layout4->addWidget( TextLabel5, 0, 0 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setSuffix( ein );
setCaption( tr( "Document Setup" ) );
setIcon(loadIcon("AppIcon.png"));
ReformDocLayout = new QVBoxLayout( this );
ReformDocLayout->setSpacing( 6 );
ReformDocLayout->setMargin( 10 );
GroupBox7 = new QGroupBox( this, "GroupBox7" );
GroupBox7->setTitle( tr( "Margin Guides" ) );
GroupBox7->setColumnLayout(0, Qt::Vertical );
GroupBox7->layout()->setSpacing( 0 );
GroupBox7->layout()->setMargin( 0 );
GroupBox7Layout = new QHBoxLayout( GroupBox7->layout() );
GroupBox7Layout->setAlignment( Qt::AlignTop );
GroupBox7Layout->setSpacing( 0 );
GroupBox7Layout->setMargin( 10 );
Layout4 = new QGridLayout;
Layout4->setSpacing( 6 );
Layout4->setMargin( 0 );
TextLabel5 = new QLabel( GroupBox7, "TextLabel5" );
TextLabel5->setText( tr( "Top:" ) );
Layout4->addWidget( TextLabel5, 0, 0 );
TopR = new MSpinBox( GroupBox7, 4 );
TopR->setSuffix( ein );
TopR->setDecimals( decimals );
TopR->setMaxValue(Hoehe);
TopR->setValue(t * UmReFaktor);
Layout4->addWidget( TopR, 0, 1 );
Links = new QLabel( GroupBox7, "Links" );
Links->setText( tr( "Left:" ) );
Layout4->addWidget( Links, 0, 2 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setSuffix( ein );
TopR->setMaxValue(Hoehe);
TopR->setValue(t * UmReFaktor);
Layout4->addWidget( TopR, 0, 1 );
Links = new QLabel( GroupBox7, "Links" );
Links->setText( tr( "Left:" ) );
Layout4->addWidget( Links, 0, 2 );
LeftR = new MSpinBox( GroupBox7, 4 );
LeftR->setSuffix( ein );
LeftR->setDecimals( decimals );
LeftR->setMaxValue(Breite);
LeftR->setValue(l * UmReFaktor);
Layout4->addWidget( LeftR, 0, 3 );
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
Layout4->addWidget( TextLabel7, 1, 0 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setSuffix( ein );
LeftR->setMaxValue(Breite);
LeftR->setValue(l * UmReFaktor);
Layout4->addWidget( LeftR, 0, 3 );
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
TextLabel7->setText( tr( "Bottom:" ) );
Layout4->addWidget( TextLabel7, 1, 0 );
BottomR = new MSpinBox( GroupBox7, 4 );
BottomR->setSuffix( ein );
BottomR->setDecimals( decimals );
BottomR->setMaxValue(Hoehe);
BottomR->setValue(b * UmReFaktor);
Layout4->addWidget( BottomR, 1, 1 );
Rechts = new QLabel( GroupBox7, "Rechts" );
Rechts->setText( tr( "Right:" ) );
Layout4->addWidget( Rechts, 1, 2 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setSuffix( ein );
BottomR->setMaxValue(Hoehe);
BottomR->setValue(b * UmReFaktor);
Layout4->addWidget( BottomR, 1, 1 );
Rechts = new QLabel( GroupBox7, "Rechts" );
Rechts->setText( tr( "Right:" ) );
Layout4->addWidget( Rechts, 1, 2 );
RightR = new MSpinBox( GroupBox7, 4 );
RightR->setSuffix( ein );
RightR->setDecimals( decimals );
RightR->setMaxValue(Breite);
RightR->setValue(r * UmReFaktor);
Layout4->addWidget( RightR, 1, 3 );
Doppelseiten = new QCheckBox( GroupBox7, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Doppelseiten->setChecked( fp );
Layout4->addMultiCellWidget( Doppelseiten, 2, 2, 0, 1 );
ErsteSeite = new QCheckBox( GroupBox7, "n" );
ErsteSeite->setText( tr( "Left Page first" ) );
ErsteSeite->setChecked( fpe );
Layout4->addMultiCellWidget( ErsteSeite, 2, 2, 2, 3 );
if (!fp)
ErsteSeite->setEnabled(false);
setDS();
GroupBox7Layout->addLayout( Layout4 );
ReformDocLayout->addWidget( GroupBox7 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton->setDefault( true );
Layout3->addWidget( OKButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB->setAutoDefault( false );
Layout3->addWidget( CancelB );
ReformDocLayout->addLayout( Layout3 );
RightR->setMaxValue(Breite - LeftR->value());
LeftR->setMaxValue(Breite - RightR->value());
TopR->setMaxValue(Hoehe - BottomR->value());
BottomR->setMaxValue(Hoehe - TopR->value());
RightR->setMaxValue(Breite);
RightR->setValue(r * UmReFaktor);
Layout4->addWidget( RightR, 1, 3 );
Doppelseiten = new QCheckBox( GroupBox7, "Doppelseiten" );
Doppelseiten->setText( tr( "Facing Pages" ) );
Doppelseiten->setChecked( fp );
Layout4->addMultiCellWidget( Doppelseiten, 2, 2, 0, 1 );
ErsteSeite = new QCheckBox( GroupBox7, "n" );
ErsteSeite->setText( tr( "Left Page first" ) );
ErsteSeite->setChecked( fpe );
Layout4->addMultiCellWidget( ErsteSeite, 2, 2, 2, 3 );
if (!fp)
ErsteSeite->setEnabled(false);
setDS();
GroupBox7Layout->addLayout( Layout4 );
ReformDocLayout->addWidget( GroupBox7 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OKButton = new QPushButton( this, "OKButton" );
OKButton->setText( tr( "OK" ) );
OKButton->setDefault( true );
Layout3->addWidget( OKButton );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
CancelB = new QPushButton( this, "CancelB" );
CancelB->setText( tr( "Cancel" ) );
CancelB->setAutoDefault( false );
Layout3->addWidget( CancelB );
ReformDocLayout->addLayout( Layout3 );
RightR->setMaxValue(Breite - LeftR->value());
LeftR->setMaxValue(Breite - RightR->value());
TopR->setMaxValue(Hoehe - BottomR->value());
BottomR->setMaxValue(Hoehe - TopR->value());
//tooltips
QToolTip::add( Doppelseiten, tr( "Enable single or spread based layout" ) );
QToolTip::add( ErsteSeite, tr( "Make the first page the left page of the document" ) );
QToolTip::add( TopR, tr( "Distance between the top margin guide and the edge of the page" ) );
QToolTip::add( BottomR, tr( "Distance between the bottom margin guide and the edge of the page" ) );
QToolTip::add( LeftR, tr( "Distance between the left margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
QToolTip::add( RightR, tr( "Distance between the right margin guide and the edge of the page.\nIf Facing Pages is selected, this margin space can be used to achieve the correct margins for binding" ) );
 
// signals and slots connections
connect( Doppelseiten, SIGNAL( clicked() ), this, SLOT( setDS() ) );
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( CancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
connect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
connect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
connect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
 
// signals and slots connections
connect( Doppelseiten, SIGNAL( clicked() ), this, SLOT( setDS() ) );
connect( OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( CancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
connect(TopR, SIGNAL(valueChanged(int)), this, SLOT(setTop(int)));
connect(BottomR, SIGNAL(valueChanged(int)), this, SLOT(setBottom(int)));
connect(LeftR, SIGNAL(valueChanged(int)), this, SLOT(setLeft(int)));
connect(RightR, SIGNAL(valueChanged(int)), this, SLOT(setRight(int)));
}
 
void ReformDoc::setTop(int v)
147,17 → 156,17
 
void ReformDoc::setDS()
{
if (Doppelseiten->isChecked())
{
Links->setText( tr( "Inside:" ) );
Rechts->setText( tr( "Outside:" ) );
ErsteSeite->setEnabled(true);
}
else
{
Links->setText( tr( "Left:" ) );
Rechts->setText( tr( "Right:" ) );
ErsteSeite->setEnabled(false);
}
if (Doppelseiten->isChecked())
{
Links->setText( tr( "Inside:" ) );
Rechts->setText( tr( "Outside:" ) );
ErsteSeite->setEnabled(true);
}
else
{
Links->setText( tr( "Left:" ) );
Rechts->setText( tr( "Right:" ) );
ErsteSeite->setEnabled(false);
}
}
 
/trunk/Scribus/scribus/scribusdoc.cpp
205,6 → 205,7
if ((*AllFonts)[name]->ReadMetrics())
{
(*AllFonts)[name]->CharWidth[13] = 0;
(*AllFonts)[name]->CharWidth[28] = 0;
(*AllFonts)[name]->CharWidth[9] = 1;
QString afnm = (*AllFonts)[name]->Datei.left((*AllFonts)[name]->Datei.length()-3);
QFile afm(afnm+"afm");
/trunk/Scribus/scribus/hysettings.h
22,7 → 22,9
QComboBox* Language;
QLabel* Text1;
QLabel* Text2;
QLabel* Text3;
QSpinBox* WordLen;
QSpinBox* MaxCount;
QPushButton* OK;
QPushButton* Cancel;
 
/trunk/Scribus/scribus/docinfo.cpp
12,7 → 12,7
 
#include <qtooltip.h>
 
/*
/*
* Constructs a DocInfos which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
20,68 → 20,73
* TRUE to construct a modal dialog.
*/
DocInfos::DocInfos( QWidget* parent, QString Autor, QString Titel, QString Des, QString keyW )
: QDialog( parent, "i", true, 0 )
: QDialog( parent, "i", true, 0 )
{
setMaximumSize( QSize( 32767, 32767 ) );
setCaption( tr( "Document Info" ) );
setIcon(loadIcon("AppIcon.png"));
DocInfosLayout = new QVBoxLayout( this );
DocInfosLayout->setSpacing( 6 );
DocInfosLayout->setMargin( 11 );
Layout1 = new QGridLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setMinimumSize(QSize(80, 20));
TextLabel1->setText( tr( "Author:" ) );
Layout1->addWidget( TextLabel1, 0, 0 );
AutorInfo = new QLineEdit( this, "AutorInfo" );
AutorInfo->setMinimumSize(QSize(200, 20));
AutorInfo->setText(Autor);
Layout1->addWidget( AutorInfo, 0, 1 );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setMinimumSize(QSize(80, 20));
TextLabel2->setText( tr( "Title:" ) );
Layout1->addWidget( TextLabel2, 1, 0 );
TitelInfo = new QLineEdit( this, "TitelInfo" );
TitelInfo->setMinimumSize(QSize(200, 20));
TitelInfo->setText(Titel);
Layout1->addWidget( TitelInfo, 1, 1 );
TextLabel3 = new QLabel( this, "TextLabel3" );
TextLabel3->setMinimumSize(QSize(80, 20));
TextLabel3->setText( tr( "Description:" ) );
TextLabel3->setAlignment( static_cast<int>( QLabel::AlignTop | QLabel::AlignLeft ) );
Layout1->addWidget( TextLabel3, 2, 0 );
MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" );
MultiLineEdit1->setMinimumSize(QSize(200, 105));
MultiLineEdit1->setText(Des);
Layout1->addWidget( MultiLineEdit1, 2, 1 );
TextLabel3a = new QLabel( this, "TextLabel3" );
TextLabel3a->setMinimumSize(QSize(80, 20));
TextLabel3a->setText( tr( "Keywords:" ) );
TextLabel3a->setAlignment( static_cast<int>( QLabel::AlignTop | QLabel::AlignLeft ) );
Layout1->addWidget( TextLabel3a, 3, 0 );
MultiLineEdit2 = new QMultiLineEdit( this, "MultiLineEdit1" );
MultiLineEdit2->setMinimumSize(QSize(200, 105));
MultiLineEdit2->setText(keyW);
Layout1->addWidget( MultiLineEdit2, 3, 1 );
DocInfosLayout->addLayout( Layout1 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout3->addWidget(OK);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel->setDefault( false );
Layout3->addWidget(Cancel);
DocInfosLayout->addLayout( Layout3 );
setMaximumSize( QSize( 32767, 32767 ) );
setCaption( tr( "Document Info" ) );
setIcon(loadIcon("AppIcon.png"));
DocInfosLayout = new QVBoxLayout( this );
DocInfosLayout->setSpacing( 6 );
DocInfosLayout->setMargin( 11 );
Layout1 = new QGridLayout;
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );
TextLabel1 = new QLabel( this, "TextLabel1" );
TextLabel1->setMinimumSize(QSize(80, 20));
TextLabel1->setText( tr( "Author:" ) );
Layout1->addWidget( TextLabel1, 0, 0 );
AutorInfo = new QLineEdit( this, "AutorInfo" );
AutorInfo->setMinimumSize(QSize(200, 20));
AutorInfo->setText(Autor);
Layout1->addWidget( AutorInfo, 0, 1 );
TextLabel2 = new QLabel( this, "TextLabel2" );
TextLabel2->setMinimumSize(QSize(80, 20));
TextLabel2->setText( tr( "Title:" ) );
Layout1->addWidget( TextLabel2, 1, 0 );
TitelInfo = new QLineEdit( this, "TitelInfo" );
TitelInfo->setMinimumSize(QSize(200, 20));
TitelInfo->setText(Titel);
Layout1->addWidget( TitelInfo, 1, 1 );
TextLabel3 = new QLabel( this, "TextLabel3" );
TextLabel3->setMinimumSize(QSize(80, 20));
TextLabel3->setText( tr( "Description:" ) );
TextLabel3->setAlignment( static_cast<int>( QLabel::AlignTop | QLabel::AlignLeft ) );
Layout1->addWidget( TextLabel3, 2, 0 );
MultiLineEdit1 = new QMultiLineEdit( this, "MultiLineEdit1" );
MultiLineEdit1->setMinimumSize(QSize(200, 105));
MultiLineEdit1->setText(Des);
Layout1->addWidget( MultiLineEdit1, 2, 1 );
TextLabel3a = new QLabel( this, "TextLabel3" );
TextLabel3a->setMinimumSize(QSize(80, 20));
TextLabel3a->setText( tr( "Keywords:" ) );
TextLabel3a->setAlignment( static_cast<int>( QLabel::AlignTop | QLabel::AlignLeft ) );
Layout1->addWidget( TextLabel3a, 3, 0 );
MultiLineEdit2 = new QMultiLineEdit( this, "MultiLineEdit1" );
MultiLineEdit2->setMinimumSize(QSize(200, 105));
MultiLineEdit2->setText(keyW);
Layout1->addWidget( MultiLineEdit2, 3, 1 );
DocInfosLayout->addLayout( Layout1 );
Layout3 = new QHBoxLayout;
Layout3->setSpacing( 6 );
Layout3->setMargin( 0 );
OK = new QPushButton( this, "OK" );
OK->setText( tr( "OK" ) );
OK->setDefault( true );
Layout3->addWidget(OK);
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
Layout3->addItem( spacer );
Cancel = new QPushButton( this, "Cancel" );
Cancel->setText( tr( "Cancel" ) );
Cancel->setDefault( false );
Layout3->addWidget(Cancel);
DocInfosLayout->addLayout( Layout3 );
//tooltips
QToolTip::add( AutorInfo, tr( "This field can be embedded in the Scribus document for reference, as well as in the metadata of a PDF" ) );
QToolTip::add( TitelInfo, tr( "This field can be embedded in the Scribus document for reference, as well as in the metadata of a PDF" ) );
QToolTip::add( MultiLineEdit1, tr( "This field is for a brief description or abstract of the document. It is embedded in the PDF on export" ) );
QToolTip::add( MultiLineEdit2, tr( "This field is for document keywords you wish to embed in a PDF, to assist searches and indexing of PDF files" ) );
 
// signals and slots connections
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
// signals and slots connections
connect( OK, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( Cancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
}
/trunk/Scribus/scribus/colorm.cpp
85,7 → 85,7
 
layout3 = new QVBoxLayout( 0, 0, 6, "layout3");
SaveF = new QPushButton( this, "SaveF" );
SaveF->setText( tr( "Save" ) );
SaveF->setText( tr( "OK" ) );
layout3->addWidget( SaveF );
CancF = new QPushButton( this, "CancF" );
CancF->setText( tr( "Cancel" ) );
/trunk/Scribus/scribus/scribusXml.cpp
1105,6 → 1105,7
doc->ActiveLayer = QStoInt(dc.attribute("ALAYER","0"));
doc->Language = dc.attribute("LANGUAGE", "");
doc->MinWordLen = QStoInt(dc.attribute("MINWORDLEN", "3"));
doc->HyCount = QStoInt(dc.attribute("HYCOUNT", "2"));
doc->Automatic = static_cast<bool>(QStoInt(dc.attribute("AUTOMATIC", "1")));
doc->AutoCheck = static_cast<bool>(QStoInt(dc.attribute("AUTOCHECK", "0")));
doc->GuideLock = static_cast<bool>(QStoInt(dc.attribute("GUIDELOCK", "0")));
2313,7 → 2314,7
}
}
elem.setAttribute("COUNT", Selitems->count());
elem.setAttribute("Version", "1.1.5");
elem.setAttribute("Version", "1.2cvs");
for (uint co=0; co<Selitems->count(); ++co)
{
QString CurDirP = QDir::currentDirPath();
3003,7 → 3004,7
QString st="<SCRIBUSUTF8></SCRIBUSUTF8>";
docu.setContent(st);
QDomElement elem=docu.documentElement();
elem.setAttribute("Version", "1.1.5");
elem.setAttribute("Version", "1.2cvs");
QDomElement dc=docu.createElement("DOCUMENT");
dc.setAttribute("ANZPAGES",doc->PageC);
dc.setAttribute("PAGEWITH",doc->PageB);
3052,6 → 3053,7
dc.setAttribute("ALAYER", doc->ActiveLayer);
dc.setAttribute("LANGUAGE", doc->Language);
dc.setAttribute("MINWORDLEN", doc->MinWordLen);
dc.setAttribute("HYCOUNT", doc->HyCount);
dc.setAttribute("AUTOMATIC", static_cast<int>(doc->Automatic));
dc.setAttribute("AUTOCHECK", static_cast<int>(doc->AutoCheck));
dc.setAttribute("GUIDELOCK", static_cast<int>(doc->GuideLock));
3442,6 → 3444,7
QDomElement rde=docu.createElement("HYPHEN");
rde.setAttribute("LANG", Vor->Language);
rde.setAttribute("WORDLEN", Vor->MinWordLen);
rde.setAttribute("HYCOUNT", Vor->HyCount);
rde.setAttribute("MODE", static_cast<int>(Vor->Automatic));
rde.setAttribute("INMODE", static_cast<int>(Vor->AutoCheck));
elem.appendChild(rde);
3723,6 → 3726,7
if (dc.attribute("LANG", "") != "")
Vorein->Language = dc.attribute("LANG");
Vorein->MinWordLen = QStoInt(dc.attribute("WORDLEN", "3"));
Vorein->HyCount = QStoInt(dc.attribute("HYCOUNT", "2"));
Vorein->Automatic = static_cast<bool>(QStoInt(dc.attribute("MODE", "1")));
Vorein->AutoCheck = static_cast<bool>(QStoInt(dc.attribute("INMODE", "1")));
}