Add downloads and user dictionary paths to ScPath

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17524 11d20701-8431-0410-a711-e3c959e3b870

2 files changed, 32 insertions, 3 deletions

diff --git a/scribus/scpaths.cpp b/scribus/scpaths.cpp
index 7238d47..ae0217c 100644
--- a/scribus/scpaths.cpp
+++ b/scribus/scpaths.cpp
@@ -260,10 +260,12 @@ QStringList ScPaths::spellDirs() const
 	QString osxLibreOfficePath("/Applications/LibreOffice.app/Contents/share/extensions");
 	QString osxUserLibreOfficePath(QDir::homePath()+"/Applications/LibreOffice.app/Contents/share/extensions");
 	QString linuxLocalPath("/usr/local/share/hunspell/");
-	QString linuxPath("/usr/share/hunspell/");
+	QString linuxHunspellPath("/usr/share/hunspell/");
+	QString linuxMyspellPath("/usr/share/myspell/");
 	QString windowsLOPath("LibreOffice 3.5/share/extensions");
 	QDir d;
 	QStringList spellDirs;
+	spellDirs.append(getUserDictDir(false));
 	spellDirs.append(m_shareDir + "dicts/spelling/");
 #ifdef Q_OS_MAC
 	d.setPath(macPortsPath);
@@ -303,9 +305,12 @@ QStringList ScPaths::spellDirs() const
 			spellDirs.append(progFiles+windowsLOPath + "/" + dir + "/");
 	}
 #elif defined(Q_WS_X11)
-	d.setPath(linuxPath);
+	d.setPath(linuxHunspellPath);
 	if (d.exists())
-		spellDirs.append(linuxPath);
+		spellDirs.append(linuxHunspellPath);
+	d.setPath(linuxMyspellPath);
+	if (d.exists())
+		spellDirs.append(linuxMyspellPath);
 	d.setPath(linuxLocalPath);
 	if (d.exists())
 		spellDirs.append(linuxLocalPath);
@@ -412,6 +417,17 @@ QString ScPaths::getApplicationDataDir(void)
 #endif
 }
 
+QString ScPaths::getUserDictDir(bool createIfNotExists)
+{
+	QDir userDictDirectory(getApplicationDataDir() + "dicts/");
+	if(createIfNotExists)
+	{
+		if (!userDictDirectory.exists())
+			userDictDirectory.mkpath(userDictDirectory.absolutePath());
+	}
+	return userDictDirectory.absolutePath()+"/";
+}
+
 QString ScPaths::getUserDocumentDir(void)
 {
 #if defined(_WIN32)
@@ -442,6 +458,14 @@ QString ScPaths::getTempFileDir(void)
 	return getApplicationDataDir();
 }
 
+QString ScPaths::downloadDir()
+{
+	QDir downloadDirectory(getApplicationDataDir() + "downloads/");
+	if (!downloadDirectory.exists())
+		downloadDirectory.mkpath(downloadDirectory.absolutePath());
+	return downloadDirectory.absolutePath()+"/";
+}
+
 QString ScPaths::getSpecialDir(int folder)
 {
 	QString qstr;
diff --git a/scribus/scpaths.h b/scribus/scpaths.h
index 0c033e9..15d813a 100644
--- a/scribus/scpaths.h
+++ b/scribus/scpaths.h
@@ -65,10 +65,15 @@ public:
 
 	/** @brief Return path to application data dir*/
 	static QString getApplicationDataDir(void);
+	/** @brief Return path to application data dir for downloaded dictsionaries*/
+	static QString getUserDictDir(bool createIfNotExists);
+
 	/** @brief Return path to user documents*/
 	static QString getUserDocumentDir(void);
 	/** @brief Return path to directory used for temporary files*/
 	static QString getTempFileDir(void);
+	/** @brief Return path to directory used for downloaded (permanent) files*/
+	static QString downloadDir(void);
 	/** @brief Return path to Contents OSX subdirectory*/
 	QString bundleDir(void) const;