[Scummvm-git-logs] scummvm master -> 80ddd9498caef76f874949fbedbf280a9ab0444c

mduggan noreply at scummvm.org
Mon Nov 13 02:24:09 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
80ddd9498c GUI: Avoid dumping dialogs not compiled in to build


Commit: 80ddd9498caef76f874949fbedbf280a9ab0444c
    https://github.com/scummvm/scummvm/commit/80ddd9498caef76f874949fbedbf280a9ab0444c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-11-13T13:23:57+11:00

Commit Message:
GUI: Avoid dumping dialogs not compiled in to build

Changed paths:
    gui/dump-all-dialogs.cpp


diff --git a/gui/dump-all-dialogs.cpp b/gui/dump-all-dialogs.cpp
index 2e6e57d390e..4e7b24a7c98 100644
--- a/gui/dump-all-dialogs.cpp
+++ b/gui/dump-all-dialogs.cpp
@@ -97,13 +97,29 @@ void dumpDialogs(const Common::String &message, int res, const Common::String &l
 	GUI::AboutDialog aboutDialog;
 	handleSimpleDialog(aboutDialog, "aboutDialog-", surf);
 
+#if USE_CLOUD && USE_LIBCURL
 	// CloudConnectingWizard
 	GUI::CloudConnectionWizard cloudConnectingWizard;
 	handleSimpleDialog(cloudConnectingWizard, "cloudConnectingWizard-", surf);
 
+	// RemoteBrowserDialog
+	GUI::RemoteBrowserDialog remoteBrowserDialog(_("Select directory with game data"));
+	handleSimpleDialog(remoteBrowserDialog, "remoteBrowserDialog-", surf);
+
+	// DownloadIconPacksDialog
+	GUI::DownloadPacksDialog downloadIconPacksDialog(_("icon packs"), "LIST", "gui-icons*.dat");
+	handleSimpleDialog(downloadIconPacksDialog, "downloadIconPacksDialog-", surf);
+
+	// DownloadShaderPacksDialog
+	GUI::DownloadPacksDialog downloadShaderPacksDialog(_("shader packs"), "LIST-SHADERS", "shaders*.dat");
+	handleSimpleDialog(downloadShaderPacksDialog, "downloadShaderPacksDialog-", surf);
+#endif
+
+#if USE_FLUIDSYNTH
 	// FluidSynthSettingsDialog
 	GUI::FluidSynthSettingsDialog fluidSynthSettingsDialog;
 	handleSimpleDialog(fluidSynthSettingsDialog, "fluidSynthSettings-", surf);
+#endif
 
 	// ThemeBrowserDialog
 	GUI::ThemeBrowser themeBrowser;
@@ -113,23 +129,10 @@ void dumpDialogs(const Common::String &message, int res, const Common::String &l
 	GUI::BrowserDialog browserDialog(_("Select directory with game data"), true);
 	handleSimpleDialog(browserDialog, "browserDialog-", surf);
 
-	// RemoteBrowserDialog
-	GUI::RemoteBrowserDialog remoteBrowserDialog(_("Select directory with game data"));
-	handleSimpleDialog(remoteBrowserDialog, "remoteBrowserDialog-", surf);
-
 	// ChooserDialog
 	GUI::ChooserDialog chooserDialog(_("Pick the game:"));
 	handleSimpleDialog(chooserDialog, "chooserDialog-", surf);
 
-	// DownloadIconPacksDialog
-	GUI::DownloadPacksDialog downloadIconPacksDialog(_("icon packs"), "LIST", "gui-icons*.dat");
-	handleSimpleDialog(downloadIconPacksDialog, "downloadIconPacksDialog-", surf);
-
-	// DownloadShaderPacksDialog
-	GUI::DownloadPacksDialog downloadShaderPacksDialog(_("shader packs"), "LIST-SHADERS", "shaders*.dat");
-	handleSimpleDialog(downloadShaderPacksDialog, "downloadShaderPacksDialog-", surf);
-
-
 	// MassAddDialog
 	GUI::MassAddDialog massAddDialog(Common::FSNode("."));
 	handleSimpleDialog(massAddDialog, "massAddDialog-", surf);




More information about the Scummvm-git-logs mailing list