Kaydet (Commit) 8ee4911d authored tarafından Justin Luth's avatar Justin Luth

mailconfig UI: SSL CB toggles secure port 587 and unsecure 25

If the default value is in the SMTP port field, switching
SSL on and off will toggle between SECURE_PORT and DEFAULT_PORT

Change-Id: Ie4bdd55a3d8bbe64ce6b8761ba30971464c1db4e
Reviewed-on: https://gerrit.libreoffice.org/48211Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
üst 85ee924f
...@@ -134,6 +134,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ...@@ -134,6 +134,7 @@ SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet
m_pReplyToCB->SetClickHdl(LINK(this, SwMailConfigPage, ReplyToHdl)); m_pReplyToCB->SetClickHdl(LINK(this, SwMailConfigPage, ReplyToHdl));
m_pServerAuthenticationPB->SetClickHdl(LINK(this, SwMailConfigPage, AuthenticationHdl)); m_pServerAuthenticationPB->SetClickHdl(LINK(this, SwMailConfigPage, AuthenticationHdl));
m_pTestPB->SetClickHdl(LINK(this, SwMailConfigPage, TestHdl)); m_pTestPB->SetClickHdl(LINK(this, SwMailConfigPage, TestHdl));
m_pSecureCB->SetClickHdl(LINK(this, SwMailConfigPage, SecureHdl));
} }
SwMailConfigPage::~SwMailConfigPage() SwMailConfigPage::~SwMailConfigPage()
...@@ -227,6 +228,13 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void) ...@@ -227,6 +228,13 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, Button*, void)
ScopedVclPtrInstance<SwTestAccountSettingsDialog>(this)->Execute(); ScopedVclPtrInstance<SwTestAccountSettingsDialog>(this)->Execute();
} }
IMPL_LINK(SwMailConfigPage, SecureHdl, Button*, pBox, void)
{
bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked();
m_pConfigItem->SetSecureConnection(bEnable);
m_pPortNF->SetValue(m_pConfigItem->GetMailPort());
}
SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent) SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent)
: SfxModalDialog(pParent, "TestMailSettings", "modules/swriter/ui/testmailsettings.ui") : SfxModalDialog(pParent, "TestMailSettings", "modules/swriter/ui/testmailsettings.ui")
, m_aCompletedImg(BitmapEx(RID_BMP_FORMULA_APPLY)) , m_aCompletedImg(BitmapEx(RID_BMP_FORMULA_APPLY))
......
...@@ -53,6 +53,7 @@ class SwMailConfigPage : public SfxTabPage ...@@ -53,6 +53,7 @@ class SwMailConfigPage : public SfxTabPage
DECL_LINK(ReplyToHdl, Button*, void); DECL_LINK(ReplyToHdl, Button*, void);
DECL_LINK(AuthenticationHdl, Button*, void); DECL_LINK(AuthenticationHdl, Button*, void);
DECL_LINK(TestHdl, Button*, void); DECL_LINK(TestHdl, Button*, void);
DECL_LINK(SecureHdl, Button*, void);
public: public:
SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet );
......
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