remove from qt

src/frontend_common/config.cpp

@@ -308,16 +308,6 @@ void Config::ReadDebuggingValues() {
     EndGroup();
 }
 
-#ifdef __unix__
-void Config::ReadLinuxValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Linux));
-
-    ReadCategory(Settings::Category::Linux);
-
-    EndGroup();
-}
-#endif
-
 void Config::ReadServiceValues() {
     BeginGroup(Settings::TranslateCategory(Settings::Category::Services));
 
@@ -434,9 +424,6 @@ void Config::ReadValues() {
     ReadControlValues();
     ReadCoreValues();
     ReadCpuValues();
-#ifdef __unix__
-    ReadLinuxValues();
-#endif
     ReadRendererValues();
     ReadAudioValues();
     ReadSystemValues();
@@ -537,9 +524,6 @@ void Config::SaveValues() {
     SaveControlValues();
     SaveCoreValues();
     SaveCpuValues();
-#ifdef __unix__
-    SaveLinuxValues();
-#endif
     SaveRendererValues();
     SaveAudioValues();
     SaveSystemValues();
@@ -616,16 +600,6 @@ void Config::SaveDebuggingValues() {
     EndGroup();
 }
 
-#ifdef __unix__
-void Config::SaveLinuxValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Linux));
-
-    WriteCategory(Settings::Category::Linux);
-
-    EndGroup();
-}
-#endif
-
 void Config::SaveNetworkValues() {
     BeginGroup(Settings::TranslateCategory(Settings::Category::Services));
 

src/frontend_common/config.h

@@ -84,9 +84,6 @@ protected:
     void ReadCoreValues();
     void ReadDataStorageValues();
     void ReadDebuggingValues();
-#ifdef __unix__
-    void ReadLinuxValues();
-#endif
     void ReadServiceValues();
     void ReadDisabledAddOnValues();
     void ReadMiscellaneousValues();
@@ -119,9 +116,6 @@ protected:
     void SaveCoreValues();
     void SaveDataStorageValues();
     void SaveDebuggingValues();
-#ifdef __unix__
-    void SaveLinuxValues();
-#endif
     void SaveNetworkValues();
     void SaveDisabledAddOnValues();
     void SaveMiscellaneousValues();

src/qt_common/config/shared_translation.cpp

@@ -433,7 +433,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent)
            tr("Whether or not to check for updates upon startup."));
 
     // Linux
-    INSERT(UISettings, enable_gamemode, tr("Enable Gamemode"), QString());
+    INSERT(Settings, enable_gamemode, tr("Enable Gamemode"), QString());
 #ifdef __unix__
     INSERT(Settings, gui_force_x11, tr("Force X11 as Graphics Backend"), QString());
     INSERT(Settings, gui_hide_backend_warning, QString(), QString());

src/yuzu/CMakeLists.txt

@@ -104,9 +104,6 @@ add_executable(yuzu
     configuration/configure_input_profile_dialog.cpp
     configuration/configure_input_profile_dialog.h
     configuration/configure_input_profile_dialog.ui
-    configuration/configure_linux_tab.cpp
-    configuration/configure_linux_tab.h
-    configuration/configure_linux_tab.ui
     configuration/configure_mouse_panning.cpp
     configuration/configure_mouse_panning.h
     configuration/configure_mouse_panning.ui

src/yuzu/configuration/configure_general.cpp

@@ -54,7 +54,6 @@ void ConfigureGeneral::Setup(const ConfigurationShared::Builder& builder) {
     };
 
     push(UISettings::values.linkage.by_category[Settings::Category::UiGeneral]);
-    push(Settings::values.linkage.by_category[Settings::Category::Linux]);
 
     // Only show Linux group on Unix
 #ifndef __unix__
@@ -76,9 +75,6 @@ void ConfigureGeneral::Setup(const ConfigurationShared::Builder& builder) {
         case Settings::Category::UiGeneral:
             general_hold.emplace(setting->Id(), widget);
             break;
-        case Settings::Category::Linux:
-            linux_hold.emplace(setting->Id(), widget);
-            break;
         default:
             widget->deleteLater();
         }

src/yuzu/configuration/configure_linux_tab.cpp

@@ -1,75 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/settings.h"
-#include "core/core.h"
-#include "ui_configure_linux_tab.h"
-#include "yuzu/configuration/configuration_shared.h"
-#include "yuzu/configuration/configure_linux_tab.h"
-#include "yuzu/configuration/shared_widget.h"
-
-ConfigureLinuxTab::ConfigureLinuxTab(const Core::System& system_,
-                                     std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
-                                     const ConfigurationShared::Builder& builder, QWidget* parent)
-    : Tab(group_, parent), ui(std::make_unique<Ui::ConfigureLinuxTab>()), system{system_} {
-    ui->setupUi(this);
-
-    Setup(builder);
-
-    SetConfiguration();
-}
-
-ConfigureLinuxTab::~ConfigureLinuxTab() = default;
-
-void ConfigureLinuxTab::SetConfiguration() {}
-void ConfigureLinuxTab::Setup(const ConfigurationShared::Builder& builder) {
-    QLayout& linux_layout = *ui->linux_widget->layout();
-
-    std::map<u32, QWidget*> linux_hold{};
-
-    std::vector<Settings::BasicSetting*> settings;
-    const auto push = [&](Settings::Category category) {
-        for (const auto setting : Settings::values.linkage.by_category[category]) {
-            settings.push_back(setting);
-        }
-    };
-
-    push(Settings::Category::Linux);
-
-    for (auto* setting : settings) {
-        auto* widget = builder.BuildWidget(setting, apply_funcs);
-
-        if (widget == nullptr) {
-            continue;
-        }
-        if (!widget->Valid()) {
-            widget->deleteLater();
-            continue;
-        }
-
-        linux_hold.insert({setting->Id(), widget});
-    }
-
-    for (const auto& [id, widget] : linux_hold) {
-        linux_layout.addWidget(widget);
-    }
-}
-
-void ConfigureLinuxTab::ApplyConfiguration() {
-    const bool is_powered_on = system.IsPoweredOn();
-    for (const auto& apply_func : apply_funcs) {
-        apply_func(is_powered_on);
-    }
-}
-
-void ConfigureLinuxTab::changeEvent(QEvent* event) {
-    if (event->type() == QEvent::LanguageChange) {
-        RetranslateUI();
-    }
-
-    QWidget::changeEvent(event);
-}
-
-void ConfigureLinuxTab::RetranslateUI() {
-    ui->retranslateUi(this);
-}

src/yuzu/configuration/configure_linux_tab.h

@@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QWidget>
-
-namespace Core {
-class System;
-}
-
-namespace Ui {
-class ConfigureLinuxTab;
-}
-
-namespace ConfigurationShared {
-class Builder;
-}
-
-class ConfigureLinuxTab : public ConfigurationShared::Tab {
-    Q_OBJECT
-
-public:
-    explicit ConfigureLinuxTab(const Core::System& system_,
-                               std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
-                               const ConfigurationShared::Builder& builder,
-                               QWidget* parent = nullptr);
-    ~ConfigureLinuxTab() override;
-
-    void ApplyConfiguration() override;
-    void SetConfiguration() override;
-
-private:
-    void changeEvent(QEvent* event) override;
-    void RetranslateUI();
-
-    void Setup(const ConfigurationShared::Builder& builder);
-
-    std::unique_ptr<Ui::ConfigureLinuxTab> ui;
-
-    const Core::System& system;
-
-    std::vector<std::function<void(bool)>> apply_funcs{};
-};

src/yuzu/configuration/configure_linux_tab.ui

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigureLinuxTab</class>
- <widget class="QWidget" name="ConfigureLinuxTab">
-  <property name="accessibleName">
-   <string>Linux</string>
-  </property>
-  <layout class="QVBoxLayout">
-   <item>
-    <widget class="QGroupBox" name="LinuxGroupBox">
-     <property name="title">
-      <string>Linux</string>
-     </property>
-     <layout class="QVBoxLayout" name="LinuxVerticalLayout_1">
-      <item>
-       <widget class="QWidget" name="linux_widget" native="true">
-        <layout class="QVBoxLayout" name="LinuxVerticalLayout_2">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/yuzu/configuration/configure_per_game.cpp

@@ -37,7 +37,6 @@
 #include "yuzu/configuration/configure_graphics_advanced.h"
 #include "yuzu/configuration/configure_graphics_extensions.h"
 #include "yuzu/configuration/configure_input_per_game.h"
-#include "yuzu/configuration/configure_linux_tab.h"
 #include "yuzu/configuration/configure_per_game.h"
 #include "yuzu/configuration/configure_per_game_addons.h"
 #include "yuzu/configuration/configure_system.h"
@@ -68,7 +67,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
         system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
         [](Settings::AspectRatio, Settings::ResolutionSetup) {}, tab_group, *builder, this);
     input_tab = std::make_unique<ConfigureInputPerGame>(system_, game_config.get(), this);
-    linux_tab = std::make_unique<ConfigureLinuxTab>(system_, tab_group, *builder, this);
     system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, *builder, this);
     network_tab = std::make_unique<ConfigureNetwork>(system_, this);
 

src/yuzu/configuration/configure_per_game.h

@@ -36,7 +36,6 @@ class ConfigureGraphics;
 class ConfigureGraphicsAdvanced;
 class ConfigureGraphicsExtensions;
 class ConfigureInputPerGame;
-class ConfigureLinuxTab;
 class ConfigureSystem;
 class ConfigureNetwork;
 
@@ -92,7 +91,6 @@ private:
     std::unique_ptr<ConfigureGraphicsExtensions> graphics_extensions_tab;
     std::unique_ptr<ConfigureGraphics> graphics_tab;
     std::unique_ptr<ConfigureInputPerGame> input_tab;
-    std::unique_ptr<ConfigureLinuxTab> linux_tab;
     std::unique_ptr<ConfigureSystem> system_tab;
     std::unique_ptr<ConfigureNetwork> network_tab;
 };