config: Rename is_docked to use_docked_mode to be consistent with other config bools.
This commit is contained in:
		
							parent
							
								
									f1423fcbc1
								
							
						
					
					
						commit
						5ecf152c8e
					
				@ -242,20 +242,20 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
 | 
					void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
 | 
				
			||||||
    const bool is_docked{Settings::values.is_docked};
 | 
					    const bool use_docked_mode{Settings::values.use_docked_mode};
 | 
				
			||||||
    IPC::ResponseBuilder rb{ctx, 3};
 | 
					    IPC::ResponseBuilder rb{ctx, 3};
 | 
				
			||||||
    rb.Push(RESULT_SUCCESS);
 | 
					    rb.Push(RESULT_SUCCESS);
 | 
				
			||||||
    rb.Push(static_cast<u8>(is_docked ? OperationMode::Docked : OperationMode::Handheld));
 | 
					    rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    LOG_WARNING(Service_AM, "(STUBBED) called");
 | 
					    LOG_WARNING(Service_AM, "(STUBBED) called");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
 | 
					void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
 | 
				
			||||||
    const bool is_docked{Settings::values.is_docked};
 | 
					    const bool use_docked_mode{Settings::values.use_docked_mode};
 | 
				
			||||||
    IPC::ResponseBuilder rb{ctx, 3};
 | 
					    IPC::ResponseBuilder rb{ctx, 3};
 | 
				
			||||||
    rb.Push(RESULT_SUCCESS);
 | 
					    rb.Push(RESULT_SUCCESS);
 | 
				
			||||||
    rb.Push(static_cast<u32>(is_docked ? APM::PerformanceMode::Docked
 | 
					    rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked
 | 
				
			||||||
                                       : APM::PerformanceMode::Handheld));
 | 
					                                             : APM::PerformanceMode::Handheld));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    LOG_WARNING(Service_AM, "(STUBBED) called");
 | 
					    LOG_WARNING(Service_AM, "(STUBBED) called");
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -112,7 +112,7 @@ enum class CpuCore {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
struct Values {
 | 
					struct Values {
 | 
				
			||||||
    // System
 | 
					    // System
 | 
				
			||||||
    bool is_docked;
 | 
					    bool use_docked_mode;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Controls
 | 
					    // Controls
 | 
				
			||||||
    std::array<std::string, NativeButton::NumButtons> buttons;
 | 
					    std::array<std::string, NativeButton::NumButtons> buttons;
 | 
				
			||||||
 | 
				
			|||||||
@ -95,7 +95,7 @@ void Config::ReadValues() {
 | 
				
			|||||||
    qt_config->endGroup();
 | 
					    qt_config->endGroup();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qt_config->beginGroup("System");
 | 
					    qt_config->beginGroup("System");
 | 
				
			||||||
    Settings::values.is_docked = qt_config->value("is_docked", true).toBool();
 | 
					    Settings::values.use_docked_mode = qt_config->value("use_docked_mode", true).toBool();
 | 
				
			||||||
    qt_config->endGroup();
 | 
					    qt_config->endGroup();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qt_config->beginGroup("Miscellaneous");
 | 
					    qt_config->beginGroup("Miscellaneous");
 | 
				
			||||||
@ -193,7 +193,7 @@ void Config::SaveValues() {
 | 
				
			|||||||
    qt_config->endGroup();
 | 
					    qt_config->endGroup();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qt_config->beginGroup("System");
 | 
					    qt_config->beginGroup("System");
 | 
				
			||||||
    qt_config->setValue("is_docked", Settings::values.is_docked);
 | 
					    qt_config->setValue("use_docked_mode", Settings::values.use_docked_mode);
 | 
				
			||||||
    qt_config->endGroup();
 | 
					    qt_config->endGroup();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qt_config->beginGroup("Miscellaneous");
 | 
					    qt_config->beginGroup("Miscellaneous");
 | 
				
			||||||
 | 
				
			|||||||
@ -16,7 +16,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
 | 
				
			|||||||
    this->setConfiguration();
 | 
					    this->setConfiguration();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
 | 
					    ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
 | 
				
			||||||
    ui->is_docked->setEnabled(!Core::System::GetInstance().IsPoweredOn());
 | 
					    ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn());
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ConfigureGeneral::~ConfigureGeneral() {}
 | 
					ConfigureGeneral::~ConfigureGeneral() {}
 | 
				
			||||||
@ -25,7 +25,7 @@ void ConfigureGeneral::setConfiguration() {
 | 
				
			|||||||
    ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
 | 
					    ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
 | 
				
			||||||
    ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
 | 
					    ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
 | 
				
			||||||
    ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
 | 
					    ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
 | 
				
			||||||
    ui->is_docked->setChecked(Settings::values.is_docked);
 | 
					    ui->use_docked_mode->setChecked(Settings::values.use_docked_mode);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ConfigureGeneral::applyConfiguration() {
 | 
					void ConfigureGeneral::applyConfiguration() {
 | 
				
			||||||
@ -33,6 +33,6 @@ void ConfigureGeneral::applyConfiguration() {
 | 
				
			|||||||
    UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
 | 
					    UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
 | 
				
			||||||
    Settings::values.cpu_core =
 | 
					    Settings::values.cpu_core =
 | 
				
			||||||
        static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
 | 
					        static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
 | 
				
			||||||
    Settings::values.is_docked = ui->is_docked->isChecked();
 | 
					    Settings::values.use_docked_mode = ui->use_docked_mode->isChecked();
 | 
				
			||||||
    Settings::Apply();
 | 
					    Settings::Apply();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -79,7 +79,7 @@
 | 
				
			|||||||
          <item>
 | 
					          <item>
 | 
				
			||||||
            <layout class="QVBoxLayout" name="EmulationVerticalLayout">
 | 
					            <layout class="QVBoxLayout" name="EmulationVerticalLayout">
 | 
				
			||||||
              <item>
 | 
					              <item>
 | 
				
			||||||
                <widget class="QCheckBox" name="is_docked">
 | 
					                <widget class="QCheckBox" name="use_docked_mode">
 | 
				
			||||||
                  <property name="text">
 | 
					                  <property name="text">
 | 
				
			||||||
                    <string>Enable docked mode</string>
 | 
					                    <string>Enable docked mode</string>
 | 
				
			||||||
                  </property>
 | 
					                  </property>
 | 
				
			||||||
 | 
				
			|||||||
@ -108,7 +108,7 @@ void Config::ReadValues() {
 | 
				
			|||||||
        sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
 | 
					        sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // System
 | 
					    // System
 | 
				
			||||||
    Settings::values.is_docked = sdl2_config->GetBoolean("System", "is_docked", true);
 | 
					    Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Miscellaneous
 | 
					    // Miscellaneous
 | 
				
			||||||
    Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
 | 
					    Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
 | 
				
			||||||
 | 
				
			|||||||
@ -156,7 +156,7 @@ use_virtual_sd =
 | 
				
			|||||||
[System]
 | 
					[System]
 | 
				
			||||||
# Whether the system is docked
 | 
					# Whether the system is docked
 | 
				
			||||||
# 1 (default): Yes, 0: No
 | 
					# 1 (default): Yes, 0: No
 | 
				
			||||||
is_docked =
 | 
					use_docked_mode =
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# The system region that Citra will use during emulation
 | 
					# The system region that Citra will use during emulation
 | 
				
			||||||
# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
 | 
					# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user