r21864 by jghali - #12831: scrapbook doesn't work with images

[scribus-commit]

Author: jghali
Date: Tue Apr  4 22:45:50 2017
New Revision: 21864

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21864
Log:
#12831: scrapbook doesn't work with images

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

Modified: trunk/Scribus/scribus/ui/scrapbookpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21864&path=/trunk/Scribus/scribus/ui/scrapbookpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrapbookpalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/scrapbookpalette.cpp	Tue Apr  4 22:45:50 2017
@@ -262,13 +262,13 @@
 		dd.mkdir(QDir::cleanPath(QDir::toNativeSeparators(dir + "/" + fid.baseName())));
 	}
 	QString source = "";
-	QString fileDir = ScPaths::scrapbookDir(true);
+	QString fileDir = ScPaths::applicationDataDir();
 	bool first = true;
 	DOC = elem.firstChild();
 	while(!DOC.isNull())
 	{
 		QDomElement pg = DOC.toElement();
-		if(pg.tagName() == "ITEM")
+		if (pg.tagName() == "ITEM")
 		{
 			if (first)
 				pg.setAttribute("ANNAME", fid.baseName());
@@ -361,12 +361,12 @@
 void BibView::checkAndChangeGroups(QDomElement elem, QString dir, QFileInfo fid)
 {
 	QString source = "";
-	QString fileDir = QDir::homePath();
+	QString fileDir = ScPaths::applicationDataDir();
 	QDomNode DOC = elem.firstChild();
-	while(!DOC.isNull())
+	while (!DOC.isNull())
 	{
 		QDomElement pg = DOC.toElement();
-		if(pg.tagName() == "PAGEOBJECT")
+		if (pg.tagName() == "PAGEOBJECT")
 		{
 			PageItem::ItemType PType = static_cast<PageItem::ItemType>(pg.attribute("PTYPE").toInt());
 			if ((PType == PageItem::ImageFrame) || (PType == PageItem::TextFrame))