r19807 by craig - Fix PS plugin loading issue by not re-registering formats on languagechange, allows PS import to canvas on OSX

[scribus-commit]

Author: craig
Date: Tue Feb 10 18:55:54 2015
New Revision: 19807

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19807
Log:
Fix PS plugin loading issue by not re-registering formats on languagechange, allows PS import to canvas on OSX

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
    trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19807&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp Tue Feb 10 18:55:54 2015
@@ -50,8 +50,8 @@
 {
 	// Set action info in languageChange, so we only have to do it in one
 	// place. This includes registering file format support.
+	languageChange();
 	registerFormats();
-	languageChange();
 }
 
 void ImportPdfPlugin::languageChange()

Modified: trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19807&path=/trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp Tue Feb 10 18:55:54 2015
@@ -47,6 +47,7 @@
 	// Set action info in languageChange, so we only have to do it in one
 	// place. This includes registering file format support.
 	languageChange();
+	registerFormats();
 }
 /*
 void ImportPSPlugin::addToMainWindowMenu(ScribusMainWindow *mw)
@@ -60,8 +61,8 @@
 {
 	importAction->setText( tr("Import PostScript..."));
 	// (Re)register file format support
-	unregisterAll();
-	registerFormats();
+	//unregisterAll();
+	//registerFormats();
 }
 
 ImportPSPlugin::~ImportPSPlugin()
@@ -106,7 +107,7 @@
 	fmt.mimeTypes = FormatsManager::instance()->mimetypeOfFormat(FormatsManager::EPS); // MIME types
 	fmt.priority = 64; // Priority
 	registerFormat(fmt);
-	
+
 	FileFormat fmt2(this);
 	fmt2.trName = FormatsManager::instance()->nameOfFormat(FormatsManager::PS); // Human readable name
 	fmt2.formatId = 0;