From 5bad8f903205fb0e21c60fafd0d6913d3143a477 Mon Sep 17 00:00:00 2001
From: Seth Riley <17361645+Qudix@users.noreply.github.com>
Date: Mon, 2 Nov 2020 19:13:04 -0600
Subject: Fixed tutorials

---
 src/main.cpp       | 6 ++----
 src/mainwindow.cpp | 4 ++--
 src/qt.conf        | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 60b06817..a3e30fa0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -693,10 +693,8 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     }
 
     log::debug("initializing tutorials");
-    TutorialManager::init(
-        qApp->applicationDirPath() + "/"
-            + QString::fromStdWString(AppConfig::tutorialsPath()) + "/",
-        &organizer);
+    QString tutorialsPath = QCoreApplication::applicationDirPath() + "/dlls/tutorials/";
+    TutorialManager::init(tutorialsPath, &organizer);
 
     if (!application.setStyleFile(settings.interface().styleName().value_or(""))) {
       // disable invalid stylesheet
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 65c1d65c..650f5db3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1203,7 +1203,7 @@ void MainWindow::createHelpMenu()
 
   ActionList tutorials;
 
-  QDirIterator dirIter(QApplication::applicationDirPath() + "/tutorials", QStringList("*.js"), QDir::Files);
+  QDirIterator dirIter(QApplication::applicationDirPath() + "/dlls/tutorials", QStringList("*.js"), QDir::Files);
   while (dirIter.hasNext()) {
     dirIter.next();
     QString fileName = dirIter.fileName();
@@ -1315,7 +1315,7 @@ bool MainWindow::addProfile()
 
 void MainWindow::hookUpWindowTutorials()
 {
-  QDirIterator dirIter(QApplication::applicationDirPath() + "/tutorials", QStringList("*.js"), QDir::Files);
+  QDirIterator dirIter(QApplication::applicationDirPath() + "/dlls/tutorials", QStringList("*.js"), QDir::Files);
   while (dirIter.hasNext()) {
     dirIter.next();
     QString fileName = dirIter.fileName();
diff --git a/src/qt.conf b/src/qt.conf
index d5a3f6ac..6a9d56ae 100644
--- a/src/qt.conf
+++ b/src/qt.conf
@@ -4,4 +4,5 @@ Libraries=.
 LibraryExecutables=.
 Plugins=QtPlugins
 Imports=QtImports
-Qml2Imports=QtImports
\ No newline at end of file
+Qml2Imports=QtImports
+Translations=translations
\ No newline at end of file
-- 
cgit v1.3.1