diff options
| author | 2018-03-26 22:25:13 -0400 | |
|---|---|---|
| committer | 2018-03-26 23:02:35 -0400 | |
| commit | c97ff4460c87cc79977d3bd2448ba1cf79fefa1d (patch) | |
| tree | 7681d5173a1143115d680d661b45b12283b4c169 /src | |
| parent | config: Add setting for whether the system is docked or not. (diff) | |
| download | yuzu-c97ff4460c87cc79977d3bd2448ba1cf79fefa1d.tar.gz yuzu-c97ff4460c87cc79977d3bd2448ba1cf79fefa1d.tar.xz yuzu-c97ff4460c87cc79977d3bd2448ba1cf79fefa1d.zip | |
qt: Add config option for is_docked.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_general.ui | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 92fd6ab02..e81161035 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp | |||
| @@ -16,6 +16,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) | |||
| 16 | this->setConfiguration(); | 16 | this->setConfiguration(); |
| 17 | 17 | ||
| 18 | ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | 18 | ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn()); |
| 19 | ui->is_docked->setEnabled(!Core::System::GetInstance().IsPoweredOn()); | ||
| 19 | } | 20 | } |
| 20 | 21 | ||
| 21 | ConfigureGeneral::~ConfigureGeneral() {} | 22 | ConfigureGeneral::~ConfigureGeneral() {} |
| @@ -24,6 +25,7 @@ void ConfigureGeneral::setConfiguration() { | |||
| 24 | ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); | 25 | ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); |
| 25 | ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); | 26 | ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); |
| 26 | ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core)); | 27 | ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core)); |
| 28 | ui->is_docked->setChecked(Settings::values.is_docked); | ||
| 27 | } | 29 | } |
| 28 | 30 | ||
| 29 | void ConfigureGeneral::applyConfiguration() { | 31 | void ConfigureGeneral::applyConfiguration() { |
| @@ -31,5 +33,6 @@ void ConfigureGeneral::applyConfiguration() { | |||
| 31 | UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); | 33 | UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); |
| 32 | Settings::values.cpu_core = | 34 | Settings::values.cpu_core = |
| 33 | static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex()); | 35 | static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex()); |
| 36 | Settings::values.is_docked = ui->is_docked->isChecked(); | ||
| 34 | Settings::Apply(); | 37 | Settings::Apply(); |
| 35 | } | 38 | } |
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 573c4cb0e..35d3b26ad 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui | |||
| @@ -71,6 +71,26 @@ | |||
| 71 | </widget> | 71 | </widget> |
| 72 | </item> | 72 | </item> |
| 73 | <item> | 73 | <item> |
| 74 | <widget class="QGroupBox" name="groupBox_4"> | ||
| 75 | <property name="title"> | ||
| 76 | <string>Emulation</string> | ||
| 77 | </property> | ||
| 78 | <layout class="QHBoxLayout" name="horizontalLayout_8"> | ||
| 79 | <item> | ||
| 80 | <layout class="QVBoxLayout" name="verticalLayout_6"> | ||
| 81 | <item> | ||
| 82 | <widget class="QCheckBox" name="is_docked"> | ||
| 83 | <property name="text"> | ||
| 84 | <string>Enable docked mode</string> | ||
| 85 | </property> | ||
| 86 | </widget> | ||
| 87 | </item> | ||
| 88 | </layout> | ||
| 89 | </item> | ||
| 90 | </layout> | ||
| 91 | </widget> | ||
| 92 | </item> | ||
| 93 | <item> | ||
| 74 | <widget class="QGroupBox" name="groupBox_3"> | 94 | <widget class="QGroupBox" name="groupBox_3"> |
| 75 | <property name="title"> | 95 | <property name="title"> |
| 76 | <string>Hotkeys</string> | 96 | <string>Hotkeys</string> |