Merge pull request #1305 from ModOrganizer2/revert-1277-master

Revert "Changing the location of several directories"

7 files changed, 42 insertions, 56 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ffaf3c0c..a53d845d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -232,17 +232,15 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
 )
 
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
         DESTINATION bin/dlls
         RENAME dlls.manifest)
 
-install(FILES ${qm_files} DESTINATION bin/resources/translations)
+install(FILES ${qm_files} DESTINATION bin/translations)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
-		DESTINATION bin)
-		
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
-		DESTINATION bin/resources)
+                  ${CMAKE_CURRENT_SOURCE_DIR}/tutorials
+        DESTINATION bin)
 
 deploy_qt(BINARIES ModOrganizer.exe uibase.dll plugins/bsa_packer.dll)
 
diff --git a/src/dlls.manifest b/src/dlls.manifest.qt5
index 846a02ae..cae74df1 100644
--- a/src/dlls.manifest
+++ b/src/dlls.manifest.qt5
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>
-  <file name="7z.dll"/>
-  <file name="archive.dll"/>
-  <file name="d3dcompiler_47.dll"/>
-  <file name="libEGL.dll"/>
-  <file name="libGLESV2.dll"/>
-  <file name="liblz4.dll"/>
-  <file name="opengl32sw.dll"/>
-  <file name="Qt5Core.dll"/>
-  <file name="Qt5Gui.dll"/>
-  <file name="Qt5Network.dll"/>
-  <file name="Qt5Positioning.dll"/>
-  <file name="Qt5PrintSupport.dll"/>
-  <file name="Qt5Qml.dll"/>
-  <file name="Qt5QmlModels.dll"/>
-  <file name="Qt5QmlWorkerScript.dll"/>
-  <file name="Qt5Quick.dll"/>
-  <file name="Qt5QuickWidgets.dll"/>
-  <file name="Qt5SerialPort.dll"/>
-  <file name="Qt5Svg.dll"/>
-  <file name="Qt5WebChannel.dll"/>
-  <file name="Qt5WebEngineCore.dll"/>
-  <file name="Qt5WebEngineWidgets.dll"/>
-  <file name="Qt5WebSockets.dll"/>
-  <file name="Qt5Widgets.dll"/>
-  <file name="Qt5WinExtras.dll"/>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <assemblyIdentity type="win32" name="dlls" version="1.0.0.0" processorArchitecture="x86"/>

+  <file name="7z.dll"/>

+  <file name="archive.dll"/>

+  <file name="d3dcompiler_47.dll"/>

+  <file name="libEGL.dll"/>

+  <file name="libGLESV2.dll"/>

+  <file name="liblz4.dll"/>

+  <file name="opengl32sw.dll"/>

+  <file name="Qt5Core.dll"/>

+  <file name="Qt5Gui.dll"/>

+  <file name="Qt5Network.dll"/>

+  <file name="Qt5Positioning.dll"/>

+  <file name="Qt5PrintSupport.dll"/>

+  <file name="Qt5Qml.dll"/>

+  <file name="Qt5QmlModels.dll"/>

+  <file name="Qt5QmlWorkerScript.dll"/>

+  <file name="Qt5Quick.dll"/>

+  <file name="Qt5QuickWidgets.dll"/>

+  <file name="Qt5SerialPort.dll"/>

+  <file name="Qt5Svg.dll"/>

+  <file name="Qt5WebChannel.dll"/>

+  <file name="Qt5WebEngineCore.dll"/>

+  <file name="Qt5WebEngineWidgets.dll"/>

+  <file name="Qt5WebSockets.dll"/>

+  <file name="Qt5Widgets.dll"/>

+  <file name="Qt5WinExtras.dll"/>

+</assembly>

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)
diff --git a/src/qt.conf b/src/qt.conf
index 5e070fa3..f834a22a 100644
--- a/src/qt.conf
+++ b/src/qt.conf
@@ -1,7 +1,3 @@
 [Paths]

-Libraries=dlls

-LibraryExecutables=resources

+Prefix=.

 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 9eae2ba1..f29e1d24 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -81,9 +81,9 @@ void GeneralSettingsTab::addLanguages()
 
   const QRegExp exp(pattern);
 
-  QString translationsPath = qApp->applicationDirPath()
-    + "/" + QString::fromStdWString(AppConfig::translationsPath());
-  QDirIterator iter(translationsPath, QDir::Files);
+  QDirIterator iter(
+    QCoreApplication::applicationDirPath() + "/translations",
+    QDir::Files);
 
   std::vector<std::pair<QString, QString>> languages;
 
diff --git a/src/shared/appconfig.inc b/src/shared/appconfig.inc
index 8d4125cf..5839c2f4 100644
--- a/src/shared/appconfig.inc
+++ b/src/shared/appconfig.inc
@@ -6,8 +6,7 @@ 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"resources/tutorials")

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

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

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

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

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

diff --git a/src/tutorials/TutorialOverlay.qml b/src/tutorials/TutorialOverlay.qml
index 0a31ef0e..47e5065d 100644
--- a/src/tutorials/TutorialOverlay.qml
+++ b/src/tutorials/TutorialOverlay.qml
@@ -55,9 +55,7 @@ Rectangle  {
 

   Connections {

     target: manager

-    function onTabChanged() {

-      tabChanged(index)

-    }

+    onTabChanged: tabChanged(index)

   }

 

   Tooltip {