aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2023-03-31 08:28:29 +0000
committerSaturneric <[email protected]>2023-03-31 08:28:29 +0000
commit676220f4846a3f2161daaa38a67933453c9f56b6 (patch)
treeb9af17bc1e65aceaa33c652053ba5d44a1481d06
parentfeat: improve ui when gnupg is offline (diff)
downloadGpgFrontend-676220f4846a3f2161daaa38a67933453c9f56b6.tar.gz
GpgFrontend-676220f4846a3f2161daaa38a67933453c9f56b6.zip
fix: solve known ui issues
-rw-r--r--src/ui/dialog/help/AboutDialog.cpp2
-rw-r--r--src/ui/dialog/settings/SettingsKeyServer.cpp5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index 548ba47a..faf2b316 100644
--- a/src/ui/dialog/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -97,7 +97,7 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
_("or send a mail to my mailing list at") + " <a " +
"href=\"mailto:[email protected]\">[email protected]</a>." + "<br><br> " +
_("Built with Qt") + " " + qVersion() + ", " + OPENSSL_VERSION_TEXT +
- " " + _("and") + "GPGME" + " " +
+ " " + _("and") + " " + "GPGME" + " " +
GpgFrontend::GpgContext::GetInstance()
.GetInfo(false)
.GpgMEVersion.c_str() +
diff --git a/src/ui/dialog/settings/SettingsKeyServer.cpp b/src/ui/dialog/settings/SettingsKeyServer.cpp
index 8719ab9a..83bd2c80 100644
--- a/src/ui/dialog/settings/SettingsKeyServer.cpp
+++ b/src/ui/dialog/settings/SettingsKeyServer.cpp
@@ -284,6 +284,11 @@ void KeyserverTab::slot_test_listed_key_server() {
Thread::TaskRunnerGetter::GetInstance()
.GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Network)
->PostTask(task);
+
+ QEventLoop loop;
+ connect(task, &Thread::Task::SignalTaskEnd, &loop, &QEventLoop::quit);
+ connect(waiting_dialog, &QProgressDialog::canceled, &loop, &QEventLoop::quit);
+ loop.exec();
}
void KeyserverTab::contextMenuEvent(QContextMenuEvent* event) {