yuzu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-23 18:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2044 from wwylele/system-setting-fix

Browse source 
Qt: unify running detection of system settings configure
This commit is contained in:
bunnei 2016-09-02 09:36:08 -04:00 committed by GitHub
parent 309ffc1df1 bdc59c4c21
commit 274b925a97
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/citra_qt/configure_dialog.cpp
View file

@ -9,10 +9,9 @@
#include "core/settings.h" #include "core/settings.h"
ConfigureDialog::ConfigureDialog(QWidget *parent, bool running) : ConfigureDialog::ConfigureDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::ConfigureDialog), ui(new Ui::ConfigureDialog)
emulation_running(running)
{ {
ui->setupUi(this); ui->setupUi(this);
this->setConfiguration(); this->setConfiguration();
@ -22,9 +21,6 @@ ConfigureDialog::~ConfigureDialog() {
} }
void ConfigureDialog::setConfiguration() { void ConfigureDialog::setConfiguration() {
// System tab needs set manually
// depending on whether emulation is running
ui->systemTab->setConfiguration(emulation_running);
} }
void ConfigureDialog::applyConfiguration() { void ConfigureDialog::applyConfiguration() {

3
src/citra_qt/configure_dialog.h
View file

@ -16,7 +16,7 @@ class ConfigureDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit ConfigureDialog(QWidget *parent, bool emulation_running); explicit ConfigureDialog(QWidget *parent);
~ConfigureDialog(); ~ConfigureDialog();
void applyConfiguration(); void applyConfiguration();
@ -26,5 +26,4 @@ private:
private: private:
std::unique_ptr<Ui::ConfigureDialog> ui; std::unique_ptr<Ui::ConfigureDialog> ui;
bool emulation_running;
}; };

6
src/citra_qt/configure_system.cpp
View file

@ -8,6 +8,7 @@
#include "core/hle/service/fs/archive.h" #include "core/hle/service/fs/archive.h"
#include "core/hle/service/cfg/cfg.h" #include "core/hle/service/cfg/cfg.h"
#include "core/system.h"
static const std::array<int, 12> days_in_month = {{ static const std::array<int, 12> days_in_month = {{
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
@ -17,6 +18,7 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ConfigureSystem) { ui(new Ui::ConfigureSystem) {
ui->setupUi(this); ui->setupUi(this);
this->setConfiguration();
connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int))); connect(ui->combo_birthmonth, SIGNAL(currentIndexChanged(int)), SLOT(updateBirthdayComboBox(int)));
} }
@ -24,8 +26,8 @@ ConfigureSystem::ConfigureSystem(QWidget *parent) :
ConfigureSystem::~ConfigureSystem() { ConfigureSystem::~ConfigureSystem() {
} }
void ConfigureSystem::setConfiguration(bool emulation_running) { void ConfigureSystem::setConfiguration() {
enabled = !emulation_running; enabled = !System::IsPoweredOn();
if (!enabled) { if (!enabled) {
ReadSystemSettings(); ReadSystemSettings();

2
src/citra_qt/configure_system.h
View file

@ -20,7 +20,7 @@ public:
~ConfigureSystem(); ~ConfigureSystem();
void applyConfiguration(); void applyConfiguration();
void setConfiguration(bool emulation_running); void setConfiguration();
public slots: public slots:
void updateBirthdayComboBox(int birthmonth_index); void updateBirthdayComboBox(int birthmonth_index);

2
src/citra_qt/main.cpp
View file

@ -510,7 +510,7 @@ void GMainWindow::ToggleWindowMode() {
} }
void GMainWindow::OnConfigure() { void GMainWindow::OnConfigure() {
ConfigureDialog configureDialog(this, emulation_running); ConfigureDialog configureDialog(this);
auto result = configureDialog.exec(); auto result = configureDialog.exec();
if (result == QDialog::Accepted) if (result == QDialog::Accepted)
{ {