Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 19370 → Rev 19371

/trunk/Scribus/scribus/ui/newmarginwidget.cpp
161,22 → 161,24
setPreset();
}
 
void NewMarginWidget::setNewUnitIndex(int newUnitIndex)
void NewMarginWidget::setNewUnit(int newUnitIndex)
{
leftMarginSpinBox->blockSignals(true);
rightMarginSpinBox->blockSignals(true);
topMarginSpinBox->blockSignals(true);
bottomMarginSpinBox->blockSignals(true);
m_unitIndex=newUnitIndex;
m_unitRatio=unitGetRatioFromIndex(newUnitIndex);
bool leftSigBlocked = leftMarginSpinBox->blockSignals(true);
bool rightSigBlocked = rightMarginSpinBox->blockSignals(true);
bool topSigBlocked = topMarginSpinBox->blockSignals(true);
bool bottomSigBlocked = bottomMarginSpinBox->blockSignals(true);
 
m_unitIndex = newUnitIndex;
m_unitRatio = unitGetRatioFromIndex(newUnitIndex);
topMarginSpinBox->setNewUnit(newUnitIndex);
bottomMarginSpinBox->setNewUnit(newUnitIndex);
leftMarginSpinBox->setNewUnit(newUnitIndex);
rightMarginSpinBox->setNewUnit(newUnitIndex);
leftMarginSpinBox->blockSignals(false);
rightMarginSpinBox->blockSignals(false);
topMarginSpinBox->blockSignals(false);
bottomMarginSpinBox->blockSignals(false);
 
leftMarginSpinBox->blockSignals(leftSigBlocked);
rightMarginSpinBox->blockSignals(rightSigBlocked);
topMarginSpinBox->blockSignals(topSigBlocked);
bottomMarginSpinBox->blockSignals(bottomSigBlocked);
}
 
void NewMarginWidget::setPreset()
/trunk/Scribus/scribus/ui/newmarginwidget.h
29,7 → 29,7
void setPageHeight(double);
/*! \brief Set the page size for margin getting from cups */
void setPageSize(const QString&);
void setNewUnitIndex(int);
void setNewUnit(int unitIndex);
void setNewValues(const MarginStruct& margs);
/*! \brief Setup the presetCombo without changing the margin values, only used by tabdocument */
void setMarginPreset(int p);
/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
75,10 → 75,10
unitRatio = unitGetRatioFromIndex(docUnitIndex);
pageWidthSpinBox->setValue(pageW * unitRatio);
pageHeightSpinBox->setValue(pageH * unitRatio);
marginsWidget->setNewUnitIndex(docUnitIndex);
marginsWidget->setNewUnit(docUnitIndex);
marginsWidget->setPageHeight(pageH);
marginsWidget->setPageWidth(pageW);
bleedsWidget->setNewUnitIndex(docUnitIndex);
bleedsWidget->setNewUnit(docUnitIndex);
bleedsWidget->setPageHeight(pageH);
bleedsWidget->setPageWidth(pageW);
 
/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
118,6 → 118,8
markOffsetSpinBox->setNewUnit(unitIndex);
markOffsetSpinBox->setMinimum(0);
markOffsetSpinBox->setMaximum(3000 * unitRatio);
 
bleedsWidget->setNewUnit(unitIndex);
}
 
void Prefs_PDFExport::languageChange()
/trunk/Scribus/scribus/ui/prefs_printer.cpp
39,7 → 39,7
 
void Prefs_Printer::unitChange(int newIndex)
{
bleedsWidget->setNewUnitIndex(newIndex);
bleedsWidget->setNewUnit(newIndex);
markOffsetSpinBox->setNewUnit(newIndex);
markLengthSpinBox->setNewUnit(newIndex);
}