1 files changed, 19 insertions, 0 deletions
diff --git a/src/ui/settings/SettingsSendMail.cpp b/src/ui/settings/SettingsSendMail.cpp
index 742c0644..21911e0f 100644
--- a/src/ui/settings/SettingsSendMail.cpp
+++ b/src/ui/settings/SettingsSendMail.cpp
@@ -49,6 +49,7 @@ SendMailTab::SendMailTab(QWidget* parent)
     ui->passwordEdit->setDisabled(state != Qt::Checked);
 
     ui->defaultSenderEmailEdit->setDisabled(state != Qt::Checked);
+    ui->gpgKeyIDEdit->setDisabled(state != Qt::Checked);
     ui->checkConnectionButton->setDisabled(state != Qt::Checked);
   });
 
@@ -92,6 +93,8 @@ SendMailTab::SendMailTab(QWidget* parent)
   ui->senderLabel->setText(_("Default Sender Email"));
   ui->checkConnectionButton->setText(_("Check Connection"));
   ui->senTestMailButton->setText(_("Send Test Email"));
+  ui->gpgkeyIdLabel->setText(_("Default Sender GPG Key ID"));
+
   ui->tipsLabel->setText(
       _("Tips: It is recommended that you build your own mail server or use "
         "a trusted mail server. If you don't know the detailed configuration "
@@ -152,6 +155,15 @@ void SendMailTab::setSettings() {
     LOG(ERROR) << _("Setting Operation Error") << _("default_sender");
   }
 
+  try {
+    std::string default_sender_gpg_key_id =
+        settings.lookup("smtp.default_sender_gpg_key_id");
+    ui->gpgKeyIDEdit->setText(default_sender_gpg_key_id.c_str());
+  } catch (...) {
+    LOG(ERROR) << _("Setting Operation Error")
+               << _("default_sender_gpg_key_id");
+  }
+
   ui->identityCheckBox->setCheckState(Qt::Unchecked);
   try {
     bool identity_enable = settings.lookup("smtp.identity_enable");
@@ -227,6 +239,13 @@ void SendMailTab::applySettings() {
     smtp["default_sender"] = ui->defaultSenderEmailEdit->text().toStdString();
   }
 
+  if (!smtp.exists("default_sender_gpg_key_id"))
+    smtp.add("default_sender_gpg_key_id", libconfig::Setting::TypeString) =
+        ui->gpgKeyIDEdit->text().toStdString();
+  else {
+    smtp["default_sender_gpg_key_id"] = ui->gpgKeyIDEdit->text().toStdString();
+  }
+
   if (!smtp.exists("identity_enable"))
     smtp.add("identity_enable", libconfig::Setting::TypeBoolean) =
         ui->identityCheckBox->isChecked();