Browse Source
Merge pull request #1842 from lioncash/slot
yuzu/configuration: Minor clean-up related changes
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with
12 additions and
14 deletions
-
src/yuzu/configuration/configure_audio.h
-
src/yuzu/configuration/configure_debug.h
-
src/yuzu/configuration/configure_dialog.h
-
src/yuzu/configuration/configure_gamelist.h
-
src/yuzu/configuration/configure_general.h
-
src/yuzu/configuration/configure_graphics.h
-
src/yuzu/configuration/configure_input.cpp
-
src/yuzu/configuration/configure_input.h
-
src/yuzu/configuration/configure_web.h
|
|
|
@ -16,15 +16,14 @@ class ConfigureAudio : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureAudio(QWidget* parent = nullptr); |
|
|
|
~ConfigureAudio(); |
|
|
|
~ConfigureAudio() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
void retranslateUi(); |
|
|
|
|
|
|
|
public slots: |
|
|
|
private: |
|
|
|
void updateAudioDevices(int sink_index); |
|
|
|
|
|
|
|
private: |
|
|
|
void setConfiguration(); |
|
|
|
void setOutputSinkFromSinkID(); |
|
|
|
void setAudioDeviceFromDeviceID(); |
|
|
|
|
|
|
|
@ -16,13 +16,12 @@ class ConfigureDebug : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureDebug(QWidget* parent = nullptr); |
|
|
|
~ConfigureDebug(); |
|
|
|
~ConfigureDebug() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
void setConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
std::unique_ptr<Ui::ConfigureDebug> ui; |
|
|
|
}; |
|
|
|
@ -18,13 +18,12 @@ class ConfigureDialog : public QDialog { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry); |
|
|
|
~ConfigureDialog(); |
|
|
|
~ConfigureDialog() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
void setConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
std::unique_ptr<Ui::ConfigureDialog> ui; |
|
|
|
}; |
|
|
|
@ -16,7 +16,7 @@ class ConfigureGameList : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureGameList(QWidget* parent = nullptr); |
|
|
|
~ConfigureGameList(); |
|
|
|
~ConfigureGameList() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ class ConfigureGeneral : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureGeneral(QWidget* parent = nullptr); |
|
|
|
~ConfigureGeneral(); |
|
|
|
~ConfigureGeneral() override; |
|
|
|
|
|
|
|
void PopulateHotkeyList(const HotkeyRegistry& registry); |
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
@ -16,14 +16,13 @@ class ConfigureGraphics : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureGraphics(QWidget* parent = nullptr); |
|
|
|
~ConfigureGraphics(); |
|
|
|
~ConfigureGraphics() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
void setConfiguration(); |
|
|
|
|
|
|
|
private: |
|
|
|
std::unique_ptr<Ui::ConfigureGraphics> ui; |
|
|
|
QColor bg_color; |
|
|
|
}; |
|
|
|
@ -88,6 +88,8 @@ ConfigureInput::ConfigureInput(QWidget* parent) |
|
|
|
[this] { CallConfigureDialog<ConfigureTouchscreenAdvanced>(*this); }); |
|
|
|
} |
|
|
|
|
|
|
|
ConfigureInput::~ConfigureInput() = default; |
|
|
|
|
|
|
|
void ConfigureInput::OnDockedModeChanged(bool last_state, bool new_state) { |
|
|
|
if (ui->use_docked_mode->isChecked() && ui->handheld_connected->isChecked()) { |
|
|
|
ui->handheld_connected->setChecked(false); |
|
|
|
|
|
|
|
@ -25,6 +25,7 @@ class ConfigureInput : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureInput(QWidget* parent = nullptr); |
|
|
|
~ConfigureInput() override; |
|
|
|
|
|
|
|
/// Save all button configurations to settings file |
|
|
|
void applyConfiguration(); |
|
|
|
|
|
|
|
@ -17,18 +17,17 @@ class ConfigureWeb : public QWidget { |
|
|
|
|
|
|
|
public: |
|
|
|
explicit ConfigureWeb(QWidget* parent = nullptr); |
|
|
|
~ConfigureWeb(); |
|
|
|
~ConfigureWeb() override; |
|
|
|
|
|
|
|
void applyConfiguration(); |
|
|
|
void retranslateUi(); |
|
|
|
|
|
|
|
public slots: |
|
|
|
private: |
|
|
|
void RefreshTelemetryID(); |
|
|
|
void OnLoginChanged(); |
|
|
|
void VerifyLogin(); |
|
|
|
void OnLoginVerified(); |
|
|
|
|
|
|
|
private: |
|
|
|
void setConfiguration(); |
|
|
|
|
|
|
|
bool user_verified = true; |
|
|
|
|