From 5ebe1c0d3134be830fa42b507d2a5b54880527da Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 16 Feb 2022 21:22:44 -0700 Subject: [PATCH] update gui --- mupen64plus-gui/.github/workflows/build.yml | 2 +- mupen64plus-gui/mainwindow.cpp | 2 +- mupen64plus-gui/netplay/createroom.cpp | 2 +- mupen64plus-gui/netplay/joinroom.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mupen64plus-gui/.github/workflows/build.yml b/mupen64plus-gui/.github/workflows/build.yml index 26a1d47..698a983 100644 --- a/mupen64plus-gui/.github/workflows/build.yml +++ b/mupen64plus-gui/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: qmake .. make build-windows: - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/checkout@v2 - name: Checkout core repo diff --git a/mupen64plus-gui/mainwindow.cpp b/mupen64plus-gui/mainwindow.cpp index 00cb0f4..5f30974 100644 --- a/mupen64plus-gui/mainwindow.cpp +++ b/mupen64plus-gui/mainwindow.cpp @@ -792,7 +792,7 @@ void MainWindow::openROM(QString filename, QString netplay_ip, int netplay_port, void MainWindow::on_actionOpen_ROM_triggered() { QString filename = QFileDialog::getOpenFileName(this, - tr("Open ROM"), settings->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.zip *.ZIP *.7z)")); + tr("Open ROM"), settings->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.rom *.ROM *.zip *.ZIP *.7z)")); if (!filename.isNull()) { QFileInfo info(filename); settings->setValue("ROMdir", info.absoluteDir().absolutePath()); diff --git a/mupen64plus-gui/netplay/createroom.cpp b/mupen64plus-gui/netplay/createroom.cpp index 6727752..c71e091 100644 --- a/mupen64plus-gui/netplay/createroom.cpp +++ b/mupen64plus-gui/netplay/createroom.cpp @@ -133,7 +133,7 @@ void CreateRoom::onFinished(int) void CreateRoom::handleRomButton() { filename = QFileDialog::getOpenFileName(this, - tr("Open ROM"), w->getSettings()->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.zip *.ZIP *.7z)")); + tr("Open ROM"), w->getSettings()->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.rom *.ROM *.zip *.ZIP *.7z)")); if (!filename.isNull()) { romButton->setText(filename); diff --git a/mupen64plus-gui/netplay/joinroom.cpp b/mupen64plus-gui/netplay/joinroom.cpp index 369f48d..ae269d5 100644 --- a/mupen64plus-gui/netplay/joinroom.cpp +++ b/mupen64plus-gui/netplay/joinroom.cpp @@ -173,7 +173,7 @@ void JoinRoom::joinGame() } filename = QFileDialog::getOpenFileName(this, - tr("Open ROM"), w->getSettings()->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.zip *.ZIP *.7z)")); + tr("Open ROM"), w->getSettings()->value("ROMdir").toString(), tr("ROM Files (*.n64 *.N64 *.z64 *.Z64 *.v64 *.V64 *.rom *.ROM *.zip *.ZIP *.7z)")); if (!filename.isNull()) { if (loadROM(filename) == M64ERR_SUCCESS)