diff options
Diffstat (limited to 'src/ui/dialog')
4 files changed, 7 insertions, 23 deletions
diff --git a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp index 5a84700c..53ff3b1d 100644 --- a/src/ui/dialog/key_generate/KeyGenerateDialog.cpp +++ b/src/ui/dialog/key_generate/KeyGenerateDialog.cpp @@ -116,6 +116,10 @@ KeyGenerateDialog::KeyGenerateDialog(int channel, QWidget* parent) ui_->generateButton->setText(tr("Generate")); + const auto min_date_time = QDateTime::currentDateTime().addDays(3); + ui_->pExpireDateTimeEdit->setMinimumDateTime(min_date_time); + ui_->sExpireDateTimeEdit->setMinimumDateTime(min_date_time); + QSet<QString> p_algo_set; for (const auto& algo : supported_primary_key_algos_) { p_algo_set.insert(algo.Name()); diff --git a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp index 7aaa7caf..58734c7d 100644 --- a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp +++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp @@ -66,6 +66,9 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(int channel, const KeyId& key_id, ui_->nonExpiredCheckBox->setText(tr("Non Expired")); ui_->nonPassphraseCheckBox->setText(tr("No Passphrase")); + const auto min_date_time = QDateTime::currentDateTime().addDays(3); + ui_->expireDateTimeEdit->setMinimumDateTime(min_date_time); + QSet<QString> algo_set; for (const auto& algo : supported_subkey_algos_) { algo_set.insert(algo.Name()); diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp index e8987029..2f86b603 100644 --- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp +++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp @@ -97,17 +97,7 @@ void KeySetExpireDateDialog::init() { auto settings = GpgFrontend::GetSettings(); - bool longer_expiration_date = - settings.value("basic/longer_expiration_date").toBool(); - - auto max_date_time = - longer_expiration_date - ? QDateTime::currentDateTime().toLocalTime().addYears(30) - : QDateTime::currentDateTime().toLocalTime().addYears(2); - auto min_date_time = QDateTime::currentDateTime().addDays(7); - - ui_->dateEdit->setMaximumDateTime(max_date_time); ui_->dateEdit->setMinimumDateTime(min_date_time); // set default date time to expire date time @@ -132,10 +122,6 @@ void KeySetExpireDateDialog::init() { } ui_->titleLabel->setText(tr("Modified Expiration Date (Local Time)")); - ui_->label->setText(tr( - "Tips: For the sake of security, the key is valid for up to two years. " - "If you are an expert user, please unlock it for a longer time in the " - "settings.")); ui_->noExpirationCheckBox->setText(tr("No Expiration")); this->setWindowTitle(tr("Modified Expiration Date")); this->setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp index 7df9ff1c..73d8bccd 100644 --- a/src/ui/dialog/settings/SettingsGeneral.cpp +++ b/src/ui/dialog/settings/SettingsGeneral.cpp @@ -48,8 +48,6 @@ GeneralTab::GeneralTab(QWidget* parent) "crash.")); ui_->importConfirmationBox->setTitle(tr("Operation")); - ui_->longerKeyExpirationDateCheckBox->setText( - tr("Enable to use longer key expiration date.")); ui_->importConfirmationCheckBox->setText( tr("Import files dropped on the Key List without confirmation.")); ui_->disableLoadingModulesCheckBox->setText( @@ -121,11 +119,6 @@ void GeneralTab::SetSettings() { ui_->restoreTextEditorPageCheckBox->setCheckState( restore_text_editor_page ? Qt::Checked : Qt::Unchecked); - auto longer_expiration_date = - settings.value("basic/longer_expiration_date", false).toBool(); - ui_->longerKeyExpirationDateCheckBox->setCheckState( - longer_expiration_date ? Qt::Checked : Qt::Unchecked); - auto confirm_import_keys = settings.value("basic/confirm_import_keys", false).toBool(); ui_->importConfirmationCheckBox->setCheckState( @@ -149,8 +142,6 @@ void GeneralTab::SetSettings() { void GeneralTab::ApplySettings() { auto settings = GpgFrontend::GetSettings(); - settings.setValue("basic/longer_expiration_date", - ui_->longerKeyExpirationDateCheckBox->isChecked()); settings.setValue("basic/clear_gpg_password_cache", ui_->clearGpgPasswordCacheCheckBox->isChecked()); settings.setValue("basic/restore_text_editor_page", |