# HG changeset patch
# User Emanuel Schuetze <emanuel@intevation.de>
# Date 1411542128 -7200
# Node ID 1171a4778562ff5fdfeb0f0cb277040c3e6000b0
# Parent  ae893a9a44f7c741f4c5d03fc1f1065e5c6bbc84
(issue68) Added license note to about dialog of client and admin application.

diff -r ae893a9a44f7 -r 1171a4778562 ui/aboutdialog.cpp
--- a/ui/aboutdialog.cpp	Wed Sep 24 08:59:57 2014 +0200
+++ b/ui/aboutdialog.cpp	Wed Sep 24 09:02:08 2014 +0200
@@ -41,7 +41,7 @@
     headerLayout->addLayout(headerTextLayout);
     headerLayout->insertStretch(2, 10);
 
-    QLabel *textDesc = new QLabel(tr("TrustBridge is a root certificate"
+    QLabel *textDesc = new QLabel("<hr>" + tr("TrustBridge is a root certificate"
         " installer for Windows and GNU/Linux.<br/>") +
     tr("The root certificate lists are managed"
         " by the German <a href=\"https://www.bsi.bund.de\">"
@@ -49,10 +49,21 @@
     tr("The software was developed by the companies"
         " <a href=\"http://www.intevation.de\">Intevation GmbH</a> and "
         " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
-        " contracted by the German Federal Office for Information Security (BSI).<br/><br/>") +
+        " contracted by the BSI.<br/><br/>") +
     tr("TrustBridge is Free Software licensed"
-        " under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
-        " in der Informationstechnik"));
+        " under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
+        " in der Informationstechnik<br/><br/>") +
+    tr("TrustBridge Administrator uses several Free Software components with different licenses:") +
+	"<ul><li>TrustBridge source code (GPL v>=2)" +
+	"<li>Qt (LGPL v==2.1)" +
+	"<li>PolarSSL (GPL v>=2)" +
+	"<li>Oxygen-Icons (LGPL v==3)" +
+	"<li>OpenSSL-based signcode utility (GPL v==3)" +
+	"<li>OpenSSL (OpenSSL License)" +
+	"<li>NSIS (zlib/libpng license & Common Public License version 1.0)</ul>" +
+    tr("Read more about the license information in the 'licenses' directory in the "
+       "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>."));
+
     textDesc->setTextFormat(Qt::RichText);
     textDesc->setTextInteractionFlags(
         Qt::TextSelectableByMouse |
diff -r ae893a9a44f7 -r 1171a4778562 ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Wed Sep 24 08:59:57 2014 +0200
+++ b/ui/mainwindow.cpp	Wed Sep 24 09:02:08 2014 +0200
@@ -645,10 +645,19 @@
     tr("The software was developed by the companies"
         " <a href=\"http://www.intevation.de\">Intevation GmbH</a> and "
         " <a href=\"http://www.dn-systems.de\">DN-Systems GmbH</a>, <br>"
-        " contracted by the German Federal Office for Information Security (BSI).<br/><br/>") +
+        " contracted by the BSI.<br/><br/>") +
     tr("TrustBridge is Free Software licensed"
-        " under GNU GPL v2+.<br/><br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
-        " in der Informationstechnik"));
+        " under GNU GPL v>=3.<br/>Copyright (C) 2014 by Bundesamt für Sicherheit"
+        " in der Informationstechnik<br/><br/>") +
+    tr("TrustBridge uses several Free Software components with different licenses:") +
+	"<ul><li>TrustBridge source code (GPL v>=2)" +
+	"<li>Qt (LGPL v==2.1)" +
+	"<li>PolarSSL (GPL v>=2)" +
+	"<li>Oxygen-Icons (LGPL v==3)" +
+	"<li>Mozilla NSS (Mozilla Public License v2)" +
+	"<li>libcurl (The curl license)</ul>" +
+    tr("Read more about the license information in the 'licenses' directory in the "
+       "<a href=\"https://wald.intevation.org/hg/trustbridge/file/tip/licenses\">TrustBridge code repository</a>."));
     textDesc->setTextFormat(Qt::RichText);
     textDesc->setTextInteractionFlags(
         Qt::TextSelectableByMouse |