ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Show native directory separators in the GUI. 

The core still gets '/'s always (it chokes on '\'s), but the Qt
interface always uses the native separators.

In the process of doing this, also removed the custom FileDialog
subclass and made everything use GBAApp::get*FileDialog instead.

Also fixes #552, because I had to change that code anyway.
This commit is contained in:
waddlesplash 2017-03-30 11:11:29 -04:00 committed by endrift
parent 5d13a00cf7
commit 10fe4a743c
6 changed files with 12 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/platform/qt/GBAApp.cpp
View File

@ -163,7 +163,7 @@ QString GBAApp::getOpenFileName(QWidget* owner, const QString& title, const QStr
QString filename = QFileDialog::getOpenFileName(owner, title, m_configController.getOption("lastDirectory"), filter);
continueAll(paused);
if (!filename.isEmpty()) {
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path());
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().canonicalPath());
}
return filename;
}
@ -174,7 +174,7 @@ QString GBAApp::getSaveFileName(QWidget* owner, const QString& title, const QStr
QString filename = QFileDialog::getSaveFileName(owner, title, m_configController.getOption("lastDirectory"), filter);
continueAll(paused);
if (!filename.isEmpty()) {
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path());
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().canonicalPath());
}
return filename;
}
@ -185,23 +185,11 @@ QString GBAApp::getOpenDirectoryName(QWidget* owner, const QString& title) {
QString filename = QFileDialog::getExistingDirectory(owner, title, m_configController.getOption("lastDirectory"));
continueAll(paused);
if (!filename.isEmpty()) {
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().path());
m_configController.setOption("lastDirectory", QFileInfo(filename).dir().canonicalPath());
}
return filename;
}
QFileDialog* GBAApp::getOpenFileDialog(QWidget* owner, const QString& title, const QString& filter) {
FileDialog* dialog = new FileDialog(this, owner, title, filter);
dialog->setAcceptMode(QFileDialog::AcceptOpen);
return dialog;
}
QFileDialog* GBAApp::getSaveFileDialog(QWidget* owner, const QString& title, const QString& filter) {
FileDialog* dialog = new FileDialog(this, owner, title, filter);
dialog->setAcceptMode(QFileDialog::AcceptSave);
return dialog;
}
QString GBAApp::dataDir() {
#ifdef DATADIR
QString path = QString::fromUtf8(DATADIR);
@ -241,24 +229,6 @@ bool GBAApp::reloadGameDB() {
}
#endif
GBAApp::FileDialog::FileDialog(GBAApp* app, QWidget* parent, const QString& caption, const QString& filter)
: QFileDialog(parent, caption, app->m_configController.getOption("lastDirectory"), filter)
, m_app(app)
{
}
int GBAApp::FileDialog::exec() {
QList<Window*> paused;
m_app->pauseAll(&paused);
bool didAccept = QFileDialog::exec() == QDialog::Accepted;
QStringList filenames = selectedFiles();
if (!filenames.isEmpty()) {
m_app->m_configController.setOption("lastDirectory", QFileInfo(filenames[0]).dir().path());
}
m_app->continueAll(paused);
return didAccept;
}
#ifdef USE_SQLITE3
GameDBParser::GameDBParser(NoIntroDB* db, QObject* parent)
: QObject(parent)

13
src/platform/qt/GBAApp.h
View File

@ -55,9 +55,6 @@ public:
QString getSaveFileName(QWidget* owner, const QString& title, const QString& filter = QString());
QString getOpenDirectoryName(QWidget* owner, const QString& title);
QFileDialog* getOpenFileDialog(QWidget* owner, const QString& title, const QString& filter = QString());
QFileDialog* getSaveFileDialog(QWidget* owner, const QString& title, const QString& filter = QString());
const NoIntroDB* gameDB() const { return m_db; }
bool reloadGameDB();
@ -65,16 +62,6 @@ protected:
bool event(QEvent*);
private:
class FileDialog : public QFileDialog {
public:
FileDialog(GBAApp* app, QWidget* parent = nullptr, const QString& caption = QString(),
const QString& filter = QString());
virtual int exec() override;
private:
GBAApp* m_app;
};
Window* newWindowInternal();
void pauseAll(QList<Window*>* paused);

4
src/platform/qt/GameController.cpp
View File

@ -409,10 +409,10 @@ void GameController::loadGame(VFile* vf, const QString& path, const QString& bas
closeGame();
QFileInfo info(base);
if (info.isDir()) {
m_fname = base + QDir::separator() + path;
m_fname = QFileInfo(base + '/' + path).canonicalFilePath();
m_fsub = QString();
} else {
m_fname = base;
m_fname = info.canonicalFilePath();
m_fsub = path;
}
m_vf = vf;

8
src/platform/qt/ObjView.cpp
View File

@ -244,12 +244,8 @@ void ObjView::updateTilesGB(bool force) {
void ObjView::exportObj() {
GameController::Interrupter interrupter(m_controller);
QFileDialog* dialog = GBAApp::app()->getSaveFileDialog(this, tr("Export sprite"),
tr("Portable Network Graphics (*.png)"));
if (!dialog->exec()) {
return;
}
QString filename = dialog->selectedFiles()[0];
QString filename = GBAApp::app()->getSaveFileName(this, tr("Export sprite"),
tr("Portable Network Graphics (*.png)"));
VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC);
if (!vf) {
LOG(QT, ERROR) << tr("Failed to open output PNG file: %1").arg(filename);

13
src/platform/qt/PaletteView.cpp
View File

@ -134,21 +134,16 @@ void PaletteView::exportPalette(int start, int length) {
}
GameController::Interrupter interrupter(m_controller);
QFileDialog* dialog = GBAApp::app()->getSaveFileDialog(this, tr("Export palette"),
tr("Windows PAL (*.pal);;Adobe Color Table (*.act)"));
if (!dialog->exec()) {
return;
}
QString filename = dialog->selectedFiles()[0];
QString filename = GBAApp::app()->getSaveFileName(this, tr("Export palette"),
tr("Windows PAL (*.pal);;Adobe Color Table (*.act)"));
VFile* vf = VFileDevice::open(filename, O_WRONLY | O_CREAT | O_TRUNC);
if (!vf) {
LOG(QT, ERROR) << tr("Failed to open output palette file: %1").arg(filename);
return;
}
QString filter = dialog->selectedNameFilter();
if (filter.contains("*.pal")) {
if (filename.endsWith(".pal", Qt::CaseInsensitive)) {
exportPaletteRIFF(vf, length, &static_cast<GBA*>(m_controller->thread()->core->board)->video.palette[start]);
} else if (filter.contains("*.act")) {
} else if (filename.endsWith(".act", Qt::CaseInsensitive)) {
exportPaletteACT(vf, length, &static_cast<GBA*>(m_controller->thread()->core->board)->video.palette[start]);
}
vf->close(vf);

2
src/platform/qt/Window.cpp
View File

@ -1580,7 +1580,7 @@ void Window::updateMRU() {
m_mruMenu->clear();
int i = 0;
for (const QString& file : m_mruFiles) {
QAction* item = new QAction(file, m_mruMenu);
QAction* item = new QAction(QDir::toNativeSeparators(file).replace("&", "&&"), m_mruMenu);
item->setShortcut(QString("Ctrl+%1").arg(i));
connect(item, &QAction::triggered, [this, file]() { m_controller->loadGame(file); });
m_mruMenu->addAction(item);