From 3336e618597fa0452001527077964bdf33a739f8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 22 Apr 2022 08:26:27 +0200 Subject: [PATCH] (Qt) Combine Qt header files --- Makefile.common | 13 +- ui/drivers/qt/coreinfodialog.h | 21 -- ui/drivers/qt/coreoptionsdialog.h | 42 --- ui/drivers/qt/filedropwidget.h | 28 -- ui/drivers/qt/playlistentrydialog.h | 45 ---- ui/drivers/qt/qt_dialogs.cpp | 11 +- ui/drivers/qt/qt_dialogs.h | 245 ++++++++++++++++++ ui/drivers/qt/qt_options.cpp | 2 +- ui/drivers/qt/qt_options.h | 2 +- ui/drivers/qt/qt_playlist.cpp | 2 +- ui/drivers/qt/qt_widgets.cpp | 5 +- .../qt/{settingswidgets.h => qt_widgets.h} | 23 ++ ui/drivers/qt/shaderparamsdialog.h | 96 ------- ui/drivers/qt/viewoptionsdialog.h | 82 ------ ui/drivers/ui_qt.cpp | 10 +- ui/drivers/ui_qt.h | 2 +- 16 files changed, 279 insertions(+), 350 deletions(-) delete mode 100644 ui/drivers/qt/coreinfodialog.h delete mode 100644 ui/drivers/qt/coreoptionsdialog.h delete mode 100644 ui/drivers/qt/filedropwidget.h delete mode 100644 ui/drivers/qt/playlistentrydialog.h create mode 100644 ui/drivers/qt/qt_dialogs.h rename ui/drivers/qt/{settingswidgets.h => qt_widgets.h} (96%) delete mode 100644 ui/drivers/qt/shaderparamsdialog.h delete mode 100644 ui/drivers/qt/viewoptionsdialog.h diff --git a/Makefile.common b/Makefile.common index 7b495ee01d..908d9b1688 100644 --- a/Makefile.common +++ b/Makefile.common @@ -536,17 +536,10 @@ ifeq ($(HAVE_QT), 1) MOC_HEADERS += ui/drivers/ui_qt.h \ ui/drivers/qt/ui_qt_load_core_window.h \ ui/drivers/qt/gridview.h \ - ui/drivers/qt/coreoptionsdialog.h \ - ui/drivers/qt/filedropwidget.h \ - ui/drivers/qt/coreinfodialog.h \ - ui/drivers/qt/playlistentrydialog.h \ - ui/drivers/qt/viewoptionsdialog.h + ui/drivers/qt/qt_dialogs.h \ + ui/drivers/qt/qt_widgets.h ifeq ($(HAVE_MENU), 1) - ifeq ($(HAVE_SHADERS_COMMON), 1) - MOC_HEADERS += ui/drivers/qt/shaderparamsdialog.h - endif - MOC_HEADERS += ui/drivers/qt/settingswidgets.h \ - ui/drivers/qt/qt_options.h + MOC_HEADERS += ui/drivers/qt/qt_options.h endif DEFINES += -DHAVE_MAIN diff --git a/ui/drivers/qt/coreinfodialog.h b/ui/drivers/qt/coreinfodialog.h deleted file mode 100644 index c0cb3f9f30..0000000000 --- a/ui/drivers/qt/coreinfodialog.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef COREINFODIALOG_H -#define COREINFODIALOG_H - -#include - -class QFormLayout; -class MainWindow; - -class CoreInfoDialog : public QDialog -{ - Q_OBJECT -public: - CoreInfoDialog(MainWindow *mainwindow, QWidget *parent = 0); -public slots: - void showCoreInfo(); -private: - QFormLayout *m_formLayout; - MainWindow *m_mainwindow; -}; - -#endif diff --git a/ui/drivers/qt/coreoptionsdialog.h b/ui/drivers/qt/coreoptionsdialog.h deleted file mode 100644 index d233f9db88..0000000000 --- a/ui/drivers/qt/coreoptionsdialog.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef COREOPTIONSDIALOG_H -#define COREOPTIONSDIALOG_H - -#include -#include - -class QCloseEvent; -class QResizeEvent; -class QVBoxLayout; -class QFormLayout; -class QLayout; -class QScrollArea; - -class CoreOptionsDialog : public QDialog -{ - Q_OBJECT -public: - CoreOptionsDialog(QWidget *parent = 0); - ~CoreOptionsDialog(); -signals: - void closed(); - void resized(QSize size); -public slots: - void reload(); -private slots: - void clearLayout(); - void buildLayout(); - void onSaveGameSpecificOptions(); - void onSaveFolderSpecificOptions(); - void onCoreOptionComboBoxCurrentIndexChanged(int index); - void onCoreOptionResetClicked(); - void onCoreOptionResetAllClicked(); -private: - QPointer m_layout; - QPointer m_scrollArea; -protected: - void closeEvent(QCloseEvent *event); - void resizeEvent(QResizeEvent *event); - void paintEvent(QPaintEvent *event); -}; - -#endif diff --git a/ui/drivers/qt/filedropwidget.h b/ui/drivers/qt/filedropwidget.h deleted file mode 100644 index 0c2d01a9bf..0000000000 --- a/ui/drivers/qt/filedropwidget.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef FILEDROPWIDGET_H -#define FILEDROPWIDGET_H - -#include - -class QDragEnterEvent; -class QDropEvent; -class QKeyEvent; -class QPaintEvent; - -class FileDropWidget : public QStackedWidget -{ - Q_OBJECT -public: - FileDropWidget(QWidget *parent = 0); -signals: - void filesDropped(QStringList files); - void enterPressed(); - void deletePressed(); -protected: - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void keyPressEvent(QKeyEvent *event); - void paintEvent(QPaintEvent *event); -}; - -#endif diff --git a/ui/drivers/qt/playlistentrydialog.h b/ui/drivers/qt/playlistentrydialog.h deleted file mode 100644 index 0dffa1268f..0000000000 --- a/ui/drivers/qt/playlistentrydialog.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef PLAYLISTENTRYDIALOG_H -#define PLAYLISTENTRYDIALOG_H - -#include - -class QSettings; -class QLineEdit; -class QComboBox; -class QCheckBox; -class MainWindow; - -class PlaylistEntryDialog : public QDialog -{ - Q_OBJECT -public: - PlaylistEntryDialog(MainWindow *mainwindow, QWidget *parent = 0); - const QHash getSelectedCore(); - const QString getSelectedDatabase(); - const QString getSelectedName(); - const QString getSelectedPath(); - const QStringList getSelectedExtensions(); - bool filterInArchive(); - bool nameFieldEnabled(); - void setEntryValues(const QHash &contentHash); -public slots: - bool showDialog(const QHash &hash = QHash()); - void hideDialog(); - void onAccepted(); - void onRejected(); -private slots: - void onPathClicked(); -private: - void loadPlaylistOptions(); - - MainWindow *m_mainwindow; - QSettings *m_settings; - QLineEdit *m_nameLineEdit; - QLineEdit *m_pathLineEdit; - QLineEdit *m_extensionsLineEdit; - QComboBox *m_coreComboBox; - QComboBox *m_databaseComboBox; - QCheckBox *m_extensionArchiveCheckBox; -}; - -#endif diff --git a/ui/drivers/qt/qt_dialogs.cpp b/ui/drivers/qt/qt_dialogs.cpp index 54f91f4efc..568a7b7ba9 100644 --- a/ui/drivers/qt/qt_dialogs.cpp +++ b/ui/drivers/qt/qt_dialogs.cpp @@ -29,10 +29,7 @@ #include #include -#include "coreoptionsdialog.h" -#include "viewoptionsdialog.h" -#include "coreinfodialog.h" -#include "playlistentrydialog.h" +#include "qt_dialogs.h" #include "../ui_qt.h" #ifndef CXX_BUILD @@ -69,12 +66,6 @@ extern "C" { } #endif -#if defined(HAVE_MENU) -#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) -#include "shaderparamsdialog.h" -#endif -#endif - #include "qt_options.h" #if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900) diff --git a/ui/drivers/qt/qt_dialogs.h b/ui/drivers/qt/qt_dialogs.h new file mode 100644 index 0000000000..cf2a818604 --- /dev/null +++ b/ui/drivers/qt/qt_dialogs.h @@ -0,0 +1,245 @@ +#ifndef COREINFODIALOG_H +#define COREINFODIALOG_H + +#include +#include + +#include + +#ifndef CXX_BUILD +extern "C" { +#endif + +#include "../../../gfx/video_shader_parse.h" + +#ifndef CXX_BUILD +} +#endif + +class QFormLayout; +class QCloseEvent; +class QResizeEvent; +class QVBoxLayout; +class QLayout; +class QScrollArea; +class MainWindow; +class QSettings; +class QLineEdit; +class QCheckBox; +class QComboBox; +class QPushButton; +class QColor; +class QLabel; +class QSpinBox; + +#ifdef HAVE_MENU +class QWidget; +class OptionsCategory; +class QListWidget; +class QStackedLayout; +#endif + +class CoreInfoDialog : public QDialog +{ + Q_OBJECT +public: + CoreInfoDialog(MainWindow *mainwindow, QWidget *parent = 0); +public slots: + void showCoreInfo(); +private: + QFormLayout *m_formLayout; + MainWindow *m_mainwindow; +}; + +class CoreOptionsDialog : public QDialog +{ + Q_OBJECT +public: + CoreOptionsDialog(QWidget *parent = 0); + ~CoreOptionsDialog(); +signals: + void closed(); + void resized(QSize size); +public slots: + void reload(); +private slots: + void clearLayout(); + void buildLayout(); + void onSaveGameSpecificOptions(); + void onSaveFolderSpecificOptions(); + void onCoreOptionComboBoxCurrentIndexChanged(int index); + void onCoreOptionResetClicked(); + void onCoreOptionResetAllClicked(); +private: + QPointer m_layout; + QPointer m_scrollArea; +protected: + void closeEvent(QCloseEvent *event); + void resizeEvent(QResizeEvent *event); + void paintEvent(QPaintEvent *event); +}; + +class ShaderPass +{ +public: + ShaderPass(struct video_shader_pass *passToCopy = NULL); + ~ShaderPass(); + ShaderPass& operator=(const ShaderPass &other); + struct video_shader_pass *pass; +}; + +class ShaderParamsDialog : public QDialog +{ + Q_OBJECT +public: + ShaderParamsDialog(QWidget *parent = 0); + ~ShaderParamsDialog(); +signals: + void closed(); + void resized(QSize size); +public slots: + void reload(); +private slots: + void onShaderParamCheckBoxClicked(); + void onShaderParamSliderValueChanged(int value); + void onShaderParamSpinBoxValueChanged(int value); + void onShaderParamDoubleSpinBoxValueChanged(double value); + void onFilterComboBoxIndexChanged(int index); + void onGroupBoxContextMenuRequested(const QPoint &pos); + void onParameterLabelContextMenuRequested(const QPoint &pos); + void onScaleComboBoxIndexChanged(int index); + void onShaderPassMoveDownClicked(); + void onShaderPassMoveUpClicked(); + void onShaderResetPass(int pass); + void onShaderResetAllPasses(); + void onShaderRemovePass(int pass); + void onShaderRemoveAllPassesClicked(); + void onShaderRemovePassClicked(); + void onShaderResetParameter(QString parameter); + void onShaderLoadPresetClicked(); + void onShaderAddPassClicked(); + void onShaderSavePresetAsClicked(); + void onShaderSaveCorePresetClicked(); + void onShaderSaveParentPresetClicked(); + void onShaderSaveGamePresetClicked(); + void onShaderSaveGlobalPresetClicked(); + void onShaderRemoveCorePresetClicked(); + void onShaderRemoveParentPresetClicked(); + void onShaderRemoveGamePresetClicked(); + void onShaderRemoveGlobalPresetClicked(); + void onShaderApplyClicked(); + void updateRemovePresetButtonsState(); + void clearLayout(); + void buildLayout(); +private: + QString getFilterLabel(unsigned filter); + void addShaderParam(struct video_shader_parameter *param, QFormLayout *form); + void getShaders(struct video_shader **menu_shader, struct video_shader **video_shader); + void operateShaderPreset(bool save, const char *path, unsigned action_type); + + QPointer m_layout; + QPointer m_scrollArea; + QAction *removeGlobalPresetAction; + QAction *removeCorePresetAction; + QAction *removeParentPresetAction; + QAction *removeGamePresetAction; +protected: + void closeEvent(QCloseEvent *event); + void resizeEvent(QResizeEvent *event); + void paintEvent(QPaintEvent *event); +}; + +class ViewOptionsWidget : public QWidget +{ + Q_OBJECT +public: + ViewOptionsWidget(MainWindow *mainwindow, QWidget *parent = 0); +public slots: + void onAccepted(); + void onRejected(); + void loadViewOptions(); + void saveViewOptions(); +private slots: + void onThemeComboBoxIndexChanged(int index); + void onHighlightColorChoose(); +private: + void showOrHideHighlightColor(); + + MainWindow *m_mainwindow; + QSettings *m_settings; + QCheckBox *m_saveGeometryCheckBox; + QCheckBox *m_saveDockPositionsCheckBox; + QCheckBox *m_saveLastTabCheckBox; + QCheckBox *m_showHiddenFilesCheckBox; + QComboBox *m_themeComboBox; + QSpinBox *m_thumbnailCacheSpinBox; + QSpinBox *m_thumbnailDropSizeSpinBox; + QComboBox *m_startupPlaylistComboBox; + QPushButton *m_highlightColorPushButton; + QColor m_highlightColor; + QLabel *m_highlightColorLabel; + QString m_customThemePath; + QCheckBox *m_suggestLoadedCoreFirstCheckBox; + QSpinBox *m_allPlaylistsListMaxCountSpinBox; + QSpinBox *m_allPlaylistsGridMaxCountSpinBox; +}; + +class ViewOptionsDialog : public QDialog +{ + Q_OBJECT +public: + ViewOptionsDialog(MainWindow *window, QWidget *parent = 0); +#ifdef HAVE_MENU + void repaintIcons(); +#endif +public slots: + void showDialog(); + void hideDialog(); +private slots: + void onRejected(); +private: +#ifdef HAVE_MENU + void addCategory(QWidget *widget, QString name, QString icon); + void addCategory(OptionsCategory *category); + QVector m_categoryList; + QListWidget *m_optionsList; + QStackedLayout *m_optionsStack; +#else + ViewOptionsWidget *m_viewOptionsWidget; +#endif +}; + +class PlaylistEntryDialog : public QDialog +{ + Q_OBJECT +public: + PlaylistEntryDialog(MainWindow *mainwindow, QWidget *parent = 0); + const QHash getSelectedCore(); + const QString getSelectedDatabase(); + const QString getSelectedName(); + const QString getSelectedPath(); + const QStringList getSelectedExtensions(); + bool filterInArchive(); + bool nameFieldEnabled(); + void setEntryValues(const QHash &contentHash); +public slots: + bool showDialog(const QHash &hash = QHash()); + void hideDialog(); + void onAccepted(); + void onRejected(); +private slots: + void onPathClicked(); +private: + void loadPlaylistOptions(); + + MainWindow *m_mainwindow; + QSettings *m_settings; + QLineEdit *m_nameLineEdit; + QLineEdit *m_pathLineEdit; + QLineEdit *m_extensionsLineEdit; + QComboBox *m_coreComboBox; + QComboBox *m_databaseComboBox; + QCheckBox *m_extensionArchiveCheckBox; +}; + +#endif diff --git a/ui/drivers/qt/qt_options.cpp b/ui/drivers/qt/qt_options.cpp index f4b35d5f34..d956ff319c 100644 --- a/ui/drivers/qt/qt_options.cpp +++ b/ui/drivers/qt/qt_options.cpp @@ -4,7 +4,7 @@ #include #include "qt_options.h" -#include "viewoptionsdialog.h" +#include "qt_dialogs.h" #ifndef CXX_BUILD extern "C" { diff --git a/ui/drivers/qt/qt_options.h b/ui/drivers/qt/qt_options.h index 3035626977..e607974c27 100644 --- a/ui/drivers/qt/qt_options.h +++ b/ui/drivers/qt/qt_options.h @@ -6,7 +6,7 @@ #include #include -#include "settingswidgets.h" +#include "qt_widgets.h" #include "../../../configuration.h" diff --git a/ui/drivers/qt/qt_playlist.cpp b/ui/drivers/qt/qt_playlist.cpp index 06723743ae..c83f822ce0 100644 --- a/ui/drivers/qt/qt_playlist.cpp +++ b/ui/drivers/qt/qt_playlist.cpp @@ -13,7 +13,7 @@ #include #include "../ui_qt.h" -#include "playlistentrydialog.h" +#include "qt_dialogs.h" #ifndef CXX_BUILD extern "C" { diff --git a/ui/drivers/qt/qt_widgets.cpp b/ui/drivers/qt/qt_widgets.cpp index fa360777b3..7a3a78dd06 100644 --- a/ui/drivers/qt/qt_widgets.cpp +++ b/ui/drivers/qt/qt_widgets.cpp @@ -18,9 +18,8 @@ #include #include -#include "filedropwidget.h" -#include "settingswidgets.h" -#include "playlistentrydialog.h" +#include "qt_widgets.h" +#include "qt_dialogs.h" #include "../ui_qt.h" #ifndef CXX_BUILD diff --git a/ui/drivers/qt/settingswidgets.h b/ui/drivers/qt/qt_widgets.h similarity index 96% rename from ui/drivers/qt/settingswidgets.h rename to ui/drivers/qt/qt_widgets.h index f7b1728195..5aee0781a5 100644 --- a/ui/drivers/qt/settingswidgets.h +++ b/ui/drivers/qt/qt_widgets.h @@ -14,6 +14,7 @@ #include #include #include +#include #ifndef CXX_BUILD extern "C" { @@ -28,6 +29,11 @@ extern "C" { } #endif +class QDragEnterEvent; +class QDropEvent; +class QKeyEvent; +class QPaintEvent; + class FormLayout : public QFormLayout { public: @@ -547,4 +553,21 @@ protected: QColor color(); }; +class FileDropWidget : public QStackedWidget +{ + Q_OBJECT +public: + FileDropWidget(QWidget *parent = 0); +signals: + void filesDropped(QStringList files); + void enterPressed(); + void deletePressed(); +protected: + void dragEnterEvent(QDragEnterEvent *event); + void dragMoveEvent(QDragMoveEvent *event); + void dropEvent(QDropEvent *event); + void keyPressEvent(QKeyEvent *event); + void paintEvent(QPaintEvent *event); +}; + #endif diff --git a/ui/drivers/qt/shaderparamsdialog.h b/ui/drivers/qt/shaderparamsdialog.h deleted file mode 100644 index 02542cf2f0..0000000000 --- a/ui/drivers/qt/shaderparamsdialog.h +++ /dev/null @@ -1,96 +0,0 @@ -#ifndef SHADERPARAMSDIALOG_H -#define SHADERPARAMSDIALOG_H - -#include -#include - -#include - -#ifndef CXX_BUILD -extern "C" { -#endif - -#include "../../../gfx/video_shader_parse.h" - -#ifndef CXX_BUILD -} -#endif - -class QCloseEvent; -class QResizeEvent; -class QVBoxLayout; -class QFormLayout; -class QLayout; -class QScrollArea; - -class ShaderPass -{ -public: - ShaderPass(struct video_shader_pass *passToCopy = NULL); - ~ShaderPass(); - ShaderPass& operator=(const ShaderPass &other); - struct video_shader_pass *pass; -}; - -class ShaderParamsDialog : public QDialog -{ - Q_OBJECT -public: - ShaderParamsDialog(QWidget *parent = 0); - ~ShaderParamsDialog(); -signals: - void closed(); - void resized(QSize size); -public slots: - void reload(); -private slots: - void onShaderParamCheckBoxClicked(); - void onShaderParamSliderValueChanged(int value); - void onShaderParamSpinBoxValueChanged(int value); - void onShaderParamDoubleSpinBoxValueChanged(double value); - void onFilterComboBoxIndexChanged(int index); - void onGroupBoxContextMenuRequested(const QPoint &pos); - void onParameterLabelContextMenuRequested(const QPoint &pos); - void onScaleComboBoxIndexChanged(int index); - void onShaderPassMoveDownClicked(); - void onShaderPassMoveUpClicked(); - void onShaderResetPass(int pass); - void onShaderResetAllPasses(); - void onShaderRemovePass(int pass); - void onShaderRemoveAllPassesClicked(); - void onShaderRemovePassClicked(); - void onShaderResetParameter(QString parameter); - void onShaderLoadPresetClicked(); - void onShaderAddPassClicked(); - void onShaderSavePresetAsClicked(); - void onShaderSaveCorePresetClicked(); - void onShaderSaveParentPresetClicked(); - void onShaderSaveGamePresetClicked(); - void onShaderSaveGlobalPresetClicked(); - void onShaderRemoveCorePresetClicked(); - void onShaderRemoveParentPresetClicked(); - void onShaderRemoveGamePresetClicked(); - void onShaderRemoveGlobalPresetClicked(); - void onShaderApplyClicked(); - void updateRemovePresetButtonsState(); - void clearLayout(); - void buildLayout(); -private: - QString getFilterLabel(unsigned filter); - void addShaderParam(struct video_shader_parameter *param, QFormLayout *form); - void getShaders(struct video_shader **menu_shader, struct video_shader **video_shader); - void operateShaderPreset(bool save, const char *path, unsigned action_type); - - QPointer m_layout; - QPointer m_scrollArea; - QAction *removeGlobalPresetAction; - QAction *removeCorePresetAction; - QAction *removeParentPresetAction; - QAction *removeGamePresetAction; -protected: - void closeEvent(QCloseEvent *event); - void resizeEvent(QResizeEvent *event); - void paintEvent(QPaintEvent *event); -}; - -#endif diff --git a/ui/drivers/qt/viewoptionsdialog.h b/ui/drivers/qt/viewoptionsdialog.h deleted file mode 100644 index ab2d358a41..0000000000 --- a/ui/drivers/qt/viewoptionsdialog.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef VIEWOPTIONSDIALOG_H -#define VIEWOPTIONSDIALOG_H - -#include - -class MainWindow; -class QSettings; -class QCheckBox; -class QComboBox; -class QPushButton; -class QColor; -class QLabel; -class QSpinBox; - -#ifdef HAVE_MENU -class QWidget; -class OptionsCategory; -class QListWidget; -class QStackedLayout; -#endif - -class ViewOptionsWidget : public QWidget -{ - Q_OBJECT -public: - ViewOptionsWidget(MainWindow *mainwindow, QWidget *parent = 0); -public slots: - void onAccepted(); - void onRejected(); - void loadViewOptions(); - void saveViewOptions(); -private slots: - void onThemeComboBoxIndexChanged(int index); - void onHighlightColorChoose(); -private: - void showOrHideHighlightColor(); - - MainWindow *m_mainwindow; - QSettings *m_settings; - QCheckBox *m_saveGeometryCheckBox; - QCheckBox *m_saveDockPositionsCheckBox; - QCheckBox *m_saveLastTabCheckBox; - QCheckBox *m_showHiddenFilesCheckBox; - QComboBox *m_themeComboBox; - QSpinBox *m_thumbnailCacheSpinBox; - QSpinBox *m_thumbnailDropSizeSpinBox; - QComboBox *m_startupPlaylistComboBox; - QPushButton *m_highlightColorPushButton; - QColor m_highlightColor; - QLabel *m_highlightColorLabel; - QString m_customThemePath; - QCheckBox *m_suggestLoadedCoreFirstCheckBox; - QSpinBox *m_allPlaylistsListMaxCountSpinBox; - QSpinBox *m_allPlaylistsGridMaxCountSpinBox; -}; - -class ViewOptionsDialog : public QDialog -{ - Q_OBJECT -public: - ViewOptionsDialog(MainWindow *window, QWidget *parent = 0); -#ifdef HAVE_MENU - void repaintIcons(); -#endif -public slots: - void showDialog(); - void hideDialog(); -private slots: - void onRejected(); -private: -#ifdef HAVE_MENU - void addCategory(QWidget *widget, QString name, QString icon); - void addCategory(OptionsCategory *category); - QVector m_categoryList; - QListWidget *m_optionsList; - QStackedLayout *m_optionsStack; -#else - ViewOptionsWidget *m_viewOptionsWidget; -#endif -}; - -#endif diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index e36cb20805..40bf8e4096 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -49,15 +49,7 @@ #include "ui_qt.h" #include "qt/gridview.h" #include "qt/ui_qt_load_core_window.h" -#include "qt/coreinfodialog.h" -#include "qt/playlistentrydialog.h" -#if defined(HAVE_MENU) -#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) -#include "qt/shaderparamsdialog.h" -#endif -#endif -#include "qt/coreoptionsdialog.h" -#include "qt/viewoptionsdialog.h" +#include "qt/qt_dialogs.h" #ifndef CXX_BUILD extern "C" { diff --git a/ui/drivers/ui_qt.h b/ui/drivers/ui_qt.h index 1a9edf08f4..3763dd4a98 100644 --- a/ui/drivers/ui_qt.h +++ b/ui/drivers/ui_qt.h @@ -43,7 +43,7 @@ #include #include -#include "qt/filedropwidget.h" +#include "qt/qt_widgets.h" #ifndef CXX_BUILD extern "C" {