From 27c05b0fdf676294518e4f97d992ce8f555f3b31 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Mon, 6 May 2019 10:46:34 -0500 Subject: Add ability to include logo in copyrights.txt. Add NASPA logo for its dictionaries. Add a separator between settings and copyright for clarity. Tighten up vertical spacing in the settings panel. --- lexiconparameters.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'lexiconparameters.cpp') diff --git a/lexiconparameters.cpp b/lexiconparameters.cpp index 130804f..17910de 100644 --- a/lexiconparameters.cpp +++ b/lexiconparameters.cpp @@ -242,7 +242,7 @@ string LexiconParameters::hashString(bool shortened) const return hashStr; } -string LexiconParameters::copyrightString() const +string LexiconParameters::getLexiconCopyrightLine() const { string copyrightsFilename = QUACKLE_DATAMANAGER->makeDataFilename("lexica", "copyrights.txt", false); fstream copyrightsFile(copyrightsFilename, ios_base::in); @@ -254,10 +254,25 @@ string LexiconParameters::copyrightString() const continue; if (hashString(true).compare(line.substr(0,8)) != 0) continue; - return line.substr(9, line.size()); + return line.substr(9); } return string(); } +string LexiconParameters::copyrightString() const +{ + string copyrightLine = getLexiconCopyrightLine(); + size_t colonPos = min(copyrightLine.size(), copyrightLine.find_last_of(':')); + return copyrightLine.substr(0, colonPos); +} + +string LexiconParameters::logoFileName() const +{ + string copyrightLine = getLexiconCopyrightLine(); + size_t colonPos = copyrightLine.find_last_of(':'); + if (colonPos == string::npos) + return string(); + return QUACKLE_DATAMANAGER->makeDataFilename("lexica", copyrightLine.substr(colonPos + 1), false); +} LexiconInterpreter* LexiconParameters::createInterpreter(char version) const { -- cgit v1.2.3