Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 4785 → Rev 4786

/branches/Version13x/Scribus/scribus/sampleitem.cpp
31,7 → 31,7
//pagesType, unit, firstPageOrder,
1, 1, 1,
//orientation, firstPageNr, "Custom");
1, 1, "custom");
1, 1, "custom", 1, false);
ScMW->doc->pageSets[1/*pagesType*/].FirstPage = 1;//firstPageOrder;
used = false;
}
/branches/Version13x/Scribus/scribus/scribus.cpp
1825,8 → 1825,9
return retVal;
}
 
bool ScribusMainWindow::doFileNew(double width, double h, double tpr, double lr, double rr, double br, double ab, double sp,
bool atf, int fp, int einh, int firstleft, int Ori, int SNr, const QString& defaultPageSize, int pageCount)
bool ScribusMainWindow::doFileNew(double width, double h, double tpr, double lr, double rr, double br, double ab,
double sp, bool atf, int fp, int einh, int firstleft, int Ori, int SNr,
const QString& defaultPageSize, int pageCount, bool showView)
{
QString cc;
if (HaveDoc)
1880,11 → 1881,14
// connect(w, SIGNAL(SaveAndClose()), this, SLOT(DoSaveClose()));
 
//Independent finishing tasks after doc setup
if ( wsp->windowList().isEmpty() )
w->showMaximized();
else
w->show();
view->show();
if (showView)
{
if ( wsp->windowList().isEmpty() )
w->showMaximized();
else
w->show();
view->show();
}
connect(w, SIGNAL(AutoSaved()), this, SLOT(slotAutoSaved()));
connect(fileWatcher, SIGNAL(fileChanged(QString)), doc, SLOT(updatePict(QString)));
connect(fileWatcher, SIGNAL(fileDeleted(QString)), doc, SLOT(removePict(QString)));
/branches/Version13x/Scribus/scribus/scribus.h
135,7 → 135,7
const bool fileWatcherActive();
 
bool doFileNew(double width, double h, double tpr, double lr, double rr, double br, double ab, double sp,
bool atf, int fp, int einh, int firstleft, int Ori, int SNr, const QString&, int pageCount=1);
bool atf, int fp, int einh, int firstleft, int Ori, int SNr, const QString&, int pageCount=1, bool showView=true);
bool DoFileSave(QString fn);
void closeEvent(QCloseEvent *ce);
void keyPressEvent(QKeyEvent *k);