From feb5d172715d0eb98a80ef57de547f713f4de5f0 Mon Sep 17 00:00:00 2001
From: raym55 <100526773+piplup55@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:58:32 +0100
Subject: [PATCH] hiddey

---
 src/yuzu/configuration/config.cpp       |  4 ++++
 src/yuzu/configuration/configure_ui.cpp |  6 ++++++
 src/yuzu/configuration/configure_ui.ui  | 14 ++++++++++++++
 src/yuzu/game_list.cpp                  |  2 ++
 src/yuzu/uisettings.h                   |  4 ++++
 5 files changed, 30 insertions(+)

diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 195074bf25..c4c8d38c5f 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -820,6 +820,8 @@ void Config::ReadUIGamelistValues() {
 
     ReadBasicSetting(UISettings::values.show_add_ons);
     ReadBasicSetting(UISettings::values.game_icon_size);
+    ReadBasicSetting(UISettings::values.show_size);
+    ReadBasicSetting(UISettings::values.show_types);
     ReadBasicSetting(UISettings::values.folder_icon_size);
     ReadBasicSetting(UISettings::values.row_1_text_id);
     ReadBasicSetting(UISettings::values.row_2_text_id);
@@ -1414,6 +1416,8 @@ void Config::SaveUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
     WriteBasicSetting(UISettings::values.show_add_ons);
+    WriteBasicSetting(UISettings::values.show_size);
+    WriteBasicSetting(UISettings::values.show_types);
     WriteBasicSetting(UISettings::values.game_icon_size);
     WriteBasicSetting(UISettings::values.folder_icon_size);
     WriteBasicSetting(UISettings::values.row_1_text_id);
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp
index 48f71b53c6..5fce63a078 100644
--- a/src/yuzu/configuration/configure_ui.cpp
+++ b/src/yuzu/configuration/configure_ui.cpp
@@ -74,6 +74,8 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
     connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &ConfigureUi::RequestGameListUpdate);
+    connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
+    connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->folder_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
             this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->row_1_text_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -109,6 +111,8 @@ void ConfigureUi::ApplyConfiguration() {
     UISettings::values.theme =
         ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString();
     UISettings::values.show_add_ons = ui->show_add_ons->isChecked();
+    UISettings::values.show_size = ui->show_size->isChecked();
+    UISettings::values.show_types = ui->show_types->isChecked();
     UISettings::values.game_icon_size = ui->game_icon_size_combobox->currentData().toUInt();
     UISettings::values.folder_icon_size = ui->folder_icon_size_combobox->currentData().toUInt();
     UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
@@ -129,6 +133,8 @@ void ConfigureUi::SetConfiguration() {
     ui->language_combobox->setCurrentIndex(
         ui->language_combobox->findData(UISettings::values.language));
     ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue());
+    ui->show_size->setChecked(UISettings::values.show_size.GetValue());
+    ui->show_types->setChecked(UISettings::values.show_types.GetValue());
     ui->game_icon_size_combobox->setCurrentIndex(
         ui->game_icon_size_combobox->findData(UISettings::values.game_icon_size.GetValue()));
     ui->folder_icon_size_combobox->setCurrentIndex(
diff --git a/src/yuzu/configuration/configure_ui.ui b/src/yuzu/configuration/configure_ui.ui
index a50df7f6f8..507ac0b7c6 100644
--- a/src/yuzu/configuration/configure_ui.ui
+++ b/src/yuzu/configuration/configure_ui.ui
@@ -83,6 +83,20 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QCheckBox" name="show_size">
+          <property name="text">
+           <string>Show Size Column</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="show_types">
+          <property name="text">
+           <string>Show File Types Column</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <layout class="QHBoxLayout" name="game_icon_size_qhbox_layout_2">
           <item>
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index b127badc25..fa92b4522c 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -786,6 +786,8 @@ void GameList::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) {
 
     // Update the columns in case UISettings has changed
     tree_view->setColumnHidden(COLUMN_ADD_ONS, !UISettings::values.show_add_ons);
+    tree_view->setColumnHidden(COLUMN_FILE_TYPE, !UISettings::values.show_types);
+    tree_view->setColumnHidden(COLUMN_SIZE, !UISettings::values.show_size);
 
     // Delete any rows that might already exist if we're repopulating
     item_model->removeRows(0, item_model->rowCount());
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index 753797efc4..2519c610bd 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -129,6 +129,10 @@ struct Values {
     Settings::Setting<bool> favorites_expanded{true, "favorites_expanded"};
     QVector<u64> favorited_ids;
 
+    //Size & File Types Column
+    Settings::Setting<bool> show_size{true, "show_size"};
+    Settings::Setting<bool> show_types{true, "show_types"};
+
     bool configuration_applied;
     bool reset_to_defaults;
     Settings::Setting<bool> disable_web_applet{true, "disable_web_applet"};