From 0300ae01d0f91b558c2fed7d85be37a8b64d1b96 Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 24 Nov 2025 08:46:15 +0000 Subject: [PATCH] remove from qt --- src/frontend_common/config.cpp | 26 ------- src/frontend_common/config.h | 6 -- src/qt_common/config/shared_translation.cpp | 2 +- src/yuzu/CMakeLists.txt | 3 - src/yuzu/configuration/configure_general.cpp | 4 - .../configuration/configure_linux_tab.cpp | 75 ------------------- src/yuzu/configuration/configure_linux_tab.h | 44 ----------- src/yuzu/configuration/configure_linux_tab.ui | 53 ------------- src/yuzu/configuration/configure_per_game.cpp | 2 - src/yuzu/configuration/configure_per_game.h | 2 - 10 files changed, 1 insertion(+), 216 deletions(-) delete mode 100644 src/yuzu/configuration/configure_linux_tab.cpp delete mode 100644 src/yuzu/configuration/configure_linux_tab.h delete mode 100644 src/yuzu/configuration/configure_linux_tab.ui diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index eec169aa14..94ec349651 100644 --- a/src/frontend_common/config.cpp +++ b/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)); diff --git a/src/frontend_common/config.h b/src/frontend_common/config.h index ff816443ad..8aaf71cc60 100644 --- a/src/frontend_common/config.h +++ b/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(); diff --git a/src/qt_common/config/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp index 36009d8590..c601d25d80 100644 --- a/src/qt_common/config/shared_translation.cpp +++ b/src/qt_common/config/shared_translation.cpp @@ -433,7 +433,7 @@ std::unique_ptr 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()); diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 8abeb90086..f3f0939705 100644 --- a/src/yuzu/CMakeLists.txt +++ b/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 diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 29168ed79e..b4015e7b97 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/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(); } diff --git a/src/yuzu/configuration/configure_linux_tab.cpp b/src/yuzu/configuration/configure_linux_tab.cpp deleted file mode 100644 index ab3d188162..0000000000 --- a/src/yuzu/configuration/configure_linux_tab.cpp +++ /dev/null @@ -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> group_, - const ConfigurationShared::Builder& builder, QWidget* parent) - : Tab(group_, parent), ui(std::make_unique()), 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 linux_hold{}; - - std::vector 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); -} diff --git a/src/yuzu/configuration/configure_linux_tab.h b/src/yuzu/configuration/configure_linux_tab.h deleted file mode 100644 index 2f402079c9..0000000000 --- a/src/yuzu/configuration/configure_linux_tab.h +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include - -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> 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; - - const Core::System& system; - - std::vector> apply_funcs{}; -}; diff --git a/src/yuzu/configuration/configure_linux_tab.ui b/src/yuzu/configuration/configure_linux_tab.ui deleted file mode 100644 index f8e07f5811..0000000000 --- a/src/yuzu/configuration/configure_linux_tab.ui +++ /dev/null @@ -1,53 +0,0 @@ - - - ConfigureLinuxTab - - - Linux - - - - - - Linux - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp index 08a7a2da1f..0571e43408 100644 --- a/src/yuzu/configuration/configure_per_game.cpp +++ b/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(system_, game_config.get(), this); - linux_tab = std::make_unique(system_, tab_group, *builder, this); system_tab = std::make_unique(system_, tab_group, *builder, this); network_tab = std::make_unique(system_, this); diff --git a/src/yuzu/configuration/configure_per_game.h b/src/yuzu/configuration/configure_per_game.h index 81a652262e..e4d18f29b9 100644 --- a/src/yuzu/configuration/configure_per_game.h +++ b/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 graphics_extensions_tab; std::unique_ptr graphics_tab; std::unique_ptr input_tab; - std::unique_ptr linux_tab; std::unique_ptr system_tab; std::unique_ptr network_tab; };