gaming/RetroArch
gaming/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-07-03 00:38:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix --disable-menu

Browse Source
This commit is contained in:
twinaphex 2021-03-24 01:24:49 +01:00
parent 8f79e14d0a
commit 95f5df358a
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -504,10 +504,10 @@ ifeq ($(HAVE_QT), 1)
ui/drivers/qt/coreinfodialog.h \
ui/drivers/qt/playlistentrydialog.h \
ui/drivers/qt/viewoptionsdialog.h
ifeq ($(HAVE_MENU), 1)
ifeq ($(HAVE_SHADERS_COMMON), 1)
MOC_HEADERS += ui/drivers/qt/shaderparamsdialog.h
endif
ifeq ($(HAVE_MENU), 1)
MOC_HEADERS += ui/drivers/qt/settingswidgets.h \
ui/drivers/qt/qt_options.h
endif

7
ui/drivers/qt/qt_dialogs.cpp
View File

@ -51,8 +51,10 @@ extern "C" {
#ifdef HAVE_MENU
#include "../../../menu/menu_driver.h"
#include "../../../menu/menu_entries.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "../../../menu/menu_shader.h"
#endif
#endif
#include "../../../command.h"
#include "../../../core_info.h"
@ -67,9 +69,11 @@ 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"
@ -1288,7 +1292,7 @@ void CoreOptionsDialog::onCoreOptionResetAllClicked()
}
}
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
enum
{
@ -2970,3 +2974,4 @@ void ShaderParamsDialog::onShaderParamDoubleSpinBoxValueChanged(double value)
}
}
#endif
#endif

9
ui/drivers/ui_qt.cpp
View File

@ -88,6 +88,7 @@ extern "C" {
#include "../../configuration.h"
#include "../../frontend/frontend.h"
#include "../../frontend/frontend_driver.h"
#include "../../file_path_special.h"
#include "../../paths.h"
#include "../../retroarch.h"
#include "../../verbosity.h"
@ -1205,8 +1206,10 @@ MainWindow::MainWindow(QWidget *parent) :
,m_allPlaylistsGridMaxCount(0)
,m_playlistEntryDialog(NULL)
,m_statusMessageElapsedTimer()
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
,m_shaderParamsDialog(new ShaderParamsDialog())
#endif
#endif
,m_coreOptionsDialog(new CoreOptionsDialog())
,m_networkManager(new QNetworkAccessManager(this))
@ -1565,8 +1568,10 @@ MainWindow::MainWindow(QWidget *parent) :
connect(this, SIGNAL(gotLogMessage(const QString&)), this, SLOT(onGotLogMessage(const QString&)), Qt::AutoConnection);
connect(this, SIGNAL(gotStatusMessage(QString,unsigned,unsigned,bool)), this, SLOT(onGotStatusMessage(QString,unsigned,unsigned,bool)), Qt::AutoConnection);
connect(this, SIGNAL(gotReloadPlaylists()), this, SLOT(onGotReloadPlaylists()), Qt::AutoConnection);
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
connect(this, SIGNAL(gotReloadShaderParams()), this, SLOT(onGotReloadShaderParams()), Qt::AutoConnection);
#endif
#endif
connect(this, SIGNAL(gotReloadCoreOptions()), this, SLOT(onGotReloadCoreOptions()), Qt::AutoConnection);
@ -2010,6 +2015,7 @@ void MainWindow::onGotStatusMessage(
}
}
#if defined(HAVE_MENU)
void MainWindow::deferReloadShaderParams()
{
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
@ -2036,6 +2042,7 @@ void MainWindow::onGotReloadShaderParams()
m_shaderParamsDialog->reload();
#endif
}
#endif
void MainWindow::onCoreOptionsClicked()
{
@ -4971,9 +4978,11 @@ static void ui_companion_qt_event_command(void *data, enum event_command cmd)
{
case CMD_EVENT_SHADERS_APPLY_CHANGES:
case CMD_EVENT_SHADER_PRESET_LOADED:
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
RARCH_LOG("[Qt]: Reloading shader parameters.\n");
win_handle->qtWindow->deferReloadShaderParams();
#endif
#endif
break;
default:

20
ui/drivers/ui_qt.h
View File

@ -102,9 +102,11 @@ class MainWindow;
class ThumbnailWidget;
class ThumbnailLabel;
class GridView;
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
class ShaderParamsDialog;
#endif
#endif
class CoreOptionsDialog;
class CoreInfoDialog;
class PlaylistEntryDialog;
@ -414,7 +416,11 @@ signals:
void gotLogMessage(const QString &msg);
void gotStatusMessage(QString msg, unsigned priority, unsigned duration, bool flush);
void gotReloadPlaylists();
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void gotReloadShaderParams();
#endif
#endif
void gotReloadCoreOptions();
void showErrorMessageDeferred(QString msg);
void showInfoMessageDeferred(QString msg);
@ -449,7 +455,11 @@ public slots:
void reloadPlaylists();
void deferReloadPlaylists();
void onGotReloadPlaylists();
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void onGotReloadShaderParams();
#endif
#endif
void onGotReloadCoreOptions();
void showWelcomeScreen();
void onIconViewClicked();
@ -463,7 +473,11 @@ public slots:
void showAbout();
void showDocs();
void onThumbnailPackExtractFinished(bool success);
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void deferReloadShaderParams();
#endif
#endif
void downloadThumbnail(QString system, QString title, QUrl url = QUrl());
void downloadAllThumbnails(QString system, QUrl url = QUrl());
void downloadPlaylistThumbnails(QString playlistPath);
@ -495,7 +509,11 @@ private slots:
void onStopClicked();
void onZoomValueChanged(int value);
void onPlaylistFilesDropped(QStringList files);
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
void onShaderParamsClicked();
#endif
#endif
void onCoreOptionsClicked();
void onShowErrorMessage(QString msg);
void onShowInfoMessage(QString msg);
@ -608,8 +626,10 @@ private:
int m_allPlaylistsGridMaxCount;
PlaylistEntryDialog *m_playlistEntryDialog;
QElapsedTimer m_statusMessageElapsedTimer;
#if defined(HAVE_MENU)
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
QPointer<ShaderParamsDialog> m_shaderParamsDialog;
#endif
#endif
QPointer<CoreOptionsDialog> m_coreOptionsDialog;
QNetworkAccessManager *m_networkManager;