r17217 by fschmid - Take import plugins into account when building the filetype list for importing colors.

scribus-commit scribus-commit at lists.scribus.net
Sat Jan 21 10:58:05 UTC 2012


Author: fschmid
Date: Sat Jan 21 10:58:05 2012
New Revision: 17217

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17217
Log:
Take import plugins into account when building the filetype list for importing colors.

Modified:
    trunk/Scribus/scribus/ui/paintmanager.cpp

Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17217&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Sat Jan 21 10:58:05 2012
@@ -1029,14 +1029,21 @@
 		}
 		else if ((it->parent() == colorItems) || (it == colorItems))
 		{
-		//	QStringList allFormatsV = LoadSavePlugin::getExtensionsForColors();
-		//	qDebug() << allFormatsV;
+			QStringList allFormatsV = LoadSavePlugin::getExtensionsForColors();
+			allFormatsV.removeAll("sla");
+			allFormatsV.removeAll("scd");
+			allFormatsV.removeAll("sla.gz");
+			allFormatsV.removeAll("scd.gz");
+			allFormatsV.removeAll("ai");
+			QString extra = allFormatsV.join(" *.");
+			extra.prepend(" *.");
 			QString fileName;
 			PrefsContext* dirs = PrefsManager::instance()->prefsFile->getContext("dirs");
 			QString wdir = dirs->get("colors", ".");
 			QString docexts("*.sla *.sla.gz *.scd *.scd.gz");
 			QString aiepsext(FormatsManager::instance()->extensionListForFormat(FormatsManager::EPS|FormatsManager::PS|FormatsManager::AI, 0));
-			QString ooexts(" *.acb *.aco *.skp *.soc *.gpl *.xar *.xml");
+			QString ooexts(" *.acb *.aco *.skp *.soc *.gpl *.xml");
+			ooexts += extra;
 			QString filter = tr("All Supported Formats (%1);;Documents (%2);;Other Files (%3);;All Files (*)").arg(docexts+" "+aiepsext+ooexts).arg(docexts).arg(aiepsext+ooexts);
 			CustomFDialog dia(this, wdir, tr("Import Colors"), filter, fdHidePreviewCheckBox);
 			if (dia.exec() == QDialog::Accepted)




More information about the scribus-commit mailing list