Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 8091 → Rev 8092

/branches/Version13x/Scribus/scribus/mspinbox.cpp
37,7 → 37,8
setValidator(0);
ed = editor();
QSpinBox::setLineStep(Decimals);
oldLineStep=0;
oldLineStep = 0;
currLineStep = Decimals;
readOnly=false;
edited = false;
connect( ed, SIGNAL(textChanged(const QString&)), SLOT(textChanged()) );
50,6 → 51,7
ed = editor();
QSpinBox::setLineStep(Decimals);
oldLineStep=0;
currLineStep = Decimals;
setMinValue(minValue);
setMaxValue(maxValue);
readOnly=false;
64,6 → 66,7
ed = editor();
QSpinBox::setLineStep(Decimals); // pv - dummy setup for designer's constructor
oldLineStep=0;
currLineStep = Decimals;
readOnly=false;
edited = false;
connect( ed, SIGNAL(textChanged(const QString&)), SLOT(textChanged()) );
109,7 → 112,7
bool controlB=k->state() & ControlButton;
if (k->key() == Key_Shift && !controlB)
{
setLineStep(QMAX(Decimals / 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep / 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
116,7 → 119,7
}
else if (k->key() == Key_Control && !shiftB)
{
setLineStep(QMAX(Decimals * 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep * 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
123,7 → 126,7
}
else if ((k->key() == Key_Control && shiftB) || (k->key() == Key_Shift && controlB))
{
setLineStep(QMAX(Decimals / 100, 1));
QSpinBox::setLineStep(QMAX(currLineStep / 100, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
144,7 → 147,7
bool controlB=k->stateAfter() & ControlButton;
if ((k->key() == Key_Shift && !controlB) || (k->key() == Key_Control && !shiftB))
{
setLineStep(Decimals);
QSpinBox::setLineStep(currLineStep);
retval = true;
qApp->sendEvent( this, ev );
return retval;
151,7 → 154,7
}
else if (k->key() == Key_Shift && controlB)
{
setLineStep(QMAX(Decimals * 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep * 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
158,7 → 161,7
}
else if (k->key() == Key_Control && shiftB)
{
setLineStep(QMAX(Decimals / 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep / 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
174,7 → 177,7
bool controlB=k->state() & ControlButton;
if (shiftB && !controlB)
{
setLineStep(QMAX(Decimals / 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep / 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
181,7 → 184,7
}
else if (!shiftB && controlB)
{
setLineStep(QMAX(Decimals * 10, 1));
QSpinBox::setLineStep(QMAX(currLineStep * 10, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
188,7 → 191,7
}
else if (shiftB && controlB)
{
setLineStep(QMAX(Decimals / 100, 1));
QSpinBox::setLineStep(QMAX(currLineStep / 100, 1));
retval = true;
qApp->sendEvent( this, ev );
return retval;
196,7 → 199,7
else
if (!shiftB && !controlB)
{
setLineStep(Decimals);
QSpinBox::setLineStep(currLineStep);
retval = true;
qApp->sendEvent( this, ev );
return retval;
336,6 → 339,7
{
Decimals = deci;
QSpinBox::setLineStep(Decimals);
currLineStep = Decimals;
if (deci < 10)
Width = 0;
if ((deci > 9) && (deci < 100))
364,6 → 368,12
edited = false;
}
 
void MSpinBox::setLineStep(int val)
{
QSpinBox::setLineStep( val * 100 );
currLineStep = val * 100;
}
 
double MSpinBox::value()
{
return static_cast<double>(QSpinBox::value()) / Decimals;
/branches/Version13x/Scribus/scribus/scribusview.cpp
169,6 → 169,7
zoomSpinBox->setTabAdvance(false);
zoomSpinBox->setFont(fo);
zoomSpinBox->setValue( 100 );
zoomSpinBox->setLineStep(10);
zoomSpinBox->setFocusPolicy(QWidget::ClickFocus);
zoomSpinBox->setSuffix( tr( " %" ) );
#if OPTION_USE_QTOOLBUTTON
/branches/Version13x/Scribus/scribus/mspinbox.h
124,6 → 124,7
\param val new Value
*/
virtual void setValue(double val);
void setLineStep(int val);
void setReadOnly(bool ro);
void setValues(double min, double max, int deci, double val);
void getValues(double *min, double *max, int *deci, double *val);
135,6 → 136,7
void setFPConstants(FunctionParser &fp);
bool readOnly;
int oldLineStep;
int currLineStep;
bool edited;
QMap <QString, double> functionParserConstants;
};
/branches/Version13x/Scribus/scribus/pdflib.cpp
689,7 → 689,10
if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
{
if (pgit->isAnnotation())
{
StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");
ReallyUsed.insert(pgit->itemText.defaultStyle().charStyle().font().replacementName(), DocFonts[pgit->itemText.defaultStyle().charStyle().font().replacementName()]);
}
for (uint e = 0; e < static_cast<uint>(pgit->itemText.length()); ++e)
{
ReallyUsed.insert(pgit->itemText.charStyle(e).font().replacementName(), DocFonts[pgit->itemText.charStyle(e).font().replacementName()]);
702,7 → 705,10
if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
{
if (pgit->isAnnotation())
{
StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");
ReallyUsed.insert(pgit->itemText.defaultStyle().charStyle().font().replacementName(), DocFonts[pgit->itemText.defaultStyle().charStyle().font().replacementName()]);
}
for (uint e = 0; e < static_cast<uint>(pgit->itemText.length()); ++e)
{
ReallyUsed.insert(pgit->itemText.charStyle(e).font().replacementName(), DocFonts[pgit->itemText.charStyle(e).font().replacementName()]);
715,7 → 721,10
if ((pgit->itemType() == PageItem::TextFrame) || (pgit->itemType() == PageItem::PathText))
{
if (pgit->isAnnotation())
{
StdFonts.insert(ind2PDFabr[pgit->annotation().Font()], "");
ReallyUsed.insert(pgit->itemText.defaultStyle().charStyle().font().replacementName(), DocFonts[pgit->itemText.defaultStyle().charStyle().font().replacementName()]);
}
for (uint e = 0; e < static_cast<uint>(pgit->itemText.length()); ++e)
{
ReallyUsed.insert(pgit->itemText.charStyle(e).font().replacementName(), DocFonts[pgit->itemText.charStyle(e).font().replacementName()]);
1005,7 → 1014,8
AllFonts[it.key()].glyphNames(gl);
int nglyphs = 0;
QMap<uint,std::pair<QChar,QString> >::Iterator gli;
for (gli = gl.begin(); gli != gl.end(); ++gli) {
for (gli = gl.begin(); gli != gl.end(); ++gli)
{
if (gli.key() > static_cast<uint>(nglyphs))
nglyphs = gli.key();
}
1046,7 → 1056,8
uint glyph = 224 * Fc + ww2 - 32;
if (gl[glyph].second != "")
{
if (startOfSeq) {
if (startOfSeq)
{
PutDoc(QString::number(ww2)+" ");
startOfSeq = false;
}
1053,7 → 1064,8
PutDoc("/"+gl[glyph].second+" ");
crc++;
}
else {
else
{
startOfSeq = true;
}
if (signed(glyph) == nglyphs-1)