mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	config: Remove Dump options from configure_debug
This commit is contained in:
		
							parent
							
								
									a49169e819
								
							
						
					
					
						commit
						ccd70819c2
					
				| @ -462,38 +462,45 @@ void Config::ReadDataStorageValues() { | ||||
|     FileUtil::GetUserPath( | ||||
|         FileUtil::UserPath::LoadDir, | ||||
|         qt_config | ||||
|             ->value("load_directory", | ||||
|             ->value(QStringLiteral("load_directory"), | ||||
|                     QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::LoadDir))) | ||||
|             .toString() | ||||
|             .toStdString()); | ||||
|     FileUtil::GetUserPath( | ||||
|         FileUtil::UserPath::DumpDir, | ||||
|         qt_config | ||||
|             ->value("dump_directory", | ||||
|             ->value(QStringLiteral("dump_directory"), | ||||
|                     QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::DumpDir))) | ||||
|             .toString() | ||||
|             .toStdString()); | ||||
|     FileUtil::GetUserPath( | ||||
|         FileUtil::UserPath::CacheDir, | ||||
|         qt_config | ||||
|             ->value("cache_directory", | ||||
|             ->value(QStringLiteral("cache_directory"), | ||||
|                     QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir))) | ||||
|             .toString() | ||||
|             .toStdString()); | ||||
|     Settings::values.gamecard_inserted = ReadSetting("gamecard_inserted", false).toBool(); | ||||
|     Settings::values.gamecard_current_game = ReadSetting("gamecard_current_game", false).toBool(); | ||||
|     Settings::values.gamecard_path = ReadSetting("gamecard_path", "").toString().toStdString(); | ||||
|     Settings::values.gamecard_inserted = | ||||
|         ReadSetting(QStringLiteral("gamecard_inserted"), false).toBool(); | ||||
|     Settings::values.gamecard_current_game = | ||||
|         ReadSetting(QStringLiteral("gamecard_current_game"), false).toBool(); | ||||
|     Settings::values.gamecard_path = | ||||
|         ReadSetting(QStringLiteral("gamecard_path"), QStringLiteral("")).toString().toStdString(); | ||||
|     Settings::values.nand_total_size = static_cast<Settings::NANDTotalSize>( | ||||
|         ReadSetting(QStringLiteral("nand_total_size"), static_cast<u64>(Settings::NANDTotalSize::S29_1GB)) | ||||
|         ReadSetting(QStringLiteral("nand_total_size"), | ||||
|                     static_cast<u64>(Settings::NANDTotalSize::S29_1GB)) | ||||
|             .toULongLong()); | ||||
|     Settings::values.nand_user_size = static_cast<Settings::NANDUserSize>( | ||||
|         ReadSetting(QStringLiteral("nand_user_size"), static_cast<u64>(Settings::NANDUserSize::S26GB)) | ||||
|         ReadSetting(QStringLiteral("nand_user_size"), | ||||
|                     static_cast<u64>(Settings::NANDUserSize::S26GB)) | ||||
|             .toULongLong()); | ||||
|     Settings::values.nand_system_size = static_cast<Settings::NANDSystemSize>( | ||||
|         ReadSetting(QStringLiteral("nand_system_size"), static_cast<u64>(Settings::NANDSystemSize::S2_5GB)) | ||||
|         ReadSetting(QStringLiteral("nand_system_size"), | ||||
|                     static_cast<u64>(Settings::NANDSystemSize::S2_5GB)) | ||||
|             .toULongLong()); | ||||
|     Settings::values.sdmc_size = static_cast<Settings::SDMCSize>( | ||||
|         ReadSetting(QStringLiteral("sdmc_size"), static_cast<u64>(Settings::SDMCSize::S16GB)).toULongLong()); | ||||
|         ReadSetting(QStringLiteral("sdmc_size"), static_cast<u64>(Settings::SDMCSize::S16GB)) | ||||
|             .toULongLong()); | ||||
| 
 | ||||
|     qt_config->endGroup(); | ||||
| } | ||||
| @ -920,13 +927,18 @@ void Config::SaveDataStorageValues() { | ||||
|                  QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir)), | ||||
|                  QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir))); | ||||
|     WriteSetting(QStringLiteral("gamecard_inserted"), Settings::values.gamecard_inserted, false); | ||||
|     WriteSetting(QStringLiteral("gamecard_current_game"), Settings::values.gamecard_current_game, false); | ||||
|     WriteSetting(QStringLiteral("gamecard_path"), QString::fromStdString(Settings::values.gamecard_path), ""); | ||||
|     WriteSetting(QStringLiteral("nand_total_size"), static_cast<u64>(Settings::values.nand_total_size), | ||||
|     WriteSetting(QStringLiteral("gamecard_current_game"), Settings::values.gamecard_current_game, | ||||
|                  false); | ||||
|     WriteSetting(QStringLiteral("gamecard_path"), | ||||
|                  QString::fromStdString(Settings::values.gamecard_path), QStringLiteral("")); | ||||
|     WriteSetting(QStringLiteral("nand_total_size"), | ||||
|                  static_cast<u64>(Settings::values.nand_total_size), | ||||
|                  static_cast<u64>(Settings::NANDTotalSize::S29_1GB)); | ||||
|     WriteSetting(QStringLiteral("nand_user_size"), static_cast<u64>(Settings::values.nand_user_size), | ||||
|     WriteSetting(QStringLiteral("nand_user_size"), | ||||
|                  static_cast<u64>(Settings::values.nand_user_size), | ||||
|                  static_cast<u64>(Settings::NANDUserSize::S26GB)); | ||||
|     WriteSetting(QStringLiteral("nand_system_size"), static_cast<u64>(Settings::values.nand_system_size), | ||||
|     WriteSetting(QStringLiteral("nand_system_size"), | ||||
|                  static_cast<u64>(Settings::values.nand_system_size), | ||||
|                  static_cast<u64>(Settings::NANDSystemSize::S2_5GB)); | ||||
|     WriteSetting(QStringLiteral("sdmc_size"), static_cast<u64>(Settings::values.sdmc_size), | ||||
|                  static_cast<u64>(Settings::SDMCSize::S16GB)); | ||||
|  | ||||
| @ -34,8 +34,6 @@ void ConfigureDebug::SetConfiguration() { | ||||
|     ui->toggle_console->setChecked(UISettings::values.show_console); | ||||
|     ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter)); | ||||
|     ui->homebrew_args_edit->setText(QString::fromStdString(Settings::values.program_args)); | ||||
|     ui->dump_exefs->setChecked(Settings::values.dump_exefs); | ||||
|     ui->dump_decompressed_nso->setChecked(Settings::values.dump_nso); | ||||
|     ui->reporting_services->setChecked(Settings::values.reporting_services); | ||||
|     ui->quest_flag->setChecked(Settings::values.quest_flag); | ||||
| } | ||||
| @ -46,8 +44,6 @@ void ConfigureDebug::ApplyConfiguration() { | ||||
|     UISettings::values.show_console = ui->toggle_console->isChecked(); | ||||
|     Settings::values.log_filter = ui->log_filter_edit->text().toStdString(); | ||||
|     Settings::values.program_args = ui->homebrew_args_edit->text().toStdString(); | ||||
|     Settings::values.dump_exefs = ui->dump_exefs->isChecked(); | ||||
|     Settings::values.dump_nso = ui->dump_decompressed_nso->isChecked(); | ||||
|     Settings::values.reporting_services = ui->reporting_services->isChecked(); | ||||
|     Settings::values.quest_flag = ui->quest_flag->isChecked(); | ||||
|     Debugger::ToggleConsole(); | ||||
|  | ||||
| @ -130,31 +130,6 @@ | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="QGroupBox" name="groupBox_4"> | ||||
|      <property name="title"> | ||||
|       <string>Dump</string> | ||||
|      </property> | ||||
|      <layout class="QVBoxLayout" name="verticalLayout_6"> | ||||
|       <item> | ||||
|        <widget class="QCheckBox" name="dump_decompressed_nso"> | ||||
|         <property name="whatsThis"> | ||||
|          <string>When checked, any NSO yuzu tries to load or patch will be copied decompressed to the yuzu/dump directory.</string> | ||||
|         </property> | ||||
|         <property name="text"> | ||||
|          <string>Dump Decompressed NSOs</string> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item> | ||||
|        <widget class="QCheckBox" name="dump_exefs"> | ||||
|         <property name="whatsThis"> | ||||
|          <string>When checked, any game that yuzu loads will have its ExeFS dumped to the yuzu/dump directory.</string> | ||||
|         </property> | ||||
|         <property name="text"> | ||||
|          <string>Dump ExeFS</string> | ||||
|         </property> | ||||
|        </widget> | ||||
|       </item> | ||||
|       <item> | ||||
|        <widget class="QCheckBox" name="reporting_services"> | ||||
|         <property name="text"> | ||||
| @ -197,6 +172,11 @@ | ||||
|     </widget> | ||||
|    </item> | ||||
|    <item> | ||||
|     <widget class="QGroupBox" name="groupBox_4"> | ||||
|      <property name="title"> | ||||
|       <string>Dump</string> | ||||
|      </property> | ||||
|      <layout class="QVBoxLayout" name="verticalLayout_6"> | ||||
|     <spacer name="verticalSpacer"> | ||||
|      <property name="orientation"> | ||||
|       <enum>Qt::Vertical</enum> | ||||
|  | ||||
| @ -136,7 +136,7 @@ void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) | ||||
|     QString str; | ||||
|     if (target == DirectoryTarget::Gamecard) { | ||||
|         str = QFileDialog::getOpenFileName(this, caption, QFileInfo(edit->text()).dir().path(), | ||||
|                                            "NX Gamecard;*.xci"); | ||||
|                                            QStringLiteral("NX Gamecard;*.xci")); | ||||
|     } else { | ||||
|         str = QFileDialog::getExistingDirectory(this, caption, edit->text()); | ||||
|     } | ||||
| @ -148,8 +148,12 @@ void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) | ||||
| } | ||||
| 
 | ||||
| void ConfigureFilesystem::ResetMetadata() { | ||||
|     if (FileUtil::DeleteDirRecursively(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir) + | ||||
|                                        DIR_SEP + "game_list")) { | ||||
|     if (!FileUtil::Exists(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir) + DIR_SEP + | ||||
|                           "game_list")) { | ||||
|         QMessageBox::information(this, tr("Reset Metadata Cache"), | ||||
|                                  tr("The metadata cache is already empty.")); | ||||
|     } else if (FileUtil::DeleteDirRecursively(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir) + | ||||
|                                               DIR_SEP + "game_list")) { | ||||
|         QMessageBox::information(this, tr("Reset Metadata Cache"), | ||||
|                                  tr("The operation completed successfully.")); | ||||
|         UISettings::values.is_game_list_reload_pending.exchange(true); | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Zach Hilman
						Zach Hilman