From a6a4a4443b403e2785da06d53e02237a35324dd7 Mon Sep 17 00:00:00 2001
From: John Fultz <jfultz@wolfram.com>
Date: Mon, 6 May 2019 11:44:15 -0500
Subject: About box fixes.

Re-sort copyrights so newer ones show up first.
Exclude copyright.txt lines from about box if they don't have
an actual copyright.
---
 data/lexica/copyrights.txt | 10 +++++-----
 quacker/quacker.cpp        |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/data/lexica/copyrights.txt b/data/lexica/copyrights.txt
index bdfa56a..0e436d7 100644
--- a/data/lexica/copyrights.txt
+++ b/data/lexica/copyrights.txt
@@ -1,8 +1,8 @@
-eea8dfe5:Collins Scrabble™ Words 2012, ©HarperCollins Publishers Ltd 2015
-48dea2c8:Collins Scrabble™ Words 2015, ©HarperCollins Publishers Ltd 2015
-0109ce12:Official Tournament and Club Word List 2014 Edition (OTCWL2014), Copyright © 2014 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
-9ea8d964:Official Tournament and Club Word List 2016 Edition (OTCWL2016), Copyright © 2016 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
-5a728cf0:School Scrabble Word List 2016 Edition (SSWL2016), Copyright © 2016 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
 41da74af:NASPA Word List 2018 (NWL2018), Copyright © 2019 North American SCRABBLE Players Association.:naspa.gif
 de591703:NASPA School Word List 2018 (NSWL2018), Copyright © 2019 North American SCRABBLE Players Association.:naspa.gif
+5a728cf0:School Scrabble Word List 2016 Edition (SSWL2016), Copyright © 2016 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
+9ea8d964:Official Tournament and Club Word List 2016 Edition (OTCWL2016), Copyright © 2016 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
+0109ce12:Official Tournament and Club Word List 2014 Edition (OTCWL2014), Copyright © 2014 Hasbro, Inc.  Published under license with Merriam-Webster, Incorporated.
+48dea2c8:Collins Scrabble™ Words 2015, ©HarperCollins Publishers Ltd 2015
+eea8dfe5:Collins Scrabble™ Words 2012, ©HarperCollins Publishers Ltd 2015
 d5aeccff:ODS7
diff --git a/quacker/quacker.cpp b/quacker/quacker.cpp
index 4498900..6a2a34a 100644
--- a/quacker/quacker.cpp
+++ b/quacker/quacker.cpp
@@ -2170,7 +2170,9 @@ void TopLevel::about()
 				line = line.mid(startPos + 1);
 				int endPos = line.indexOf(':');
 				line = line.mid(0, endPos);
-				aboutText += "<li>" + line + "</li>";
+				// Only include lines with a copyright (the word or the symbol) in them
+				if (line.indexOf("copyright", 0, Qt::CaseInsensitive) != -1 || line.indexOf(QChar(0xA9)) != -1)
+					aboutText += "<li>" + line + "</li>";
 			}
 			line = strm.readLine();
 		}
-- 
cgit v1.2.3