summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_ui.cpp6
-rw-r--r--src/yuzu/configuration/configure_ui.ui16
-rw-r--r--src/yuzu/game_list.cpp2
-rw-r--r--src/yuzu/uisettings.h4
5 files changed, 31 insertions, 1 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 927dd1069..343f3b8e5 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -820,6 +820,8 @@ void Config::ReadUIGamelistValues() {
820 820
821 ReadBasicSetting(UISettings::values.show_add_ons); 821 ReadBasicSetting(UISettings::values.show_add_ons);
822 ReadBasicSetting(UISettings::values.show_compat); 822 ReadBasicSetting(UISettings::values.show_compat);
823 ReadBasicSetting(UISettings::values.show_size);
824 ReadBasicSetting(UISettings::values.show_types);
823 ReadBasicSetting(UISettings::values.game_icon_size); 825 ReadBasicSetting(UISettings::values.game_icon_size);
824 ReadBasicSetting(UISettings::values.folder_icon_size); 826 ReadBasicSetting(UISettings::values.folder_icon_size);
825 ReadBasicSetting(UISettings::values.row_1_text_id); 827 ReadBasicSetting(UISettings::values.row_1_text_id);
@@ -1416,6 +1418,8 @@ void Config::SaveUIGamelistValues() {
1416 1418
1417 WriteBasicSetting(UISettings::values.show_add_ons); 1419 WriteBasicSetting(UISettings::values.show_add_ons);
1418 WriteBasicSetting(UISettings::values.show_compat); 1420 WriteBasicSetting(UISettings::values.show_compat);
1421 WriteBasicSetting(UISettings::values.show_size);
1422 WriteBasicSetting(UISettings::values.show_types);
1419 WriteBasicSetting(UISettings::values.game_icon_size); 1423 WriteBasicSetting(UISettings::values.game_icon_size);
1420 WriteBasicSetting(UISettings::values.folder_icon_size); 1424 WriteBasicSetting(UISettings::values.folder_icon_size);
1421 WriteBasicSetting(UISettings::values.row_1_text_id); 1425 WriteBasicSetting(UISettings::values.row_1_text_id);
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp
index 92e6da6ee..2ebb80302 100644
--- a/src/yuzu/configuration/configure_ui.cpp
+++ b/src/yuzu/configuration/configure_ui.cpp
@@ -73,6 +73,8 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
73 // Force game list reload if any of the relevant settings are changed. 73 // Force game list reload if any of the relevant settings are changed.
74 connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); 74 connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
75 connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate); 75 connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
76 connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
77 connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
76 connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, 78 connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
77 &ConfigureUi::RequestGameListUpdate); 79 &ConfigureUi::RequestGameListUpdate);
78 connect(ui->folder_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), 80 connect(ui->folder_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
@@ -111,6 +113,8 @@ void ConfigureUi::ApplyConfiguration() {
111 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); 113 ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
112 UISettings::values.show_add_ons = ui->show_add_ons->isChecked(); 114 UISettings::values.show_add_ons = ui->show_add_ons->isChecked();
113 UISettings::values.show_compat = ui->show_compat->isChecked(); 115 UISettings::values.show_compat = ui->show_compat->isChecked();
116 UISettings::values.show_size = ui->show_size->isChecked();
117 UISettings::values.show_types = ui->show_types->isChecked();
114 UISettings::values.game_icon_size = ui->game_icon_size_combobox->currentData().toUInt(); 118 UISettings::values.game_icon_size = ui->game_icon_size_combobox->currentData().toUInt();
115 UISettings::values.folder_icon_size = ui->folder_icon_size_combobox->currentData().toUInt(); 119 UISettings::values.folder_icon_size = ui->folder_icon_size_combobox->currentData().toUInt();
116 UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt(); 120 UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
@@ -132,6 +136,8 @@ void ConfigureUi::SetConfiguration() {
132 ui->language_combobox->findData(UISettings::values.language)); 136 ui->language_combobox->findData(UISettings::values.language));
133 ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue()); 137 ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue());
134 ui->show_compat->setChecked(UISettings::values.show_compat.GetValue()); 138 ui->show_compat->setChecked(UISettings::values.show_compat.GetValue());
139 ui->show_size->setChecked(UISettings::values.show_size.GetValue());
140 ui->show_types->setChecked(UISettings::values.show_types.GetValue());
135 ui->game_icon_size_combobox->setCurrentIndex( 141 ui->game_icon_size_combobox->setCurrentIndex(
136 ui->game_icon_size_combobox->findData(UISettings::values.game_icon_size.GetValue())); 142 ui->game_icon_size_combobox->findData(UISettings::values.game_icon_size.GetValue()));
137 ui->folder_icon_size_combobox->setCurrentIndex( 143 ui->folder_icon_size_combobox->setCurrentIndex(
diff --git a/src/yuzu/configuration/configure_ui.ui b/src/yuzu/configuration/configure_ui.ui
index f0b719ba3..10bb27312 100644
--- a/src/yuzu/configuration/configure_ui.ui
+++ b/src/yuzu/configuration/configure_ui.ui
@@ -7,7 +7,7 @@
7 <x>0</x> 7 <x>0</x>
8 <y>0</y> 8 <y>0</y>
9 <width>363</width> 9 <width>363</width>
10 <height>507</height> 10 <height>562</height>
11 </rect> 11 </rect>
12 </property> 12 </property>
13 <property name="windowTitle"> 13 <property name="windowTitle">
@@ -91,6 +91,20 @@
91 </widget> 91 </widget>
92 </item> 92 </item>
93 <item> 93 <item>
94 <widget class="QCheckBox" name="show_size">
95 <property name="text">
96 <string>Show Size Column</string>
97 </property>
98 </widget>
99 </item>
100 <item>
101 <widget class="QCheckBox" name="show_types">
102 <property name="text">
103 <string>Show File Types Column</string>
104 </property>
105 </widget>
106 </item>
107 <item>
94 <layout class="QHBoxLayout" name="game_icon_size_qhbox_layout_2"> 108 <layout class="QHBoxLayout" name="game_icon_size_qhbox_layout_2">
95 <item> 109 <item>
96 <widget class="QLabel" name="game_icon_size_label"> 110 <widget class="QLabel" name="game_icon_size_label">
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index d6adfca16..5c33c1b0f 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -788,6 +788,8 @@ void GameList::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) {
788 // Update the columns in case UISettings has changed 788 // Update the columns in case UISettings has changed
789 tree_view->setColumnHidden(COLUMN_ADD_ONS, !UISettings::values.show_add_ons); 789 tree_view->setColumnHidden(COLUMN_ADD_ONS, !UISettings::values.show_add_ons);
790 tree_view->setColumnHidden(COLUMN_COMPATIBILITY, !UISettings::values.show_compat); 790 tree_view->setColumnHidden(COLUMN_COMPATIBILITY, !UISettings::values.show_compat);
791 tree_view->setColumnHidden(COLUMN_FILE_TYPE, !UISettings::values.show_types);
792 tree_view->setColumnHidden(COLUMN_SIZE, !UISettings::values.show_size);
791 793
792 // Delete any rows that might already exist if we're repopulating 794 // Delete any rows that might already exist if we're repopulating
793 item_model->removeRows(0, item_model->rowCount()); 795 item_model->removeRows(0, item_model->rowCount());
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 4f5b2a99d..452038cd9 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -132,6 +132,10 @@ struct Values {
132 // Compatibility List 132 // Compatibility List
133 Settings::Setting<bool> show_compat{false, "show_compat"}; 133 Settings::Setting<bool> show_compat{false, "show_compat"};
134 134
135 // Size & File Types Column
136 Settings::Setting<bool> show_size{true, "show_size"};
137 Settings::Setting<bool> show_types{true, "show_types"};
138
135 bool configuration_applied; 139 bool configuration_applied;
136 bool reset_to_defaults; 140 bool reset_to_defaults;
137 Settings::Setting<bool> disable_web_applet{true, "disable_web_applet"}; 141 Settings::Setting<bool> disable_web_applet{true, "disable_web_applet"};