mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 07:21:14 +01:00
Qt: Remove GraphicsWidget class
The old tooltip description box used GraphicsWidget to provide shared code to the Graphics config panes for adding descriptions to their settings. The description box has been replaced by BalloonTips and serves no further purpose, so remove it and have the Graphics panes derive from QWidget instead.
This commit is contained in:
parent
d95a85212f
commit
5ca0430cb2
@ -77,7 +77,6 @@ add_executable(dolphin-emu
|
|||||||
Config/Graphics/EnhancementsWidget.h
|
Config/Graphics/EnhancementsWidget.h
|
||||||
Config/Graphics/GeneralWidget.cpp
|
Config/Graphics/GeneralWidget.cpp
|
||||||
Config/Graphics/GeneralWidget.h
|
Config/Graphics/GeneralWidget.h
|
||||||
Config/Graphics/GraphicsWidget.h
|
|
||||||
Config/Graphics/GraphicsWindow.cpp
|
Config/Graphics/GraphicsWindow.cpp
|
||||||
Config/Graphics/GraphicsWindow.h
|
Config/Graphics/GraphicsWindow.h
|
||||||
Config/Graphics/HacksWidget.cpp
|
Config/Graphics/HacksWidget.cpp
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
|
#include <QWidget>
|
||||||
|
|
||||||
class ConfigBool;
|
class ConfigBool;
|
||||||
class ConfigChoice;
|
class ConfigChoice;
|
||||||
@ -14,15 +14,15 @@ class QComboBox;
|
|||||||
class QSpinBox;
|
class QSpinBox;
|
||||||
class ToolTipCheckBox;
|
class ToolTipCheckBox;
|
||||||
|
|
||||||
class AdvancedWidget final : public GraphicsWidget
|
class AdvancedWidget final : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit AdvancedWidget(GraphicsWindow* parent);
|
explicit AdvancedWidget(GraphicsWindow* parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSettings() override;
|
void LoadSettings();
|
||||||
void SaveSettings() override;
|
void SaveSettings();
|
||||||
|
|
||||||
void CreateWidgets();
|
void CreateWidgets();
|
||||||
void ConnectWidgets();
|
void ConnectWidgets();
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
|
#include <QWidget>
|
||||||
|
|
||||||
class ConfigBool;
|
class ConfigBool;
|
||||||
class ConfigChoice;
|
class ConfigChoice;
|
||||||
@ -17,15 +17,15 @@ class QPushButton;
|
|||||||
class QSlider;
|
class QSlider;
|
||||||
class ToolTipComboBox;
|
class ToolTipComboBox;
|
||||||
|
|
||||||
class EnhancementsWidget final : public GraphicsWidget
|
class EnhancementsWidget final : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit EnhancementsWidget(GraphicsWindow* parent);
|
explicit EnhancementsWidget(GraphicsWindow* parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSettings() override;
|
void LoadSettings();
|
||||||
void SaveSettings() override;
|
void SaveSettings();
|
||||||
|
|
||||||
void CreateWidgets();
|
void CreateWidgets();
|
||||||
void ConnectWidgets();
|
void ConnectWidgets();
|
||||||
|
@ -4,7 +4,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
|
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
class ConfigBool;
|
class ConfigBool;
|
||||||
class ConfigChoice;
|
class ConfigChoice;
|
||||||
@ -16,7 +17,7 @@ class QRadioButton;
|
|||||||
class QGridLayout;
|
class QGridLayout;
|
||||||
class ToolTipComboBox;
|
class ToolTipComboBox;
|
||||||
|
|
||||||
class GeneralWidget final : public GraphicsWidget
|
class GeneralWidget final : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
@ -25,8 +26,8 @@ signals:
|
|||||||
void BackendChanged(const QString& backend);
|
void BackendChanged(const QString& backend);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSettings() override;
|
void LoadSettings();
|
||||||
void SaveSettings() override;
|
void SaveSettings();
|
||||||
|
|
||||||
void CreateWidgets();
|
void CreateWidgets();
|
||||||
void ConnectWidgets();
|
void ConnectWidgets();
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
// Copyright 2017 Dolphin Emulator Project
|
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <QWidget>
|
|
||||||
|
|
||||||
class GraphicsWidget : public QWidget
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
protected:
|
|
||||||
virtual void LoadSettings() = 0;
|
|
||||||
virtual void SaveSettings() = 0;
|
|
||||||
};
|
|
@ -3,22 +3,22 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "DolphinQt/Config/Graphics/GraphicsWidget.h"
|
#include <QWidget>
|
||||||
|
|
||||||
class ConfigBool;
|
class ConfigBool;
|
||||||
class GraphicsWindow;
|
class GraphicsWindow;
|
||||||
class QLabel;
|
class QLabel;
|
||||||
class ToolTipSlider;
|
class ToolTipSlider;
|
||||||
|
|
||||||
class HacksWidget final : public GraphicsWidget
|
class HacksWidget final : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit HacksWidget(GraphicsWindow* parent);
|
explicit HacksWidget(GraphicsWindow* parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSettings() override;
|
void LoadSettings();
|
||||||
void SaveSettings() override;
|
void SaveSettings();
|
||||||
|
|
||||||
void OnBackendChanged(const QString& backend_name);
|
void OnBackendChanged(const QString& backend_name);
|
||||||
|
|
||||||
|
@ -273,7 +273,6 @@
|
|||||||
<QtMoc Include="Config\Graphics\AdvancedWidget.h" />
|
<QtMoc Include="Config\Graphics\AdvancedWidget.h" />
|
||||||
<QtMoc Include="Config\Graphics\EnhancementsWidget.h" />
|
<QtMoc Include="Config\Graphics\EnhancementsWidget.h" />
|
||||||
<QtMoc Include="Config\Graphics\GeneralWidget.h" />
|
<QtMoc Include="Config\Graphics\GeneralWidget.h" />
|
||||||
<QtMoc Include="Config\Graphics\GraphicsWidget.h" />
|
|
||||||
<QtMoc Include="Config\Graphics\GraphicsWindow.h" />
|
<QtMoc Include="Config\Graphics\GraphicsWindow.h" />
|
||||||
<QtMoc Include="Config\Graphics\HacksWidget.h" />
|
<QtMoc Include="Config\Graphics\HacksWidget.h" />
|
||||||
<QtMoc Include="Config\Graphics\PostProcessingConfigWindow.h" />
|
<QtMoc Include="Config\Graphics\PostProcessingConfigWindow.h" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user