Implement suggestions

5 files changed, 16 insertions, 16 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79389e42..782d6589 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -227,15 +227,15 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest
         DESTINATION bin/dlls
         RENAME dlls.manifest)
 
-install(FILES ${qm_files} DESTINATION bin/dlls/translations)
+install(FILES ${qm_files} DESTINATION bin/resources/translations)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
 		DESTINATION bin)
 		
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
-		DESTINATION bin/dlls)
+		DESTINATION bin/resources)
 
 deploy_qt(BINARIES ModOrganizer.exe uibase.dll plugins/bsa_packer.dll)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/QtPlugins/imageformats)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html DESTINATION bin/dlls/resources)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html DESTINATION bin/resources)
diff --git a/src/main.cpp b/src/main.cpp
index a3e30fa0..6b1ec482 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -693,7 +693,7 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     }
 
     log::debug("initializing tutorials");
-    QString tutorialsPath = QCoreApplication::applicationDirPath() + "/dlls/tutorials/";
+    QString tutorialsPath = QCoreApplication::applicationDirPath() + "/resources/tutorials/";
     TutorialManager::init(tutorialsPath, &organizer);
 
     if (!application.setStyleFile(settings.interface().styleName().value_or(""))) {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 650f5db3..522657fb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1203,7 +1203,7 @@ void MainWindow::createHelpMenu()
 
   ActionList tutorials;
 
-  QDirIterator dirIter(QApplication::applicationDirPath() + "/dlls/tutorials", QStringList("*.js"), QDir::Files);
+  QDirIterator dirIter(QApplication::applicationDirPath() + "/resources/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() + "/dlls/tutorials", QStringList("*.js"), QDir::Files);
+  QDirIterator dirIter(QApplication::applicationDirPath() + "/resources/tutorials", QStringList("*.js"), QDir::Files);
   while (dirIter.hasNext()) {
     dirIter.next();
     QString fileName = dirIter.fileName();
@@ -5185,7 +5185,7 @@ void MainWindow::installTranslator(const QString &name)
 {
   QTranslator *translator = new QTranslator(this);
   QString fileName = name + "_" + m_CurrentLanguage;
-  if (!translator->load(fileName, qApp->applicationDirPath() + "/translations")) {
+  if (!translator->load(fileName, qApp->applicationDirPath() + "/resources/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)
diff --git a/src/qt.conf b/src/qt.conf
index 6a9d56ae..2b659e87 100644
--- a/src/qt.conf
+++ b/src/qt.conf
@@ -1,8 +1,8 @@
 [Paths]

-Prefix=dlls

-Libraries=.

-LibraryExecutables=.

-Plugins=QtPlugins

-Imports=QtImports

-Qml2Imports=QtImports

-Translations=translations
\ No newline at end of file
+Prefix=.

+Libraries=dlls

+LibraryExecutables=dlls

+Plugins=dlls

+Imports=dlls

+Qml2Imports=dlls

+Translations=resources/translations
\ No newline at end of file
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 3d14d521..072764c9 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -82,7 +82,7 @@ void GeneralSettingsTab::addLanguages()
   const QRegExp exp(pattern);
 
   QDirIterator iter(
-    QCoreApplication::applicationDirPath() + "/translations",
+    QCoreApplication::applicationDirPath() + "/resources/translations",
     QDir::Files);
 
   std::vector<std::pair<QString, QString>> languages;