From 97d13004e4f1cb33941a9be57c7e7662e223890b Mon Sep 17 00:00:00 2001
From: Saturneric <eric@bktus.com>
Date: Mon, 6 Dec 2021 23:58:23 +0800
Subject: Improve UI & Functions

---
 src/ui/KeyServerImportDialog.cpp | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'src/ui/KeyServerImportDialog.cpp')

diff --git a/src/ui/KeyServerImportDialog.cpp b/src/ui/KeyServerImportDialog.cpp
index 17db7d65..2b814693 100644
--- a/src/ui/KeyServerImportDialog.cpp
+++ b/src/ui/KeyServerImportDialog.cpp
@@ -196,7 +196,7 @@ void KeyServerImportDialog::createKeysTable() {
 
 void KeyServerImportDialog::setMessage(const QString& text, bool error) {
   if (mAutomatic) return;
-  
+
   message->setText(text);
   if (error) {
     icon->setPixmap(
@@ -527,34 +527,24 @@ KeyServerImportDialog::KeyServerImportDialog(QWidget* parent)
     : QDialog(parent), mAutomatic(true) {
   setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint);
 
-  message = new QLabel;
-  message->setFixedHeight(24);
-  icon = new QLabel;
-  icon->setFixedHeight(24);
-
   // Network Waiting
   waitingBar = new QProgressBar();
   waitingBar->setVisible(false);
   waitingBar->setRange(0, 0);
-  waitingBar->setFixedHeight(24);
-  waitingBar->setFixedWidth(200);
+  waitingBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  waitingBar->setTextVisible(false);
 
   // Layout for messagebox
-  auto* messageLayout = new QHBoxLayout;
-  messageLayout->addWidget(icon);
-  messageLayout->addWidget(message);
-  messageLayout->addWidget(waitingBar);
-  messageLayout->addStretch();
+  auto* layout = new QHBoxLayout();
+  layout->setContentsMargins(0, 0, 0, 0);
+  layout->setSpacing(0);
+  layout->addWidget(waitingBar);
 
   keyServerComboBox = createComboBox();
 
-  auto* mainLayout = new QGridLayout;
-
-  mainLayout->addLayout(messageLayout, 0, 0, 1, 3);
-
-  this->setLayout(mainLayout);
-  this->setWindowTitle(_("Upload Keys from Keyserver"));
-  this->setFixedSize(200, 42);
+  this->setLayout(layout);
+  this->setWindowTitle(_("Update Keys from Keyserver"));
+  this->setFixedSize(240, 42);
   this->setModal(true);
 }
 
-- 
cgit v1.2.3


From 1a2c3d6bc0b2feb4b286cc1dbe7b2cd5afcb69ba Mon Sep 17 00:00:00 2001
From: Saturneric <eric@bktus.com>
Date: Tue, 7 Dec 2021 06:05:21 +0800
Subject: Add Translate & Fix Bugs.

---
 src/ui/KeyServerImportDialog.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/ui/KeyServerImportDialog.cpp')

diff --git a/src/ui/KeyServerImportDialog.cpp b/src/ui/KeyServerImportDialog.cpp
index 2b814693..844f2ae5 100644
--- a/src/ui/KeyServerImportDialog.cpp
+++ b/src/ui/KeyServerImportDialog.cpp
@@ -505,12 +505,13 @@ void KeyServerImportDialog::importKeys(ByteArrayPtr in_data) {
   GpgImportInformation result =
       GpgKeyImportExportor::GetInstance().ImportKey(std::move(in_data));
   emit signalKeyImported();
+  QWidget* _parent = qobject_cast<QWidget*>(parent());
   if (mAutomatic) {
-    auto dialog = new KeyImportDetailDialog(result, true, nullptr);
+    auto dialog = new KeyImportDetailDialog(result, true, _parent);
     dialog->show();
     this->accept();
   } else {
-    auto dialog = new KeyImportDetailDialog(result, false, this);
+    auto dialog = new KeyImportDetailDialog(result, false, _parent);
     dialog->exec();
   }
 }
-- 
cgit v1.2.3