Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3296 → Rev 3295

/branches/Version13x/Scribus/scribus/scribus.cpp
2307,7 → 2307,6
doc->pageSets[facingPages].FirstPage = firstPage;
if (dia->PgNum->value() > 1)
{
view->hide();
for (int pg = 1; pg < dia->PgNum->value(); pg++)
{
slotNewPage(pg);
2316,7 → 2315,6
}
outlinePalette->BuildTree(doc);
pagePalette->RebuildPage();
view->show();
view->GotoPage(0);
}
delete ps2;
2371,7 → 2369,6
doc->pageSets[facingPages].FirstPage = firstPage;
if (dia->PgNum->value() > 1)
{
view->hide();
for (int pg = 1; pg < dia->PgNum->value(); pg++)
{
slotNewPage(pg);
2380,7 → 2377,6
}
outlinePalette->BuildTree(doc);
pagePalette->RebuildPage();
view->show();
view->GotoPage(0);
}
mainWindowStatusLabel->setText( tr("Ready"));
/branches/Version13x/Scribus/scribus/scribusview.cpp
135,8 → 135,7
zoomInToolbarButton->setAutoDefault( false );
zoomInToolbarButton->setFlat(OPTION_FLAT_BUTTON);
#endif
zoomDefaultToolbarButton->setText("1:1");
// zoomDefaultToolbarButton->setPixmap(loadIcon("viewmag1.png"));
zoomDefaultToolbarButton->setPixmap(loadIcon("viewmag1.png"));
zoomOutToolbarButton->setPixmap(loadIcon("viewmagout.png"));
zoomInToolbarButton->setPixmap(loadIcon("viewmagin.png"));
PGS = new PageSelector(this, 1);
8611,26 → 8610,6
horizRuler->repaint();
vertRuler->repaint();
evSpon = true;
if ((verticalScrollBar()->draggingSlider()) || (horizontalScrollBar()->draggingSlider()))
{
QValueList<int> pag;
pag.clear();
for (uint a = 0; a < Doc->Pages.count(); ++a)
{
int xs = static_cast<int>(Doc->Pages.at(a)->xOffset() * Scale);
int ys = static_cast<int>(Doc->Pages.at(a)->yOffset() * Scale);
int ws = static_cast<int>(Doc->Pages.at(a)->width() * Scale);
int hs = static_cast<int>(Doc->Pages.at(a)->height() * Scale);
QRect drawRect = QRect(x, y, visibleWidth(), visibleHeight());
drawRect.moveBy(qRound(-Doc->minCanvasCoordinate.x() * Scale), qRound(-Doc->minCanvasCoordinate.y() * Scale));
if (drawRect.intersects(QRect(xs, ys, ws, hs)))
pag.append(a+1);
}
if (!pag.isEmpty())
ScApp->mainWindowStatusLabel->setText( tr("Page %1 to %2").arg(pag.first()).arg(pag.last()));
}
else
ScApp->mainWindowStatusLabel->setText("");
}
 
void ScribusView::Zval()
/branches/Version13x/Scribus/scribus/about.cpp
46,7 → 46,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("14").arg("September").arg("2005 ");
QString bu = tr("%1 %2 %3 ").arg("13").arg("September").arg("2005 ");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/icons/viewmagin.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream