r15207 by cbradney - #8896: Leave File Save enabled after File Collect, plus rename scribus.cpp collect function

[scribus-commit]

Revision: 15207
Author: cbradney
Date: 2010-06-17T20:27:10.081792Z
Commit message: #8896: Leave File Save enabled after File Collect, plus rename scribus.cpp collect function

Changeset: 
M  /trunk/Scribus/scribus/actionmanager.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
M  /trunk/Scribus/scribus/scribus.h
M  /trunk/Scribus/scribus/ui/collectforoutput_ui.cpp

Diffs:
Index: scribus/actionmanager.cpp
===================================================================
--- scribus/actionmanager.cpp	(revision 15206)
+++ scribus/actionmanager.cpp	(revision 15207)
@@ -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()) );
Index: scribus/ui/collectforoutput_ui.cpp
===================================================================
--- scribus/ui/collectforoutput_ui.cpp	(revision 15206)
+++ scribus/ui/collectforoutput_ui.cpp	(revision 15207)
@@ -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("");
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 15206)
+++ scribus/scribus.cpp	(revision 15207)
@@ -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;
Index: scribus/plugins/saveastemplateplugin/satemplate.cpp
===================================================================
--- scribus/plugins/saveastemplateplugin/satemplate.cpp	(revision 15206)
+++ scribus/plugins/saveastemplateplugin/satemplate.cpp	(revision 15207)
@@ -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);
Index: scribus/scribus.h
===================================================================
--- scribus/scribus.h	(revision 15206)
+++ scribus/scribus.h	(revision 15207)
@@ -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);