Merge pull request #15 from saturneric/develop

Develop

1 files changed, 30 insertions, 212 deletions

diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp
index b0486cc9..8b482675 100644
--- a/src/ui/Wizard.cpp
+++ b/src/ui/Wizard.cpp
@@ -24,10 +24,6 @@
 
 #include "ui/Wizard.h"
 
-#ifdef Q_OS_WIN
-#include "windows.h"
-#endif
-
 Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
         : QWizard(parent), appPath(qApp->applicationDirPath()),
           settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini", QSettings::IniFormat) {
@@ -36,8 +32,6 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
 
     setPage(Page_Intro, new IntroPage(this));
     setPage(Page_Choose, new ChoosePage(this));
-    setPage(Page_ImportFromGpg4usb, new ImportFromGpg4usbPage(mCtx, mKeyMgmt, this));
-    setPage(Page_ImportFromGnupg, new ImportFromGnupgPage(mCtx, mKeyMgmt, this));
     setPage(Page_GenKey, new KeyGenPage(mCtx, this));
     setPage(Page_Conclusion, new ConclusionPage(this));
 #ifndef Q_WS_MAC
@@ -54,7 +48,6 @@ Wizard::Wizard(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
     settings.remove("wizard/nextPage");
 
     connect(this, SIGNAL(accepted()), this, SLOT(slotWizardAccepted()));
-    // connect(this, SIGNAL(signalOpenHelp(QString)), parentWidget(), SLOT(signalOpenHelp(QString)));
 
 }
 
@@ -67,57 +60,20 @@ void Wizard::slotWizardAccepted() {
     }
 }
 
-bool Wizard::importPubAndSecKeysFromDir(const QString &dir, KeyMgmt *keyMgmt) {
-    QFile secRingFile(dir + "/secring.gpg");
-    QFile pubRingFile(dir + "/pubring.gpg");
-
-    // Return, if no keyrings are found in subdir of chosen dir
-    if (!(pubRingFile.exists() or secRingFile.exists())) {
-        QMessageBox::critical(0, tr("Import Error"), tr("Couldn't locate any keyring file in %1").arg(dir));
-        return false;
-    }
-
-    QByteArray inBuffer;
-    if (secRingFile.exists()) {
-        // write content of secringfile to inBuffer
-        if (!secRingFile.open(QIODevice::ReadOnly)) {
-            QMessageBox::critical(nullptr, tr("Import error"),
-                                  tr("Couldn't open private keyringfile: %1").arg(secRingFile.fileName()));
-            return false;
-        }
-        inBuffer = secRingFile.readAll();
-        secRingFile.close();
-    }
-
-    if (pubRingFile.exists()) {
-        // try to import public keys
-        if (!pubRingFile.open(QIODevice::ReadOnly)) {
-            QMessageBox::critical(nullptr, tr("Import error"),
-                                  tr("Couldn't open public keyringfile: %1").arg(pubRingFile.fileName()));
-            return false;
-        }
-        inBuffer.append(pubRingFile.readAll());
-        pubRingFile.close();
-    }
-    keyMgmt->slotImportKeys(inBuffer);
-    inBuffer.clear();
-
-    return true;
-}
-
 IntroPage::IntroPage(QWidget *parent)
         : QWizardPage(parent), appPath(qApp->applicationDirPath()),
           settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini", QSettings::IniFormat) {
     setTitle(tr("Getting Started..."));
     setSubTitle(tr("... with GPGFrontend"));
 
-    auto *topLabel = new QLabel(tr("Welcome to use GPGFrontend for decrypting and signing text or file!")+
-                                   " <br><br><a href='https://github.com/saturneric/GpgFrontend'>GpgFrontend</a> " +
-                                   tr("is a Powerful, Easy-to-Use, Compact, Cross-Platform, and Installation-Free OpenPGP Crypto Tool.") +
-                                   tr("For brief information have a look at the") + "<a href='https://saturneric.github.io/GpgFrontend/index.html#/overview'>"+
-                                   tr("Overview") +"</a> (" +
-                                   tr("by clicking the link, the page will open in the web browser") +
-                                   "). <br>");
+    auto *topLabel = new QLabel(tr("Welcome to use GPGFrontend for decrypting and signing text or file!") +
+                                " <br><br><a href='https://gpgfrontend.pub'>GpgFrontend</a> " +
+                                tr("is a Powerful, Easy-to-Use, Compact, Cross-Platform, and Installation-Free OpenPGP Crypto Tool.") +
+                                tr("For brief information have a look at the") +
+                                " <a href='https://gpgfrontend.pub/index.html#/overview'>" +
+                                tr("Overview") + "</a> (" +
+                                tr("by clicking the link, the page will open in the web browser") +
+                                "). <br>");
     topLabel->setTextFormat(Qt::RichText);
     topLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     topLabel->setOpenExternalLinks(true);
@@ -130,7 +86,7 @@ IntroPage::IntroPage(QWidget *parent)
     languages = SettingsDialog::listLanguages();
     auto *langSelectBox = new QComboBox();
 
-    for(const auto &l : languages) {
+    for (const auto &l : languages) {
         langSelectBox->addItem(l);
     }
     // selected entry from config
@@ -166,19 +122,21 @@ ChoosePage::ChoosePage(QWidget *parent)
     setSubTitle(tr("...by clicking on the appropriate link."));
 
     auto *keygenLabel = new QLabel(tr("If you have never used GPGFrontend before and also don't own a gpg key yet you "
-                                      "may possibly want to read how to") + " <a href=\"https://saturneric.github.io/GpgFrontend/index.html#/manual/generate-key\">"
+                                      "may possibly want to read how to") +
+                                   " <a href=\"https://gpgfrontend.pub/index.html#/manual/generate-key\">"
                                    + tr("Generate Key") + "</a><hr>");
     keygenLabel->setTextFormat(Qt::RichText);
     keygenLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     keygenLabel->setOpenExternalLinks(true);
     keygenLabel->setWordWrap(true);
 
-    auto *encrDecyTextLabel = new QLabel(tr("If you want to learn how to encrypt, decrypt, sign and verify text, you can read ")
-                                          + "<a href=\"https://saturneric.github.io/GpgFrontend/index.html#/manual/encrypt-decrypt-text\">"
-                                          + tr("Encrypt & Decrypt Text") + "</a> " + tr("or")
-                                          + " <a href=\"https://saturneric.github.io/GpgFrontend/index.html#/manual/sign-verify-text\">"
-                                          + tr("Sign & Verify Text")
-                                          +"</a><hr>");
+    auto *encrDecyTextLabel = new QLabel(
+            tr("If you want to learn how to encrypt, decrypt, sign and verify text, you can read ")
+            + "<a href=\"https://gpgfrontend.pub/index.html#/manual/encrypt-decrypt-text\">"
+            + tr("Encrypt & Decrypt Text") + "</a> " + tr("or")
+            + " <a href=\"https://gpgfrontend.pub/index.html#/manual/sign-verify-text\">"
+            + tr("Sign & Verify Text")
+            + "</a><hr>");
 
     encrDecyTextLabel->setTextFormat(Qt::RichText);
     encrDecyTextLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
@@ -186,11 +144,13 @@ ChoosePage::ChoosePage(QWidget *parent)
     encrDecyTextLabel->setWordWrap(true);
 
     auto *signVerifyTextLabel = new QLabel(tr("If you want to operate file, you can read ")
-                                        + "<a href=\"https://saturneric.github.io/GpgFrontend/index.html#/manual/encrypt-decrypt-file\">"
-                                        + tr("Encrypt & Sign File") + "</a> " + tr("or")
-                                        + " <a href=\"https://saturneric.github.io/GpgFrontend/index.html#/manual/sign-verify-file\">"
-                                        + tr("Sign & Verify File")
-                                        +"</a><hr>");
+                                           +
+                                           "<a href=\"https://gpgfrontend.pub/index.html#/manual/encrypt-decrypt-file\">"
+                                           + tr("Encrypt & Sign File") + "</a> " + tr("or")
+                                           +
+                                           " <a href=\"https://gpgfrontend.pub/index.html#/manual/sign-verify-file\">"
+                                           + tr("Sign & Verify File")
+                                           + "</a><hr>");
     signVerifyTextLabel->setTextFormat(Qt::RichText);
     signVerifyTextLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     signVerifyTextLabel->setOpenExternalLinks(true);
@@ -217,149 +177,6 @@ void ChoosePage::slotJumpPage(const QString &page) {
     wizard()->next();
 }
 
-ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
-        : QWizardPage(parent), appPath(qApp->applicationDirPath()),
-          settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini", QSettings::IniFormat) {
-    mCtx = ctx;
-    mKeyMgmt = keyMgmt;
-    setTitle(tr("Import from..."));
-    setSubTitle(tr("...existing GPGFrontend"));
-
-    auto *topLabel = new QLabel(tr("You can import keys and/or settings from existing GPGFrontend. <br><br>"
-                                   "Just check what you want to import, click the import button and choose "
-                                   "the directory of your other GPGFrontend in the appearing file dialog."), this);
-    topLabel->setWordWrap(true);
-
-    gpg4usbKeyCheckBox = new QCheckBox();
-    gpg4usbKeyCheckBox->setChecked(true);
-    auto *keyLabel = new QLabel(tr("Keys"));
-
-    gpg4usbConfigCheckBox = new QCheckBox();
-    gpg4usbConfigCheckBox->setChecked(true);
-    auto *configLabel = new QLabel(tr("Configuration"));
-
-    auto *importFromGpg4usbButton = new QPushButton(tr("Import from GPGFrontend"));
-    connect(importFromGpg4usbButton, SIGNAL(clicked()), this, SLOT(slotImportFromOlderGpg4usb()));
-
-    auto *gpg4usbLayout = new QGridLayout();
-    gpg4usbLayout->addWidget(topLabel, 1, 1, 1, 2);
-    gpg4usbLayout->addWidget(gpg4usbKeyCheckBox, 2, 1, Qt::AlignRight);
-    gpg4usbLayout->addWidget(keyLabel, 2, 2);
-    gpg4usbLayout->addWidget(gpg4usbConfigCheckBox, 3, 1, Qt::AlignRight);
-    gpg4usbLayout->addWidget(configLabel, 3, 2);
-    gpg4usbLayout->addWidget(importFromGpg4usbButton, 4, 2);
-
-    this->setLayout(gpg4usbLayout);
-}
-
-void ImportFromGpg4usbPage::slotImportFromOlderGpg4usb() {
-    QString dir = QFileDialog::getExistingDirectory(this, tr("Other GPGFrontend directory"));
-
-    // Return, if cancel was hit
-    if (dir.isEmpty()) {
-        return;
-    }
-
-    // try to import keys, if appropriate box is checked, return, if import was unsuccessful
-    if (gpg4usbKeyCheckBox->isChecked()) {
-        if (!Wizard::importPubAndSecKeysFromDir(dir + "/keydb", mKeyMgmt)) {
-            return;
-        }
-    }
-
-    // try to import config, if appropriate box is checked
-    if (gpg4usbConfigCheckBox->isChecked()) {
-        slotImportConfFromGpg4usb(dir);
-
-        settings.setValue("wizard/nextPage", this->nextId());
-        QMessageBox::information(nullptr, tr("Configuration Imported"),
-                                 tr("Imported Configuration from old GPGFrontend.<br>"
-                                    "Will now restart to activate the configuration."));
-        // TODO: edit->maybesave?
-        qApp->exit(RESTART_CODE);
-    }
-    wizard()->next();
-}
-
-bool ImportFromGpg4usbPage::slotImportConfFromGpg4usb(const QString &dir) {
-    QString path = dir + "/conf/gpgfrontend.ini";
-    QSettings oldconf(path, QSettings::IniFormat, this);
-    QSettings actualConf;
-            foreach(QString key, oldconf.allKeys()) {
-            actualConf.setValue(key, oldconf.value(key));
-        }
-    return true;
-}
-
-int ImportFromGpg4usbPage::nextId() const {
-    return Wizard::Page_Conclusion;
-}
-
-ImportFromGnupgPage::ImportFromGnupgPage(GpgME::GpgContext *ctx, KeyMgmt *keyMgmt, QWidget *parent)
-        : QWizardPage(parent) {
-    mCtx = ctx;
-    mKeyMgmt = keyMgmt;
-    setTitle(tr("Import keys..."));
-    setSubTitle(tr("...from existing GnuPG installation"));
-
-    auto *gnupgLabel = new QLabel(tr("You can import keys from a locally installed GnuPG.<br><br> The location is read "
-                                     "from registry in Windows or assumed to be the .gnupg folder in the your home directory in Linux.<br>"));
-    gnupgLabel->setWordWrap(true);
-
-    importFromGnupgButton = new QPushButton(tr("Import keys from GnuPG"));
-    connect(importFromGnupgButton, SIGNAL(clicked()), this, SLOT(slotrImportKeysFromGnupg()));
-
-    auto *layout = new QGridLayout();
-    layout->addWidget(gnupgLabel);
-    layout->addWidget(importFromGnupgButton);
-
-    this->setLayout(layout);
-}
-
-void ImportFromGnupgPage::slotrImportKeysFromGnupg() {
-    // first get gnupghomedir and check, if it exists
-    QString gnuPGHome = getGnuPGHome();
-    if (gnuPGHome == nullptr) {
-        QMessageBox::critical(0, tr("Import Error"), tr("Couldn't locate GnuPG home directory"));
-        return;
-    }
-
-    // Try to import the keyring files and return the return value of the method
-    Wizard::importPubAndSecKeysFromDir(gnuPGHome, mKeyMgmt);
-    wizard()->next();
-}
-
-QString ImportFromGnupgPage::getGnuPGHome() {
-    QString gnuPGHome = "";
-#ifdef _WIN32
-    bool existsAndSuccess = false;
-
-    HKEY hKey;
-
-    existsAndSuccess = (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\GNU\\GNUPG", 0, KEY_READ, &hKey) == ERROR_SUCCESS);
-
-    if (existsAndSuccess) {
-        QSettings gnuPGsettings("HKEY_CURRENT_USER\\Software\\GNU\\GNUPG", QSettings::NativeFormat);
-            if (gnuPGsettings.contains("HomeDir")) {
-                gnuPGHome = gnuPGsettings.value("HomeDir").toString();
-            } else {
-                return NULL;
-            }
-        }
-#else
-    gnuPGHome = QDir::homePath() + "/.gnupg";
-    if (!QFile(gnuPGHome).exists()) {
-        return nullptr;
-    }
-#endif
-
-    return gnuPGHome;
-}
-
-int ImportFromGnupgPage::nextId() const {
-    return Wizard::Page_Conclusion;
-}
-
 KeyGenPage::KeyGenPage(GpgME::GpgContext *ctx, QWidget *parent)
         : QWizardPage(parent) {
     mCtx = ctx;
@@ -407,10 +224,11 @@ ConclusionPage::ConclusionPage(QWidget *parent)
     setTitle(tr("Ready."));
     setSubTitle(tr("Have fun with GPGFrontend!"));
 
-    auto *bottomLabel = new QLabel(tr("You are ready to use GPGFrontend now.<br><br>")+
-            "<a href=\"https://saturneric.github.io/GpgFrontend/index.html#/overview\">"
-            + tr("The Online Document") + "</a>"
-            + tr(" will get you started with GPGFrontend. It will open in the main window.<br>"));
+    auto *bottomLabel = new QLabel(tr("You are ready to use GPGFrontend now.<br><br>") +
+                                   "<a href=\"https://saturneric.github.io/GpgFrontend/index.html#/overview\">"
+                                   + tr("The Online Document") + "</a>"
+                                   +
+                                   tr(" will get you started with GPGFrontend. It will open in the main window.<br>"));
 
     bottomLabel->setTextFormat(Qt::RichText);
     bottomLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);