summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-26 22:59:18 -0400
committerGravatar bunnei2018-03-26 23:02:36 -0400
commit5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3 (patch)
treeeb7722cc9dee21ca3fe35df1187f3e2d41131448 /src
parentconfigure_general: Cleanup naming. (diff)
downloadyuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.gz
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.xz
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.zip
config: Rename is_docked to use_docked_mode to be consistent with other config bools.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp10
-rw-r--r--src/core/settings.h2
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_general.cpp6
-rw-r--r--src/yuzu/configuration/configure_general.ui2
-rw-r--r--src/yuzu_cmd/config.cpp2
-rw-r--r--src/yuzu_cmd/default_ini.h2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 07522e730..bab338205 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -242,20 +242,20 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) {
242} 242}
243 243
244void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { 244void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
245 const bool is_docked{Settings::values.is_docked}; 245 const bool use_docked_mode{Settings::values.use_docked_mode};
246 IPC::ResponseBuilder rb{ctx, 3}; 246 IPC::ResponseBuilder rb{ctx, 3};
247 rb.Push(RESULT_SUCCESS); 247 rb.Push(RESULT_SUCCESS);
248 rb.Push(static_cast<u8>(is_docked ? OperationMode::Docked : OperationMode::Handheld)); 248 rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld));
249 249
250 LOG_WARNING(Service_AM, "(STUBBED) called"); 250 LOG_WARNING(Service_AM, "(STUBBED) called");
251} 251}
252 252
253void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { 253void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
254 const bool is_docked{Settings::values.is_docked}; 254 const bool use_docked_mode{Settings::values.use_docked_mode};
255 IPC::ResponseBuilder rb{ctx, 3}; 255 IPC::ResponseBuilder rb{ctx, 3};
256 rb.Push(RESULT_SUCCESS); 256 rb.Push(RESULT_SUCCESS);
257 rb.Push(static_cast<u32>(is_docked ? APM::PerformanceMode::Docked 257 rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked
258 : APM::PerformanceMode::Handheld)); 258 : APM::PerformanceMode::Handheld));
259 259
260 LOG_WARNING(Service_AM, "(STUBBED) called"); 260 LOG_WARNING(Service_AM, "(STUBBED) called");
261} 261}
diff --git a/src/core/settings.h b/src/core/settings.h
index 002d25dbd..eaef47236 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -112,7 +112,7 @@ enum class CpuCore {
112 112
113struct Values { 113struct Values {
114 // System 114 // System
115 bool is_docked; 115 bool use_docked_mode;
116 116
117 // Controls 117 // Controls
118 std::array<std::string, NativeButton::NumButtons> buttons; 118 std::array<std::string, NativeButton::NumButtons> buttons;
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 5842bebee..70035f388 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -95,7 +95,7 @@ void Config::ReadValues() {
95 qt_config->endGroup(); 95 qt_config->endGroup();
96 96
97 qt_config->beginGroup("System"); 97 qt_config->beginGroup("System");
98 Settings::values.is_docked = qt_config->value("is_docked", true).toBool(); 98 Settings::values.use_docked_mode = qt_config->value("use_docked_mode", true).toBool();
99 qt_config->endGroup(); 99 qt_config->endGroup();
100 100
101 qt_config->beginGroup("Miscellaneous"); 101 qt_config->beginGroup("Miscellaneous");
@@ -193,7 +193,7 @@ void Config::SaveValues() {
193 qt_config->endGroup(); 193 qt_config->endGroup();
194 194
195 qt_config->beginGroup("System"); 195 qt_config->beginGroup("System");
196 qt_config->setValue("is_docked", Settings::values.is_docked); 196 qt_config->setValue("use_docked_mode", Settings::values.use_docked_mode);
197 qt_config->endGroup(); 197 qt_config->endGroup();
198 198
199 qt_config->beginGroup("Miscellaneous"); 199 qt_config->beginGroup("Miscellaneous");
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index e81161035..3ddb2f4b1 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -16,7 +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 ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn());
20} 20}
21 21
22ConfigureGeneral::~ConfigureGeneral() {} 22ConfigureGeneral::~ConfigureGeneral() {}
@@ -25,7 +25,7 @@ void ConfigureGeneral::setConfiguration() {
25 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); 25 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
26 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); 26 ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
27 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); 28 ui->use_docked_mode->setChecked(Settings::values.use_docked_mode);
29} 29}
30 30
31void ConfigureGeneral::applyConfiguration() { 31void ConfigureGeneral::applyConfiguration() {
@@ -33,6 +33,6 @@ void ConfigureGeneral::applyConfiguration() {
33 UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); 33 UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
34 Settings::values.cpu_core = 34 Settings::values.cpu_core =
35 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(); 36 Settings::values.use_docked_mode = ui->use_docked_mode->isChecked();
37 Settings::Apply(); 37 Settings::Apply();
38} 38}
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index b0684f0c1..717b1b474 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -79,7 +79,7 @@
79 <item> 79 <item>
80 <layout class="QVBoxLayout" name="EmulationVerticalLayout"> 80 <layout class="QVBoxLayout" name="EmulationVerticalLayout">
81 <item> 81 <item>
82 <widget class="QCheckBox" name="is_docked"> 82 <widget class="QCheckBox" name="use_docked_mode">
83 <property name="text"> 83 <property name="text">
84 <string>Enable docked mode</string> 84 <string>Enable docked mode</string>
85 </property> 85 </property>
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 38f76d425..b09e9fc0b 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -108,7 +108,7 @@ void Config::ReadValues() {
108 sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true); 108 sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
109 109
110 // System 110 // System
111 Settings::values.is_docked = sdl2_config->GetBoolean("System", "is_docked", true); 111 Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", true);
112 112
113 // Miscellaneous 113 // Miscellaneous
114 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); 114 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 50802104c..c42aba6a4 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -156,7 +156,7 @@ use_virtual_sd =
156[System] 156[System]
157# Whether the system is docked 157# Whether the system is docked
158# 1 (default): Yes, 0: No 158# 1 (default): Yes, 0: No
159is_docked = 159use_docked_mode =
160 160
161# The system region that Citra will use during emulation 161# The system region that Citra will use during emulation
162# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan 162# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan