From 1a843709a2a434bd6a2729c0110ae2c58f943e2c Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Sat, 29 Jul 2023 12:12:08 +0100 Subject: [PATCH] 2975 Headless _builds_ use fewer libraries --- src/util.cpp | 83 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/src/util.cpp b/src/util.cpp index 421706c43f..977dd6a6f7 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -593,27 +593,45 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent ) "

" ); // libraries used by this compilation - txvLibraries->setText ( - tr ( "This app uses the following libraries, resources or code snippets:" ) + "

" + tr ( "Qt cross-platform application framework" ) + - ", https://www.qt.io

" - "

Opus Interactive Audio Codec" - ", https://www.opus-codec.org

" -# if defined( _WIN32 ) && !defined( WITH_JACK ) - "

ASIO (Audio Stream I/O) SDK" - ", https://www.steinberg.net/developers
" + - "ASIO is a trademark and software of Steinberg Media Technologies GmbH

" + txvLibraries->setText ( tr ( "This app uses the following libraries, resources or code snippets:" ) + "

" + + tr ( "Qt cross-platform application framework" ) + QString ( " %1" ).arg ( QT_VERSION_STR ) + + ", https://www.qt.io" + "

" + "

" + "Opus Interactive Audio Codec" + ", https://www.opus-codec.org" + "

" +# ifndef SERVER_ONLY +# if defined( _WIN32 ) && !defined( WITH_JACK ) + "

" + "ASIO (Audio Stream I/O) SDK" + ", https://www.steinberg.net/developers" + "
" + "ASIO is a trademark and software of Steinberg Media Technologies GmbH" + "

" +# endif +# ifndef HEADLESS + "

" + + tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) + + ", 1995 - 2021" + ", The Synthesis ToolKit in C++ (STK)" + ", https://ccrma.stanford.edu/software/stk" + "

" + "

" + + QString ( tr ( "Some pixmaps are from the %1" ) ).arg ( "Open Clip Art Library (OCAL)" ) + + ", https://openclipart.org" + "

" + "

" + + tr ( "Flag icons by Mark James" ) + + ", http://www.famfamfam.com" + "

" + "

" + + QString ( tr ( "Some sound samples are from %1" ) ).arg ( "Freesound" ) + + ", https://freesound.org" + "

" +# endif # endif - "

" + - tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) + - ", 1995 - 2021, " - "The Synthesis ToolKit in C++ (STK)

" - "

" + - tr ( "Some pixmaps are from the" ) + - " Open Clip Art Library (OCAL), " - "https://openclipart.org

" - "

" + - tr ( "Flag icons by Mark James" ) + ", http://www.famfamfam.com

" + "

" + - tr ( "Some sound samples are from" ) + " Freesound, " + "https://freesound.org

" ); + ); // contributors list txvContributors->setText ( @@ -1705,31 +1723,38 @@ QString GetVersionAndNameStr ( const bool bDisplayInGui ) strVersionText += "\n *** Foundation; either version 2 of the License, or (at your option) any later version."; strVersionText += "\n *** There is NO WARRANTY, to the extent permitted by law."; strVersionText += "\n *** "; - strVersionText += "\n *** Using the following libraries, resources or code snippets:"; + + strVersionText += "\n *** " + QCoreApplication::tr ( "This app uses the following libraries, resources or code snippets:" ); strVersionText += "\n *** "; - strVersionText += QString ( "\n *** Qt framework %1" ).arg ( QT_VERSION_STR ); - strVersionText += "\n *** "; + strVersionText += "\n *** " + QCoreApplication::tr ( "Qt cross-platform application framework" ) + QString ( " %1" ).arg ( QT_VERSION_STR ); + strVersionText += "\n *** "; strVersionText += "\n *** "; strVersionText += "\n *** Opus Interactive Audio Codec"; strVersionText += "\n *** "; strVersionText += "\n *** "; -#if defined( _WIN32 ) && !defined( WITH_JACK ) +#ifndef SERVER_ONLY +# if defined( _WIN32 ) && !defined( WITH_JACK ) strVersionText += "\n *** ASIO (Audio Stream I/O) SDK"; strVersionText += "\n *** "; + strVersionText += "\n *** ASIO is a trademark and software of Steinberg Media Technologies GmbH"; strVersionText += "\n *** "; -#endif - strVersionText += "\n *** Audio reverberation code by Perry R. Cook and Gary P. Scavone"; +# endif +# ifndef HEADLESS + strVersionText += "\n *** " + QCoreApplication::tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) + + ", 1995 - 2021, The Synthesis ToolKit in C++ (STK)"; strVersionText += "\n *** "; strVersionText += "\n *** "; - strVersionText += "\n *** Some pixmaps are from the Open Clip Art Library (OCAL)"; + strVersionText += "\n *** " + QString ( QCoreApplication::tr ( "Some pixmaps are from the %1" ) ).arg ( " Open Clip Art Library (OCAL)" ); strVersionText += "\n *** "; strVersionText += "\n *** "; - strVersionText += "\n *** Flag icons by Mark James"; + strVersionText += "\n *** " + QCoreApplication::tr ( "Flag icons by Mark James" ); strVersionText += "\n *** "; strVersionText += "\n *** "; - strVersionText += "\n *** Some sound samples are from Freesound"; + strVersionText += "\n *** " + QString ( QCoreApplication::tr ( "Some sound samples are from %1" ) ).arg ( "Freesound" ); strVersionText += "\n *** "; strVersionText += "\n *** "; +# endif +#endif strVersionText += "\n *** Copyright © 2005-2023 The Jamulus Development Team"; strVersionText += "\n"; }