chore: remove setting 'basic/longer_expiration_date'

6 files changed, 14 insertions, 49 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",
diff --git a/ui/GeneralSettings.ui b/ui/GeneralSettings.ui
index 78f3bb6a..dde687b9 100644
--- a/ui/GeneralSettings.ui
+++ b/ui/GeneralSettings.ui
@@ -59,13 +59,6 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="longerKeyExpirationDateCheckBox">
-            <property name="text">
-             <string>Enable to use longer key expiration date.</string>
-            </property>
-           </widget>
-          </item>
-          <item>
            <widget class="QCheckBox" name="disableLoadingModulesCheckBox">
             <property name="text">
              <string>Disable loading of all modules (including integrated modules)</string>
@@ -88,7 +81,7 @@
           <item>
            <widget class="QComboBox" name="langSelectBox">
             <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToContents</enum>
+             <enum>QComboBox::SizeAdjustPolicy::AdjustToContents</enum>
             </property>
            </widget>
           </item>
@@ -141,7 +134,7 @@
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
diff --git a/ui/ModifiedExpirationDateTime.ui b/ui/ModifiedExpirationDateTime.ui
index 10c1d326..f926384a 100644
--- a/ui/ModifiedExpirationDateTime.ui
+++ b/ui/ModifiedExpirationDateTime.ui
@@ -17,16 +17,16 @@
    <item row="2" column="0">
     <widget class="QDialogButtonBox" name="button_box_">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
-     <item alignment="Qt::AlignTop">
+     <item alignment="Qt::AlignmentFlag::Qt::AlignmentFlag::AlignTop">
       <widget class="QLabel" name="titleLabel">
        <property name="text">
         <string>Modified Expiration Date (Local Time)</string>
@@ -53,26 +53,14 @@
      <item>
       <widget class="Line" name="line">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>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.
-                                </string>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>