Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-13 04:15:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #734 from GriffinRichards/config-file

Browse Source 
Fix some issues with config loading
This commit is contained in:
GriffinR
2025-05-22 14:28:13 -04:00
committed by GitHub
parent d5248c7dbc d8e3eb6a30
commit 947142e370
10 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mainwindow.cpp
View File

@@ -728,10 +728,11 @@ bool MainWindow::openProject(QString dir, bool initial) {
porysplash->start();
porysplash->showLoadingMessage("config");
userConfig.projectDir = dir;
userConfig.load();
projectConfig.projectDir = dir;
projectConfig.load();
if (!projectConfig.load(dir) || !userConfig.load(dir)) {
showProjectOpenFailure();
porysplash->stop();
return false;
}
porysplash->showLoadingMessage("custom scripts");
Scripting::init(this);
@@ -992,13 +993,8 @@ void MainWindow::showFileWatcherWarning() {
this->fileWatcherWarning->exec();
}
QString MainWindow::getExistingDirectory(QString dir) {
return FileDialog::getExistingDirectory(this, "Open Directory", dir, QFileDialog::ShowDirsOnly);
}
void MainWindow::on_action_Open_Project_triggered()
{
QString dir = getExistingDirectory(!projectConfig.projectDir.isEmpty() ? userConfig.projectDir : ".");
void MainWindow::on_action_Open_Project_triggered() {
QString dir = FileDialog::getExistingDirectory(this, QStringLiteral("Choose Project Folder"));
if (!dir.isEmpty())
openProject(dir);
}
@@ -3010,7 +3006,7 @@ void MainWindow::reloadScriptEngine() {
Scripting::init(this);
Scripting::populateGlobalObject(this);
// Lying to the scripts here, simulating a project reload
Scripting::cb_ProjectOpened(projectConfig.projectDir);
Scripting::cb_ProjectOpened(projectConfig.projectDir());
if (this->editor) {
if (this->editor->layout)
Scripting::cb_LayoutOpened(this->editor->layout->name);