Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1832 → Rev 1833

/branches/Version13x/Scribus/scribus/tabguides.h
23,7 → 23,7
public:
TabGuides( QWidget* parent, struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex);
~TabGuides() {};
void restoreDefaults();
void restoreDefaults(struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex);
 
MSpinBox* majorSpace;
MSpinBox* minorSpace;
/branches/Version13x/Scribus/scribus/about.cpp
49,7 → 49,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("3").arg("April").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("4").arg("April").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/reformdoc.cpp
421,7 → 421,7
tabHyphenator->maxCount->setValue(currDoc->docHyphenator->HyCount);
}
else if (current == tabGuides)
tabGuides->restoreDefaults();
tabGuides->restoreDefaults(&currDoc->guidesSettings, &currDoc->typographicSetttings, einheit);
else if (current == tabTypo)
tabTypo->restoreDefaults(&currDoc->typographicSetttings);
else if (current == tabTools)
/branches/Version13x/Scribus/scribus/scribusview.cpp
8545,11 → 8545,19
for (uint ite = 0; ite < Doc->Items.count(); ++ite)
{
PageItem *item = Doc->Items.at(ite);
oldPg = pageTable[item->OwnPage];
item->Xpos = item->Xpos - oldPg.oldXO + Doc->Pages.at(oldPg.newPg)->Xoffset;
item->Ypos = item->Ypos - oldPg.oldYO + Doc->Pages.at(oldPg.newPg)->Yoffset;
item->OwnPage = static_cast<int>(oldPg.newPg);
setRedrawBounding(item);
if (item->OwnPage < 0)
{
item->OwnPage = OnPage(item);
setRedrawBounding(item);
}
else
{
oldPg = pageTable[item->OwnPage];
item->Xpos = item->Xpos - oldPg.oldXO + Doc->Pages.at(oldPg.newPg)->Xoffset;
item->Ypos = item->Ypos - oldPg.oldYO + Doc->Pages.at(oldPg.newPg)->Yoffset;
item->OwnPage = static_cast<int>(oldPg.newPg);
setRedrawBounding(item);
}
}
if (Doc->PageFP)
{
/branches/Version13x/Scribus/scribus/tabguides.cpp
255,8 → 255,43
QToolTip::add( autoLine, tr( "Percentage increase over the font size for the line spacing" ) );
}
 
void TabGuides::restoreDefaults()
void TabGuides::restoreDefaults(struct guidesPrefs *prefsData, struct typoPrefs *prefsData2, int unitIndex)
{
unit = unitGetSuffixFromIndex(unitIndex);
precision = unitGetPrecisionFromIndex(unitIndex);
unitRatio = unitGetRatioFromIndex(unitIndex);
QPixmap pm3 = QPixmap(54, 14);
pm3.fill(prefsData->guideColor);
colorGuides = prefsData->guideColor;
guideColor->setPixmap(pm3);
QPixmap pm6 = QPixmap(54, 14);
pm6.fill(prefsData->margColor);
colorMargin = prefsData->margColor;
marginColor->setPixmap(pm6);
QPixmap pm1 = QPixmap(54, 14);
pm1.fill(prefsData->majorColor);
colorMajorGrid = prefsData->majorColor;
majorGridColor->setPixmap(pm1);
QPixmap pm = QPixmap(54, 14);
pm.fill(prefsData->minorColor);
colorMinorGrid = prefsData->minorColor;
minorGridColor->setPixmap(pm);
QPixmap pm4 = QPixmap(54, 14);
pm4.fill(prefsData->baseColor);
colorBaselineGrid = prefsData->baseColor;
baselineColor->setPixmap(pm4);
minorSpace->setValue(prefsData->minorGrid * unitRatio);
majorSpace->setValue(prefsData->majorGrid * unitRatio);
snapDistance->setValue(prefsData->guideRad * unitRatio);
grabDistance->setValue(prefsData->grabRad);
baseGrid->setValue(prefsData2->valueBaseGrid * unitRatio);
baseOffset->setValue(prefsData2->offsetBaseGrid * unitRatio);
inBackground->setChecked( prefsData->before );
inForeground->setChecked( !prefsData->before );
checkBaseline->setChecked(prefsData->baseShown);
checkGrid->setChecked(prefsData->gridShown);
checkMargin->setChecked(prefsData->marginsShown);
checkGuides->setChecked(prefsData->guidesShown);
}
 
void TabGuides::changeMajorColor()