Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7919 → Rev 7920

/branches/Version13x/Scribus/scribus/mspinbox.cpp
40,7 → 40,6
oldLineStep=0;
readOnly=false;
edited = false;
tabAdvance = true;
connect( ed, SIGNAL(textChanged(const QString&)), SLOT(textChanged()) );
}
 
55,7 → 54,6
setMaxValue(maxValue);
readOnly=false;
edited = false;
tabAdvance = true;
connect( ed, SIGNAL(textChanged(const QString&)), SLOT(textChanged()) );
}
 
68,10 → 66,15
oldLineStep=0;
readOnly=false;
edited = false;
tabAdvance = true;
connect( ed, SIGNAL(textChanged(const QString&)), SLOT(textChanged()) );
}
 
MSpinBox::~MSpinBox()
{
if (ed)
disconnect( ed, SIGNAL(textChanged(const QString&)));
}
 
void MSpinBox::setParameters( int s )
{
if (s>=0 && s <=unitGetMaxIndex())
85,11 → 88,12
Decimals = 100;
}
edited = false;
m_tabAdvance = true;
}
 
void MSpinBox::setTabAdvance(bool enable)
{
tabAdvance = enable;
m_tabAdvance = enable;
}
 
bool MSpinBox::eventFilter( QObject* ob, QEvent* ev )
126,7 → 130,7
}
else if ((k->key() == Key_Return) || (k->key() == Key_Enter) || (k->key() == Key_Tab))
{
if (!tabAdvance)
if (!m_tabAdvance)
{
QSpinBox::interpretText();
return true;
/branches/Version13x/Scribus/scribus/mspinbox.h
60,7 → 60,7
\param name optional name of the object */
MSpinBox(QWidget *parent, const char * name = 0);
 
~MSpinBox() {};
~MSpinBox();
/*!
\author Franz Schmid
\brief Returns the current Value of the SpinBox
98,7 → 98,6
void setTabAdvance(bool enable);
int Decimals;
int Width;
bool tabAdvance;
QLineEdit *ed;
void setDecimals( int deci );
bool isReadOnly() const;
130,6 → 129,7
void getValues(double *min, double *max, int *deci, double *val);
 
protected:
bool m_tabAdvance;
bool eventFilter( QObject* ob, QEvent* ev );
void setParameters( int s );
void setFPConstants(FunctionParser &fp);
/branches/Version13x/Scribus/scribus/tabprinter.cpp
45,25 → 45,25
unitRatio = unitGetRatioFromIndex(docUnitIndex);
int decimals = unitGetPrecisionFromIndex(docUnitIndex);
QString unitSuffix = unitGetSuffixFromIndex(docUnitIndex);
bleedTop->setDecimals( decimals );
bleedTop->setMinValue(0);
bleedTop->setMaxValue(3000*unitRatio);
bleedTop->setDecimals( decimals );
bleedTop->setSuffix(unitSuffix);
bleedBottom->setDecimals( decimals );
bleedBottom->setMinValue(0);
bleedBottom->setMaxValue(3000*unitRatio);
bleedBottom->setDecimals( decimals );
bleedBottom->setSuffix(unitSuffix);
bleedLeft->setDecimals( decimals );
bleedLeft->setMinValue(0);
bleedLeft->setMaxValue(3000*unitRatio);
bleedLeft->setDecimals( decimals );
bleedLeft->setSuffix(unitSuffix);
bleedRight->setDecimals( decimals );
bleedRight->setMinValue(0);
bleedRight->setMaxValue(3000*unitRatio);
bleedRight->setDecimals( decimals );
bleedRight->setSuffix(unitSuffix);
offsetValue->setDecimals( decimals );
offsetValue->setMinValue(0);
offsetValue->setMaxValue(3000*unitRatio);
offsetValue->setDecimals( decimals );
offsetValue->setSuffix(unitSuffix);
 
defaultPrinter->setMinimumSize( QSize( 250, 22 ) );