r18342 by craig - #11604: Detect if file is already compressed and use this in the collect for output dialog, and rename the file correctly

[scribus-commit]

Author: craig
Date: Wed Jun 26 20:37:25 2013
New Revision: 18342

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18342
Log:
#11604: Detect if file is already compressed and use this in the collect for output dialog, and rename the file correctly

Modified:
    branches/Version14x/Scribus/scribus/collect4output.cpp
    branches/Version14x/Scribus/scribus/scribus.cpp

Modified: branches/Version14x/Scribus/scribus/collect4output.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18342&path=/branches/Version14x/Scribus/scribus/collect4output.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/collect4output.cpp (original)
+++ branches/Version14x/Scribus/scribus/collect4output.cpp Wed Jun 26 20:37:25 2013
@@ -134,11 +134,11 @@
 	{
 		if (!newName.endsWith(".gz"))
 			newName += ".gz";
-		else
-		{
-			if (newName.endsWith(".gz"))
-				newName = newName.remove(".gz");
-		}
+	}
+	else
+	{
+		if (newName.endsWith(".gz"))
+			newName = newName.remove(".gz");
 	}
 
 	if (!overwrite(ScCore->primaryMainWindow(), newName))

Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18342&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Wed Jun 26 20:37:25 2013
@@ -9142,6 +9142,8 @@
 
 QString ScribusMainWindow::Collect(bool compress, bool withFonts, const bool withProfiles, const QString& )
 {
+	if ((doc->hasName) && doc->DocName.endsWith(".gz"))
+		compress=true;
 	CollectForOutput c(doc, withFonts, withProfiles, compress);
 	return c.collect();
 }