fixed conflicts

fixed failing "verify format" and conflicts

src/yuzu/configuration/config.cpp

@@ -819,6 +819,7 @@ void Config::ReadUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
     ReadBasicSetting(UISettings::values.show_add_ons);
+    ReadBasicSetting(UISettings::values.show_compat);
     ReadBasicSetting(UISettings::values.show_size);
     ReadBasicSetting(UISettings::values.show_types);
     ReadBasicSetting(UISettings::values.game_icon_size);
@@ -1416,6 +1417,7 @@ void Config::SaveUIGamelistValues() {
     qt_config->beginGroup(QStringLiteral("UIGameList"));
 
     WriteBasicSetting(UISettings::values.show_add_ons);
+    WriteBasicSetting(UISettings::values.show_compat);
     WriteBasicSetting(UISettings::values.show_size);
     WriteBasicSetting(UISettings::values.show_types);
     WriteBasicSetting(UISettings::values.game_icon_size);

src/yuzu/configuration/configure_ui.cpp

@@ -72,6 +72,7 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
 
     // Force game list reload if any of the relevant settings are changed.
     connect(ui->show_add_ons, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
+    connect(ui->show_compat, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->show_size, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->show_types, &QCheckBox::stateChanged, this, &ConfigureUi::RequestGameListUpdate);
     connect(ui->game_icon_size_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
@@ -111,6 +112,7 @@ 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_compat = ui->show_compat->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();
@@ -133,6 +135,7 @@ 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_compat->setChecked(UISettings::values.show_compat.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(

src/yuzu/configuration/configure_ui.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>363</width>
-    <height>507</height>
+    <height>562</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -76,6 +76,13 @@
      <layout class="QHBoxLayout" name="GameListHorizontalLayout">
       <item>
        <layout class="QVBoxLayout" name="GeneralVerticalLayout">
+        <item>
+         <widget class="QCheckBox" name="show_compat">
+          <property name="text">
+           <string>Show Compatibility List</string>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QCheckBox" name="show_add_ons">
           <property name="text">

src/yuzu/game_list.cpp

@@ -786,6 +786,7 @@ 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_COMPATIBILITY, !UISettings::values.show_compat);
     tree_view->setColumnHidden(COLUMN_FILE_TYPE, !UISettings::values.show_types);
     tree_view->setColumnHidden(COLUMN_SIZE, !UISettings::values.show_size);
 

src/yuzu/uisettings.h

@@ -129,7 +129,10 @@ struct Values {
     Settings::Setting<bool> favorites_expanded{true, "favorites_expanded"};
     QVector<u64> favorited_ids;
 
-    //Size & File Types Column
+    // Compatibility List
+    Settings::Setting<bool> show_compat{false, "show_compat"};
+
+    // Size & File Types Column
     Settings::Setting<bool> show_size{true, "show_size"};
     Settings::Setting<bool> show_types{true, "show_types"};