weld fpicker cluster

Change-Id: I6566263809ff0032388a0b56571f0cf7428058d7
Reviewed-on: https://gerrit.libreoffice.org/81334
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 10 insertions, 12 deletions

diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index 697ab8aeb41c..0eb8b5e96f00 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -124,6 +124,7 @@ public:
     SVT_DLLPUBLIC static OUString GetFileImageId( const INetURLObject& rURL );
     SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL );
     SVT_DLLPUBLIC static Image  GetImageNoDefault(const INetURLObject& rURL, bool bBig = false, Size const & rPreferredSize = Size());
+    SVT_DLLPUBLIC static OUString GetFolderImageId( const svtools::VolumeInfo& rInfo );
     SVT_DLLPUBLIC static Image  GetFolderImage( const svtools::VolumeInfo& rInfo );
 
     SVT_DLLPUBLIC static OUString GetDescription( const INetURLObject& rObject );
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index ff2a674618b8..c6c3b03137dd 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -98,9 +98,12 @@ class SVT_DLLPUBLIC URLBox
     rtl::Reference< MatchContext_Impl > pCtx;
     std::unique_ptr<SvtURLBox_Impl> pImpl;
     INetProtocol                    eSmartProtocol;
+    bool                            bOnlyDirectories    : 1;
     bool                            bHistoryDisabled    : 1;
+    bool                            bNoSelection        : 1;
 
     Link<weld::ComboBox&, void>     aChangeHdl;
+    Link<weld::Widget&, void>       aFocusInHdl;
     Link<weld::Widget&, void>       aFocusOutHdl;
 
     std::unique_ptr<weld::ComboBox> m_xWidget;
@@ -122,16 +125,21 @@ public:
     void                connect_entry_activate(const Link<weld::ComboBox&, bool>& rLink) { m_xWidget->connect_entry_activate(rLink); }
     void                connect_changed(const Link<weld::ComboBox&, void>& rLink) { aChangeHdl = rLink; }
     void                trigger_changed() { aChangeHdl.Call(*m_xWidget); }
+    void                connect_focus_in(const Link<weld::Widget&, void>& rLink) { aFocusInHdl = rLink; }
     void                connect_focus_out(const Link<weld::Widget&, void>& rLink) { aFocusOutHdl = rLink; }
     void                append_text(const OUString& rStr) { m_xWidget->append_text(rStr); }
     int                 find_text(const OUString& rStr) const { return m_xWidget->find_text(rStr); }
     OUString            get_active_text() const { return m_xWidget->get_active_text(); }
     void                grab_focus() { m_xWidget->grab_focus(); }
     void                set_sensitive(bool bSensitive) { m_xWidget->set_sensitive(bSensitive); }
-    void                EnableAutocomplete() { m_xWidget->set_entry_completion(true); }
+    void                set_help_id(const OString& rHelpId) { m_xWidget->set_help_id(rHelpId); }
+    void                select_entry_region(int nStartPos, int nEndPos) { m_xWidget->select_entry_region(nStartPos, nEndPos); }
 
+    void                EnableAutocomplete(bool bEnable = true) { m_xWidget->set_entry_completion(bEnable); }
     void                SetBaseURL( const OUString& rURL );
     const OUString&     GetBaseURL() const { return aBaseURL; }
+    void                SetOnlyDirectories( bool bDir );
+    void                SetNoURLSelection( bool bSet );
     void                SetSmartProtocol( INetProtocol eProt );
     INetProtocol        GetSmartProtocol() const { return eSmartProtocol; }
     OUString            GetURL();
diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index a7ddf804c2e3..5b99e51605e3 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -103,22 +103,11 @@
 #define STR_FURTHER_OBJECT                      NC_("STR_FURTHER_OBJECT", "Further objects")
 #define STR_UNKNOWN_SOURCE                      NC_("STR_UNKNOWN_SOURCE", "Unknown source")
 
-#define STR_SVT_FILEVIEW_COLUMN_TITLE           NC_("STR_SVT_FILEVIEW_COLUMN_TITLE", "Name")
-#define STR_SVT_FILEVIEW_COLUMN_SIZE            NC_("STR_SVT_FILEVIEW_COLUMN_SIZE", "Size")
-#define STR_SVT_FILEVIEW_COLUMN_DATE            NC_("STR_SVT_FILEVIEW_COLUMN_DATE", "Date modified")
-#define STR_SVT_FILEVIEW_COLUMN_TYPE            NC_("STR_SVT_FILEVIEW_COLUMN_TYPE", "Type")
 #define STR_SVT_BYTES                           NC_("STR_SVT_BYTES", "Bytes")
 #define STR_SVT_KB                              NC_("STR_SVT_KB", "KB")
 #define STR_SVT_MB                              NC_("STR_SVT_MB", "MB")
 #define STR_SVT_GB                              NC_("STR_SVT_GB", "GB")
 
-// descriptions of accessible objects
-#define STR_SVT_ACC_DESC_TABLISTBOX             NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2")
-#define STR_SVT_ACC_DESC_FILEVIEW               NC_("STR_SVT_ACC_DESC_FILEVIEW", ", Type: %1, URL: %2")
-#define STR_SVT_ACC_DESC_FOLDER                 NC_("STR_SVT_ACC_DESC_FOLDER", "Folder")
-#define STR_SVT_ACC_DESC_FILE                   NC_("STR_SVT_ACC_DESC_FILE", "File")
-#define STR_SVT_ACC_EMPTY_FIELD                 NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field")
-
 /*
  * resources for CollatorResource / CollatorResourceData resp.
  */