diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-11-27 07:34:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 07:34:00 -0500 |
| commit | 5dd9bbe33aa962cf796f039dcf77680cb11e2c27 (patch) | |
| tree | d9f428c16fc41d0269baf017c732ade505c550e3 /src/mainwindow.cpp | |
| parent | ddba54382aab3cb5548485d14c85e2611272f3cb (diff) | |
Revert "Changing the location of several directories"
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c2aefdd2..cdc048fd 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1206,9 +1206,7 @@ void MainWindow::createHelpMenu() ActionList tutorials; - QString tutorialPath = QApplication::applicationDirPath() - + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/"; - QDirIterator dirIter(tutorialPath, QStringList("*.js"), QDir::Files); + QDirIterator dirIter(QApplication::applicationDirPath() + "/tutorials", QStringList("*.js"), QDir::Files); while (dirIter.hasNext()) { dirIter.next(); QString fileName = dirIter.fileName(); @@ -1320,8 +1318,7 @@ bool MainWindow::addProfile() void MainWindow::hookUpWindowTutorials() { - QString tutorialPath = QApplication::applicationDirPath() + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/"; - QDirIterator dirIter(tutorialPath, QStringList("*.js"), QDir::Files); + QDirIterator dirIter(QApplication::applicationDirPath() + "/tutorials", QStringList("*.js"), QDir::Files); while (dirIter.hasNext()) { dirIter.next(); QString fileName = dirIter.fileName(); @@ -5229,9 +5226,7 @@ void MainWindow::installTranslator(const QString &name) { QTranslator *translator = new QTranslator(this); QString fileName = name + "_" + m_CurrentLanguage; - QString translationsPath = qApp->applicationDirPath() - + "/" + QString::fromStdWString(AppConfig::translationsPath()); - if (!translator->load(fileName, translationsPath)) { + if (!translator->load(fileName, qApp->applicationDirPath() + "/translations")) { 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) |