Merge pull request #49 from saturneric/develop-2.0.5

v2.0.5

1 files changed, 98 insertions, 95 deletions

diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/key_generate/SubkeyGenerateDialog.cpp
index 70d3ee3c..4eb041aa 100644
--- a/src/ui/keygen/SubkeyGenerateDialog.cpp
+++ b/src/ui/key_generate/SubkeyGenerateDialog.cpp
@@ -1,4 +1,6 @@
 /**
+ * Copyright (C) 2021 Saturneric
+ *
  * This file is part of GpgFrontend.
  *
  * GpgFrontend is free software: you can redistribute it and/or modify
@@ -6,29 +8,29 @@
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Foobar is distributed in the hope that it will be useful,
+ * GpgFrontend is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Foobar.  If not, see <https://www.gnu.org/licenses/>.
+ * along with GpgFrontend. If not, see <https://www.gnu.org/licenses/>.
  *
- * The initial version of the source code is inherited from gpg4usb-team.
- * Their source code version also complies with GNU General Public License.
+ * The initial version of the source code is inherited from
+ * the gpg4usb project, which is under GPL-3.0-or-later.
  *
  * The source code version of this software was modified and released
  * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021.
  *
  */
 
-#include "ui/keygen/SubkeyGenerateDialog.h"
+#include "ui/key_generate/SubkeyGenerateDialog.h"
 
-#include "gpg/function/GpgKeyGetter.h"
-#include "gpg/function/GpgKeyOpera.h"
+#include "dialog/WaitingDialog.h"
+#include "core/function/gpg/GpgKeyGetter.h"
+#include "core/function/gpg/GpgKeyOpera.h"
 #include "ui/SignalStation.h"
-#include "ui/WaitingDialog.h"
-#include "ui/settings/GlobalSettingStation.h"
+#include "core/function/GlobalSettingStation.h"
 
 namespace GpgFrontend::UI {
 
@@ -50,29 +52,29 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(const KeyId& key_id, QWidget* parent)
                        ? QDateTime::currentDateTime().toLocalTime().addYears(30)
                        : QDateTime::currentDateTime().toLocalTime().addYears(2);
 
-  buttonBox =
+  button_box_ =
       new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
 
-  keyUsageGroupBox = create_key_usage_group_box();
+  key_usage_group_box_ = create_key_usage_group_box();
 
   auto* groupGrid = new QGridLayout(this);
   groupGrid->addWidget(create_basic_info_group_box(), 0, 0);
-  groupGrid->addWidget(keyUsageGroupBox, 1, 0);
+  groupGrid->addWidget(key_usage_group_box_, 1, 0);
 
   auto* nameList = new QWidget(this);
   nameList->setLayout(groupGrid);
 
   auto* vbox2 = new QVBoxLayout();
   vbox2->addWidget(nameList);
-  vbox2->addWidget(errorLabel);
-  vbox2->addWidget(buttonBox);
+  vbox2->addWidget(error_label_);
+  vbox2->addWidget(button_box_);
 
   this->setWindowTitle(_("Generate New Subkey"));
   this->setLayout(vbox2);
   this->setModal(true);
 
-  connect(this, SIGNAL(SubKeyGenerated()), SignalStation::GetInstance(),
-          SIGNAL(KeyDatabaseRefresh()));
+  connect(this, &SubkeyGenerateDialog::SignalSubKeyGenerated, SignalStation::GetInstance(),
+          &SignalStation::SignalKeyDatabaseRefresh);
 
   set_signal_slot();
   refresh_widgets_state();
@@ -112,27 +114,27 @@ QGroupBox* SubkeyGenerateDialog::create_key_usage_group_box() {
 }
 
 QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
-  errorLabel = new QLabel();
-  keySizeSpinBox = new QSpinBox(this);
-  keyTypeComboBox = new QComboBox(this);
+  error_label_ = new QLabel();
+  key_size_spin_box_ = new QSpinBox(this);
+  key_type_combo_box_ = new QComboBox(this);
 
-  for (auto& algo : GenKeyInfo::getSupportedKeyAlgo()) {
-    keyTypeComboBox->addItem(QString::fromStdString(algo));
+  for (auto& algo : GenKeyInfo::GetSupportedKeyAlgo()) {
+    key_type_combo_box_->addItem(QString::fromStdString(algo));
   }
-  if (!GenKeyInfo::getSupportedKeyAlgo().empty()) {
-    keyTypeComboBox->setCurrentIndex(0);
+  if (!GenKeyInfo::GetSupportedKeyAlgo().empty()) {
+    key_type_combo_box_->setCurrentIndex(0);
   }
 
+  date_edit_ =
+      new QDateTimeEdit(QDateTime::currentDateTime().addYears(2), this);
+  date_edit_->setMinimumDateTime(QDateTime::currentDateTime());
+  date_edit_->setMaximumDateTime(max_date_time_);
+  date_edit_->setDisplayFormat("dd/MM/yyyy hh:mm:ss");
+  date_edit_->setCalendarPopup(true);
+  date_edit_->setEnabled(true);
 
-  dateEdit = new QDateTimeEdit(QDateTime::currentDateTime().addYears(2), this);
-  dateEdit->setMinimumDateTime(QDateTime::currentDateTime());
-  dateEdit->setMaximumDateTime(max_date_time_);
-  dateEdit->setDisplayFormat("dd/MM/yyyy hh:mm:ss");
-  dateEdit->setCalendarPopup(true);
-  dateEdit->setEnabled(true);
-
-  expireCheckBox = new QCheckBox(this);
-  expireCheckBox->setCheckState(Qt::Unchecked);
+  expire_check_box_ = new QCheckBox(this);
+  expire_check_box_->setCheckState(Qt::Unchecked);
 
   auto* vbox1 = new QGridLayout;
 
@@ -141,10 +143,10 @@ QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
   vbox1->addWidget(new QLabel(QString(_("KeySize (in Bit)")) + ": "), 1, 0);
   vbox1->addWidget(new QLabel(QString(_("Key Type")) + ": "), 0, 0);
 
-  vbox1->addWidget(dateEdit, 2, 1);
-  vbox1->addWidget(expireCheckBox, 2, 2);
-  vbox1->addWidget(keySizeSpinBox, 1, 1);
-  vbox1->addWidget(keyTypeComboBox, 0, 1);
+  vbox1->addWidget(date_edit_, 2, 1);
+  vbox1->addWidget(expire_check_box_, 2, 2);
+  vbox1->addWidget(key_size_spin_box_, 1, 1);
+  vbox1->addWidget(key_type_combo_box_, 0, 1);
 
   auto basicInfoGroupBox = new QGroupBox();
   basicInfoGroupBox->setLayout(vbox1);
@@ -154,103 +156,103 @@ QGroupBox* SubkeyGenerateDialog::create_basic_info_group_box() {
 }
 
 void SubkeyGenerateDialog::set_signal_slot() {
-  connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotKeyGenAccept()));
-  connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-  connect(expireCheckBox, SIGNAL(stateChanged(int)), this,
-          SLOT(slotExpireBoxChanged()));
-
-  connect(key_usage_check_boxes_[0], SIGNAL(stateChanged(int)), this,
-          SLOT(slotEncryptionBoxChanged(int)));
-  connect(key_usage_check_boxes_[1], SIGNAL(stateChanged(int)), this,
-          SLOT(slotSigningBoxChanged(int)));
-  connect(key_usage_check_boxes_[2], SIGNAL(stateChanged(int)), this,
-          SLOT(slotCertificationBoxChanged(int)));
-  connect(key_usage_check_boxes_[3], SIGNAL(stateChanged(int)), this,
-          SLOT(slotAuthenticationBoxChanged(int)));
-
-  connect(keyTypeComboBox, SIGNAL(currentIndexChanged(int)), this,
-          SLOT(slotActivatedKeyType(int)));
+  connect(button_box_, &QDialogButtonBox::accepted, this, &SubkeyGenerateDialog::slot_key_gen_accept);
+  connect(button_box_, &QDialogButtonBox::rejected, this, &SubkeyGenerateDialog::reject);
+
+  connect(expire_check_box_, &QCheckBox::stateChanged, this,
+          &SubkeyGenerateDialog::slot_expire_box_changed);
+
+  connect(key_usage_check_boxes_[0], &QCheckBox::stateChanged, this,
+          &SubkeyGenerateDialog::slot_encryption_box_changed);
+  connect(key_usage_check_boxes_[1], &QCheckBox::stateChanged, this,
+          &SubkeyGenerateDialog::slot_signing_box_changed);
+  connect(key_usage_check_boxes_[2], &QCheckBox::stateChanged, this,
+          &SubkeyGenerateDialog::slot_certification_box_changed);
+  connect(key_usage_check_boxes_[3], &QCheckBox::stateChanged, this,
+          &SubkeyGenerateDialog::slot_authentication_box_changed);
+
+  connect(key_type_combo_box_, qOverload<int>(&QComboBox::currentIndexChanged), this,
+          &SubkeyGenerateDialog::slot_activated_key_type);
 }
 
-void SubkeyGenerateDialog::slotExpireBoxChanged() {
-  if (expireCheckBox->checkState()) {
-    dateEdit->setEnabled(false);
+void SubkeyGenerateDialog::slot_expire_box_changed() {
+  if (expire_check_box_->checkState()) {
+    date_edit_->setEnabled(false);
   } else {
-    dateEdit->setEnabled(true);
+    date_edit_->setEnabled(true);
   }
 }
 
 void SubkeyGenerateDialog::refresh_widgets_state() {
   qDebug() << "refresh_widgets_state called";
 
-  if (gen_key_info_->isAllowEncryption())
+  if (gen_key_info_->IsAllowEncryption())
     key_usage_check_boxes_[0]->setCheckState(Qt::CheckState::Checked);
   else
     key_usage_check_boxes_[0]->setCheckState(Qt::CheckState::Unchecked);
 
-  if (gen_key_info_->isAllowChangeEncryption())
+  if (gen_key_info_->IsAllowChangeEncryption())
     key_usage_check_boxes_[0]->setDisabled(false);
   else
     key_usage_check_boxes_[0]->setDisabled(true);
 
-  if (gen_key_info_->isAllowSigning())
+  if (gen_key_info_->IsAllowSigning())
     key_usage_check_boxes_[1]->setCheckState(Qt::CheckState::Checked);
   else
     key_usage_check_boxes_[1]->setCheckState(Qt::CheckState::Unchecked);
 
-  if (gen_key_info_->isAllowChangeSigning())
+  if (gen_key_info_->IsAllowChangeSigning())
     key_usage_check_boxes_[1]->setDisabled(false);
   else
     key_usage_check_boxes_[1]->setDisabled(true);
 
-  if (gen_key_info_->isAllowCertification())
+  if (gen_key_info_->IsAllowCertification())
     key_usage_check_boxes_[2]->setCheckState(Qt::CheckState::Checked);
   else
     key_usage_check_boxes_[2]->setCheckState(Qt::CheckState::Unchecked);
 
-  if (gen_key_info_->isAllowChangeCertification())
+  if (gen_key_info_->IsAllowChangeCertification())
     key_usage_check_boxes_[2]->setDisabled(false);
   else
     key_usage_check_boxes_[2]->setDisabled(true);
 
-  if (gen_key_info_->isAllowAuthentication())
+  if (gen_key_info_->IsAllowAuthentication())
     key_usage_check_boxes_[3]->setCheckState(Qt::CheckState::Checked);
   else
     key_usage_check_boxes_[3]->setCheckState(Qt::CheckState::Unchecked);
 
-  if (gen_key_info_->isAllowChangeAuthentication())
+  if (gen_key_info_->IsAllowChangeAuthentication())
     key_usage_check_boxes_[3]->setDisabled(false);
   else
     key_usage_check_boxes_[3]->setDisabled(true);
 
-  keySizeSpinBox->setRange(gen_key_info_->getSuggestMinKeySize(),
-                           gen_key_info_->getSuggestMaxKeySize());
-  keySizeSpinBox->setValue(gen_key_info_->getKeySize());
-  keySizeSpinBox->setSingleStep(gen_key_info_->getSizeChangeStep());
+  key_size_spin_box_->setRange(gen_key_info_->GetSuggestMinKeySize(),
+                               gen_key_info_->GetSuggestMaxKeySize());
+  key_size_spin_box_->setValue(gen_key_info_->GetKeyLength());
+  key_size_spin_box_->setSingleStep(gen_key_info_->GetSizeChangeStep());
 }
 
-void SubkeyGenerateDialog::slotKeyGenAccept() {
+void SubkeyGenerateDialog::slot_key_gen_accept() {
   std::stringstream err_stream;
 
   /**
    * primary keys should have a reasonable expiration date (no more than 2 years
    * in the future)
    */
-  if (dateEdit->dateTime() > QDateTime::currentDateTime().addYears(2)) {
+  if (date_edit_->dateTime() > QDateTime::currentDateTime().addYears(2)) {
     err_stream << "  " << _("Expiration time no more than 2 years.") << "  ";
   }
 
   auto err_string = err_stream.str();
 
   if (err_string.empty()) {
-    gen_key_info_->setKeySize(keySizeSpinBox->value());
+    gen_key_info_->SetKeyLength(key_size_spin_box_->value());
 
-    if (expireCheckBox->checkState()) {
-      gen_key_info_->setNonExpired(true);
+    if (expire_check_box_->checkState()) {
+      gen_key_info_->SetNonExpired(true);
     } else {
-      gen_key_info_->setExpired(
-          boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t()));
+      gen_key_info_->SetExpireTime(
+          boost::posix_time::from_time_t(date_edit_->dateTime().toTime_t()));
     }
 
     GpgError error;
@@ -277,7 +279,7 @@ void SubkeyGenerateDialog::slotKeyGenAccept() {
       msg_box->setModal(false);
       msg_box->open();
 
-      emit SubKeyGenerated();
+      emit SignalSubKeyGenerated();
       this->close();
     } else
       QMessageBox::critical(this, _("Failure"), _(gpgme_strerror(error)));
@@ -286,51 +288,52 @@ void SubkeyGenerateDialog::slotKeyGenAccept() {
     /**
      * create error message
      */
-    errorLabel->setAutoFillBackground(true);
-    QPalette error = errorLabel->palette();
+    error_label_->setAutoFillBackground(true);
+    QPalette error = error_label_->palette();
     error.setColor(QPalette::Window, "#ff8080");
-    errorLabel->setPalette(error);
-    errorLabel->setText(err_string.c_str());
+    error_label_->setPalette(error);
+    error_label_->setText(err_string.c_str());
 
     this->show();
   }
 }
 
-void SubkeyGenerateDialog::slotEncryptionBoxChanged(int state) {
+void SubkeyGenerateDialog::slot_encryption_box_changed(int state) {
   if (state == 0) {
-    gen_key_info_->setAllowEncryption(false);
+    gen_key_info_->SetAllowEncryption(false);
   } else {
-    gen_key_info_->setAllowEncryption(true);
+    gen_key_info_->SetAllowEncryption(true);
   }
 }
 
-void SubkeyGenerateDialog::slotSigningBoxChanged(int state) {
+void SubkeyGenerateDialog::slot_signing_box_changed(int state) {
   if (state == 0) {
-    gen_key_info_->setAllowSigning(false);
+    gen_key_info_->SetAllowSigning(false);
   } else {
-    gen_key_info_->setAllowSigning(true);
+    gen_key_info_->SetAllowSigning(true);
   }
 }
 
-void SubkeyGenerateDialog::slotCertificationBoxChanged(int state) {
+void SubkeyGenerateDialog::slot_certification_box_changed(int state) {
   if (state == 0) {
-    gen_key_info_->setAllowCertification(false);
+    gen_key_info_->SetAllowCertification(false);
   } else {
-    gen_key_info_->setAllowCertification(true);
+    gen_key_info_->SetAllowCertification(true);
   }
 }
 
-void SubkeyGenerateDialog::slotAuthenticationBoxChanged(int state) {
+void SubkeyGenerateDialog::slot_authentication_box_changed(int state) {
   if (state == 0) {
-    gen_key_info_->setAllowAuthentication(false);
+    gen_key_info_->SetAllowAuthentication(false);
   } else {
-    gen_key_info_->setAllowAuthentication(true);
+    gen_key_info_->SetAllowAuthentication(true);
   }
 }
 
-void SubkeyGenerateDialog::slotActivatedKeyType(int index) {
+void SubkeyGenerateDialog::slot_activated_key_type(int index) {
   qDebug() << "key type index changed " << index;
-  gen_key_info_->setAlgo(this->keyTypeComboBox->itemText(index).toStdString());
+  gen_key_info_->SetAlgo(
+      this->key_type_combo_box_->itemText(index).toStdString());
   refresh_widgets_state();
 }