2 files changed, 17 insertions, 2 deletions
diff --git a/src/ui/dialog/key_generate/GenerateCardKeyDialog.cpp b/src/ui/dialog/key_generate/GenerateCardKeyDialog.cpp
index 91498d43..62d12986 100644
--- a/src/ui/dialog/key_generate/GenerateCardKeyDialog.cpp
+++ b/src/ui/dialog/key_generate/GenerateCardKeyDialog.cpp
@@ -47,13 +47,26 @@ GenerateCardKeyDialog::GenerateCardKeyDialog(int channel,
       ui_(QSharedPointer<Ui_GenerateCardKeyDialog>::create()) {
   ui_->setupUi(this);
 
-  const auto min_date_time = QDateTime::currentDateTime().addDays(3);
-  ui_->dateEdit->setMinimumDateTime(min_date_time);
+  ui_->nameLabel->setText(tr("Name"));
+  ui_->emailLabel->setText(tr("Email"));
+  ui_->commentLabel->setText(tr("Comment"));
+  ui_->expireLabel->setText(tr("Expire Date"));
+  ui_->nonExpireCheckBox->setText(tr("Non Expire"));
+  ui_->tipLabel->setText(
+      tr("Warning: This Operation will overwrite keys which exist on card!"));
+  ui_->generateButton->setText(tr("Generate"));
+
+  ui_->dateEdit->setMinimumDateTime(QDateTime::currentDateTime().addDays(3));
+  ui_->dateEdit->setMinimumDateTime(QDateTime::currentDateTime().addYears(2));
 
   connect(ui_->generateButton, &QPushButton::clicked, this,
           &GenerateCardKeyDialog::slot_generate_card_key);
+  connect(ui_->nonExpireCheckBox, &QCheckBox::stateChanged, this,
+          [=](int state) { ui_->dateEdit->setDisabled(state == Qt::Checked); });
 
+  setWindowTitle(tr("Card Key Generation"));
   movePosition2CenterOfParent();
+  setModal(true);
 
   this->show();
   this->raise();
diff --git a/src/ui/dialog/key_generate/GenerateCardKeyDialog.h b/src/ui/dialog/key_generate/GenerateCardKeyDialog.h
index 93df5aaa..2062ac4d 100644
--- a/src/ui/dialog/key_generate/GenerateCardKeyDialog.h
+++ b/src/ui/dialog/key_generate/GenerateCardKeyDialog.h
@@ -34,6 +34,8 @@ class Ui_GenerateCardKeyDialog;
 
 namespace GpgFrontend::UI {
 class GenerateCardKeyDialog : public GeneralDialog {
+  Q_OBJECT
+
  public:
   /**
    * @brief Construct a new Generate Card Key Dialog object