Kaydet (Commit) 3113ecb2 authored tarafından Giuseppe Castagno's avatar Giuseppe Castagno Kaydeden (comit) jan iversen

Related tdf#96833: hide user and password for WebDAV servers...

...because they are asked for and stored in a successive user
interaction.

Change-Id: I09a3a1e59fe3819a28d7565e83b0db968dfee74b
Reviewed-on: https://gerrit.libreoffice.org/21040Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
Tested-by: 's avatarjan iversen <jani@documentfoundation.org>
üst d74161f2
...@@ -34,6 +34,7 @@ private: ...@@ -34,6 +34,7 @@ private:
std::shared_ptr< DetailsContainer > m_xCurrentDetails; std::shared_ptr< DetailsContainer > m_xCurrentDetails;
VclPtr<Edit> m_pEDUsername; VclPtr<Edit> m_pEDUsername;
VclPtr<FixedText> m_pFTUsernameLabel;
VclPtr<CheckBox> m_pCBPassword; VclPtr<CheckBox> m_pCBPassword;
VclPtr<Edit> m_pEDPassword; VclPtr<Edit> m_pEDPassword;
VclPtr<FixedText> m_pFTPasswordLabel; VclPtr<FixedText> m_pFTPasswordLabel;
......
...@@ -57,6 +57,8 @@ class DetailsContainer ...@@ -57,6 +57,8 @@ class DetailsContainer
virtual void setUsername( const OUString& /*rUsername*/ ) { }; virtual void setUsername( const OUString& /*rUsername*/ ) { };
virtual void setPassword( const OUString& ) { }; virtual void setPassword( const OUString& ) { };
virtual bool enableUserCredentials( ) { return true; };
void setActive( bool bActive = true ); void setActive( bool bActive = true );
protected: protected:
...@@ -98,6 +100,7 @@ class DavDetailsContainer : public HostDetailsContainer ...@@ -98,6 +100,7 @@ class DavDetailsContainer : public HostDetailsContainer
virtual ~DavDetailsContainer( ) { }; virtual ~DavDetailsContainer( ) { };
virtual void show( bool bShow = true ) override; virtual void show( bool bShow = true ) override;
virtual bool enableUserCredentials( ) override { return false; };
protected: protected:
virtual bool verifyScheme( const OUString& rScheme ) override; virtual bool verifyScheme( const OUString& rScheme ) override;
......
...@@ -28,6 +28,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent) ...@@ -28,6 +28,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent)
get( m_pEDServerName, "name" ); get( m_pEDServerName, "name" );
get( m_pLBServerType, "type" ); get( m_pLBServerType, "type" );
get( m_pEDUsername, "login" ); get( m_pEDUsername, "login" );
get( m_pFTUsernameLabel, "loginLabel" );
get( m_pBTOk, "ok" ); get( m_pBTOk, "ok" );
get( m_pBTCancel, "cancel" ); get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" ); get( m_pBTDelete, "delete" );
...@@ -61,6 +62,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla ...@@ -61,6 +62,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla
get( m_pEDServerName, "name" ); get( m_pEDServerName, "name" );
get( m_pLBServerType, "type" ); get( m_pLBServerType, "type" );
get( m_pEDUsername, "login" ); get( m_pEDUsername, "login" );
get( m_pFTUsernameLabel, "loginLabel" );
get( m_pBTOk, "ok" ); get( m_pBTOk, "ok" );
get( m_pBTCancel, "cancel" ); get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" ); get( m_pBTDelete, "delete" );
...@@ -120,6 +122,7 @@ void PlaceEditDialog::dispose() ...@@ -120,6 +122,7 @@ void PlaceEditDialog::dispose()
m_pEDServerName.clear(); m_pEDServerName.clear();
m_pLBServerType.clear(); m_pLBServerType.clear();
m_pEDUsername.clear(); m_pEDUsername.clear();
m_pFTUsernameLabel.clear();
m_pBTOk.clear(); m_pBTOk.clear();
m_pBTCancel.clear(); m_pBTCancel.clear();
m_pBTDelete.clear(); m_pBTDelete.clear();
...@@ -333,9 +336,11 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) ...@@ -333,9 +336,11 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, SelectTypeHdl, ListBox&, void )
m_xCurrentDetails->show(); m_xCurrentDetails->show();
m_pCBPassword->Show( m_bShowPassword ); m_pCBPassword->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
m_pEDPassword->Show( m_bShowPassword ); m_pEDPassword->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
m_pFTPasswordLabel->Show( m_bShowPassword ); m_pFTPasswordLabel->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
m_pEDUsername->Show( m_xCurrentDetails->enableUserCredentials() );
m_pFTUsernameLabel->Show( m_xCurrentDetails->enableUserCredentials() );
SetSizePixel(GetOptimalSize()); SetSizePixel(GetOptimalSize());
......
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