From 20f8cdc3e099958dc5fc5d8c6db18d4e0a9588aa Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Tue, 20 Dec 2016 01:35:07 -0800 Subject: [PATCH] Qt: Move last directory setting from qt.ini to config.ini --- CHANGES | 1 + src/platform/qt/GBAApp.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index fc42feec4..37e3a24ae 100644 --- a/CHANGES +++ b/CHANGES @@ -53,6 +53,7 @@ Misc: - GBA Memory: Support for Mo Jie Qi Bing by Vast Fame (taizou) - GBA Memory: Support reading/writing POSTFLG - Util: Add size counting to Table + - Qt: Move last directory setting from qt.ini to config.ini 0.5.1: (2016-10-05) Bugfixes: diff --git a/src/platform/qt/GBAApp.cpp b/src/platform/qt/GBAApp.cpp index 7b41f8d0f..377f9f67d 100644 --- a/src/platform/qt/GBAApp.cpp +++ b/src/platform/qt/GBAApp.cpp @@ -152,10 +152,10 @@ void GBAApp::continueAll(const QList* paused) { QString GBAApp::getOpenFileName(QWidget* owner, const QString& title, const QString& filter) { QList paused; pauseAll(&paused); - QString filename = QFileDialog::getOpenFileName(owner, title, m_configController.getQtOption("lastDirectory").toString(), filter); + QString filename = QFileDialog::getOpenFileName(owner, title, m_configController.getOption("lastDirectory"), filter); continueAll(&paused); if (!filename.isEmpty()) { - m_configController.setQtOption("lastDirectory", QFileInfo(filename).dir().path()); + m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path()); } return filename; } @@ -163,10 +163,10 @@ QString GBAApp::getOpenFileName(QWidget* owner, const QString& title, const QStr QString GBAApp::getSaveFileName(QWidget* owner, const QString& title, const QString& filter) { QList paused; pauseAll(&paused); - QString filename = QFileDialog::getSaveFileName(owner, title, m_configController.getQtOption("lastDirectory").toString(), filter); + QString filename = QFileDialog::getSaveFileName(owner, title, m_configController.getOption("lastDirectory"), filter); continueAll(&paused); if (!filename.isEmpty()) { - m_configController.setQtOption("lastDirectory", QFileInfo(filename).dir().path()); + m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path()); } return filename; } @@ -174,10 +174,10 @@ QString GBAApp::getSaveFileName(QWidget* owner, const QString& title, const QStr QString GBAApp::getOpenDirectoryName(QWidget* owner, const QString& title) { QList paused; pauseAll(&paused); - QString filename = QFileDialog::getExistingDirectory(owner, title, m_configController.getQtOption("lastDirectory").toString()); + QString filename = QFileDialog::getExistingDirectory(owner, title, m_configController.getOption("lastDirectory")); continueAll(&paused); if (!filename.isEmpty()) { - m_configController.setQtOption("lastDirectory", QFileInfo(filename).dir().path()); + m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path()); } return filename; } @@ -224,7 +224,7 @@ bool GBAApp::reloadGameDB() { } GBAApp::FileDialog::FileDialog(GBAApp* app, QWidget* parent, const QString& caption, const QString& filter) - : QFileDialog(parent, caption, app->m_configController.getQtOption("lastDirectory").toString(), filter) + : QFileDialog(parent, caption, app->m_configController.getOption("lastDirectory"), filter) , m_app(app) { } @@ -235,7 +235,7 @@ int GBAApp::FileDialog::exec() { bool didAccept = QFileDialog::exec() == QDialog::Accepted; QStringList filenames = selectedFiles(); if (!filenames.isEmpty()) { - m_app->m_configController.setQtOption("lastDirectory", QFileInfo(filenames[0]).dir().path()); + m_app->m_configController.setOption("lastDirectory", QFileInfo(filenames[0]).dir().path()); } m_app->continueAll(&paused); return didAccept;