diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpg/GpgContext.cpp | 12 | ||||
| -rw-r--r-- | src/ui/AboutDialog.cpp | 2 | ||||
| -rwxr-xr-x | src/ui/SettingsDialog.cpp | 12 | ||||
| -rw-r--r-- | src/ui/Wizard.cpp | 2 |
4 files changed, 8 insertions, 20 deletions
diff --git a/src/gpg/GpgContext.cpp b/src/gpg/GpgContext.cpp index a6be9c3c..4366d967 100644 --- a/src/gpg/GpgContext.cpp +++ b/src/gpg/GpgContext.cpp @@ -65,18 +65,6 @@ namespace GpgME { err = gpgme_new(&mCtx); checkErr(err); - QSettings qSettings; - QString accKeydbPath = qSettings.value("gpgpaths/keydbpath").toString(); - QString qGpgKeys = appPath + "/keydb/" + accKeydbPath; - - if (accKeydbPath != "") { - if (!QDir(qGpgKeys).exists()) { - QMessageBox::critical(nullptr, tr("keydb path"), - tr("Didn't find keydb directory. Switching to gpg4usb's default keydb directory for this session.")); - qGpgKeys = appPath + "/keydb"; - } - } - gpgme_engine_info_t engineInfo; engineInfo = gpgme_ctx_get_engine_info(mCtx); diff --git a/src/ui/AboutDialog.cpp b/src/ui/AboutDialog.cpp index 40ba6e61..67069049 100644 --- a/src/ui/AboutDialog.cpp +++ b/src/ui/AboutDialog.cpp @@ -58,7 +58,7 @@ InfoTab::InfoTab(QWidget *parent) "Saturneric<br><br>" "If you have any questions or suggestions have a look<br/>" "at my <a href=\"https://bktus.com/%e8%81%94%e7%b3%bb%e4%b8%8e%e9%aa%8c%e8%af%81\">" - "contact page</a> or send a mail to our<br/> mailing list at" + "contact page</a> or send a mail to my<br/> mailing list at" " <a href=\"mailto:[email protected]\">[email protected]</a>.") + tr("<br><br> Built with Qt ") + qVersion() + tr(" and GPGME ") + GpgME::GpgContext::getGpgmeVersion() + "</center>"); diff --git a/src/ui/SettingsDialog.cpp b/src/ui/SettingsDialog.cpp index 2e174b91..99a25f8a 100755 --- a/src/ui/SettingsDialog.cpp +++ b/src/ui/SettingsDialog.cpp @@ -38,8 +38,8 @@ SettingsDialog::SettingsDialog(GpgME::GpgContext *ctx, QWidget *parent) tabWidget->addTab(generalTab, tr("General")); tabWidget->addTab(appearanceTab, tr("Appearance")); tabWidget->addTab(mimeTab, tr("PGP/Mime")); - tabWidget->addTab(keyserverTab, tr("Keyserver")); - tabWidget->addTab(gpgPathsTab, tr("Gpg paths")); + tabWidget->addTab(keyserverTab, tr("Key Server")); + // tabWidget->addTab(gpgPathsTab, tr("Gpg paths")); tabWidget->addTab(advancedTab, tr("Advanced")); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok @@ -65,7 +65,7 @@ SettingsDialog::SettingsDialog(GpgME::GpgContext *ctx, QWidget *parent) connect(this, SIGNAL(signalRestartNeeded(bool)), parent, SLOT(slotSetRestartNeeded(bool))); - exec(); + this->show(); } bool SettingsDialog::getRestartNeeded() const { @@ -551,9 +551,9 @@ KeyserverTab::KeyserverTab(QWidget *parent) auto *addKeyServerBox = new QWidget(this); auto *addKeyServerLayout = new QHBoxLayout(addKeyServerBox); - auto *http = new QLabel("http://"); + auto *http = new QLabel("URL: "); newKeyServerEdit = new QLineEdit(this); - auto *newKeyServerButton = new QPushButton(tr("Add to keyserverlist"), this); + auto *newKeyServerButton = new QPushButton(tr("Add"), this); connect(newKeyServerButton, SIGNAL(clicked()), this, SLOT(addKeyServer())); addKeyServerLayout->addWidget(http); addKeyServerLayout->addWidget(newKeyServerEdit); @@ -586,7 +586,7 @@ void KeyserverTab::setSettings() { } void KeyserverTab::addKeyServer() { - if (newKeyServerEdit->text().startsWith("http://")) { + if (newKeyServerEdit->text().startsWith("http://") || newKeyServerEdit->text().startsWith("https://")) { comboBox->addItem(newKeyServerEdit->text()); } else { comboBox->addItem("http://" + newKeyServerEdit->text()); diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp index 3a09323a..03883a06 100644 --- a/src/ui/Wizard.cpp +++ b/src/ui/Wizard.cpp @@ -54,7 +54,7 @@ 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))); + // connect(this, SIGNAL(signalOpenHelp(QString)), parentWidget(), SLOT(signalOpenHelp(QString))); } |