Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 15205 → Rev 15208

/trunk/Scribus/scribus/actionmanager.cpp
170,7 → 170,7
connect( (*scrActions)["filePreferences"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefsOrg()) );
connect( (*scrActions)["filePreferences150"], SIGNAL(triggered()), mainWindow, SLOT(slotPrefs150Org()) );
connect( (*scrActions)["fileRevert"], SIGNAL(triggered()), mainWindow, SLOT(slotFileRevert()) );
connect( (*scrActions)["fileCollect"], SIGNAL(triggered()), mainWindow, SLOT(Collect()) );
connect( (*scrActions)["fileCollect"], SIGNAL(triggered()), mainWindow, SLOT(fileCollect()) );
connect( (*scrActions)["fileQuit"], SIGNAL(triggered()), mainWindow, SLOT(slotFileQuit()) );
//File Import Menu
connect( (*scrActions)["fileImportText"], SIGNAL(triggered()), mainWindow, SLOT(slotGetContent()) );
/trunk/Scribus/scribus/ui/collectforoutput_ui.cpp
117,7 → 117,6
QDir::setCurrent(m_outputDirectory);
ScCore->primaryMainWindow()->updateActiveWindowCaption(newName);
UndoManager::instance()->renameStack(newName);
ScCore->primaryMainWindow()->scrActions["fileSave"]->setEnabled(false);
ScCore->primaryMainWindow()->scrActions["fileRevert"]->setEnabled(false);
ScCore->primaryMainWindow()->updateRecent(newName);
ScCore->primaryMainWindow()->setStatusBarInfoText("");
/trunk/Scribus/scribus/scribus.cpp
9053,7 → 9053,7
}
}
 
QString ScribusMainWindow::Collect(bool compress, bool withFonts, const bool withProfiles, const QString& )
QString ScribusMainWindow::fileCollect(bool compress, bool withFonts, const bool withProfiles, const QString& )
{
CollectForOutput_UI c(this, doc, QString::null, withFonts, withProfiles, compress);
QString newFileName;
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
134,7 → 134,7
templatesDir = userTemplatesDir;
}
dirs->set("collect", templatesDir);
if (doc->scMW()->Collect().isEmpty())
if (doc->scMW()->fileCollect().isEmpty())
return;
if (oldCollect != ".")
dirs->set("collect", oldCollect);
/trunk/Scribus/scribus/scribus.h
260,7 → 260,7
void slotStoryEditor();
void slotCharSelect();
void ImageEffects();
QString Collect(const bool compress = false, const bool withFonts = false, const bool withProfiles = false, const QString& newDirectory=QString::null);
QString fileCollect(const bool compress = false, const bool withFonts = false, const bool withProfiles = false, const QString& newDirectory=QString::null);
void AddBookMark(PageItem *ite);
void DelBookMark(PageItem *ite);
void BookMarkTxT(PageItem *ite);