r21528 by craig - #9808: Switch directory finding for data dirs to QStandardPaths, thereby implementing XDG standards on Linux. Clean up. Bump Qt minimum to 5.5, third part

scribus-commit scribus-commit at lists.scribus.net
Sun Nov 20 23:59:58 UTC 2016


Author: craig
Date: Sun Nov 20 23:59:57 2016
New Revision: 21528

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21528
Log:
#9808: Switch directory finding for data dirs to QStandardPaths, thereby implementing XDG standards on Linux. Clean up. Bump Qt minimum to 5.5, third part

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21528&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp	(original)
+++ trunk/Scribus/scribus/prefsmanager.cpp	Sun Nov 20 23:59:57 2016
@@ -747,6 +747,24 @@
 	QFileInfo oldPi3 = QFileInfo(oldPR3);
 	if (oldPi3.exists())
 		moveFile(oldPR3, m_prefsLocation+"scrap.scs");
+	QString oldPrefsLocation(QDir::homePath()+"/.scribus/");
+	QString oldPR4 = QDir::toNativeSeparators(oldPrefsLocation + "scribus150.rc");
+	QFileInfo oldPi4 = QFileInfo(oldPR4);
+	if (oldPi4.exists())
+		moveFile(oldPR4, m_prefsLocation+"scribus150.rc");
+	QString oldPR5 = QDir::toNativeSeparators(oldPrefsLocation + "scrap150.scs");
+	QFileInfo oldPi5 = QFileInfo(oldPR5);
+	if (oldPi5.exists())
+		moveFile(oldPR5, m_prefsLocation+"scrap150.scs");
+	QString oldPR6 = QDir::toNativeSeparators(oldPrefsLocation + "prefs150.xml");
+	QFileInfo oldPi6 = QFileInfo(oldPR6);
+	if (oldPi6.exists())
+		moveFile(oldPR6, m_prefsLocation+"prefs150.xml");
+	QString oldPR7 = QDir::toNativeSeparators(oldPrefsLocation + "scripter150.rc");
+	QFileInfo oldPi7 = QFileInfo(oldPR7);
+	if (oldPi7.exists())
+		moveFile(oldPR7, m_prefsLocation+"scripter150.rc");
+
 
 	//Move plugin data files to new plugin data file directory
 	QDir oldPluginData(ScPaths::preferencesDir() + "/plugins");




More information about the scribus-commit mailing list