From 14f261f1875c1ded74d1feebdd2c97c1618fbc7b Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Thu, 22 Sep 2022 13:45:00 -0600 Subject: [PATCH] update gui --- simple64-gui/mainwindow.cpp | 37 +++++++++++++++++++++---------------- simple64-gui/mainwindow.h | 2 ++ simple64-gui/mainwindow.ui | 18 +++++++++++++++--- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/simple64-gui/mainwindow.cpp b/simple64-gui/mainwindow.cpp index e2a3d2f..d69000c 100644 --- a/simple64-gui/mainwindow.cpp +++ b/simple64-gui/mainwindow.cpp @@ -176,15 +176,15 @@ void MainWindow::updateGB(Ui::MainWindow *ui) QAction *fileSelect2 = new QAction(this); current = settings->value("Player1GBRAM").toString(); - fileSelect2->setText("Player 1 RAM: " + current); + fileSelect2->setText("Player 1 SAV: " + current); GB->addAction(fileSelect2); connect(fileSelect2, &QAction::triggered,[=](){ QString filename = QFileDialog::getOpenFileName(this, - tr("GB RAM File"), NULL, tr("GB RAM Files (*.sav)")); + tr("GB RAM File"), NULL, tr("GB SAV Files (*.sav)")); if (!filename.isNull()) { settings->setValue("Player1GBRAM", filename); QString current = filename; - fileSelect2->setText("Player 1 RAM: " + current); + fileSelect2->setText("Player 1 SAV: " + current); } }); @@ -195,7 +195,7 @@ void MainWindow::updateGB(Ui::MainWindow *ui) settings->remove("Player1GBROM"); settings->remove("Player1GBRAM"); fileSelect->setText("Player 1 ROM: "); - fileSelect2->setText("Player 1 RAM: "); + fileSelect2->setText("Player 1 SAV: "); }); GB->addSeparator(); @@ -215,15 +215,15 @@ void MainWindow::updateGB(Ui::MainWindow *ui) fileSelect2 = new QAction(this); current = settings->value("Player2GBRAM").toString(); - fileSelect2->setText("Player 2 RAM: " + current); + fileSelect2->setText("Player 2 SAV: " + current); GB->addAction(fileSelect2); connect(fileSelect2, &QAction::triggered,[=](){ QString filename = QFileDialog::getOpenFileName(this, - tr("GB RAM File"), NULL, tr("GB RAM Files (*.sav)")); + tr("GB RAM File"), NULL, tr("GB SAV Files (*.sav)")); if (!filename.isNull()) { settings->setValue("Player2GBRAM", filename); QString current = filename; - fileSelect2->setText("Player 2 RAM: " + current); + fileSelect2->setText("Player 2 SAV: " + current); } }); @@ -234,7 +234,7 @@ void MainWindow::updateGB(Ui::MainWindow *ui) settings->remove("Player2GBROM"); settings->remove("Player2GBRAM"); fileSelect->setText("Player 2 ROM: "); - fileSelect2->setText("Player 2 RAM: "); + fileSelect2->setText("Player 2 SAV: "); }); GB->addSeparator(); @@ -254,15 +254,15 @@ void MainWindow::updateGB(Ui::MainWindow *ui) fileSelect2 = new QAction(this); current = settings->value("Player3GBRAM").toString(); - fileSelect2->setText("Player 3 RAM: " + current); + fileSelect2->setText("Player 3 SAV: " + current); GB->addAction(fileSelect2); connect(fileSelect2, &QAction::triggered,[=](){ QString filename = QFileDialog::getOpenFileName(this, - tr("GB RAM File"), NULL, tr("GB RAM Files (*.sav)")); + tr("GB RAM File"), NULL, tr("GB SAV Files (*.sav)")); if (!filename.isNull()) { settings->setValue("Player3GBRAM", filename); QString current = filename; - fileSelect2->setText("Player 3 RAM: " + current); + fileSelect2->setText("Player 3 SAV: " + current); } }); @@ -273,7 +273,7 @@ void MainWindow::updateGB(Ui::MainWindow *ui) settings->remove("Player3GBROM"); settings->remove("Player3GBRAM"); fileSelect->setText("Player 3 ROM: "); - fileSelect2->setText("Player 3 RAM: "); + fileSelect2->setText("Player 3 SAV: "); }); GB->addSeparator(); @@ -293,15 +293,15 @@ void MainWindow::updateGB(Ui::MainWindow *ui) fileSelect2 = new QAction(this); current = settings->value("Player4GBRAM").toString(); - fileSelect2->setText("Player 4 RAM: " + current); + fileSelect2->setText("Player 4 SAV: " + current); GB->addAction(fileSelect2); connect(fileSelect2, &QAction::triggered,[=](){ QString filename = QFileDialog::getOpenFileName(this, - tr("GB RAM File"), NULL, tr("GB RAM Files (*.sav)")); + tr("GB RAM File"), NULL, tr("GB SAV Files (*.sav)")); if (!filename.isNull()) { settings->setValue("Player4GBRAM", filename); QString current = filename; - fileSelect2->setText("Player 4 RAM: " + current); + fileSelect2->setText("Player 4 SAV: " + current); } }); @@ -312,7 +312,7 @@ void MainWindow::updateGB(Ui::MainWindow *ui) settings->remove("Player4GBROM"); settings->remove("Player4GBRAM"); fileSelect->setText("Player 4 ROM: "); - fileSelect2->setText("Player 4 RAM: "); + fileSelect2->setText("Player 4 SAV: "); }); } @@ -912,6 +912,11 @@ void MainWindow::on_actionSupport_on_Patreon_triggered() QDesktopServices::openUrl(QUrl("https://www.patreon.com/loganmc10")); } +void MainWindow::on_actionSupport_on_GithubSponser_triggered() +{ + QDesktopServices::openUrl(QUrl("https://github.com/sponsors/loganmc10")); +} + void MainWindow::on_actionOpen_Discord_Channel_triggered() { QDesktopServices::openUrl(QUrl("https://discord.gg/tsR3RtYynZ")); diff --git a/simple64-gui/mainwindow.h b/simple64-gui/mainwindow.h index 8718ebc..5e2a3e0 100644 --- a/simple64-gui/mainwindow.h +++ b/simple64-gui/mainwindow.h @@ -124,6 +124,8 @@ private slots: void on_actionSupport_on_Patreon_triggered(); + void on_actionSupport_on_GithubSponser_triggered(); + void on_actionOpen_Discord_Channel_triggered(); private: diff --git a/simple64-gui/mainwindow.ui b/simple64-gui/mainwindow.ui index 518d79f..3621eb9 100644 --- a/simple64-gui/mainwindow.ui +++ b/simple64-gui/mainwindow.ui @@ -70,13 +70,20 @@ + + + + Community + + + @@ -91,12 +98,12 @@ - Plugin and Path Selection + Input Plugin and Config Path Selection - Stop Game (Escape) + Stop Emulation (Escape) @@ -194,9 +201,14 @@ Support on Patreon + + + Support on GitHub + + - Join Discord Channel + Join Discord Server