Merge pull request #70 from saturneric/dev/2.0.8/saturnericv2.0.9

Develop 2.0.9.1

4 files changed, 137 insertions, 13 deletions

diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index e8fbeb1b..6b6e4356 100644
--- a/src/ui/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -26,39 +26,43 @@
  *
  */
 
-#include "ui/help/AboutDialog.h"
+#include "AboutDialog.h"
 
 #include "GpgFrontendBuildInfo.h"
 #include "core/function/GlobalSettingStation.h"
 #include "core/thread/TaskRunnerGetter.h"
+#include "ui/dialog/help/GnupgTab.h"
 #include "ui/thread/VersionCheckTask.h"
 
 namespace GpgFrontend::UI {
 
-AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) {
+AboutDialog::AboutDialog(int defaultIndex, QWidget* parent)
+    : GeneralDialog(typeid(AboutDialog).name(), parent) {
   this->setWindowTitle(QString(_("About")) + " " + qApp->applicationName());
 
-  auto* tabWidget = new QTabWidget;
-  auto* infoTab = new InfoTab();
-  auto* translatorsTab = new TranslatorsTab();
+  auto* tab_widget = new QTabWidget;
+  auto* info_tab = new InfoTab();
+  auto* gnupg_tab = new GnupgTab();
+  auto* translators_tab = new TranslatorsTab();
   update_tab_ = new UpdateTab();
 
-  tabWidget->addTab(infoTab, _("About Software"));
-  tabWidget->addTab(translatorsTab, _("Translators"));
-  tabWidget->addTab(update_tab_, _("Update"));
+  tab_widget->addTab(info_tab, _("About GpgFrontend"));
+  tab_widget->addTab(gnupg_tab, _("GnuPG"));
+  tab_widget->addTab(translators_tab, _("Translators"));
+  tab_widget->addTab(update_tab_, _("Update"));
 
-  connect(tabWidget, &QTabWidget::currentChanged, this,
+  connect(tab_widget, &QTabWidget::currentChanged, this,
           [&](int index) { LOG(INFO) << "Current Index" << index; });
 
-  if (defaultIndex < tabWidget->count() && defaultIndex >= 0) {
-    tabWidget->setCurrentIndex(defaultIndex);
+  if (defaultIndex < tab_widget->count() && defaultIndex >= 0) {
+    tab_widget->setCurrentIndex(defaultIndex);
   }
 
   auto* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
   connect(buttonBox, &QDialogButtonBox::accepted, this, &AboutDialog::close);
 
   auto* mainLayout = new QVBoxLayout;
-  mainLayout->addWidget(tabWidget);
+  mainLayout->addWidget(tab_widget);
   mainLayout->addWidget(buttonBox);
   setLayout(mainLayout);
 
diff --git a/src/ui/help/AboutDialog.h b/src/ui/dialog/help/AboutDialog.h
index 40d93f3e..09a63734 100644
--- a/src/ui/help/AboutDialog.h
+++ b/src/ui/dialog/help/AboutDialog.h
@@ -31,6 +31,7 @@
 
 #include "core/GpgContext.h"
 #include "ui/GpgFrontendUI.h"
+#include "ui/dialog/GeneralDialog.h"
 #include "ui/struct/SoftwareVersion.h"
 
 namespace GpgFrontend::UI {
@@ -116,7 +117,7 @@ class UpdateTab : public QWidget {
  * @brief Class for handling the about dialog
  *
  */
-class AboutDialog : public QDialog {
+class AboutDialog : public GeneralDialog {
   Q_OBJECT
 
  public:
diff --git a/src/ui/dialog/help/GnupgTab.cpp b/src/ui/dialog/help/GnupgTab.cpp
new file mode 100644
index 00000000..48787987
--- /dev/null
+++ b/src/ui/dialog/help/GnupgTab.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2022. Saturneric
+ *
+ *  This file is part of GpgFrontend.
+ *
+ * GpgFrontend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GpgFrontend 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The initial version of the source code is inherited from
+ * the gpg4usb project, which is under GPL-3.0-or-later.
+ *
+ * All the source code of GpgFrontend was modified and released by
+ * Saturneric<[email protected]> starting on May 12, 2021.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+//
+// Created by eric on 2022/7/23.
+//
+
+#include "GnupgTab.h"
+
+GpgFrontend::UI::GnupgTab::GnupgTab(QWidget* parent) : QWidget(parent) {
+  GpgContext& ctx = GpgContext::GetInstance();
+  auto info = ctx.GetInfo();
+
+  auto* pixmap = new QPixmap(":gnupg.png");
+  auto* text = new QString(
+      "<center><h2>" + QString(_("GnuPG")) + "</h2></center>" + "<center><b>" +
+      QString(_("GnuPG Version")) + ": " +
+      QString::fromStdString(info.GnupgVersion) + "</b></center>" +
+      "<center><b>" + +"</b></center>" + "<center>" +
+      QString(_("GpgME Version")) + ": " +
+      QString::fromStdString(info.GpgMEVersion) + "</center><br /><hr />" +
+      "<h3>" + QString(_("PATHs")) + "</h3>" + QString(_("GpgConf")) + ": " +
+      QString::fromStdString(info.GpgConfPath) + "<br />" +
+      QString(_("GnuPG")) + ": " + QString::fromStdString(info.AppPath) +
+      "<br />" + QString(_("CMS")) + ": " +
+      QString::fromStdString(info.CMSPath) + "<br />");
+
+  auto* layout = new QGridLayout();
+  auto* pixmapLabel = new QLabel();
+  pixmapLabel->setPixmap(*pixmap);
+  layout->addWidget(pixmapLabel, 0, 0, 1, -1, Qt::AlignCenter);
+  auto* aboutLabel = new QLabel();
+  aboutLabel->setText(*text);
+  aboutLabel->setWordWrap(true);
+  aboutLabel->setOpenExternalLinks(true);
+  layout->addWidget(aboutLabel, 1, 0, 1, -1);
+  layout->addItem(
+      new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed), 2, 1,
+      1, 1);
+
+  setLayout(layout);
+}
diff --git a/src/ui/dialog/help/GnupgTab.h b/src/ui/dialog/help/GnupgTab.h
new file mode 100644
index 00000000..4fc7ff22
--- /dev/null
+++ b/src/ui/dialog/help/GnupgTab.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022. Saturneric
+ *
+ *  This file is part of GpgFrontend.
+ *
+ * GpgFrontend is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GpgFrontend 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.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The initial version of the source code is inherited from
+ * the gpg4usb project, which is under GPL-3.0-or-later.
+ *
+ * All the source code of GpgFrontend was modified and released by
+ * Saturneric<[email protected]> starting on May 12, 2021.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+//
+// Created by eric on 2022/7/23.
+//
+
+#ifndef GPGFRONTEND_GNUPGTAB_H
+#define GPGFRONTEND_GNUPGTAB_H
+
+#include "core/GpgContext.h"
+#include "ui/GpgFrontendUI.h"
+
+namespace GpgFrontend::UI{
+class GnupgTab: public QWidget {
+  Q_OBJECT
+ public:
+  /**
+   * @brief Construct a new Info Tab object
+   *
+   * @param parent
+   */
+  explicit GnupgTab(QWidget* parent = nullptr);
+};
+}
+
+
+
+#endif  // GPGFRONTEND_GNUPGTAB_H