diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-10-18 16:17:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-18 20:28:37 +0200 |
| commit | d989619895a1215d0f701247d5d8368069da8962 (patch) | |
| tree | e8d644e2623f5e45d2f24b4ac53fac62110a4cbb /fpicker/source | |
| parent | ed92e40aea759d435ec1c05877e6480654a06ab6 (diff) | |
tdf#145169 have one button per response
not two sharing the same response, so the other buttons response
handler is not a candidate to be called on pressing return
which is the circumstance which causes the dialog to return even
after cancel was selected in its child dialog warning about overwrite
Change-Id: I09eb0ea5e94c89ce0860be362e1c7632887e7a4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123753
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 9c12a1efc25b..544887795da4 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -33,6 +33,7 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits ) , m_xContext( comphelper::getProcessComponentContext() ) , m_xMasterPasswd( PasswordContainer::create( m_xContext ) ) , m_bIsInExecute( false ) + , m_xOk_btn(m_xBuilder->weld_button("ok")) , m_xCancel_btn(m_xBuilder->weld_button("cancel")) , m_xManageServices(m_xBuilder->weld_menu_button("add_service_btn")) , m_xServices_lb(m_xBuilder->weld_combo_box("services_lb")) @@ -62,13 +63,11 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits ) if( m_eMode == REMOTEDLG_MODE_OPEN ) { - m_xOk_btn = m_xBuilder->weld_button("open"); - m_xNewFolder->hide(); } else { - m_xOk_btn = m_xBuilder->weld_button("save"); + m_xOk_btn->set_label(FpsResId(STR_EXPLORERFILE_BUTTONSAVE)); m_xNewFolder->connect_clicked( LINK( this, RemoteFilesDialog, NewFolderHdl ) ); } @@ -76,7 +75,6 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits ) m_xIconView_btn->connect_clicked( LINK( this, RemoteFilesDialog, IconViewHdl ) ); m_xListView_btn->connect_clicked( LINK( this, RemoteFilesDialog, ListViewHdl ) ); - m_xOk_btn->show(); m_xOk_btn->set_sensitive(false); m_xOk_btn->connect_clicked( LINK( this, RemoteFilesDialog, OkHdl ) ); |