r19373 by fschmid - Bug #12542: Picture Browser: Dragn'n'Drop doesn't work reliably, Second Part, fix the Drag'n'Drop

[scribus-commit]

Author: fschmid
Date: Sat Jul 26 17:49:30 2014
New Revision: 19373

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19373
Log:
Bug #12542: Picture Browser: Dragn'n'Drop doesn't work reliably, Second Part, fix the Drag'n'Drop

Modified:
    trunk/Scribus/scribus/fileloader.cpp
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19373&path=/trunk/Scribus/scribus/fileloader.cpp
==============================================================================
--- trunk/Scribus/scribus/fileloader.cpp (original)
+++ trunk/Scribus/scribus/fileloader.cpp Sat Jul 26 17:49:30 2014
@@ -126,8 +126,8 @@
 		bool found = false;
 		for (int a = 0; a < it->fileExtensions.count(); a++)
 		{
-			QString exts = it->fileExtensions[a];
-			if (ext.contains(exts, Qt::CaseInsensitive))
+			QString exts = it->fileExtensions[a].toLower();
+			if (ext == exts)
 			{
 				if (it->plug != 0)
 				{

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19373&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sat Jul 26 17:49:30 2014
@@ -792,8 +792,11 @@
 		}
 		if (ext == "JPG")
 			ext = "JPEG";
+		QString formatD(FormatsManager::instance()->extensionListForFormat(FormatsManager::IMAGESIMGFRAME, 1).toUpper());
+		imfo += formatD.split("|");
+		img = imfo.contains(ext);
 		//CB Need to handle this ugly file extension list elsewhere... some capabilities class perhaps
-		img = ((imfo.contains(ext)) || extensionIndicatesPDF(ext) || extensionIndicatesEPSorPS(ext) || extensionIndicatesTIFF(ext) || extensionIndicatesJPEG(ext) || extensionIndicatesPSD(ext));
+	//	img = ((imfo.contains(ext)) || extensionIndicatesPDF(ext) || extensionIndicatesEPSorPS(ext) || extensionIndicatesTIFF(ext) || extensionIndicatesJPEG(ext) || extensionIndicatesPSD(ext));
 //		int pscx=qRound(e->pos().x()/m_canvas->scale()), pscy=qRound(e->pos().y()/m_canvas->scale());
 		//Loop through all items and see which one(s) were under the drop point on the current layer
 		//Should make a nice function for this.