diff options
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 9 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_filesystem.cpp | 10 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_filesystem.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_filesystem.ui | 35 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 3 |
5 files changed, 1 insertions, 57 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 0635d13d0..3d6f64300 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -614,12 +614,6 @@ void Config::ReadDataStorageValues() { | |||
| 614 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir))) | 614 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir))) |
| 615 | .toString() | 615 | .toString() |
| 616 | .toStdString()); | 616 | .toStdString()); |
| 617 | FS::GetUserPath(FS::UserPath::CacheDir, | ||
| 618 | qt_config | ||
| 619 | ->value(QStringLiteral("cache_directory"), | ||
| 620 | QString::fromStdString(FS::GetUserPath(FS::UserPath::CacheDir))) | ||
| 621 | .toString() | ||
| 622 | .toStdString()); | ||
| 623 | Settings::values.gamecard_inserted = | 617 | Settings::values.gamecard_inserted = |
| 624 | ReadSetting(QStringLiteral("gamecard_inserted"), false).toBool(); | 618 | ReadSetting(QStringLiteral("gamecard_inserted"), false).toBool(); |
| 625 | Settings::values.gamecard_current_game = | 619 | Settings::values.gamecard_current_game = |
| @@ -1218,9 +1212,6 @@ void Config::SaveDataStorageValues() { | |||
| 1218 | WriteSetting(QStringLiteral("dump_directory"), | 1212 | WriteSetting(QStringLiteral("dump_directory"), |
| 1219 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir)), | 1213 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir)), |
| 1220 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir))); | 1214 | QString::fromStdString(FS::GetUserPath(FS::UserPath::DumpDir))); |
| 1221 | WriteSetting(QStringLiteral("cache_directory"), | ||
| 1222 | QString::fromStdString(FS::GetUserPath(FS::UserPath::CacheDir)), | ||
| 1223 | QString::fromStdString(FS::GetUserPath(FS::UserPath::CacheDir))); | ||
| 1224 | WriteSetting(QStringLiteral("gamecard_inserted"), Settings::values.gamecard_inserted, false); | 1215 | WriteSetting(QStringLiteral("gamecard_inserted"), Settings::values.gamecard_inserted, false); |
| 1225 | WriteSetting(QStringLiteral("gamecard_current_game"), Settings::values.gamecard_current_game, | 1216 | WriteSetting(QStringLiteral("gamecard_current_game"), Settings::values.gamecard_current_game, |
| 1226 | false); | 1217 | false); |
diff --git a/src/yuzu/configuration/configure_filesystem.cpp b/src/yuzu/configuration/configure_filesystem.cpp index 7ab4a80f7..bde2d4620 100644 --- a/src/yuzu/configuration/configure_filesystem.cpp +++ b/src/yuzu/configuration/configure_filesystem.cpp | |||
| @@ -26,8 +26,6 @@ ConfigureFilesystem::ConfigureFilesystem(QWidget* parent) | |||
| 26 | [this] { SetDirectory(DirectoryTarget::Dump, ui->dump_path_edit); }); | 26 | [this] { SetDirectory(DirectoryTarget::Dump, ui->dump_path_edit); }); |
| 27 | connect(ui->load_path_button, &QToolButton::pressed, this, | 27 | connect(ui->load_path_button, &QToolButton::pressed, this, |
| 28 | [this] { SetDirectory(DirectoryTarget::Load, ui->load_path_edit); }); | 28 | [this] { SetDirectory(DirectoryTarget::Load, ui->load_path_edit); }); |
| 29 | connect(ui->cache_directory_button, &QToolButton::pressed, this, | ||
| 30 | [this] { SetDirectory(DirectoryTarget::Cache, ui->cache_directory_edit); }); | ||
| 31 | 29 | ||
| 32 | connect(ui->reset_game_list_cache, &QPushButton::pressed, this, | 30 | connect(ui->reset_game_list_cache, &QPushButton::pressed, this, |
| 33 | &ConfigureFilesystem::ResetMetadata); | 31 | &ConfigureFilesystem::ResetMetadata); |
| @@ -50,8 +48,6 @@ void ConfigureFilesystem::setConfiguration() { | |||
| 50 | QString::fromStdString(Common::FS::GetUserPath(Common::FS::UserPath::DumpDir))); | 48 | QString::fromStdString(Common::FS::GetUserPath(Common::FS::UserPath::DumpDir))); |
| 51 | ui->load_path_edit->setText( | 49 | ui->load_path_edit->setText( |
| 52 | QString::fromStdString(Common::FS::GetUserPath(Common::FS::UserPath::LoadDir))); | 50 | QString::fromStdString(Common::FS::GetUserPath(Common::FS::UserPath::LoadDir))); |
| 53 | ui->cache_directory_edit->setText( | ||
| 54 | QString::fromStdString(Common::FS::GetUserPath(Common::FS::UserPath::CacheDir))); | ||
| 55 | 51 | ||
| 56 | ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted); | 52 | ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted); |
| 57 | ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game); | 53 | ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game); |
| @@ -72,9 +68,6 @@ void ConfigureFilesystem::applyConfiguration() { | |||
| 72 | ui->dump_path_edit->text().toStdString()); | 68 | ui->dump_path_edit->text().toStdString()); |
| 73 | Common::FS::GetUserPath(Common::FS::UserPath::LoadDir, | 69 | Common::FS::GetUserPath(Common::FS::UserPath::LoadDir, |
| 74 | ui->load_path_edit->text().toStdString()); | 70 | ui->load_path_edit->text().toStdString()); |
| 75 | Common::FS::GetUserPath(Common::FS::UserPath::CacheDir, | ||
| 76 | ui->cache_directory_edit->text().toStdString()); | ||
| 77 | Settings::values.gamecard_path = ui->gamecard_path_edit->text().toStdString(); | ||
| 78 | 71 | ||
| 79 | Settings::values.gamecard_inserted = ui->gamecard_inserted->isChecked(); | 72 | Settings::values.gamecard_inserted = ui->gamecard_inserted->isChecked(); |
| 80 | Settings::values.gamecard_current_game = ui->gamecard_current_game->isChecked(); | 73 | Settings::values.gamecard_current_game = ui->gamecard_current_game->isChecked(); |
| @@ -103,9 +96,6 @@ void ConfigureFilesystem::SetDirectory(DirectoryTarget target, QLineEdit* edit) | |||
| 103 | case DirectoryTarget::Load: | 96 | case DirectoryTarget::Load: |
| 104 | caption = tr("Select Mod Load Directory..."); | 97 | caption = tr("Select Mod Load Directory..."); |
| 105 | break; | 98 | break; |
| 106 | case DirectoryTarget::Cache: | ||
| 107 | caption = tr("Select Cache Directory..."); | ||
| 108 | break; | ||
| 109 | } | 99 | } |
| 110 | 100 | ||
| 111 | QString str; | 101 | QString str; |
diff --git a/src/yuzu/configuration/configure_filesystem.h b/src/yuzu/configuration/configure_filesystem.h index a79303760..2147cd405 100644 --- a/src/yuzu/configuration/configure_filesystem.h +++ b/src/yuzu/configuration/configure_filesystem.h | |||
| @@ -32,7 +32,6 @@ private: | |||
| 32 | Gamecard, | 32 | Gamecard, |
| 33 | Dump, | 33 | Dump, |
| 34 | Load, | 34 | Load, |
| 35 | Cache, | ||
| 36 | }; | 35 | }; |
| 37 | 36 | ||
| 38 | void SetDirectory(DirectoryTarget target, QLineEdit* edit); | 37 | void SetDirectory(DirectoryTarget target, QLineEdit* edit); |
diff --git a/src/yuzu/configuration/configure_filesystem.ui b/src/yuzu/configuration/configure_filesystem.ui index 84bea0600..62b9abc7a 100644 --- a/src/yuzu/configuration/configure_filesystem.ui +++ b/src/yuzu/configuration/configure_filesystem.ui | |||
| @@ -198,40 +198,7 @@ | |||
| 198 | <string>Caching</string> | 198 | <string>Caching</string> |
| 199 | </property> | 199 | </property> |
| 200 | <layout class="QGridLayout" name="gridLayout_5"> | 200 | <layout class="QGridLayout" name="gridLayout_5"> |
| 201 | <item row="0" column="0"> | 201 | <item row="0" column="0" colspan="2"> |
| 202 | <widget class="QLabel" name="label_10"> | ||
| 203 | <property name="text"> | ||
| 204 | <string>Cache Directory</string> | ||
| 205 | </property> | ||
| 206 | </widget> | ||
| 207 | </item> | ||
| 208 | <item row="0" column="1"> | ||
| 209 | <spacer name="horizontalSpacer_3"> | ||
| 210 | <property name="orientation"> | ||
| 211 | <enum>Qt::Horizontal</enum> | ||
| 212 | </property> | ||
| 213 | <property name="sizeType"> | ||
| 214 | <enum>QSizePolicy::Fixed</enum> | ||
| 215 | </property> | ||
| 216 | <property name="sizeHint" stdset="0"> | ||
| 217 | <size> | ||
| 218 | <width>40</width> | ||
| 219 | <height>20</height> | ||
| 220 | </size> | ||
| 221 | </property> | ||
| 222 | </spacer> | ||
| 223 | </item> | ||
| 224 | <item row="0" column="2"> | ||
| 225 | <widget class="QLineEdit" name="cache_directory_edit"/> | ||
| 226 | </item> | ||
| 227 | <item row="0" column="3"> | ||
| 228 | <widget class="QToolButton" name="cache_directory_button"> | ||
| 229 | <property name="text"> | ||
| 230 | <string>...</string> | ||
| 231 | </property> | ||
| 232 | </widget> | ||
| 233 | </item> | ||
| 234 | <item row="1" column="0" colspan="4"> | ||
| 235 | <layout class="QHBoxLayout" name="horizontalLayout_2"> | 202 | <layout class="QHBoxLayout" name="horizontalLayout_2"> |
| 236 | <item> | 203 | <item> |
| 237 | <widget class="QCheckBox" name="cache_game_list"> | 204 | <widget class="QCheckBox" name="cache_game_list"> |
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index aa0a9f288..6d8bc5509 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -329,9 +329,6 @@ void Config::ReadValues() { | |||
| 329 | FS::GetUserPath( | 329 | FS::GetUserPath( |
| 330 | FS::UserPath::DumpDir, | 330 | FS::UserPath::DumpDir, |
| 331 | sdl2_config->Get("Data Storage", "dump_directory", FS::GetUserPath(FS::UserPath::DumpDir))); | 331 | sdl2_config->Get("Data Storage", "dump_directory", FS::GetUserPath(FS::UserPath::DumpDir))); |
| 332 | FS::GetUserPath(FS::UserPath::CacheDir, | ||
| 333 | sdl2_config->Get("Data Storage", "cache_directory", | ||
| 334 | FS::GetUserPath(FS::UserPath::CacheDir))); | ||
| 335 | Settings::values.gamecard_inserted = | 332 | Settings::values.gamecard_inserted = |
| 336 | sdl2_config->GetBoolean("Data Storage", "gamecard_inserted", false); | 333 | sdl2_config->GetBoolean("Data Storage", "gamecard_inserted", false); |
| 337 | Settings::values.gamecard_current_game = | 334 | Settings::values.gamecard_current_game = |