Commit 2e28bb34 authored by Laurent Montel's avatar Laurent Montel 😁

Remove this option. It was hidden in version < 4.4 and never implemented => remove it

parent 975cbfee
......@@ -266,7 +266,6 @@ SecurityPageComposerCryptoTab::SecurityPageComposerCryptoTab( QWidget * parent )
mWidget = new Ui::ComposerCryptoConfiguration;
mWidget->setupUi( this );
connect( mWidget->mEncToSelf, SIGNAL(toggled(bool)), this, SLOT(slotEmitChanged()) );
connect( mWidget->mShowEncryptionResult, SIGNAL(toggled(bool)), this, SLOT(slotEmitChanged()) );
connect( mWidget->mShowKeyApprovalDlg, SIGNAL(toggled(bool)), this, SLOT(slotEmitChanged()) );
connect( mWidget->mAutoEncrypt, SIGNAL(toggled(bool)), this, SLOT(slotEmitChanged()) );
connect( mWidget->mNeverEncryptWhenSavingInDrafts, SIGNAL(toggled(bool)), this, SLOT(slotEmitChanged()) );
......@@ -284,8 +283,6 @@ void SecurityPage::ComposerCryptoTab::doLoadOther()
// If you change default values, sync messagecomposer.cpp too
loadWidget(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
mWidget->mShowEncryptionResult->setChecked( false ); //composer.readBoolEntry( "crypto-show-encryption-result", true ) );
mWidget->mShowEncryptionResult->hide();
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem() );
loadWidget(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->pgpAutoEncryptItem() ) ;
......@@ -298,7 +295,6 @@ void SecurityPage::ComposerCryptoTab::doLoadOther()
void SecurityPage::ComposerCryptoTab::save()
{
saveCheckBox(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
saveCheckBox(mWidget->mShowEncryptionResult, GlobalSettings::self()->cryptoShowEncryptionResultItem() );
saveCheckBox(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem() );
saveCheckBox(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->pgpAutoEncryptItem() ) ;
......@@ -310,7 +306,6 @@ void SecurityPage::ComposerCryptoTab::save()
void SecurityPage::ComposerCryptoTab::doLoadFromGlobalSettings()
{
loadWidget(mWidget->mEncToSelf, MessageComposer::MessageComposerSettings::self()->cryptoEncryptToSelfItem());
loadWidget(mWidget->mShowEncryptionResult, GlobalSettings::self()->cryptoShowEncryptionResultItem() );
loadWidget(mWidget->mShowKeyApprovalDlg, MessageComposer::MessageComposerSettings::self()->cryptoShowKeysForApprovalItem() );
loadWidget(mWidget->mAutoEncrypt, MessageComposer::MessageComposerSettings::self()->pgpAutoEncryptItem() ) ;
......
......@@ -270,10 +270,6 @@
</entry>
<entry name="SnippetSplitterPosition" type="IntList"/>
<entry name="CryptoShowEncryptionResult" type="Bool" key="crypto-show-encryption-result">
<label>Show signed/encrypted text after composing</label>
<default>true</default>
</entry>
<entry name="CryptoStoreEncrypted" type="Bool" key="crypto-store-encrypted">
<label>When check, sent messages will be stored in the encrypted form</label>
<default>true</default>
......
......@@ -27,16 +27,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mShowEncryptionResult">
<property name="whatsThis">
<string>When this option is enabled, the signed/encrypted text will be shown in a separate window, enabling you to know how it will look before it is sent. This is a good idea when you are verifying that your encryption system works.</string>
</property>
<property name="text">
<string>Show s&amp;igned/encrypted text after composing</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mStoreEncrypted">
<property name="toolTip">
......
Markdown is supported
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