N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Settings: Change slots name

Browse source
This commit is contained in:
Chin 2015-02-07 12:50:06 -05:00 committed by chinhodado
parent 6778d350f1
commit 6d4b63aeaf
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/CMakeLists.txt
View file

@ -21,7 +21,7 @@ set(SRCS
debugger/registers.cpp
util/spinbox.cpp
bootmanager.cpp
hotkeys.cpp
hotkeys.cpp
main.cpp
citra-qt.rc
)
@ -47,7 +47,7 @@ set(HEADERS
debugger/registers.h
util/spinbox.h
bootmanager.h
hotkeys.h
hotkeys.h
main.h
version.h
)
@ -59,7 +59,7 @@ set(UIS
debugger/disassembler.ui
debugger/profiler.ui
debugger/registers.ui
hotkeys.ui
hotkeys.ui
main.ui
)

10
src/citra_qt/config/inputs.cpp
View file

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/log.h"
#include "common/logging/log.h"
#include <QKeySequence>
#include <QSettings>
@ -36,10 +36,10 @@ GInputsDialog::GInputsDialog(QWidget* parent) : QDialog(parent) {
// set up event handlers for the buttons
QPushButton* defaultButton = this->ui.buttonBox->button(QDialogButtonBox::RestoreDefaults);
connect(defaultButton, SIGNAL(clicked()), this, SLOT(OnDefaultClicked()));
connect(defaultButton, SIGNAL(clicked()), this, SLOT(RestoreDefaultSettings()));
QPushButton* okButton = this->ui.buttonBox->button(QDialogButtonBox::Ok);
connect(okButton, SIGNAL(clicked()), this, SLOT(OnOkClicked()));
connect(okButton, SIGNAL(clicked()), this, SLOT(SaveSettings()));
// create a copy of the current settings
this->temp_settings = Settings::Values(Settings::values);
@ -84,7 +84,7 @@ QString GInputsDialog::getKeyName(int key_code) {
return QKeySequence(key_code).toString();
}
void GInputsDialog::OnDefaultClicked() {
void GInputsDialog::RestoreDefaultSettings() {
// load the default button settings into temp_settings
this->temp_settings.pad_a_key = Qt::Key_A;
this->temp_settings.pad_b_key = Qt::Key_S;
@ -108,7 +108,7 @@ void GInputsDialog::OnDefaultClicked() {
this->displayButtonSettings(GInputsDialog::temp_settings);
}
void GInputsDialog::OnOkClicked() {
void GInputsDialog::SaveSettings() {
Config config;
// load the temporary settings into our real settings

4
src/citra_qt/config/inputs.h
View file

@ -29,6 +29,6 @@ private:
void displayButtonSettings(const Settings::Values& values);
private slots:
void OnDefaultClicked();
void OnOkClicked();
void SaveSettings();
void RestoreDefaultSettings();
};