UI Framework Modified.

1 files changed, 66 insertions, 68 deletions

diff --git a/src/ui/keypair_details/KeyNewUIDDialog.cpp b/src/ui/keypair_details/KeyNewUIDDialog.cpp
index 7c6e1ca5..a22250c1 100644
--- a/src/ui/keypair_details/KeyNewUIDDialog.cpp
+++ b/src/ui/keypair_details/KeyNewUIDDialog.cpp
@@ -24,79 +24,77 @@
 
 #include "ui/keypair_details/KeyNewUIDDialog.h"
 
-KeyNewUIDDialog::KeyNewUIDDialog(GpgFrontend::GpgContext *ctx, const GpgKey &key, QWidget *parent) :
-    mCtx(ctx), mKey(key), QDialog(parent) {
-
-    name = new QLineEdit();
-    name->setMinimumWidth(240);
-    email = new QLineEdit();
-    email->setMinimumWidth(240);
-    comment = new QLineEdit();
-    comment->setMinimumWidth(240);
-    createButton = new QPushButton("Create");
-    errorLabel = new QLabel();
-
-    auto gridLayout = new QGridLayout();
-    gridLayout->addWidget(new QLabel(tr("Name")), 0, 0);
-    gridLayout->addWidget(new QLabel(tr("Email")), 1, 0);
-    gridLayout->addWidget(new QLabel(tr("Comment")), 2, 0);
-
-
-    gridLayout->addWidget(name, 0 ,1);
-    gridLayout->addWidget(email, 1 ,1);
-    gridLayout->addWidget(comment, 2 ,1);
-
-    gridLayout->addWidget(createButton, 3, 0, 1, 2);
-    gridLayout->addWidget(errorLabel, 4, 0, 1, 2);
-
-    connect(createButton, SIGNAL(clicked(bool)), this, SLOT(slotCreateNewUID()));
-
-    this->setLayout(gridLayout);
-    this->setWindowTitle(tr("Create New UID"));
-    this->setAttribute(Qt::WA_DeleteOnClose, true);
-    this->setModal(true);
+#include "gpg/function/GpgKeyGetter.h"
+#include "gpg/function/UidOperator.h"
+
+namespace GpgFrontend::UI {
+KeyNewUIDDialog::KeyNewUIDDialog(const KeyId& key_id, QWidget* parent)
+    : QDialog(parent), mKey(GpgKeyGetter::GetInstance().GetKey(key_id)) {
+  name = new QLineEdit();
+  name->setMinimumWidth(240);
+  email = new QLineEdit();
+  email->setMinimumWidth(240);
+  comment = new QLineEdit();
+  comment->setMinimumWidth(240);
+  createButton = new QPushButton("Create");
+  errorLabel = new QLabel();
+
+  auto gridLayout = new QGridLayout();
+  gridLayout->addWidget(new QLabel(tr("Name")), 0, 0);
+  gridLayout->addWidget(new QLabel(tr("Email")), 1, 0);
+  gridLayout->addWidget(new QLabel(tr("Comment")), 2, 0);
+
+  gridLayout->addWidget(name, 0, 1);
+  gridLayout->addWidget(email, 1, 1);
+  gridLayout->addWidget(comment, 2, 1);
+
+  gridLayout->addWidget(createButton, 3, 0, 1, 2);
+  gridLayout->addWidget(errorLabel, 4, 0, 1, 2);
+
+  connect(createButton, SIGNAL(clicked(bool)), this, SLOT(slotCreateNewUID()));
+
+  this->setLayout(gridLayout);
+  this->setWindowTitle(tr("Create New UID"));
+  this->setAttribute(Qt::WA_DeleteOnClose, true);
+  this->setModal(true);
 }
 
 void KeyNewUIDDialog::slotCreateNewUID() {
-
-    QString errorString = "";
-
+  QString errorString = "";
+
+  /**
+   * check for errors in keygen dialog input
+   */
+  if ((name->text()).size() < 5) {
+    errorString.append(tr("  Name must contain at least five characters.  \n"));
+  }
+  if (email->text().isEmpty() || !check_email_address(email->text())) {
+    errorString.append(tr("  Please give a email address.   \n"));
+  }
+
+  if (errorString.isEmpty()) {
+    if (UidOperator::GetInstance().addUID(mKey, name->text().toStdString(),
+                                          comment->text().toStdString(),
+                                          email->text().toStdString()))
+      emit finished(1);
+    else
+      emit finished(-1);
+
+  } else {
     /**
-     * check for errors in keygen dialog input
+     * create error message
      */
-    if ((name->text()).size() < 5) {
-        errorString.append(tr("  Name must contain at least five characters.  \n"));
-    } if(email->text().isEmpty() || !check_email_address(email->text())) {
-        errorString.append(tr("  Please give a email address.   \n"));
-    }
-
-    if (errorString.isEmpty()) {
-        GpgUID uid;
-        uid.name = name->text();
-        uid.email = email->text();
-        uid.comment = comment->text();
-
-        if(mCtx->addUID(mKey, uid)) {
-            emit finished(1);
-
-        } else {
-            emit finished(-1);
-        }
-
-    } else {
-        /**
-         * create error message
-         */
-        errorLabel->setAutoFillBackground(true);
-        QPalette error = errorLabel->palette();
-        error.setColor(QPalette::Window, "#ff8080");
-        errorLabel->setPalette(error);
-        errorLabel->setText(errorString);
-
-        this->show();
-    }
+    errorLabel->setAutoFillBackground(true);
+    QPalette error = errorLabel->palette();
+    error.setColor(QPalette::Window, "#ff8080");
+    errorLabel->setPalette(error);
+    errorLabel->setText(errorString);
+
+    this->show();
+  }
 }
 
-bool KeyNewUIDDialog::check_email_address(const QString &str) {
-    return re_email.match(str).hasMatch();
+bool KeyNewUIDDialog::check_email_address(const QString& str) {
+  return re_email.match(str).hasMatch();
 }
+}  // namespace GpgFrontend::UI