From 192b0bafa5ade0e8f9f36fe8ce0f1de137d72e3a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Tue, 20 Mar 2018 17:11:00 -0500
Subject: Update about dialogue and licenses

---
 src/aboutdialog.cpp | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'src/aboutdialog.cpp')

diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index ed57a217..411ef1cf 100644
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -29,7 +29,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTextBrowser>
 #include <QVariant>
 #include <Qt>
-
+#include <QFontDatabase>
 
 AboutDialog::AboutDialog(const QString &version, QWidget *parent)
   : QDialog(parent)
@@ -37,24 +37,44 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
 {
   ui->setupUi(this);
 
-  m_LicenseFiles[LICENSE_LGPL3] = "lgpl-3.0.txt";
-  m_LicenseFiles[LICENSE_GPL3] = "gpl-3.0.txt";
-  m_LicenseFiles[LICENSE_BSD3] = "bsd3.txt";
+  m_LicenseFiles[LICENSE_LGPL3] = "LGPL-v3.0.txt";
+  m_LicenseFiles[LICENSE_LGPL21] = "GNU-LGPL-v2.1.txt";
+  m_LicenseFiles[LICENSE_GPL3] = "GPL-v3.0.txt";
+  m_LicenseFiles[LICENSE_GPL2] = "GPL-v2.0.txt";
   m_LicenseFiles[LICENSE_BOOST] = "boost.txt";
+  m_LicenseFiles[LICENSE_7ZIP] = "7zip.txt";
   m_LicenseFiles[LICENSE_CCBY3] = "by-sa3.txt";
   m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
-  m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
+  m_LicenseFiles[LICENSE_PYTHON] = "python.txt";
+  m_LicenseFiles[LICENSE_SSL] = "openssl.txt";
+  m_LicenseFiles[LICENSE_CPPTOML] = "cpptoml.txt";
+  m_LicenseFiles[LICENSE_UDIS] = "udis86.txt";
+  m_LicenseFiles[LICENSE_SPDLOG] = "spdlog.txt";
+  m_LicenseFiles[LICENSE_FMT] = "fmt.txt";
+  m_LicenseFiles[LICENSE_SIP] = "sip.txt";
+  m_LicenseFiles[LICENSE_CASTLE] = "Castle.txt";
+  m_LicenseFiles[LICENSE_ANTLR] = "AntlrBuildTask.txt";
+  m_LicenseFiles[LICENSE_WIX] = "WixToolkit.txt";
 
   addLicense("Qt", LICENSE_LGPL3);
   addLicense("Qt Json", LICENSE_GPL3);
   addLicense("Boost Library", LICENSE_BOOST);
-  addLicense("7-zip", LICENSE_LGPL3);
-  addLicense("ZLib", LICENSE_ZLIB);
+  addLicense("7-zip", LICENSE_7ZIP);
+  addLicense("ZLib", LICENSE_NONE);
   addLicense("Tango Icon Theme", LICENSE_NONE);
   addLicense("RRZE Icon Set", LICENSE_CCBY3);
   addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);
-  addLicense("Castle Core", LICENSE_APACHE2);
+  addLicense("Castle Core", LICENSE_CASTLE);
+  addLicense("ANTLR", LICENSE_ANTLR);
   addLicense("LOOT", LICENSE_GPL3);
+  addLicense("Python", LICENSE_PYTHON);
+  addLicense("OpenSSL", LICENSE_SSL);
+  addLicense("cpptoml", LICENSE_CPPTOML);
+  addLicense("Udis86", LICENSE_UDIS);
+  addLicense("spdlog", LICENSE_SPDLOG);
+  addLicense("{fmt}", LICENSE_FMT);
+  addLicense("SIP", LICENSE_SIP);
+  addLicense("WiX Toolset", LICENSE_WIX);
 
   ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
 #if defined(HGID)
@@ -64,6 +84,8 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
 #else
   ui->revisionLabel->setText(ui->revisionLabel->text() + " unknown");
 #endif
+
+  ui->licenseText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
 }
 
 
@@ -85,7 +107,7 @@ void AboutDialog::on_creditsList_currentItemChanged(QListWidgetItem *current, QL
 {
   auto iter = m_LicenseFiles.find(current->data(Qt::UserRole).toInt());
   if (iter != m_LicenseFiles.end()) {
-    QString filePath = qApp->applicationDirPath() + "/license/" + iter->second;
+    QString filePath = qApp->applicationDirPath() + "/licenses/" + iter->second;
     QString text = MOBase::readFileText(filePath);
     ui->licenseText->setText(text);
   } else {
-- 
cgit v1.3.1