diff options
| -rw-r--r-- | src/lib/variant.cc | 22 | ||||
| -rw-r--r-- | src/lib/variant.h | 4 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 35 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 5 |
4 files changed, 51 insertions, 15 deletions
diff --git a/src/lib/variant.cc b/src/lib/variant.cc index e69d94012..4434993b1 100644 --- a/src/lib/variant.cc +++ b/src/lib/variant.cc @@ -36,6 +36,10 @@ static char const* _dcpomatic_playlist_editor = "DCP-o-matic Playlist Editor"; static char const* _dcpomatic_combiner = "DCP-o-matic Combiner"; static char const* _dcpomatic_batch_converter = "DCP-o-matic Batch Converter"; +static bool const _show_splash = true; +static bool const _show_tagline = true; +static bool const _show_dcpomatic_website = true; + std::string variant::dcpomatic() @@ -133,3 +137,21 @@ variant::dcpomatic_player_app() return _dcpomatic_player_app; } +bool +variant::show_splash() +{ + return _show_splash; +} + +bool +variant::show_tagline() +{ + return _show_tagline; +} + +bool +variant::show_dcpomatic_website() +{ + return _show_dcpomatic_website; +} + diff --git a/src/lib/variant.h b/src/lib/variant.h index 66b06376b..f0482ca01 100644 --- a/src/lib/variant.h +++ b/src/lib/variant.h @@ -44,5 +44,9 @@ std::string dcpomatic_app(); std::string dcpomatic_batch_converter_app(); std::string dcpomatic_player_app(); +bool show_splash(); +bool show_tagline(); +bool show_dcpomatic_website(); + } diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 28bee89b9..220092da6 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -28,6 +28,7 @@ #include "wx_util.h" #include "wx_variant.h" #include "lib/compose.hpp" +#include "lib/variant.h" #include "lib/version.h" #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS @@ -68,22 +69,26 @@ AboutDialog::AboutDialog (wxWindow* parent) sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2)); sizer->AddSpacer (12); - t = new StaticText ( - this, - _("Free, open-source DCP creation from almost anything."), - wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER - ); - t->SetFont (subtitle_font); - - sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8)); - - auto h = new wxHyperlinkCtrl ( - this, wxID_ANY, - wxT ("dcpomatic.com"), - wxT ("https://dcpomatic.com") - ); + if (variant::show_tagline()) + { + t = new StaticText( + this, + _("Free, open-source DCP creation from almost anything."), + wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER + ); + t->SetFont(subtitle_font); + sizer->Add(t, wxSizerFlags().Centre().Border(wxALL, 8)); + } - sizer->Add (h, wxSizerFlags().Centre().Border(wxALL, 8)); + if (variant::show_dcpomatic_website()) + { + auto h = new wxHyperlinkCtrl( + this, wxID_ANY, + wxT("dcpomatic.com"), + wxT("https://dcpomatic.com") + ); + sizer->Add(h, wxSizerFlags().Centre().Border(wxALL, 8)); + } t = new StaticText ( this, diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 49a3ca5c3..baf5990aa 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -37,6 +37,7 @@ #include "lib/job.h" #include "lib/job_manager.h" #include "lib/util.h" +#include "lib/variant.h" #include "lib/version.h" #include <dcp/locale_convert.h> #include <dcp/warnings.h> @@ -603,6 +604,10 @@ setup_audio_channels_choice (wxChoice* choice, int minimum) wxSplashScreen* maybe_show_splash () { + if (!variant::show_splash()) { + return nullptr; + } + wxSplashScreen* splash = nullptr; try { |
