5 files changed, 41 insertions, 15 deletions
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index 2f177a253..c1d33bd34 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -42,6 +42,10 @@
 #include <QEvent>
 #include <QCloseEvent>
 
+#ifdef COMPILE_SSL_SUPPORT
+#include <openssl/crypto.h>
+#endif //COMPILE_SSL_SUPPORT
+
 extern AboutDialog * g_pAboutDialog;
 /*
 "<font color=\"#FFFF00\"><b>KVIrc public releases :</b></font><br>\n" \
@@ -159,10 +163,6 @@ AboutDialog::AboutDialog()
 	infoString += ": ";
 	infoString += KviBuildInfo::buildRevision();
 	infoString += "<br>";
-	infoString += __tr2qs_ctx("System name", "about");
-	infoString += ": ";
-	infoString += KviBuildInfo::buildSystem();
-	infoString += "<br>";
 	infoString += __tr2qs_ctx("CPU name", "about");
 	infoString += ": ";
 	infoString += KviBuildInfo::buildCPU();
@@ -191,6 +191,32 @@ AboutDialog::AboutDialog()
 	infoString += __tr2qs_ctx("Features", "about");
 	infoString += ": ";
 	infoString += KviBuildInfo::features();
+#ifdef COMPILE_SSL_SUPPORT
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("OpenSSL version", "about");
+	infoString += ": ";
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+	infoString += SSLeay_version(SSLEAY_VERSION);
+#else
+	infoString += OpenSSL_version(OPENSSL_VERSION);
+#endif
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("OpenSSL compiler flags", "about");
+	infoString += ": ";
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+	infoString += SSLeay_version(SSLEAY_CFLAGS);
+#else
+	infoString += OpenSSL_version(OPENSSL_CFLAGS);
+#endif
+	infoString += "<br>";
+	infoString += __tr2qs_ctx("OpenSSL ", "about");
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+	infoString += SSLeay_version(SSLEAY_BUILT_ON);
+#else
+	infoString += OpenSSL_version(OPENSSL_BUILT_ON);
+#endif
+	infoString += "<br>";
+#endif //COMPILE_SSL_SUPPORT
 
 	v->setText(infoString);
 
@@ -220,7 +246,7 @@ AboutDialog::AboutDialog()
 	QString szLicense;
 
 	QString szLicensePath;
-	g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "COPYING");
+	g_pApp->getGlobalKvircDirectory(szLicensePath, KviApplication::License, "ABOUT-LICENSE");
 
 	if(!KviFileUtils::loadFile(szLicensePath, szLicense))
 	{
diff --git a/src/modules/about/AboutDialog.h b/src/modules/about/AboutDialog.h
index 7f4f819df..6cf4608e2 100644
--- a/src/modules/about/AboutDialog.h
+++ b/src/modules/about/AboutDialog.h
@@ -34,7 +34,7 @@ public:
 	~AboutDialog();
 
 protected:
-	virtual void closeEvent(QCloseEvent * e);
+	void closeEvent(QCloseEvent * e) override;
 protected slots:
 	void closeButtonPressed();
 };
diff --git a/src/modules/about/abouttext.inc b/src/modules/about/abouttext.inc
index 93141bd8e..617eba562 100644
--- a/src/modules/about/abouttext.inc
+++ b/src/modules/about/abouttext.inc
@@ -4,11 +4,11 @@ static const char * g_szAboutText = "" \
 "<title>Honor and glory</title>" \
 "</head>" \
 "<body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#FF0000\"><center>" \
-"<h4>" \
+"<h4><font color=\"#000000\">" \
 "This is a partial list of the people that have " \
 "contributed in some way to the KVIrc project.<br><br>" \
 "Honor and glory to:<br>" \
-"</h4>" \
+"</font></h4>" \
 "<br><table width=\"100%\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\">" \
 "<tr><td align=\"center\">" \
 "<font color=\"#000000\" size=\"+3\"><b>Core developers</b></font>" \
diff --git a/src/modules/about/libkviabout.h b/src/modules/about/libkviabout.h
index b396f64eb..386b488fd 100644
--- a/src/modules/about/libkviabout.h
+++ b/src/modules/about/libkviabout.h
@@ -44,8 +44,8 @@ public:
 	KviDlgAbout * m_pAboutDialog;
 	QPixmap     * m_pMemPixmap;
 public:
-	virtual void drawContents(QPainter *p);
-	virtual void resizeEvent(QResizeEvent *e);
+	void drawContents(QPainter *p) override;
+	void resizeEvent(QResizeEvent *e) override;
 };
 
 
@@ -60,8 +60,8 @@ public:
 //	void closed();
 private slots:
 	void close();
-	virtual void closeEvent(QCloseEvent *);
-//	virtual void paintEvent(QPaintEvent *);
+	void closeEvent(QCloseEvent *) override;
+//	void paintEvent(QPaintEvent *) override;
 	void scrollText();
 public:
 	int              m_posy;
@@ -80,7 +80,7 @@ public:
 private slots:
 	void close();
 private:
-	virtual void closeEvent(QCloseEvent *);
+	void closeEvent(QCloseEvent *) override;
 
 	QLabel		* m_pPicLabel;
 	QLabel		* m_pTextLabel;
diff --git a/src/modules/about/mkabouttext.pl b/src/modules/about/mkabouttext.pl
index a5c0da76f..6e6fc99a4 100755
--- a/src/modules/about/mkabouttext.pl
+++ b/src/modules/about/mkabouttext.pl
@@ -120,11 +120,11 @@ p " </head>";
 p " <body bgcolor=\"#FFFFFF\" text=\"#000000\" link=\"#FF0000\"><center>";
 
 
-p " <h4>";
+p " <h4><font color=\"#000000\">";
 p "This is a partial list of the people that have ";
 p "contributed in some way to the KVIrc project.<br><br>";
 p "Honor and glory to:<br>";
-p " </h4>";
+p " </font></h4>";
 
 $i = 0;
 $cnt++;