OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 20:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Settings: Make temp_settings non-static

Browse Source
This commit is contained in:
Chin 2015-02-07 10:07:45 -05:00 committed by chinhodado
parent 5653916c53
commit 2dbff2298c
3 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/citra_qt/QLineEditKeyConfig.cpp
View File

@ -13,58 +13,61 @@ void QLineEditKeyConfig::keyPressEvent(QKeyEvent* event) {
QString key_name = GInputsDialog::getKeyName(event->key()); QString key_name = GInputsDialog::getKeyName(event->key());
this->setText(key_name); this->setText(key_name);
GInputsDialog* parent_dialog = static_cast<GInputsDialog*>(this->parent()->parent());
Settings::Values& temp_settings = parent_dialog->temp_settings;
int key = event->key(); int key = event->key();
switch (this->button) { switch (this->button) {
case Button::A: case Button::A:
GInputsDialog::temp_settings.pad_a_key = key; temp_settings.pad_a_key = key;
break; break;
case Button::B: case Button::B:
GInputsDialog::temp_settings.pad_b_key = key; temp_settings.pad_b_key = key;
break; break;
case Button::X: case Button::X:
GInputsDialog::temp_settings.pad_x_key = key; temp_settings.pad_x_key = key;
break; break;
case Button::Y: case Button::Y:
GInputsDialog::temp_settings.pad_y_key = key; temp_settings.pad_y_key = key;
break; break;
case Button::L: case Button::L:
GInputsDialog::temp_settings.pad_l_key = key; temp_settings.pad_l_key = key;
break; break;
case Button::R: case Button::R:
GInputsDialog::temp_settings.pad_r_key = key; temp_settings.pad_r_key = key;
break; break;
case Button::Start: case Button::Start:
GInputsDialog::temp_settings.pad_start_key = key; temp_settings.pad_start_key = key;
break; break;
case Button::Select: case Button::Select:
GInputsDialog::temp_settings.pad_select_key = key; temp_settings.pad_select_key = key;
break; break;
case Button::Home: case Button::Home:
GInputsDialog::temp_settings.pad_home_key = key; temp_settings.pad_home_key = key;
break; break;
case Button::DUp: case Button::DUp:
GInputsDialog::temp_settings.pad_dup_key = key; temp_settings.pad_dup_key = key;
break; break;
case Button::DDown: case Button::DDown:
GInputsDialog::temp_settings.pad_ddown_key = key; temp_settings.pad_ddown_key = key;
break; break;
case Button::DLeft: case Button::DLeft:
GInputsDialog::temp_settings.pad_dleft_key = key; temp_settings.pad_dleft_key = key;
break; break;
case Button::DRight: case Button::DRight:
GInputsDialog::temp_settings.pad_dright_key = key; temp_settings.pad_dright_key = key;
break; break;
case Button::SUp: case Button::SUp:
GInputsDialog::temp_settings.pad_sup_key = key; temp_settings.pad_sup_key = key;
break; break;
case Button::SDown: case Button::SDown:
GInputsDialog::temp_settings.pad_sdown_key = key; temp_settings.pad_sdown_key = key;
break; break;
case Button::SLeft: case Button::SLeft:
GInputsDialog::temp_settings.pad_sleft_key = key; temp_settings.pad_sleft_key = key;
break; break;
case Button::SRight: case Button::SRight:
GInputsDialog::temp_settings.pad_sright_key = key; temp_settings.pad_sright_key = key;
break; break;
default: default:
break; break;

72
src/citra_qt/inputs.cpp
View File

@ -12,8 +12,6 @@
#include "inputs.h" #include "inputs.h"
#include "QLineEditKeyConfig.h" #include "QLineEditKeyConfig.h"
Settings::Values GInputsDialog::temp_settings;
GInputsDialog::GInputsDialog(QWidget* parent) : QDialog(parent) { GInputsDialog::GInputsDialog(QWidget* parent) : QDialog(parent) {
ui.setupUi(this); ui.setupUi(this);
@ -44,7 +42,7 @@ GInputsDialog::GInputsDialog(QWidget* parent) : QDialog(parent) {
connect(okButton, SIGNAL(clicked()), this, SLOT(OnOkClicked())); connect(okButton, SIGNAL(clicked()), this, SLOT(OnOkClicked()));
// create a copy of the current settings // create a copy of the current settings
GInputsDialog::temp_settings = Settings::Values(Settings::values); this->temp_settings = Settings::Values(Settings::values);
// display current key settings // display current key settings
this->displayButtonSettings(Settings::values); this->displayButtonSettings(Settings::values);
@ -88,23 +86,23 @@ QString GInputsDialog::getKeyName(int key_code) {
void GInputsDialog::OnDefaultClicked() { void GInputsDialog::OnDefaultClicked() {
// load the default button settings into temp_settings // load the default button settings into temp_settings
GInputsDialog::temp_settings.pad_a_key = Qt::Key_A; this->temp_settings.pad_a_key = Qt::Key_A;
GInputsDialog::temp_settings.pad_b_key = Qt::Key_S; this->temp_settings.pad_b_key = Qt::Key_S;
GInputsDialog::temp_settings.pad_x_key = Qt::Key_Z; this->temp_settings.pad_x_key = Qt::Key_Z;
GInputsDialog::temp_settings.pad_y_key = Qt::Key_X; this->temp_settings.pad_y_key = Qt::Key_X;
GInputsDialog::temp_settings.pad_l_key = Qt::Key_Q; this->temp_settings.pad_l_key = Qt::Key_Q;
GInputsDialog::temp_settings.pad_r_key = Qt::Key_W; this->temp_settings.pad_r_key = Qt::Key_W;
GInputsDialog::temp_settings.pad_start_key = Qt::Key_M; this->temp_settings.pad_start_key = Qt::Key_M;
GInputsDialog::temp_settings.pad_select_key = Qt::Key_N; this->temp_settings.pad_select_key = Qt::Key_N;
GInputsDialog::temp_settings.pad_home_key = Qt::Key_B; this->temp_settings.pad_home_key = Qt::Key_B;
GInputsDialog::temp_settings.pad_dup_key = Qt::Key_T; this->temp_settings.pad_dup_key = Qt::Key_T;
GInputsDialog::temp_settings.pad_ddown_key = Qt::Key_G; this->temp_settings.pad_ddown_key = Qt::Key_G;
GInputsDialog::temp_settings.pad_dleft_key = Qt::Key_F; this->temp_settings.pad_dleft_key = Qt::Key_F;
GInputsDialog::temp_settings.pad_dright_key = Qt::Key_H; this->temp_settings.pad_dright_key = Qt::Key_H;
GInputsDialog::temp_settings.pad_sup_key = Qt::Key_Up; this->temp_settings.pad_sup_key = Qt::Key_Up;
GInputsDialog::temp_settings.pad_sdown_key = Qt::Key_Down; this->temp_settings.pad_sdown_key = Qt::Key_Down;
GInputsDialog::temp_settings.pad_sleft_key = Qt::Key_Left; this->temp_settings.pad_sleft_key = Qt::Key_Left;
GInputsDialog::temp_settings.pad_sright_key = Qt::Key_Right; this->temp_settings.pad_sright_key = Qt::Key_Right;
// then display it // then display it
this->displayButtonSettings(GInputsDialog::temp_settings); this->displayButtonSettings(GInputsDialog::temp_settings);
@ -114,23 +112,23 @@ void GInputsDialog::OnOkClicked() {
Config config; Config config;
// load the temporary settings into our real settings // load the temporary settings into our real settings
Settings::values.pad_a_key = GInputsDialog::temp_settings.pad_a_key; Settings::values.pad_a_key = this->temp_settings.pad_a_key;
Settings::values.pad_b_key = GInputsDialog::temp_settings.pad_b_key; Settings::values.pad_b_key = this->temp_settings.pad_b_key;
Settings::values.pad_x_key = GInputsDialog::temp_settings.pad_x_key; Settings::values.pad_x_key = this->temp_settings.pad_x_key;
Settings::values.pad_y_key = GInputsDialog::temp_settings.pad_y_key; Settings::values.pad_y_key = this->temp_settings.pad_y_key;
Settings::values.pad_l_key = GInputsDialog::temp_settings.pad_l_key; Settings::values.pad_l_key = this->temp_settings.pad_l_key;
Settings::values.pad_r_key = GInputsDialog::temp_settings.pad_r_key; Settings::values.pad_r_key = this->temp_settings.pad_r_key;
Settings::values.pad_start_key = GInputsDialog::temp_settings.pad_start_key; Settings::values.pad_start_key = this->temp_settings.pad_start_key;
Settings::values.pad_select_key = GInputsDialog::temp_settings.pad_select_key; Settings::values.pad_select_key = this->temp_settings.pad_select_key;
Settings::values.pad_home_key = GInputsDialog::temp_settings.pad_home_key; Settings::values.pad_home_key = this->temp_settings.pad_home_key;
Settings::values.pad_dup_key = GInputsDialog::temp_settings.pad_dup_key; Settings::values.pad_dup_key = this->temp_settings.pad_dup_key;
Settings::values.pad_ddown_key = GInputsDialog::temp_settings.pad_ddown_key; Settings::values.pad_ddown_key = this->temp_settings.pad_ddown_key;
Settings::values.pad_dleft_key = GInputsDialog::temp_settings.pad_dleft_key; Settings::values.pad_dleft_key = this->temp_settings.pad_dleft_key;
Settings::values.pad_dright_key = GInputsDialog::temp_settings.pad_dright_key; Settings::values.pad_dright_key = this->temp_settings.pad_dright_key;
Settings::values.pad_sup_key = GInputsDialog::temp_settings.pad_sup_key; Settings::values.pad_sup_key = this->temp_settings.pad_sup_key;
Settings::values.pad_sdown_key = GInputsDialog::temp_settings.pad_sdown_key; Settings::values.pad_sdown_key = this->temp_settings.pad_sdown_key;
Settings::values.pad_sleft_key = GInputsDialog::temp_settings.pad_sleft_key; Settings::values.pad_sleft_key = this->temp_settings.pad_sleft_key;
Settings::values.pad_sright_key = GInputsDialog::temp_settings.pad_sright_key; Settings::values.pad_sright_key = this->temp_settings.pad_sright_key;
// then save it // then save it
config.Save(); config.Save();

2
src/citra_qt/inputs.h
View File

@ -17,7 +17,7 @@ public:
GInputsDialog(QWidget* parent = nullptr); GInputsDialog(QWidget* parent = nullptr);
/// Temporary settings used when configuration is changed but not saved yet /// Temporary settings used when configuration is changed but not saved yet
static Settings::Values temp_settings; Settings::Values temp_settings;
/// Given a key code, return the key name. Needed for modifier keys /// Given a key code, return the key name. Needed for modifier keys
static QString getKeyName(int key_code); static QString getKeyName(int key_code);