Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 35 → Rev 36

/trunk/Scribus/ChangeLogCVS
1,4 → 1,9
Changes since Version 0.9.11.1
20.06.2003 newfile.cpp
preferences.cpp
reformdoc.cpp Limited the Values for the Margins to fit the Page.
 
 
19.06.2003 cpalette.cpp Disabled Color "None" for Gradients.
 
18.06.2003 scribus.cpp Implemented a new Fontselection Dialog.
/trunk/Scribus/scribus/reformdoc.h
22,7 → 22,7
Q_OBJECT
 
public:
ReformDoc( QWidget* parent, float t, float l, float r, float b, bool fp, bool fpe, int Einh );
ReformDoc( QWidget* parent, float t, float l, float r, float b, float Pagebr, float Pageho, bool fp, bool fpe, int Einh );
~ReformDoc() {};
 
QGroupBox* GroupBox7;
39,6 → 39,8
QPushButton* OKButton;
QPushButton* CancelB;
int einheit;
int Breite;
int Hoehe;
 
protected:
QVBoxLayout* ReformDocLayout;
48,6 → 50,10
 
protected slots:
virtual void setDS();
virtual void setTop(int v);
virtual void setBottom(int v);
virtual void setLeft(int v);
virtual void setRight(int v);
 
};
 
/trunk/Scribus/scribus/newfile.cpp
123,7 → 123,6
ComboBox1->setCurrentItem(Vor->PageFormat);
Breite->setValue(qRound(Vor->PageBreite * Umrech) * 100);
Hoehe->setValue(qRound(Vor->PageHoehe * Umrech) * 100);
setSize(Vor->PageFormat);
Breite->setLineStep(100);
Hoehe->setLineStep(100);
 
191,6 → 190,7
LeftR->setDecimals(100);
RightR->setDecimals(100);
BottomR->setDecimals(100);
setSize(Vor->PageFormat);
 
Layout10 = new QVBoxLayout( 0, 0, 6, "Layout10");
 
293,24 → 293,46
connect(Distance, SIGNAL(valueChanged(int)), this, SLOT(setDist(int)));
}
 
void NewDoc::setBreite(int v)
{
Pagebr = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void NewDoc::setHoehe(int v)
{
Pageho = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void NewDoc::setTop(int v)
{
Top = v / Umrech / 100.0;
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void NewDoc::setBottom(int v)
{
Bottom = v / Umrech / 100.0;
TopR->setMaxValue(Hoehe->value() - BottomR->value());
}
 
void NewDoc::setLeft(int v)
{
Left = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
}
 
void NewDoc::setRight(int v)
{
Right = v / Umrech / 100.0;
LeftR->setMaxValue(Breite->value() - RightR->value());
}
 
void NewDoc::setDist(int v)
392,6 → 414,10
Breite->setValue(Hoehe->value());
Hoehe->setValue(br);
}
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void NewDoc::setPGsize()
406,6 → 432,8
{
Pagebr = Breite->value() / 100.0;
Pageho = Hoehe->value() / 100.0;
disconnect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
Breite->setEnabled(false);
Hoehe->setEnabled(false);
switch (gr)
537,6 → 565,12
}
Breite->setValue(qRound(Pagebr * Umrech * 100));
Hoehe->setValue(qRound(Pageho * Umrech * 100));
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
connect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
}
 
void NewDoc::setAT()
/trunk/Scribus/scribus/scribus.cpp
1624,7 → 1624,7
bool fpe = doc->FirstPageLeft;
float tpr2, lr2, rr2, br2;
bool ret = false;
ReformDoc* dia = new ReformDoc(this, tpr, lr, rr, br, fp, fpe, doc->Einheit);
ReformDoc* dia = new ReformDoc(this, tpr, lr, rr, br, doc->PageB, doc->PageH, fp, fpe, doc->Einheit);
if (dia->exec())
{
tpr2 = dia->TopR->value() / UmReFaktor / 100.0;
/trunk/Scribus/scribus/libprefs/prefs.cpp
1581,6 → 1581,10
connect(T6_Konvex, SIGNAL(clicked()), this, SLOT(UpdatePreView()));
connect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
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)));
connect(GZComboO, SIGNAL(activated(int)), this, SLOT(setOrien(int)));
connect(GZComboF, SIGNAL(activated(int)), this, SLOT(setSize(int)));
connect(Doppelseiten, SIGNAL(clicked()), this, SLOT(setDS()));
1648,13 → 1652,41
void Preferences::setBreite(int v)
{
Pagebr = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void Preferences::setHoehe(int v)
{
Pageho = v / Umrech / 100.0;
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void Preferences::setTop(int v)
{
BottomR->setMaxValue(Hoehe->value() - TopR->value());
}
 
void Preferences::setBottom(int v)
{
TopR->setMaxValue(Hoehe->value() - BottomR->value());
}
 
void Preferences::setLeft(int v)
{
RightR->setMaxValue(Breite->value() - LeftR->value());
}
 
void Preferences::setRight(int v)
{
LeftR->setMaxValue(Breite->value() - RightR->value());
}
 
void Preferences::setSize(int gr)
{
Pagebr = Breite->value() / 100.0;
1792,6 → 1824,10
disconnect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
Breite->setValue(qRound(Pagebr * Umrech * 100));
Hoehe->setValue(qRound(Pageho * Umrech * 100));
RightR->setMaxValue(Breite->value() - LeftR->value());
LeftR->setMaxValue(Breite->value() - RightR->value());
TopR->setMaxValue(Hoehe->value() - BottomR->value());
BottomR->setMaxValue(Hoehe->value() - TopR->value());
connect(Breite, SIGNAL(valueChanged(int)), this, SLOT(setBreite(int)));
connect(Hoehe, SIGNAL(valueChanged(int)), this, SLOT(setHoehe(int)));
}
/trunk/Scribus/scribus/reformdoc.cpp
3,7 → 3,7
extern QPixmap loadIcon(QString nam);
extern float UmReFaktor;
 
ReformDoc::ReformDoc( QWidget* parent, float t, float l, float r, float b, bool fp, bool fpe, int Einh)
ReformDoc::ReformDoc( QWidget* parent, float t, float l, float r, float b, float Pagebr, float Pageho, bool fp, bool fpe, int Einh)
: QDialog( parent, "r", true, 0 )
{
QString ein;
23,6 → 23,8
ein = " p";
break;
}
Breite = qRound(Pagebr * UmReFaktor * 100);
Hoehe = qRound(Pageho * UmReFaktor * 100);
setCaption( tr( "Document Setup" ) );
setIcon(loadIcon("AppIcon.xpm"));
ReformDocLayout = new QVBoxLayout( this );
45,7 → 47,7
Layout4->addWidget( TextLabel5, 0, 0 );
TopR = new MSpinBox( GroupBox7, 2 );
TopR->setSuffix( ein );
TopR->setMaxValue( 100000 );
TopR->setMaxValue(Hoehe);
TopR->setValue( qRound(t * UmReFaktor * 100) );
Layout4->addWidget( TopR, 0, 1 );
Links = new QLabel( GroupBox7, "Links" );
53,7 → 55,7
Layout4->addWidget( Links, 0, 2 );
LeftR = new MSpinBox( GroupBox7, 2 );
LeftR->setSuffix( ein );
LeftR->setMaxValue( 100000 );
LeftR->setMaxValue(Breite);
LeftR->setValue( qRound(l * UmReFaktor * 100) );
Layout4->addWidget( LeftR, 0, 3 );
TextLabel7 = new QLabel( GroupBox7, "TextLabel7" );
61,7 → 63,7
Layout4->addWidget( TextLabel7, 1, 0 );
BottomR = new MSpinBox( GroupBox7, 2 );
BottomR->setSuffix( ein );
BottomR->setMaxValue( 100000 );
BottomR->setMaxValue(Hoehe);
BottomR->setValue( qRound(b * UmReFaktor * 100) );
Layout4->addWidget( BottomR, 1, 1 );
Rechts = new QLabel( GroupBox7, "Rechts" );
69,7 → 71,7
Layout4->addWidget( Rechts, 1, 2 );
RightR = new MSpinBox( GroupBox7, 2 );
RightR->setSuffix( ein );
RightR->setMaxValue( 100000 );
RightR->setMaxValue(Breite);
RightR->setValue( qRound(r * UmReFaktor * 100) );
Layout4->addWidget( RightR, 1, 3 );
Doppelseiten = new QCheckBox( GroupBox7, "Doppelseiten" );
103,14 → 105,41
LeftR->setDecimals(100);
RightR->setDecimals(100);
BottomR->setDecimals(100);
RightR->setMaxValue(Breite - LeftR->value());
LeftR->setMaxValue(Breite - RightR->value());
TopR->setMaxValue(Hoehe - BottomR->value());
BottomR->setMaxValue(Hoehe - TopR->value());
 
// 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)
{
BottomR->setMaxValue(Hoehe - TopR->value());
}
 
void ReformDoc::setBottom(int v)
{
TopR->setMaxValue(Hoehe - BottomR->value());
}
 
void ReformDoc::setLeft(int v)
{
RightR->setMaxValue(Breite - LeftR->value());
}
 
void ReformDoc::setRight(int v)
{
LeftR->setMaxValue(Breite - RightR->value());
}
 
void ReformDoc::setDS()
{
if (Doppelseiten->isChecked())
/trunk/Scribus/scribus/missing.h
13,10 → 13,11
Q_OBJECT
 
public:
DmF( QWidget* parent, QString fon, preV *Prefs );
DmF( QWidget* parent, QString fon, preV *Prefs, bool miss = true );
~DmF() {};
 
QPushButton* PushButton1;
QPushButton* PushButton2;
QLabel* TextLabel6;
QLabel* PixmapLabel1;
FontCombo* Replace;
/trunk/Scribus/scribus/newfile.h
70,6 → 70,8
void setSize(int gr);
 
public slots:
void setHoehe(int v);
void setBreite(int v);
void setTop(int v);
void setBottom(int v);
void setLeft(int v);