Merge pull request #93 from saturneric/dev/2.0.10/mainv2.1.0

Develop 2.1.0.2

3 files changed, 12 insertions, 7 deletions

diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index 3cf6c2a2..faf2b316 100644
--- a/src/ui/dialog/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -28,6 +28,8 @@
 
 #include "AboutDialog.h"
 
+#include <openssl/opensslv.h>
+
 #include "GpgFrontendBuildInfo.h"
 #include "core/function/GlobalSettingStation.h"
 #include "core/thread/TaskRunnerGetter.h"
@@ -83,9 +85,9 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
       "<center><b>" + qApp->applicationVersion() + "</b></center>" +
       "<center>" + GIT_VERSION + "</center>" + "<br><center>" +
       _("GpgFrontend is an easy-to-use, compact, cross-platform, "
-        "and installation-free gpg front-end tool."
-        "It visualizes most of the common operations of gpg commands."
-        "It's licensed under the GPL v3") +
+        "and installation-free GnuPG Frontend."
+        "It visualizes most of the common operations of GnuPG."
+        "GpgFrontend is licensed under the GPLv3") +
       "<br><br>"
       "<b>" +
       _("Developer:") + "</b><br>" + "Saturneric" + "<br><br>" +
@@ -94,7 +96,8 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
       " <a href=\"https://github.com/saturneric/GpgFrontend\">GitHub</a> " +
       _("or send a mail to my mailing list at") + " <a " +
       "href=\"mailto:[email protected]\">[email protected]</a>." + "<br><br> " +
-      _("Built with Qt") + " " + qVersion() + " " + _("and GPGME") + " " +
+      _("Built with Qt") + " " + qVersion() + ", " + OPENSSL_VERSION_TEXT +
+      " " + _("and") + " " + "GPGME" + " " +
       GpgFrontend::GpgContext::GetInstance()
           .GetInfo(false)
           .GpgMEVersion.c_str() +
diff --git a/src/ui/dialog/help/AboutDialog.h b/src/ui/dialog/help/AboutDialog.h
index 09a63734..6d7ce265 100644
--- a/src/ui/dialog/help/AboutDialog.h
+++ b/src/ui/dialog/help/AboutDialog.h
@@ -80,7 +80,6 @@ class UpdateTab : public QWidget {
   QLabel* upgrade_label_;          ///<
   QProgressBar* pb_;               ///<
   QString current_version_;        ///<
-  QPushButton* download_button_;   ///<
 
  public:
   /**
diff --git a/src/ui/dialog/help/GnupgTab.cpp b/src/ui/dialog/help/GnupgTab.cpp
index 2758cbe1..996d4ad9 100644
--- a/src/ui/dialog/help/GnupgTab.cpp
+++ b/src/ui/dialog/help/GnupgTab.cpp
@@ -42,7 +42,10 @@ GpgFrontend::UI::GnupgTab::GnupgTab(QWidget* parent)
 
   QStringList components_column_titles;
   components_column_titles << _("Name") << _("Description") << _("Version")
-                           << _("Checksum") << _("Path");
+                           << _("Checksum") << _("Binary Path");
+
+  ui_->tabWidget->setTabText(0, _("Components"));
+  ui_->tabWidget->setTabText(1, _("Configurations"));
 
   ui_->componentDetailsTable->setColumnCount(components_column_titles.length());
   ui_->componentDetailsTable->setHorizontalHeaderLabels(
@@ -52,7 +55,7 @@ GpgFrontend::UI::GnupgTab::GnupgTab(QWidget* parent)
       QAbstractItemView::SelectRows);
 
   QStringList configurations_column_titles;
-  configurations_column_titles << _("Name") << _("Path");
+  configurations_column_titles << _("Key") << _("Value");
 
   ui_->configurationDetailsTable->setColumnCount(
       configurations_column_titles.length());