summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2020-02-09 12:08:01 -0500
committerGravatar GitHub2020-02-09 12:08:01 -0500
commit21c3f4827908cf960938c593cdc64684044773aa (patch)
treeeb4c47c246f90e6d0fb85e91eab5b783871c9f53
parentMerge pull request #3388 from bunnei/service-shared-ptr (diff)
parentRemove option "Show files with type 'Unknown'" (diff)
downloadyuzu-21c3f4827908cf960938c593cdc64684044773aa.tar.gz
yuzu-21c3f4827908cf960938c593cdc64684044773aa.tar.xz
yuzu-21c3f4827908cf960938c593cdc64684044773aa.zip
Merge pull request #3391 from Morph1984/remove-unknown
Remove option "Show files with type 'Unknown'"
Diffstat (limited to '')
-rw-r--r--src/yuzu/configuration/config.cpp2
-rw-r--r--src/yuzu/configuration/configure_ui.cpp3
-rw-r--r--src/yuzu/configuration/configure_ui.ui7
-rw-r--r--src/yuzu/game_list_worker.cpp3
-rw-r--r--src/yuzu/uisettings.h1
5 files changed, 1 insertions, 15 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 280d81ba9..cd94693c1 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -742,7 +742,6 @@ void Config::ReadUIValues() {
742void Config::ReadUIGamelistValues() { 742void Config::ReadUIGamelistValues() {
743 qt_config->beginGroup(QStringLiteral("UIGameList")); 743 qt_config->beginGroup(QStringLiteral("UIGameList"));
744 744
745 UISettings::values.show_unknown = ReadSetting(QStringLiteral("show_unknown"), true).toBool();
746 UISettings::values.show_add_ons = ReadSetting(QStringLiteral("show_add_ons"), true).toBool(); 745 UISettings::values.show_add_ons = ReadSetting(QStringLiteral("show_add_ons"), true).toBool();
747 UISettings::values.icon_size = ReadSetting(QStringLiteral("icon_size"), 64).toUInt(); 746 UISettings::values.icon_size = ReadSetting(QStringLiteral("icon_size"), 64).toUInt();
748 UISettings::values.row_1_text_id = ReadSetting(QStringLiteral("row_1_text_id"), 3).toUInt(); 747 UISettings::values.row_1_text_id = ReadSetting(QStringLiteral("row_1_text_id"), 3).toUInt();
@@ -1159,7 +1158,6 @@ void Config::SaveUIValues() {
1159void Config::SaveUIGamelistValues() { 1158void Config::SaveUIGamelistValues() {
1160 qt_config->beginGroup(QStringLiteral("UIGameList")); 1159 qt_config->beginGroup(QStringLiteral("UIGameList"));
1161 1160
1162 WriteSetting(QStringLiteral("show_unknown"), UISettings::values.show_unknown, true);
1163 WriteSetting(QStringLiteral("show_add_ons"), UISettings::values.show_add_ons, true); 1161 WriteSetting(QStringLiteral("show_add_ons"), UISettings::values.show_add_ons, true);
1164 WriteSetting(QStringLiteral("icon_size"), UISettings::values.icon_size, 64); 1162 WriteSetting(QStringLiteral("icon_size"), UISettings::values.icon_size, 64);
1165 WriteSetting(QStringLiteral("row_1_text_id"), UISettings::values.row_1_text_id, 3); 1163 WriteSetting(QStringLiteral("row_1_text_id"), UISettings::values.row_1_text_id, 3);
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp
index c4a84cc67..94424ee44 100644
--- a/src/yuzu/configuration/configure_ui.cpp
+++ b/src/yuzu/configuration/configure_ui.cpp
@@ -40,7 +40,6 @@ ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::Configur
40 SetConfiguration(); 40 SetConfiguration();
41 41
42 // Force game list reload if any of the relevant settings are changed. 42 // Force game list reload if any of the relevant settings are changed.
43 connect(ui->show_unknown, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
44 connect(ui->icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, 43 connect(ui->icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
45 &ConfigureUi::RequestGameListUpdate); 44 &ConfigureUi::RequestGameListUpdate);
46 connect(ui->row_1_text_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, 45 connect(ui->row_1_text_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -60,7 +59,6 @@ ConfigureUi::~ConfigureUi() = default;
60void ConfigureUi::ApplyConfiguration() { 59void ConfigureUi::ApplyConfiguration() {
61 UISettings::values.theme = 60 UISettings::values.theme =
62 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); 61 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
63 UISettings::values.show_unknown = ui->show_unknown->isChecked();
64 UISettings::values.show_add_ons = ui->show_add_ons->isChecked(); 62 UISettings::values.show_add_ons = ui->show_add_ons->isChecked();
65 UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt(); 63 UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
66 UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt(); 64 UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
@@ -74,7 +72,6 @@ void ConfigureUi::RequestGameListUpdate() {
74 72
75void ConfigureUi::SetConfiguration() { 73void ConfigureUi::SetConfiguration() {
76 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); 74 ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme));
77 ui->show_unknown->setChecked(UISettings::values.show_unknown);
78 ui->show_add_ons->setChecked(UISettings::values.show_add_ons); 75 ui->show_add_ons->setChecked(UISettings::values.show_add_ons);
79 ui->icon_size_combobox->setCurrentIndex( 76 ui->icon_size_combobox->setCurrentIndex(
80 ui->icon_size_combobox->findData(UISettings::values.icon_size)); 77 ui->icon_size_combobox->findData(UISettings::values.icon_size));
diff --git a/src/yuzu/configuration/configure_ui.ui b/src/yuzu/configuration/configure_ui.ui
index aa36bd112..bd5c5d3c2 100644
--- a/src/yuzu/configuration/configure_ui.ui
+++ b/src/yuzu/configuration/configure_ui.ui
@@ -52,13 +52,6 @@
52 <item> 52 <item>
53 <layout class="QVBoxLayout" name="GeneralVerticalLayout"> 53 <layout class="QVBoxLayout" name="GeneralVerticalLayout">
54 <item> 54 <item>
55 <widget class="QCheckBox" name="show_unknown">
56 <property name="text">
57 <string>Show files with type 'Unknown'</string>
58 </property>
59 </widget>
60 </item>
61 <item>
62 <widget class="QCheckBox" name="show_add_ons"> 55 <widget class="QCheckBox" name="show_add_ons">
63 <property name="text"> 56 <property name="text">
64 <string>Show Add-Ons Column</string> 57 <string>Show Add-Ons Column</string>
diff --git a/src/yuzu/game_list_worker.cpp b/src/yuzu/game_list_worker.cpp
index 4c81ef12b..da2c27aa2 100644
--- a/src/yuzu/game_list_worker.cpp
+++ b/src/yuzu/game_list_worker.cpp
@@ -298,8 +298,7 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
298 } 298 }
299 299
300 const auto file_type = loader->GetFileType(); 300 const auto file_type = loader->GetFileType();
301 if ((file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) && 301 if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) {
302 !UISettings::values.show_unknown) {
303 return true; 302 return true;
304 } 303 }
305 304
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index bc7725a01..a675ecf4d 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -89,7 +89,6 @@ struct Values {
89 int profile_index; 89 int profile_index;
90 90
91 // Game List 91 // Game List
92 bool show_unknown;
93 bool show_add_ons; 92 bool show_add_ons;
94 uint32_t icon_size; 93 uint32_t icon_size;
95 uint8_t row_1_text_id; 94 uint8_t row_1_text_id;