diff options
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 1 | ||||
| -rw-r--r-- | include/svtools/PlaceEditDialog.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/dialogs/PlaceEditDialog.cxx | 12 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/placeedit.ui | 38 |
4 files changed, 52 insertions, 4 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 7b90ae07b8ae..37c95351179a 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -655,6 +655,7 @@ void RemoteFilesDialog::DisableControls() IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl ) { ScopedVclPtrInstance< PlaceEditDialog > aDlg( this ); + aDlg->ShowPasswordControl(); short aRetCode = aDlg->Execute(); switch( aRetCode ) diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index e492978af5bb..cfcfe67c4dc4 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -34,6 +34,8 @@ private: std::shared_ptr< DetailsContainer > m_xCurrentDetails; VclPtr<Edit> m_pEDUsername; + VclPtr<Edit> m_pEDPassword; + VclPtr<FixedText> m_pFTPasswordLabel; VclPtr<OKButton> m_pBTOk; VclPtr<CancelButton> m_pBTCancel; @@ -67,6 +69,9 @@ public : OUString GetServerName() { return m_pEDServerName->GetText(); } OUString GetServerUrl(); + OUString GetPassword() { return m_pEDPassword->GetText(); }; + + void ShowPasswordControl( bool bShow = true ) { m_pEDPassword->Show( bShow ); m_pFTPasswordLabel->Show( bShow ); } private: diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index fdb385ec71d8..a297e9ba494d 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -31,6 +31,11 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent) get( m_pBTCancel, "cancel" ); get( m_pBTDelete, "delete" ); get( m_pBTRepoRefresh, "repositoriesRefresh" ); + get( m_pEDPassword, "password" ); + get( m_pFTPasswordLabel, "passwordLabel" ); + + m_pEDPassword->Hide(); + m_pFTPasswordLabel->Hide(); m_pBTOk->SetClickHdl( LINK( this, PlaceEditDialog, OKHdl) ); m_pBTOk->Enable( false ); @@ -59,6 +64,11 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla get( m_pBTCancel, "cancel" ); get( m_pBTDelete, "delete" ); get( m_pTypeGrid, "TypeGrid" ); + get( m_pEDPassword, "password" ); + get( m_pFTPasswordLabel, "passwordLabel" ); + + m_pEDPassword->Hide(); + m_pFTPasswordLabel->Hide(); m_pBTOk->SetClickHdl( LINK( this, PlaceEditDialog, OKHdl) ); m_pBTDelete->SetClickHdl ( LINK( this, PlaceEditDialog, DelHdl) ); @@ -105,6 +115,8 @@ void PlaceEditDialog::dispose() m_pBTOk.clear(); m_pBTCancel.clear(); m_pBTDelete.clear(); + m_pEDPassword.clear(); + m_pFTPasswordLabel.clear(); ModalDialog::dispose(); } diff --git a/svtools/uiconfig/ui/placeedit.ui b/svtools/uiconfig/ui/placeedit.ui index ec5c41e4f5b8..55867ff1a798 100644 --- a/svtools/uiconfig/ui/placeedit.ui +++ b/svtools/uiconfig/ui/placeedit.ui @@ -191,7 +191,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="top_attach">7</property> </packing> </child> <child> @@ -203,7 +203,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="top_attach">7</property> </packing> </child> <child> @@ -295,7 +295,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -307,7 +307,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> </packing> </child> <child> @@ -403,6 +403,36 @@ </packing> </child> <child> + <object class="GtkLabel" id="passwordLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Password*:</property> + <accessibility> + <relation type="description-for" target="password"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">●</property> + <accessibility> + <relation type="described-by" target="passwordLabel"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> <placeholder/> </child> </object> |