From 347e2aca61237da9b05877fc5f2a51831846c1c6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 15 May 2024 16:32:32 -0600 Subject: [PATCH] bring back big clock and about window About window has been adjusted to show PROGRAM_NAME but needs tweaks for other info displayed there. --- gtk2_ardour/about.cc | 25 +++++++++++++------------ gtk2_ardour/livetrax.menus.in | 3 +++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 210b72e4c4..1afd8a2988 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -272,14 +272,14 @@ static const char* translators[] = { 0 }; -static char const* gpl = X_("\n\ -Ardour comes with NO WARRANTY. It is free software, and you are welcome to redistribute it\n\ +static char const* gpl = X_("\n%1\ + comes with NO WARRANTY. It is free software, and you are welcome to redistribute it\n\ under the terms of the GNU General Public License (GPL) v2.0 or any later version, shown below.\n\ \n\ Plugin Clarification\n\ \n\ The following states the Ardour developers understanding of the\n\ -relationship between Ardour's license (GPL v2.0 or later) and plugins.\n\ +relationship between %1's license (GPL v2.0 or later) and plugins.\n\ \n\ For the purposes of this understanding, \"plugins\" refer to software\n\ dynamically loaded by another program, where the interaction between the\n\ @@ -292,10 +292,10 @@ and (b) any host may load any plugin that supports the API, we consider it\n\ self-evident that there can be no \"derivative\" relationship (in the sense\n\ of the GPL's use of this term) between the host and plugin.\n\ \n\ -Consequently, Ardour may load arbitrarily licensed plugins, so as to cause\n\ -interactions between Ardour and the plugin via a 3rd party API, without any\n\ -implications for either Ardour or the plugin. In our understanding, Using\n\ -such plugins with Ardour is not impacted in any way by Ardour's GPL licensing.\n\ +Consequently, %1 may load arbitrarily licensed plugins, so as to cause\n\ +interactions between %1 and the plugin via a 3rd party API, without any\n\ +implications for either %1 or the plugin. In our understanding, Using\n\ +such plugins with %1 is not impacted in any way by %1's GPL licensing.\n\ \n\ \n\ GNU GENERAL PUBLIC LICENSE\n\ @@ -641,11 +641,12 @@ About::About () #endif set_translator_credits (t); - set_copyright (_("Copyright (C) 1999-2024 Paul Davis\n")); - set_license (gpl); - set_name (X_("Ardour")); - set_website (X_("https://ardour.org/")); - set_website_label (_("http://ardour.org/")); + set_copyright (_("Copyright (C) 1999-2024 Paul Davis and others\n")); + + set_license (string_compose (gpl, PROGRAM_NAME)); + set_name (PROGRAM_NAME); + set_website (X_("https://harrison.blah/blah/")); + set_website_label (_("Harrison Consoles Blah Blah/")); set_version ((string_compose(_("%1%2\n(rev %3)\n%4%5"), VERSIONSTRING, codename, diff --git a/gtk2_ardour/livetrax.menus.in b/gtk2_ardour/livetrax.menus.in index 18ead4ff18..1d83d1dc20 100644 --- a/gtk2_ardour/livetrax.menus.in +++ b/gtk2_ardour/livetrax.menus.in @@ -111,11 +111,14 @@ + + +