Merge pull request #4785: FIX(client): About dialog improvements

5 files changed, 31 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d09366fd..856d1eca1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,9 @@ if(tests)
 endif()
 
 
+# Make the build year accessible as a macro
+add_compile_definitions(MUMBLE_BUILD_YEAR=${MUMBLE_BUILD_YEAR})
+
 add_subdirectory(src)
 
 if(g15 AND WIN32)
diff --git a/src/licenses.h b/src/licenses.h
index 505fe00a5..1087b89c8 100644
--- a/src/licenses.h
+++ b/src/licenses.h
@@ -18,7 +18,16 @@ struct ThirdPartyLicense {
 	bool isEmpty() const { return (name == 0 && url == 0 && license == 0); }
 };
 
-static const char *licenseMumble = "Copyright (C) 2005-2020 The Mumble Developers\n"
+#define DOQUOTE(arg) #arg
+#define QUOTE(arg) DOQUOTE(arg)
+
+#ifdef MUMBLE_BUILD_YEAR
+#	define COPYRIGHT_END QUOTE(MUMBLE_BUILD_YEAR)
+#else
+#	define COPYRIGHT_END "now"
+#endif
+
+static const char *licenseMumble = "Copyright (C) 2005-" COPYRIGHT_END " The Mumble Developers\n"
 								   "\n"
 								   "A list of The Mumble Developers can be found in the\n"
 								   "AUTHORS file at the root of the Mumble source tree\n"
diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp
index 77d147598..ce4ac2bf5 100644
--- a/src/mumble/About.cpp
+++ b/src/mumble/About.cpp
@@ -16,6 +16,9 @@
 // (like protobuf 3.7 does). As such, for now, we have to make this our last include.
 #include "Global.h"
 
+#define DOQUOTE(arg) #arg
+#define QUOTE(arg) DOQUOTE(arg)
+
 AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
 	setWindowTitle(tr("About Mumble"));
 
@@ -55,13 +58,21 @@ AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
 	QLabel *text = new QLabel(about);
 	text->setTextInteractionFlags(Qt::TextBrowserInteraction);
 	text->setOpenExternalLinks(true);
+
+	QString copyrightText;
+#ifdef MUMBLE_BUILD_YEAR
+	copyrightText = "Copyright 2005-" QUOTE(MUMBLE_BUILD_YEAR) " The Mumble Developers";
+#else // MUMBLE_BUILD_YEAR
+	copyrightText = "Copyright 2005-now The Mumble Developers";
+#endif // MUMBLE_BUILD_YEAR
+
 	text->setText(tr("<h3>Mumble (%1)</h3>"
 					 "<p>%3</p>"
-					 "<p><b>A voice-chat utility for gamers</b></p>"
+					 "<p><b>An Open Source, low-latency, high quality voice-chat utility</b></p>"
 					 "<p><tt><a href=\"%2\">%2</a></tt></p>")
 					  .arg(QLatin1String(MUMBLE_RELEASE))
 					  .arg(QLatin1String("https://www.mumble.info/"))
-					  .arg(QLatin1String("Copyright 2005-2020 The Mumble Developers")));
+					  .arg(copyrightText));
 	QHBoxLayout *qhbl = new QHBoxLayout(about);
 	qhbl->addWidget(icon);
 	qhbl->addWidget(text);
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
index ca885704e..ced962c4b 100644
--- a/src/mumble/CMakeLists.txt
+++ b/src/mumble/CMakeLists.txt
@@ -267,7 +267,7 @@ set(MUMBLE_SOURCES
 if(static AND WIN32)
 	# On Windows, building a static client means building the main app into a DLL.
 	add_library(mumble SHARED ${MUMBLE_SOURCES})
-	add_compile_definitions(mumble PRIVATE "MUMBLEAPP_DLL")
+	target_compile_definitions(mumble PRIVATE "MUMBLEAPP_DLL")
 
 	set_target_properties(mumble PROPERTIES OUTPUT_NAME "mumble_app")
 	if(MINGW)
diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts
index 43caf71ae..fd0ce1029 100644
--- a/src/mumble/mumble_en.ts
+++ b/src/mumble/mumble_en.ts
@@ -595,10 +595,6 @@ This value allows you to set the maximum number of users allowed in the channel.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;h3&gt;Mumble (%1)&lt;/h3&gt;&lt;p&gt;%3&lt;/p&gt;&lt;p&gt;&lt;b&gt;A voice-chat utility for gamers&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt;&lt;/tt&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;About Mumble</source>
         <translation type="unfinished"></translation>
     </message>
@@ -630,6 +626,10 @@ This value allows you to set the maximum number of users allowed in the channel.
         <source>Third-party license agreements</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;h3&gt;Mumble (%1)&lt;/h3&gt;&lt;p&gt;%3&lt;/p&gt;&lt;p&gt;&lt;b&gt;An Open Source, low-latency, high quality voice-chat utility&lt;/b&gt;&lt;/p&gt;&lt;p&gt;&lt;tt&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt;&lt;/tt&gt;&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AudioInput</name>