From 7026aeaec859fd3632b1062e0cf14d2479c23076 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Fri, 7 Jun 2019 23:00:08 -0400 Subject: fixed FileDialogMemory::getOpenFileName() not using given directory disable all widgets when there's no selection now saves application icon browse working directory uses current value in file dialog --- src/editexecutablesdialog.cpp | 54 ++++++++++++++++++++++++++++--------------- src/filedialogmemory.cpp | 28 ++++++++++++++-------- src/filedialogmemory.h | 23 ++++++++---------- 3 files changed, 63 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/editexecutablesdialog.cpp b/src/editexecutablesdialog.cpp index 5fbb30dd..efcec8e0 100644 --- a/src/editexecutablesdialog.cpp +++ b/src/editexecutablesdialog.cpp @@ -145,19 +145,28 @@ void EditExecutablesDialog::updateUI(const Executable* e) void EditExecutablesDialog::clearEdits() { ui->title->clear(); + ui->title->setEnabled(false); ui->binary->clear(); + ui->binary->setEnabled(false); + ui->browseBinary->setEnabled(false); ui->workingDirectory->clear(); + ui->workingDirectory->setEnabled(false); + ui->browseWorkingDirectory->setEnabled(false); ui->arguments->clear(); + ui->arguments->setEnabled(false); + ui->overwriteSteamAppID->setEnabled(false); ui->overwriteSteamAppID->setChecked(false); ui->steamAppID->setEnabled(false); ui->steamAppID->clear(); + ui->createFilesInMod->setEnabled(false); ui->createFilesInMod->setChecked(false); ui->mods->setEnabled(false); ui->mods->setCurrentIndex(-1); + ui->forceLoadLibraries->setEnabled(false); ui->forceLoadLibraries->setChecked(false); ui->configureLibraries->setEnabled(false); + ui->useApplicationIcon->setEnabled(false); ui->useApplicationIcon->setChecked(false); - ui->pluginProvidedLabel->setVisible(false); } @@ -252,6 +261,17 @@ void EditExecutablesDialog::save() } else { e->steamAppID(""); } + + if (ui->useApplicationIcon->isChecked()) { + e->flags(e->flags() | Executable::UseApplicationIcon); + } else { + e->flags(e->flags() & (~Executable::UseApplicationIcon)); + } +} + +void EditExecutablesDialog::on_list_itemSelectionChanged() +{ + updateUI(selectedExe()); } void EditExecutablesDialog::on_title_textChanged(const QString& s) @@ -301,6 +321,20 @@ void EditExecutablesDialog::on_forceLoadLibraries_toggled(bool checked) save(); } +void EditExecutablesDialog::on_browseWorkingDirectory_clicked() +{ + QString dirName = FileDialogMemory::getExistingDirectory( + "editExecutableDirectory", this, tr("Select a directory"), + ui->workingDirectory->text()); + + if (dirName.isNull()) { + // canceled + return; + } + + ui->workingDirectory->setText(dirName); +} + void EditExecutablesDialog::on_configureLibraries_clicked() { auto* e = selectedExe(); @@ -483,19 +517,6 @@ void EditExecutablesDialog::on_browseBinary_clicked() } } -void EditExecutablesDialog::on_browseWorkingDirectory_clicked() -{ - QString dirName = FileDialogMemory::getExistingDirectory("editExecutableDirectory", this, - tr("Select a directory")); - - if (dirName.isNull()) { - // canceled - return; - } - - ui->workingDirectory->setText(dirName); -} - void EditExecutablesDialog::on_remove_clicked() { if (QMessageBox::question(this, tr("Confirm"), tr("Really remove \"%1\" from executables?").arg(ui->title->text()), @@ -562,11 +583,6 @@ bool EditExecutablesDialog::executableChanged() return false; } -void EditExecutablesDialog::on_list_itemSelectionChanged() -{ - updateUI(selectedExe()); -} - void EditExecutablesDialog::on_buttons_accepted() { if (executableChanged()) { diff --git a/src/filedialogmemory.cpp b/src/filedialogmemory.cpp index 6b440d0f..9607beb9 100644 --- a/src/filedialogmemory.cpp +++ b/src/filedialogmemory.cpp @@ -56,10 +56,10 @@ void FileDialogMemory::restore(QSettings &settings) } -QString FileDialogMemory::getOpenFileName(const QString &dirID, QWidget *parent, - const QString &caption, const QString &dir, - const QString &filter, QString *selectedFilter, - QFileDialog::Options options) +QString FileDialogMemory::getOpenFileName( + const QString &dirID, QWidget *parent, const QString &caption, + const QString &dir, const QString &filter, QString *selectedFilter, + QFileDialog::Options options) { std::pair::iterator, bool> currentDir = instance().m_Cache.insert(std::make_pair(dirID, dir)); @@ -73,16 +73,26 @@ QString FileDialogMemory::getOpenFileName(const QString &dirID, QWidget *parent, } -QString FileDialogMemory::getExistingDirectory(const QString &dirID, QWidget *parent, - const QString &caption, const QString &dir, QFileDialog::Options options) +QString FileDialogMemory::getExistingDirectory( + const QString &dirID, QWidget *parent, const QString &caption, + const QString &dir, QFileDialog::Options options) { - std::pair::iterator, bool> currentDir = - instance().m_Cache.insert(std::make_pair(dirID, dir)); + QString currentDir = dir; + + if (currentDir.isEmpty()) { + auto itor = instance().m_Cache.find(dirID); + if (itor != instance().m_Cache.end()) { + currentDir = itor->first; + } + } + + QString result = QFileDialog::getExistingDirectory( + parent, caption, currentDir, options); - QString result = QFileDialog::getExistingDirectory(parent, caption, currentDir.first->second, options); if (!result.isNull()) { instance().m_Cache[dirID] = QFileInfo(result).path(); } + return result; } diff --git a/src/filedialogmemory.h b/src/filedialogmemory.h index b2bfdb53..81d7ba40 100644 --- a/src/filedialogmemory.h +++ b/src/filedialogmemory.h @@ -29,30 +29,25 @@ along with Mod Organizer. If not, see . class FileDialogMemory { - public: - static void save(QSettings &settings); static void restore(QSettings &settings); - static QString getOpenFileName(const QString &dirID, QWidget *parent = 0, const QString &caption = QString(), - const QString &dir = QString(), const QString &filter = QString(), - QString *selectedFilter = 0, QFileDialog::Options options = 0); + static QString getOpenFileName( + const QString &dirID, QWidget *parent = 0, const QString &caption = QString(), + const QString &dir = QString(), const QString &filter = QString(), + QString *selectedFilter = 0, QFileDialog::Options options = 0); - static QString getExistingDirectory(const QString &dirID, QWidget *parent = 0, const QString &caption = QString(), - const QString &dir = QString(), - QFileDialog::Options options = QFileDialog::ShowDirsOnly); + static QString getExistingDirectory( + const QString &dirID, QWidget *parent = 0, const QString &caption = QString(), + const QString &dir = QString(), + QFileDialog::Options options = QFileDialog::ShowDirsOnly); private: + std::map m_Cache; FileDialogMemory(); - static FileDialogMemory &instance(); - -private: - - std::map m_Cache; - }; #endif // FILEDIALOGMEMORY_H -- cgit v1.3.1