[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig

2022-05-07 Thread Andreas Heinisch (via logerrit) 
 fpicker/source/office/PlacesListBox.cxx   |   12 
 fpicker/source/office/PlacesListBox.hxx   |1 +
 fpicker/uiconfig/ui/explorerfiledialog.ui |2 ++
 3 files changed, 15 insertions(+)

New commits:
commit 9313b6c02cc40633edfaadfc7941cbb5640368b2
Author: Andreas Heinisch 
AuthorDate: Mon May 2 19:31:26 2022 +0200
Commit: Andreas Heinisch 
CommitDate: Sat May 7 11:09:32 2022 +0200

tdf#62776 - Add tooltip for folder location shortcuts

Change-Id: I326fd3c3695e5467a49688fc2164fe591aef2397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133709
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/fpicker/source/office/PlacesListBox.cxx 
b/fpicker/source/office/PlacesListBox.cxx
index 050cee39c113..86bd505179a3 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -29,6 +29,7 @@ PlacesListBox::PlacesListBox(std::unique_ptr 
xControl,
 
 mxImpl->connect_changed( LINK( this, PlacesListBox, Selection ) );
 mxImpl->connect_row_activated( LINK( this, PlacesListBox, DoubleClick ) ) ;
+mxImpl->connect_query_tooltip(LINK(this, PlacesListBox, QueryTooltipHdl));
 }
 
 PlacesListBox::~PlacesListBox( )
@@ -136,6 +137,17 @@ IMPL_LINK_NOARG( PlacesListBox, DoubleClick, 
weld::TreeView&, bool )
 return true;
 }
 
+IMPL_LINK(PlacesListBox, QueryTooltipHdl, const weld::TreeIter&, rIter, 
OUString)
+{
+const OUString sText = mxImpl->get_text(rIter);
+for (const auto& pPlace : maPlaces)
+{
+if (pPlace->GetName() == sText)
+return 
pPlace->GetUrlObject().GetMainURL(INetURLObject::DecodeMechanism::Unambiguous);
+}
+return OUString();
+}
+
 void PlacesListBox::updateView( )
 {
 sal_uInt32 nSelected = mxImpl->get_cursor_index();
diff --git a/fpicker/source/office/PlacesListBox.hxx 
b/fpicker/source/office/PlacesListBox.hxx
index ca507e06ae3a..ed3a0798e9e7 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -60,6 +60,7 @@ private:
 
 DECL_LINK( Selection, weld::TreeView&, void );
 DECL_LINK( DoubleClick, weld::TreeView&, bool );
+DECL_LINK(QueryTooltipHdl, const weld::TreeIter&, OUString);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui 
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 1817d785c814..84a50b05d91c 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -293,6 +293,7 @@
 True
 True
 True
+Add shortcut
 image1
 True
   
@@ -307,6 +308,7 @@
 True
 True
 True
+Delete shortcut
 image2
 True

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig

2021-10-18 Thread Caolán McNamara (via logerrit) 
 fpicker/source/office/RemoteFilesDialog.cxx |6 ++
 fpicker/uiconfig/ui/remotefilesdialog.ui|   21 +++--
 2 files changed, 5 insertions(+), 22 deletions(-)

New commits:
commit d989619895a1215d0f701247d5d8368069da8962
Author: Caolán McNamara 
AuthorDate: Mon Oct 18 16:17:54 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 18 20:28:37 2021 +0200

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 
Reviewed-by: Caolán McNamara 

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 ) );
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui 
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index 9f4034deefc7..be7e83f43e03 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -138,8 +138,9 @@
   
 
 
-  
+  
 _Open
+True
 True
 True
 True
@@ -152,21 +153,6 @@
 2
   
 
-
-  
-_Save
-True
-True
-True
-True
-True
-  
-  
-True
-True
-3
-  
-
   
   
 False
@@ -565,8 +551,7 @@
 
   help
   cancel
-  open
-  save
+  ok

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig

2019-11-24 Thread Caolán McNamara (via logerrit) 
 fpicker/source/office/RemoteFilesDialog.cxx |   40 ++
 fpicker/source/office/RemoteFilesDialog.hxx |7 +
 fpicker/uiconfig/ui/remotefilesdialog.ui|  102 +++-
 3 files changed, 70 insertions(+), 79 deletions(-)

New commits:
commit b004a1bd7bf3885613d52aba70dea79766eae639
Author: Caolán McNamara 
AuthorDate: Sat Nov 23 19:14:45 2019 +
Commit: Caolán McNamara 
CommitDate: Sun Nov 24 18:13:57 2019 +0100

Resolves: tdf#128940 use a normal MenuButton

instead of a split toolbar item

Change-Id: I2e706d1a3255dca7a51d323a2bcf750f28b8fd1e
Reviewed-on: https://gerrit.libreoffice.org/83581
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index b0739b49e95c..27ed01464204 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -32,8 +32,7 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, 
PickerFlags nBits )
 , m_xMasterPasswd( PasswordContainer::create( m_xContext ) )
 , m_bIsInExecute( false )
 , m_xCancel_btn(m_xBuilder->weld_button("cancel"))
-, m_xAddService_bar(m_xBuilder->weld_toolbar("add_service_bar"))
-, m_xAddService_menu(m_xBuilder->weld_menu("service_edit_menu"))
+, m_xManageServices(m_xBuilder->weld_menu_button("add_service_btn"))
 , m_xServices_lb(m_xBuilder->weld_combo_box("services_lb"))
 , m_xPathContainer(m_xBuilder->weld_container("breadcrumb_container"))
 , m_xNewFolder(m_xBuilder->weld_button("new_folder"))
@@ -42,8 +41,6 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, 
PickerFlags nBits )
 , m_xFilter_lb(m_xBuilder->weld_combo_box("filter_lb"))
 , m_xName_ed(new AutocompleteEdit(m_xBuilder->weld_entry("filename")))
 {
-m_xAddService_bar->set_item_menu("add_service_btn", 
m_xAddService_menu.get());
-
 m_eMode = ( nBits & PickerFlags::SaveAs ) ? REMOTEDLG_MODE_SAVE : 
REMOTEDLG_MODE_OPEN;
 m_eType = ( nBits & PickerFlags::PathDialog ) ? REMOTEDLG_TYPE_PATHDLG : 
REMOTEDLG_TYPE_FILEDLG;
 bool bMultiselection = bool( nBits & PickerFlags::MultiSelection );
@@ -112,8 +109,7 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* 
pParent, PickerFlags nBits )
 m_xName_ed->connect_focus_in(LINK(this, RemoteFilesDialog, 
FileNameGetFocusHdl));
 m_xName_ed->connect_changed(LINK(this, RemoteFilesDialog, 
FileNameModifyHdl));
 
-m_xAddService_bar->connect_clicked(LINK( this, RemoteFilesDialog, 
AddServiceHdl));
-m_xAddService_menu->connect_activate(LINK(this, RemoteFilesDialog, 
EditServiceMenuHdl));
+m_xManageServices->connect_selected(LINK(this, RemoteFilesDialog, 
EditServiceMenuHdl));
 
 FillServicesListbox();
 
@@ -167,6 +163,14 @@ RemoteFilesDialog::~RemoteFilesDialog()
 batch->commit();
 }
 
+void RemoteFilesDialog::EnableExtraMenuItems(bool bEnable)
+{
+m_xManageServices->set_item_visible("change_password", bEnable);
+m_xManageServices->set_item_visible("edit_service", bEnable);
+m_xManageServices->set_item_visible("delete_service", bEnable);
+m_xManageServices->set_item_visible("change_password", bEnable);
+}
+
 short RemoteFilesDialog::run()
 {
 if (m_xServices_lb->get_count() > 0)
@@ -177,7 +181,7 @@ short RemoteFilesDialog::run()
 if (!m_bIsConnected)
 {
 m_xServices_lb->set_active(-1);
-m_xAddService_bar->set_item_menu("add_service_btn", nullptr);
+EnableExtraMenuItems(false);
 }
 
 m_bIsInExecute = true;
@@ -287,10 +291,10 @@ void RemoteFilesDialog::FillServicesListbox()
 if (m_xServices_lb->get_count() > 0)
 {
 m_xServices_lb->set_active(nPos);
-m_xAddService_bar->set_item_menu("add_service_btn", 
m_xAddService_menu.get());
+EnableExtraMenuItems(true);
 }
 else
-m_xAddService_bar->set_item_menu("add_service_btn", nullptr);
+EnableExtraMenuItems(false);
 
 EnableControls();
 }
@@ -401,7 +405,7 @@ void RemoteFilesDialog::EnableControls()
 
 if (m_xServices_lb->get_active() != -1)
 {
-m_xAddService_menu->set_sensitive("change_password", false);
+m_xManageServices->set_item_sensitive("change_password", false);
 
 try
 {
@@ -417,7 +421,7 @@ void RemoteFilesDialog::EnableControls()
 
 if( aURLEntries.UserList.hasElements() )
 {
-
m_xAddService_menu->set_sensitive("change_password", true);
+
m_xManageServices->set_item_sensitive("change_password", true);
 }
 }
 }
@@ -451,14 +455,14 @@ void RemoteFilesDialog::EnableControls()
 }
 
 m_xPath->EnableFields( true );
-m_xAddService_bar->set_sensitive(true);
+m_xManageServices->set_sensitive(true);
 }
 
 void

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig

2018-05-17 Thread Caolán McNamara 
 fpicker/source/office/QueryFolderName.hxx   |   22 +++---
 fpicker/source/office/RemoteFilesDialog.cxx |8 +--
 fpicker/source/office/iodlg.cxx |   61 +---
 fpicker/uiconfig/ui/foldernamedialog.ui |   10 
 4 files changed, 41 insertions(+), 60 deletions(-)

New commits:
commit c899ad348c375e6c59dbbc30e2458d9cbe226c12
Author: Caolán McNamara 
Date:   Wed May 16 15:56:12 2018 +0100

weld QueryFolderNameDialog

Change-Id: I73ff0a15010d00a353e498755755177c8e7df607
Reviewed-on: https://gerrit.libreoffice.org/54442
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/fpicker/source/office/QueryFolderName.hxx 
b/fpicker/source/office/QueryFolderName.hxx
index d3555e3fa9b3..4172aa0f9ee0 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -19,28 +19,22 @@
 #ifndef INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
 #define INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
 
-class QueryFolderNameDialog : public ModalDialog
+class QueryFolderNameDialog : public weld::GenericDialogController
 {
 private:
-VclPtr m_pNameEdit;
-VclPtr m_pNameLine;
-VclPtr m_pOKBtn;
+std::unique_ptr m_xNameEdit;
+std::unique_ptr m_xOKBtn;
 
-DECL_LINK( OKHdl, Button*, void );
-DECL_LINK( NameHdl, Edit&, void );
+DECL_LINK( OKHdl, weld::Button&, void );
+DECL_LINK( NameHdl, weld::Entry&, void );
 
 public:
-QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
+QueryFolderNameDialog(weld::Window* _pParent, const OUString& rTitle,
 const OUString& rDefaultText);
 virtual ~QueryFolderNameDialog() override;
-virtual void dispose() override;
-OUString GetName() const { return m_pNameEdit->GetText(); }
+OUString GetName() const { return m_xNameEdit->get_text(); }
 };
 
 #endif // INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 7cac02da..bf629dfe8f2a 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -1087,17 +1087,17 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl, 
Button*, void )
 
 OUString aTitle;
 aContent.getTitle( aTitle );
-ScopedVclPtrInstance< QueryFolderNameDialog > aDlg(this, aTitle, 
FpsResId(STR_SVT_NEW_FOLDER));
+QueryFolderNameDialog aDlg(GetFrameWeld(), aTitle, 
FpsResId(STR_SVT_NEW_FOLDER));
 bool bHandled = false;
 
 while( !bHandled )
 {
-if( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
-OUString aUrl = aContent.createFolder( aDlg->GetName() );
+OUString aUrl = aContent.createFolder(aDlg.GetName());
 if( !aUrl.isEmpty() )
 {
-m_pFileView->CreatedFolder( aUrl, aDlg->GetName() );
+m_pFileView->CreatedFolder(aUrl, aDlg.GetName());
 bHandled = true;
 }
 }
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ca7cc591db3f..880e27834a82 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -745,17 +745,17 @@ IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, 
Button*, void)
 SmartContent aContent( _pFileView->GetViewURL( ) );
 OUString aTitle;
 aContent.getTitle( aTitle );
-ScopedVclPtrInstance< QueryFolderNameDialog > aDlg(this, aTitle, 
FpsResId(STR_SVT_NEW_FOLDER));
+QueryFolderNameDialog aDlg(GetFrameWeld(), aTitle, 
FpsResId(STR_SVT_NEW_FOLDER));
 bool bHandled = false;
 
 while ( !bHandled )
 {
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
-OUString aUrl = aContent.createFolder( aDlg->GetName( ) );
+OUString aUrl = aContent.createFolder(aDlg.GetName());
 if ( !aUrl.isEmpty( ) )
 {
-_pFileView->CreatedFolder( aUrl, aDlg->GetName() );
+_pFileView->CreatedFolder(aUrl, aDlg.GetName());
 bHandled = true;
 }
 }
@@ -2768,56 +2768,35 @@ Image SvtFileDialog::GetButtonImage(const OUString& 
rButtonId)
 return Image(BitmapEx(rButtonId));
 }
 
-QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent,
+QueryFolderNameDialog::QueryFolderNameDialog(weld::Window* _pParent,
 const OUString& rTitle, const OUString& rDefaultText)
-: ModalDialog(_pParent, "FolderNameDialog", "fps/ui/foldernamedialog.ui")
-{
-get(m_pNameEdit, "entry");
-get(m_pNameLine, "frame");
-get(m_pOKBtn, "ok");
-
-SetText( rTitle );
-m_pNameEdit->SetText( rDefaultText );
-m_pNameEdit->SetSelection( Selection( 0,

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig

2017-11-01 Thread Katarina Behrens 
 fpicker/source/office/iodlg.cxx   |3 ---
 fpicker/uiconfig/ui/explorerfiledialog.ui |1 -
 2 files changed, 4 deletions(-)

New commits:
commit af318eeb4e23694e17b09b902afb98ddf9da9b7b
Author: Katarina Behrens 
Date:   Tue Oct 31 21:33:26 2017 +0100

tdf#113304,filepicker: encrypt w/ GPG only when it makes sense

remotely gpg4libre-related

Change-Id: Iec6f1ca04e55c8d66e65bb8d349b613b66ad1c69
Reviewed-on: https://gerrit.libreoffice.org/44137
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 72f4e494cb36..ff486ddb3d0a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -638,9 +638,6 @@ void SvtFileDialog::Init_Impl
 pImpl->_pCbPassword->SetText( FpsResId( STR_SVT_FILEPICKER_PASSWORD ) 
);
 pImpl->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, 
ClickHdl_Impl ) );
 pImpl->_pCbPassword->Show();
-}
-if ( nStyle & PickerFlags::Password )
-{
 pImpl->_pCbGPGEncrypt->SetClickHdl( LINK( this, SvtFileDialog, 
ClickHdl_Impl ) );
 pImpl->_pCbGPGEncrypt->Show();
 }
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui 
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 4d43b4112efe..b533c06b4295 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -454,7 +454,6 @@
 
   
 Encrypt with GPG key
-True
 True
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig offapi/com

2017-08-30 Thread Katarina Behrens 
 fpicker/source/office/OfficeControlAccess.cxx   |1 
 fpicker/source/office/iodlg.cxx |   12 ++
 fpicker/source/office/iodlgimp.cxx  |1 
 fpicker/source/office/iodlgimp.hxx  |1 
 fpicker/uiconfig/ui/explorerfiledialog.ui   |   18 
+-
 offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl |1 
 6 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 4e825d97a8423c9493c5f6f4ac0493b8799f86f6
Author: Katarina Behrens 
Date:   Fri Aug 18 15:51:38 2017 +0200

gpg4libre: Encrypt with GPG checkbox in SaveAs file dialog, 1st stab

LibO's own file dialog only so far

Change-Id: Ic5f6c180afb5d4e0fc151ad57d769b99ad7fbdf3
Reviewed-on: https://gerrit.libreoffice.org/41292
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/fpicker/source/office/OfficeControlAccess.cxx 
b/fpicker/source/office/OfficeControlAccess.cxx
index 6d8543044cbc..475716c37f37 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -405,6 +405,7 @@ namespace svt
 {
 case CHECKBOX_AUTOEXTENSION:
 case CHECKBOX_PASSWORD:
+case CHECKBOX_GPGENCRYPTION:
 case CHECKBOX_FILTEROPTIONS:
 case CHECKBOX_READONLY:
 case CHECKBOX_LINK:
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f5f9660382d1..5192f42a5f2a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -555,6 +555,7 @@ void SvtFileDialog::Init_Impl
 get(pImpl->_pBtnConnectToServer, "connect_to_server");
 get(pImpl->_pBtnNewFolder, "new_folder");
 get(pImpl->_pCbPassword, "password");
+get(pImpl->_pCbGPGEncrypt, "gpgencrypt");
 get(pImpl->_pCbAutoExtension, "extension");
 get(pImpl->_pFtFileVersion, "shared_label");
 get(pImpl->_pLbFileVersion, "shared");
@@ -638,6 +639,11 @@ void SvtFileDialog::Init_Impl
 pImpl->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, 
ClickHdl_Impl ) );
 pImpl->_pCbPassword->Show();
 }
+if ( nStyle & PickerFlags::Password )
+{
+pImpl->_pCbGPGEncrypt->SetClickHdl( LINK( this, SvtFileDialog, 
ClickHdl_Impl ) );
+pImpl->_pCbGPGEncrypt->Show();
+}
 
 // set the ini file for extracting the size
 pImpl->_aIniKey = "FileDialog";
@@ -1529,6 +1535,8 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, Button*, 
pCheckBox, void )
 nId = CHECKBOX_READONLY;
 else if ( pCheckBox == pImpl->_pCbPassword )
 nId = CHECKBOX_PASSWORD;
+else if ( pCheckBox == pImpl->_pCbGPGEncrypt )
+nId = CHECKBOX_GPGENCRYPTION;
 else if ( pCheckBox == _pCbLinkBox )
 nId = CHECKBOX_LINK;
 else if ( pCheckBox == _pCbPreviewBox )
@@ -2318,6 +2326,10 @@ Control* SvtFileDialog::getControl( sal_Int16 
_nControlId, bool _bLabelControl )
 pReturn = pImpl->_pCbPassword;
 break;
 
+case CHECKBOX_GPGENCRYPTION:
+pReturn = pImpl->_pCbGPGEncrypt;
+break;
+
 case CHECKBOX_FILTEROPTIONS:
 pReturn = pImpl->_pCbOptions;
 break;
diff --git a/fpicker/source/office/iodlgimp.cxx 
b/fpicker/source/office/iodlgimp.cxx
index f71356d22485..22ae71db533b 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -194,6 +194,7 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl()   :
 _pBtnUp ( nullptr ),
 _pBtnNewFolder  ( nullptr ),
 _pCbPassword( nullptr ),
+_pCbGPGEncrypt  ( nullptr ),
 _pEdCurrentPath ( nullptr ),
 _pCbAutoExtension   ( nullptr ),
 _pCbOptions ( nullptr ),
diff --git a/fpicker/source/office/iodlgimp.hxx 
b/fpicker/source/office/iodlgimp.hxx
index 521871d2473f..233beb856491 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -145,6 +145,7 @@ public:
 VclPtr   _pBtnUp;
 VclPtr _pBtnNewFolder;
 VclPtr   _pCbPassword;
+VclPtr   _pCbGPGEncrypt;
 VclPtr  _pEdCurrentPath;
 VclPtr   _pCbAutoExtension;
 VclPtr   _pCbOptions;
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui 
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 58b268fcc423..8008e62039c4 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -433,7 +433,7 @@
   
   
 0
-1
+2

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig sd/source sd/uiconfig svx/source svx/uiconfig sw/source sw/uiconfig

2016-06-27 Thread Muhammet Kara 
 fpicker/source/office/iodlg.cxx |2 
 fpicker/uiconfig/ui/explorerfiledialog.ui   |   12 +++
 sd/source/ui/dlg/copydlg.cxx|3 
 sd/uiconfig/sdraw/ui/copydlg.ui |   21 +++--
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |3 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |6 -
 svx/uiconfig/ui/sidebargraphic.ui   |   73 
 svx/uiconfig/ui/sidebarparagraph.ui |   37 --
 sw/source/ui/table/tabledlg.cxx |5 -
 sw/uiconfig/swriter/ui/tablecolumnpage.ui   |   36 +
 10 files changed, 132 insertions(+), 66 deletions(-)

New commits:
commit 0ea96b1a2f5cf523af451b41915bbafd81a95a2c
Author: Muhammet Kara 
Date:   Mon Jun 20 15:36:23 2016 +0300

Move accessibility relations to .ui files, Part 11: tdf#87026

By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.

As of this commit, all accessible relations of type
"SetAccessibleName" have been moved to .ui files
other than a few exceptions.

Change-Id: I5972211f58de70889066dec3c74341b405f82c85
Reviewed-on: https://gerrit.libreoffice.org/26520
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index fc9663f..fa15ec9 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -595,10 +595,8 @@ void SvtFileDialog::Init_Impl
 bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode );
 _pImp->_pEdFileName->SetNoURLSelection( bSaveMode );
 
-_pImp->_pBtnConnectToServer->SetAccessibleName( 
_pImp->_pBtnConnectToServer->GetQuickHelpText() );
 _pImp->_pBtnNewFolder->SetStyle( _pImp->_pBtnNewFolder->GetStyle() | 
WB_NOPOINTERFOCUS );
 _pImp->_pBtnUp->SetAccessibleName( _pImp->_pBtnUp->GetQuickHelpText() );
-_pImp->_pBtnNewFolder->SetAccessibleName( 
_pImp->_pBtnNewFolder->GetQuickHelpText() );
 
 if ( nStyle & PickerFlags::MultiSelection )
 _pImp->_bMultiSelection = true;
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui 
b/fpicker/uiconfig/ui/explorerfiledialog.ui
index dad5ff0..3de6a6d 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -77,6 +77,11 @@
 True
 Connect To Server
 Connect To Server
+
+  
+Connect To Server
+  
+
   
   
 False
@@ -108,6 +113,11 @@
 True
 Create New Folder
 Create New Folder
+
+  
+Create New Folder
+  
+
   
   
 False
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 48cefcd..f4bd4e1 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -60,9 +60,6 @@ CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& 
rInAttrs,
 get(m_pLbEndColor, "end");
 get(m_pBtnSetDefault, "default");
 
-// Set up the view data button (image and accessible name).
-m_pBtnSetViewData->SetAccessibleName 
(m_pBtnSetViewData->GetQuickHelpText());
-
 // color tables
 DBG_ASSERT( mpColorList.is(), "No colortable available !" );
 m_pLbStartColor->Fill( mpColorList );
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index 56382a4..2ae2610 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -156,6 +156,11 @@
 True
 Values 
from Selection
 image1
+
+  
+Values from Selection
+  
+
   
   
 False
@@ -195,10 +200,10 @@
   
 True
 False
-0
 _X 
axis:
 True
 x:0.00cm
+0
   
   
 0
@@ -209,10 +214,10 @@
   
 True
 False
-0

[Libreoffice-commits] core.git: fpicker/source fpicker/uiconfig include/svtools svtools/Library_svt.mk svtools/source

2016-03-09 Thread Szymon Kłos 
 fpicker/source/office/RemoteFilesDialog.cxx |   17 
 fpicker/source/office/RemoteFilesDialog.hxx |6 
 fpicker/uiconfig/ui/remotefilesdialog.ui|   32 +
 include/svtools/fileview.hxx|8 
 include/svtools/iconview.hxx|   42 +
 include/svtools/treelistbox.hxx |   14 
 svtools/Library_svt.mk  |2 
 svtools/source/contnr/fileview.cxx  |   99 +++-
 svtools/source/contnr/iconview.cxx  |  239 +
 svtools/source/contnr/iconviewimpl.cxx  |  676 
 svtools/source/contnr/svimpbox.cxx  |   17 
 svtools/source/contnr/svlbitm.cxx   |8 
 svtools/source/contnr/treelistbox.cxx   |   10 
 svtools/source/inc/iconviewimpl.hxx |   69 ++
 svtools/source/inc/svimpbox.hxx |  100 ++--
 15 files changed, 1258 insertions(+), 81 deletions(-)

New commits:
commit 5813660e7bfe128ac076e592fe31de64a6863780
Author: Szymon Kłos 
Date:   Tue Feb 16 16:03:30 2016 +0100

icon view for RemoteFilesDialog

New view type can be accessed in:

Start Center > Remote Files > Icon View

Cloud service for testing purposes:

1. Start Center > Remote Files > Add service
2. Set type to: Alfresco 4
3. Set host to: http://cmis.alfresco.com/cmisatom
4. Click refresh icon and enter login:admin pass:admin
5. Click OK and open this service

Change-Id: I3d4674bb84d1df1b678111adffe2f835d2bb2356
Reviewed-on: https://gerrit.libreoffice.org/22437
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index cf01295..1bc4fc1 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -186,6 +186,8 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 get( m_pServices_lb, "services_lb" );
 get( m_pFilter_lb, "filter_lb" );
 get( m_pNewFolder, "new_folder" );
+get( m_pListView_btn, "list_view" );
+get( m_pIconView_btn, "icon_view" );
 
 m_eMode = ( nBits & WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE : 
REMOTEDLG_MODE_OPEN;
 m_eType = ( nBits & WB_PATH ) ? REMOTEDLG_TYPE_PATHDLG : 
REMOTEDLG_TYPE_FILEDLG;
@@ -216,6 +218,9 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, 
WinBits nBits )
 m_pNewFolder->SetClickHdl( LINK( this, RemoteFilesDialog, NewFolderHdl 
) );
 }
 
+m_pIconView_btn->SetClickHdl( LINK( this, RemoteFilesDialog, IconViewHdl ) 
);
+m_pListView_btn->SetClickHdl( LINK( this, RemoteFilesDialog, ListViewHdl ) 
);
+
 m_pOk_btn->Show();
 m_pOk_btn->Enable( false );
 
@@ -347,6 +352,8 @@ void RemoteFilesDialog::dispose()
 m_pFilter_lb.clear();
 m_pName_ed.disposeAndClear();
 m_pNewFolder.clear();
+m_pIconView_btn.clear();
+m_pListView_btn.clear();
 
 ModalDialog::dispose();
 }
@@ -720,6 +727,16 @@ void RemoteFilesDialog::SavePassword( const OUString& 
rURL, const OUString& rUse
 {}
 }
 
+IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, IconViewHdl, Button*, void )
+{
+m_pFileView->SetViewMode( eIcon );
+}
+
+IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, ListViewHdl, Button*, void )
+{
+m_pFileView->SetViewMode( eDetailedList );
+}
+
 IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void )
 {
 ScopedVclPtrInstance< PlaceEditDialog > aDlg( this );
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx 
b/fpicker/source/office/RemoteFilesDialog.hxx
index b05399d..4bc7a73 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -153,7 +153,9 @@ private:
 VclPtr< MenuButton > m_pAddService_btn;
 VclPtr< ListBox > m_pServices_lb;
 VclPtr< Breadcrumb > m_pPath;
-VclPtr m_pNewFolder;
+VclPtr< PushButton > m_pNewFolder;
+VclPtr< PushButton > m_pListView_btn;
+VclPtr< PushButton > m_pIconView_btn;
 VclPtr< Splitter > m_pSplitter;
 VclPtr< FolderTree > m_pTreeView;
 VclPtr< SvtFileView > m_pFileView;
@@ -203,6 +205,8 @@ private:
 DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void );
 
 DECL_LINK_TYPED( NewFolderHdl, Button*, void );
+DECL_LINK_TYPED( IconViewHdl, Button*, void );
+DECL_LINK_TYPED( ListViewHdl, Button*, void );
 
 DECL_LINK_TYPED( OkHdl, Button*, void );
 DECL_LINK_TYPED( CancelHdl, Button*, void );
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui 
b/fpicker/uiconfig/ui/remotefilesdialog.ui
index 00e14da..16f87d6 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -159,6 +159,32 @@
   
 
 
+  
+List view
+True
+True
+True
+