Skip to content
GitLab
Commit 5770f2bd authored by Sandro Knauß's avatar Sandro Knauß 🐝
Browse files

Adopt messagecomposer setting changes.

parent 70119b48
Hide whitespace changes
Inline Side-by-side
src/configuredialog/configuresecuritypage.cpp
View file @ 5770f2bd
......@@ -221,20 +221,22 @@ SecurityPageEncryptionTab::SecurityPageEncryptionTab(QWidget *parent)
{
mWidget = new Ui::SecurityPageEncryptionTab;
mWidget->setupUi(this);
connect(mWidget->mEncToSelf, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mShowKeyApprovalDlg, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mAlwaysEncryptWhenSavingInDrafts, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mStoreEncrypted, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mAutoSign, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mAutoEncrypt, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mShowEncSignIndicator, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->warnGroupBox, &QGroupBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mShowCryptoOwnertrust, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mShowKeyApprovalDlg, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnUnsigned, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->warnUnencryptedCB, &QCheckBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnSignKeyExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->warnGroupBox, &QGroupBox::toggled, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnEncrOwnKeyExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnEncrKeyExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnEncrChainCertExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnSignChainCertExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnSignRootCertExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->mWarnEncrRootCertExpiresSB, &KPluralHandlingSpinBox::valueChanged, this, &SecurityPageEncryptionTab::slotEmitChanged);
connect(mWidget->gnupgButton, &QPushButton::clicked, this, &SecurityPageEncryptionTab::slotConfigureGnupg);
......@@ -248,22 +250,23 @@ SecurityPageEncryptionTab::~SecurityPageEncryptionTab()
void SecurityPageEncryptionTab::doLoadFromGlobalSettings()
{
loadWidget(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
loadWidget(mWidget->mAlwaysEncryptWhenSavingInDrafts, KMailSettings::self()->alwaysEncryptDraftsItem());
loadWidget(mWidget->mStoreEncrypted, KMailSettings::self()->cryptoStoreEncryptedItem());
loadWidget(mWidget->mAutoSign, MessageComposer::MessageComposerSettings::self()->cryptoAutoSignItem());
loadWidget(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->cryptoAutoEncryptItem());
loadWidget(mWidget->mShowEncSignIndicator, KMailSettings::self()->showCryptoLabelIndicatorItem());
loadWidget(mWidget->mShowCryptoOwnertrust, KMailSettings::self()->showCryptoOwnertrustItem());
loadWidget(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
loadWidget(mWidget->mWarnUnsigned, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsignedItem());
loadWidget(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
mWidget->warnGroupBox->setChecked(MessageComposer::MessageComposerSettings::self()->cryptoWarnWhenNearExpire());
loadWidget(mWidget->mWarnSignKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignKeyNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnSignChainCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignChaincertNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnSignRootCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignRootNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnEncrKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrKeyNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnEncrOwnKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnOwnEncrKeyNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnEncrChainCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrChaincertNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnEncrRootCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrRootNearExpiryThresholdDaysItem());
}
......@@ -271,29 +274,22 @@ void SecurityPageEncryptionTab::doLoadFromGlobalSettings()
void SecurityPageEncryptionTab::doLoadOther()
{
loadWidget(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
loadWidget(mWidget->mAlwaysEncryptWhenSavingInDrafts, KMailSettings::self()->alwaysEncryptDraftsItem());
loadWidget(mWidget->mStoreEncrypted, KMailSettings::self()->cryptoStoreEncryptedItem());
loadWidget(mWidget->mAutoSign, MessageComposer::MessageComposerSettings::self()->cryptoAutoSignItem());
loadWidget(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->cryptoAutoEncryptItem());
loadWidget(mWidget->mShowEncSignIndicator, KMailSettings::self()->showCryptoLabelIndicatorItem());
loadWidget(mWidget->mShowCryptoOwnertrust, KMailSettings::self()->showCryptoOwnertrustItem());
loadWidget(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
loadWidget(mWidget->mWarnUnsigned, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsignedItem());
loadWidget(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
mWidget->warnGroupBox->setChecked(MessageComposer::MessageComposerSettings::self()->cryptoWarnWhenNearExpire());
loadWidget(mWidget->mWarnSignOwnKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignKeyNearExpiryThresholdDaysItem());
mWidget->mWarnSignOwnKeyExpiresSB->setSuffix(ki18np(" day", " days"));
loadWidget(mWidget->mWarnSignKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignKeyNearExpiryThresholdDaysItem());
mWidget->mWarnSignKeyExpiresSB->setSuffix(ki18np(" day", " days"));
loadWidget(mWidget->mWarnSignChainCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignChaincertNearExpiryThresholdDaysItem());
mWidget->mWarnSignChainCertExpiresSB->setSuffix(ki18np(" day", " days"));
loadWidget(mWidget->mWarnSignRootCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignRootNearExpiryThresholdDaysItem());
mWidget->mWarnSignRootCertExpiresSB->setSuffix(ki18np(" day", " days"));
loadWidget(mWidget->mWarnEncrOwnKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignKeyNearExpiryThresholdDaysItem());
loadWidget(mWidget->mWarnEncrOwnKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnOwnEncrKeyNearExpiryThresholdDaysItem());
mWidget->mWarnEncrOwnKeyExpiresSB->setSuffix(ki18np(" day", " days"));
loadWidget(mWidget->mWarnEncrKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrKeyNearExpiryThresholdDaysItem());
mWidget->mWarnEncrKeyExpiresSB->setSuffix(ki18np(" day", " days"));
......@@ -307,21 +303,22 @@ void SecurityPageEncryptionTab::doLoadOther()
void SecurityPageEncryptionTab::save()
{
saveCheckBox(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
saveCheckBox(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
saveCheckBox(mWidget->mAlwaysEncryptWhenSavingInDrafts, KMailSettings::self()->alwaysEncryptDraftsItem());
saveCheckBox(mWidget->mStoreEncrypted, KMailSettings::self()->cryptoStoreEncryptedItem());
saveCheckBox(mWidget->mAutoSign, MessageComposer::MessageComposerSettings::self()->cryptoAutoSignItem());
saveCheckBox(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->cryptoAutoEncryptItem());
saveCheckBox(mWidget->mShowEncSignIndicator, KMailSettings::self()->showCryptoLabelIndicatorItem());
saveCheckBox(mWidget->mShowCryptoOwnertrust, KMailSettings::self()->showCryptoOwnertrustItem());
saveCheckBox(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
saveCheckBox(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem());
saveCheckBox(mWidget->mWarnUnsigned, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsignedItem());
saveCheckBox(mWidget->warnUnencryptedCB, MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencryptedItem());
MessageComposer::MessageComposerSettings::self()->setCryptoWarnWhenNearExpire(mWidget->warnGroupBox->isChecked());
saveSpinBox(mWidget->mWarnSignKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignKeyNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnSignChainCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignChaincertNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnSignRootCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnSignRootNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnEncrOwnKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnOwnEncrKeyNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnEncrKeyExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrKeyNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnEncrChainCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrChaincertNearExpiryThresholdDaysItem());
saveSpinBox(mWidget->mWarnEncrRootCertExpiresSB, MessageComposer::MessageComposerSettings::self()->cryptoWarnEncrRootNearExpiryThresholdDaysItem());
......
src/settings/kmail.kcfg.cmake
View file @ 5770f2bd
......@@ -277,6 +277,10 @@
<label>Show crypto label indicator</label>
<default>true</default>
</entry>
<entry name="ShowCryptoOwnertrust" type="Bool">
<label>Show crypto ownertrust icons</label>
<default>false</default>
</entry>
<entry name="CheckSendDefaultActionShortcut" type="Bool">
<label>Validate Send Default Shortcut</label>
<default>false</default>
......
src/ui/securitypageencryptiontab.ui
View file @ 5770f2bd
......@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>581</width>
<width>549</width>
<height>757</height>
</rect>
</property>
......@@ -18,12 +18,12 @@
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="mEncToSelf">
<property name="whatsThis">
<string>When this option is enabled, the message/file will not only be encrypted with the receiver's public key, but also with your key. This will enable you to decrypt the message/file at a later time. This is generally a good idea.</string>
</property>
<widget class="QCheckBox" name="mAlwaysEncryptWhenSavingInDrafts">
<property name="text">
<string>When encrypting emails, always also encr&amp;ypt to the certificate of my own identity</string>
<string>Encrypt draft messages</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
......@@ -41,7 +41,7 @@ However, there may be local rules that require you to turn this option on. When
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="text">
<string>Store sent messages encry&amp;pted</string>
<string>Encry&amp;pt sent messages</string>
</property>
<property name="checked">
<bool>false</bool>
......@@ -49,26 +49,19 @@ However, there may be local rules that require you to turn this option on. When
</widget>
</item>
<item>
<widget class="QCheckBox" name="mShowKeyApprovalDlg">
<property name="whatsThis">
<string>When this option is enabled, the application will always show you a list of public keys from which you can choose the one it will use for encryption. If it is off, the application will only show the dialog if it cannot find the right key or if there are several which could be used.</string>
</property>
<widget class="QCheckBox" name="mAutoSign">
<property name="text">
<string>Always show the encryption keys &amp;for approval</string>
<string>Sign all messages</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mAlwaysEncryptWhenSavingInDrafts">
<property name="text">
<string>When sa&amp;ving as draft, sign/encrypt as indicated</string>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mShowEncSignIndicator">
<widget class="QCheckBox" name="mAutoEncrypt">
<property name="text">
<string>Show sign/encrypt indicator in editor</string>
<string>Encrypt all messages when possible</string>
</property>
</widget>
</item>
......@@ -82,14 +75,17 @@ However, there may be local rules that require you to turn this option on. When
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="mShowEncSignIndicator2">
<widget class="QCheckBox" name="mShowEncSignIndicator">
<property name="text">
<string>Show sign/encrypt indicator</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mShowEncSignIndicator3">
<widget class="QCheckBox" name="mShowCryptoOwnertrust">
<property name="text">
<string>Show encryption key ownertrust level</string>
</property>
......@@ -105,7 +101,7 @@ However, there may be local rules that require you to turn this option on. When
</property>
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="mShowEncSignIndicator4">
<widget class="QCheckBox" name="mShowKeyApprovalDlg">
<property name="text">
<string>Always approve encryption keys before send</string>
</property>
......@@ -114,14 +110,14 @@ However, there may be local rules that require you to turn this option on. When
<item>
<widget class="QCheckBox" name="mWarnUnsigned">
<property name="text">
<string>Warn when tryping to send unsigned messages</string>
<string>Warn when trying to send unsigned messages</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="warnUnencryptedCB">
<property name="text">
<string>Warn when tryping to send unencrypted messages</string>
<string>Warn when trying to send unencrypted messages</string>
</property>
</widget>
</item>
......@@ -137,20 +133,7 @@ However, there may be local rules that require you to turn this option on. When
<bool>true</bool>
</property>
<layout class="QGridLayout" name="_2">
<item row="0" column="2">
<widget class="QLabel" name="textLabel2_2">
<property name="text">
<string>For Encryption</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>For end-user certificates/&amp;keys:</string>
......@@ -158,13 +141,10 @@ However, there may be local rules that require you to turn this option on. When
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mWarnSignKeyExpiresSB</cstring>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrRootCertExpiresSB">
<item row="2" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrChainCertExpiresSB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -182,8 +162,8 @@ However, there may be local rules that require you to turn this option on. When
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If Root Certificate Expires&lt;/h1&gt;
Select the minimum number of days the root certificate should be valid without issuing a warning.
&lt;h1&gt;Warn If A Certificate In The Chain Expires&lt;/h1&gt;
Select the minimum number of days all certificates in the chain should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 14 days.
&lt;/p&gt;&lt;/qt&gt;</string>
......@@ -199,8 +179,14 @@ The recommended SPHINX setting is 14 days.
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnSignKeyExpiresSB">
<item row="1" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrKeyExpiresSB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>110</width>
......@@ -212,8 +198,8 @@ The recommended SPHINX setting is 14 days.
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If Signature Certificate Expires&lt;/h1&gt;
Select the minimum number of days the signature certificate should be valid without issuing a warning.
&lt;h1&gt;Warn If Encryption Certificate Expires&lt;/h1&gt;
Select the minimum number of days the encryption certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 14 days.
&lt;/p&gt;&lt;/qt&gt;</string>
......@@ -229,27 +215,18 @@ The recommended SPHINX setting is 14 days.
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="textLabel1_2">
<item row="0" column="0">
<widget class="QLabel" name="textLabel7">
<property name="text">
<string>For intermediate CA certificates:</string>
<string>For own certificates:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mWarnSignChainCertExpiresSB</cstring>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrChainCertExpiresSB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="0" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrOwnKeyExpiresSB">
<property name="minimumSize">
<size>
<width>110</width>
......@@ -261,10 +238,10 @@ The recommended SPHINX setting is 14 days.
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If A Certificate In The Chain Expires&lt;/h1&gt;
Select the minimum number of days all certificates in the chain should be valid without issuing a warning.
&lt;h1&gt;Warn If own Certificates Expires&lt;/h1&gt;
Select the minimum number of days own certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 14 days.
The recommended SPHINX setting is 30 days.
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="minimum">
......@@ -274,11 +251,21 @@ The recommended SPHINX setting is 14 days.
<number>999</number>
</property>
<property name="value">
<number>14</number>
<number>30</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="textLabel1_2_2">
<property name="text">
<string>For &amp;root certificates:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<item row="2" column="2">
<spacer name="spacer5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -295,50 +282,7 @@ The recommended SPHINX setting is 14 days.
</spacer>
</item>
<item row="3" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnSignChainCertExpiresSB">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Select the number of days here</string>
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If CA Certificate Expires&lt;/h1&gt;
Select the minimum number of days the CA certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 14 days.
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>14</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="textLabel1_2_2">
<property name="text">
<string>For &amp;root certificates:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mWarnSignRootCertExpiresSB</cstring>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrKeyExpiresSB">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrRootCertExpiresSB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -356,49 +300,6 @@ The recommended SPHINX setting is 14 days.
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If Encryption Certificate Expires&lt;/h1&gt;
Select the minimum number of days the encryption certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 14 days.
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>14</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>For Signing</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnSignRootCertExpiresSB">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Select the number of days here</string>
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If Root Certificate Expires&lt;/h1&gt;
Select the minimum number of days the root certificate should be valid without issuing a warning.
&lt;p&gt;
......@@ -416,77 +317,14 @@ The recommended SPHINX setting is 14 days.
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel7">
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
<string>For own certificates</string>
<string>For intermediate CA certificates:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mWarnSignOwnKeyExpiresSB</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="KPluralHandlingSpinBox" name="mWarnSignOwnKeyExpiresSB">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Select the number of days here</string>
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If own Certificates Expires&lt;/h1&gt;
Select the minimum number of days own certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 30 days.
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="KPluralHandlingSpinBox" name="mWarnEncrOwnKeyExpiresSB">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Select the number of days here</string>
</property>
<property name="whatsThis">
<string>&lt;qt&gt;
&lt;h1&gt;Warn If own Certificates Expires&lt;/h1&gt;
Select the minimum number of days own certificate should be valid without issuing a warning.
&lt;p&gt;
The recommended SPHINX setting is 30 days.
&lt;/p&gt;&lt;/qt&gt;</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>30</number>
</property>
</widget>
</item>
</layout>
......@@ -584,10 +422,7 @@ The recommended SPHINX setting is 30 days.
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mEncToSelf</tabstop>
<tabstop>mStoreEncrypted</tabstop>
<tabstop>mShowKeyApprovalDlg</tabstop>
<tabstop>mAlwaysEncryptWhenSavingInDrafts</tabstop>
</tabstops>
<resources/>
<connections/>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment