Using AppConfig

3 files changed, 13 insertions, 7 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 74885e28..52d97270 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1204,7 +1204,9 @@ void MainWindow::createHelpMenu()
 
   ActionList tutorials;
 
-  QDirIterator dirIter(QApplication::applicationDirPath() + "/resources/tutorials", QStringList("*.js"), QDir::Files);
+  QString tutorialPath = QApplication::applicationDirPath() 
+    + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/";
+  QDirIterator dirIter(tutorialPath, QStringList("*.js"), QDir::Files);
   while (dirIter.hasNext()) {
     dirIter.next();
     QString fileName = dirIter.fileName();
@@ -1316,7 +1318,8 @@ bool MainWindow::addProfile()
 
 void MainWindow::hookUpWindowTutorials()
 {
-  QDirIterator dirIter(QApplication::applicationDirPath() + "/resources/tutorials", QStringList("*.js"), QDir::Files);
+  QString tutorialPath = QApplication::applicationDirPath() + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/";
+  QDirIterator dirIter(tutorialPath, QStringList("*.js"), QDir::Files);
   while (dirIter.hasNext()) {
     dirIter.next();
     QString fileName = dirIter.fileName();
@@ -5209,7 +5212,9 @@ void MainWindow::installTranslator(const QString &name)
 {
   QTranslator *translator = new QTranslator(this);
   QString fileName = name + "_" + m_CurrentLanguage;
-  if (!translator->load(fileName, qApp->applicationDirPath() + "/resources/translations")) {
+  QString translationsPath = qApp->applicationDirPath() 
+    + "/" + QString::fromStdWString(AppConfig::translationsPath());
+  if (!translator->load(fileName, translationsPath)) {
     if (m_CurrentLanguage.contains(QRegularExpression("^.*_(EN|en)(-.*)?$"))) {
       log::debug("localization file %s not found", fileName);
     } // we don't actually expect localization files for English (en, en-us, en-uk, and any variation thereof)
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 87489ab4..9eae2ba1 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -81,9 +81,9 @@ void GeneralSettingsTab::addLanguages()
 
   const QRegExp exp(pattern);
 
-  QDirIterator iter(
-    QCoreApplication::applicationDirPath() + "/resources/translations",
-    QDir::Files);
+  QString translationsPath = qApp->applicationDirPath()
+    + "/" + QString::fromStdWString(AppConfig::translationsPath());
+  QDirIterator iter(translationsPath, QDir::Files);
 
   std::vector<std::pair<QString, QString>> languages;
 
diff --git a/src/shared/appconfig.inc b/src/shared/appconfig.inc
index 5839c2f4..8d4125cf 100644
--- a/src/shared/appconfig.inc
+++ b/src/shared/appconfig.inc
@@ -6,7 +6,8 @@ APPPARAM(std::wstring, downloadPath, L"downloads")
 APPPARAM(std::wstring, overwritePath, L"overwrite")

 APPPARAM(std::wstring, stylesheetsPath, L"stylesheets")

 APPPARAM(std::wstring, cachePath, L"webcache")

-APPPARAM(std::wstring, tutorialsPath, L"tutorials")

+APPPARAM(std::wstring, tutorialsPath, L"resources/tutorials")

+APPPARAM(std::wstring, translationsPath, L"resources/translations")

 APPPARAM(std::wstring, logPath, L"logs")

 APPPARAM(std::wstring, dumpsDir, L"crashDumps")

 APPPARAM(std::wstring, defaultProfileName, L"Default")