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/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mainwindow.cpp') 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(); -- cgit v1.3.1 From 68750575d2f28c873b0d68391a7940e61c2ad2d4 Mon Sep 17 00:00:00 2001 From: Seth Riley <17361645+Qudix@users.noreply.github.com> Date: Tue, 3 Nov 2020 18:12:23 -0600 Subject: Implement suggestions --- src/CMakeLists.txt | 8 ++++---- src/main.cpp | 2 +- src/mainwindow.cpp | 6 +++--- src/qt.conf | 14 +++++++------- src/settingsdialoggeneral.cpp | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/mainwindow.cpp') 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> languages; -- cgit v1.3.1 From b9bc1a2d56be5efc4478f1487c3e7dfb3529102d Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Mon, 9 Nov 2020 14:10:50 -0600 Subject: Using AppConfig --- src/mainwindow.cpp | 11 ++++++++--- src/settingsdialoggeneral.cpp | 6 +++--- src/shared/appconfig.inc | 3 ++- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/mainwindow.cpp') 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> 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") -- cgit v1.3.1 From e99b05f20db989e1d682841c25748227808dfa21 Mon Sep 17 00:00:00 2001 From: Mikaël Capelle Date: Fri, 13 Nov 2020 18:27:33 +0100 Subject: Fix order of saves. --- src/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mainwindow.cpp') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 94bc5800..f7714392 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1963,7 +1963,7 @@ void MainWindow::refreshSaveList() files.append(it.fileInfo()); } std::sort(files.begin(), files.end(), [](auto const& lhs, auto const& rhs) { - return lhs.fileTime(QFileDevice::FileModificationTime) < rhs.fileTime(QFileDevice::FileModificationTime); + return lhs.fileTime(QFileDevice::FileModificationTime) > rhs.fileTime(QFileDevice::FileModificationTime); }); for (const QFileInfo &file : files) { -- cgit v1.3.1