From 192b0bafa5ade0e8f9f36fe8ce0f1de137d72e3a Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Tue, 20 Mar 2018 17:11:00 -0500 Subject: Update about dialogue and licenses --- src/aboutdialog.cpp | 40 ++++++++++++++++++++------- src/aboutdialog.h | 15 +++++++++-- src/aboutdialog.ui | 78 ++++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 103 insertions(+), 30 deletions(-) (limited to 'src') 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 . #include #include #include - +#include 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("%1 %2").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 { diff --git a/src/aboutdialog.h b/src/aboutdialog.h index 103a0d2f..adf8d2c7 100644 --- a/src/aboutdialog.h +++ b/src/aboutdialog.h @@ -45,12 +45,23 @@ private: enum Licenses { LICENSE_NONE, LICENSE_LGPL3, + LICENSE_LGPL21, LICENSE_GPL3, - LICENSE_BSD3, + LICENSE_GPL2, LICENSE_BOOST, LICENSE_CCBY3, + LICENSE_PYTHON, + LICENSE_SSL, + LICENSE_CPPTOML, + LICENSE_7ZIP, LICENSE_ZLIB, - LICENSE_APACHE2 + LICENSE_UDIS, + LICENSE_SPDLOG, + LICENSE_FMT, + LICENSE_SIP, + LICENSE_CASTLE, + LICENSE_ANTLR, + LICENSE_WIX }; private: diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui index 50a9de5f..348a33b0 100644 --- a/src/aboutdialog.ui +++ b/src/aboutdialog.ui @@ -120,14 +120,14 @@ - Copyright 2011-2016 Sebastian Herbord + <html><head/><body><p>Copyright 2011-2016 Sebastian Herbord</p><p>Copyright 2016-2018 Mod Organizer 2 contributors</p></body></html> - <html><head/><body><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</p><p>See the GNU General Public License for more details.</p><p>Source code can be found at <a href="https://github.com/TanninOne/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html> + <html><head/><body><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.</p><p>See the GNU General Public License for more details.</p><p>Source code can be found at <a href="https://github.com/Modorganizer2/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html> true @@ -154,7 +154,7 @@ Thanks - + Current Maintainers @@ -167,12 +167,17 @@ - LePresidente + LePresidente (Project Lead) - Silarn + AL12 + + + + + Diana @@ -182,7 +187,7 @@ - Diana + Silarn @@ -203,17 +208,22 @@ - pndrev (German) + Scythe1912 (Chinese) - DaWul (Spanish) + yc0620shen (Chinese) - Fiama (Spanish) + miraclefreak (Czech) + + + + + Cyb3r (Dutch) @@ -233,17 +243,35 @@ - Scythe1912 (Chinese) + Faron (German) - yc0620shen (Chinese) + pndrev (German) - miraclefreak (Czech) + Mordan (Greek) + + + + + Ren (Korean) + + + + + + + + Yoosk (Polish) + + + + + Brgodfx (Portuguese) @@ -253,15 +281,22 @@ - Ren (Korean) + DaWul (Spanish) - - + + + + Fiama (Spanish) + + + + + Jax (Swedish) - ... more (Can't track) + ...and all other Transifex contributors! @@ -275,7 +310,7 @@ - Other Supporter + Other Supporters && Contributors @@ -283,9 +318,14 @@ QAbstractItemView::NoSelection - + + + SuperSandro2000 + + + - Al12 (Discord) + AnyOldName3 -- cgit v1.3.1