#5108: Make listed file extensions configurable

libs/wxutil/fsview/FileSystemView.cpp

@@ -44,6 +44,8 @@ FileSystemView::FileSystemView(wxWindow* parent, const TreeModel::Ptr& model, lo
     _treeStore(model),
     _fileIcon(DEFAULT_FILE_ICON)
 {
+    _fileExtensions.insert("*"); // list all files by default
+
     // Single visible column, containing the directory/shader name and the icon
     AppendIconTextColumn(_("File"), Columns().filename.getColumnIndex(),
         wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_AUTOSIZE, wxALIGN_NOT, wxDATAVIEW_COL_SORTABLE);
@@ -78,6 +80,11 @@ void FileSystemView::SetBasePath(const std::string& basePath)
     _basePath = basePath;
 }
 
+void FileSystemView::SetFileExtensions(const std::set<std::string>& fileExtensions)
+{
+    _fileExtensions = fileExtensions;
+}
+
 void FileSystemView::SetDefaultFileIcon(const std::string& fileIcon)
 {
     _fileIcon = fileIcon;
@@ -111,7 +118,7 @@ void FileSystemView::Populate(const std::string& preselectPath)
     row[Columns().vfspath] = "__loadingnode__"; // to prevent that item from being found
     row.SendItemAdded();
 
-    _populator.reset(new fsview::Populator(Columns(), this, GetBasePath()));
+    _populator.reset(new fsview::Populator(Columns(), this, GetBasePath(), _fileExtensions));
     _populator->SetDefaultFileIcon(_fileIcon);
 
     // Start the thread, will send an event when finished

libs/wxutil/fsview/FileSystemView.h

@@ -22,6 +22,8 @@ class FileSystemView :
     std::unique_ptr<fsview::Populator> _populator;
     std::string _preselectPath;
 
+    std::set<std::string> _fileExtensions;
+
 public:
     class SelectionChangedEvent :
         public wxEvent
@@ -53,6 +55,10 @@ class FileSystemView :
     // Sets the base path of this view. This can be either an absolute filesystem path or a VFS path
     void SetBasePath(const std::string& basePath);
 
+    // Define the set of file extensions to list in the tree (e.g. "map" or "pfbx")
+    // Use a single "*" extension to list all files.
+    void SetFileExtensions(const std::set<std::string>& fileExtensions);
+
     // Set the default icon used for files (e.g. "cmenu_add_prefab.png", relative to the bitmaps/ folder)
     void SetDefaultFileIcon(const std::string& fileIcon);
 

libs/wxutil/fsview/Populator.cpp

@@ -1,7 +1,6 @@
 #include "Populator.h"
 
 #include "iuimanager.h"
-#include "ifiletypes.h"
 #include "os/path.h"
 
 #include <wx/artprov.h>
@@ -19,13 +18,15 @@ namespace
 }
 
 Populator::Populator(const TreeColumns& columns,
-    wxEvtHandler* finishedHandler, const std::string& basePath) :
+    wxEvtHandler* finishedHandler, const std::string& basePath, 
+    const std::set<std::string>& fileExtensions) :
     wxThread(wxTHREAD_JOINABLE),
     _columns(columns),
     _treeStore(new wxutil::TreeModel(_columns)),
     _finishedHandler(finishedHandler),
     _treePopulator(_treeStore),
-    _basePath(os::standardPathWithSlash(basePath))
+    _basePath(os::standardPathWithSlash(basePath)),
+    _fileExtensions(fileExtensions)
 {
     _fileIcon.CopyFromBitmap(
         wxArtProvider::GetBitmap(GlobalUIManager().ArtIdPrefix() + FILE_ICON));
@@ -76,12 +77,9 @@ void Populator::SearchForFilesMatchingExtension(const std::string& extension)
 
 wxThread::ExitCode Populator::Entry()
 {
-    // Get the first extension from the list of possible patterns (e.g. *.pfb or *.map)
-    FileTypePatterns patterns = GlobalFiletypes().getPatternsForType(filetype::TYPE_PREFAB);
-
-    for (const auto& pattern : patterns)
+    for (const auto& extension : _fileExtensions)
     {
-        SearchForFilesMatchingExtension(pattern.extension);
+        SearchForFilesMatchingExtension(extension);
 
         if (TestDestroy()) return static_cast<wxThread::ExitCode>(0);
     }

libs/wxutil/fsview/Populator.h

@@ -46,10 +46,13 @@ class Populator :
 
     std::string _basePath;
 
+    std::set<std::string> _fileExtensions;
+
 public:
     Populator(const TreeColumns& columns,
         wxEvtHandler* finishedHandler,
-        const std::string& basePath);
+        const std::string& basePath,
+        const std::set<std::string>& fileExtensions);
 
     ~Populator(); // waits for thread to finish
 

radiant/ui/prefabselector/PrefabSelector.cpp

@@ -1,6 +1,7 @@
 #include "PrefabSelector.h"
 
 #include "ifilesystem.h"
+#include "ifiletypes.h"
 #include "itextstream.h"
 #include "i18n.h"
 #include "iradiant.h"
@@ -316,6 +317,18 @@ void PrefabSelector::setupTreeView(wxWindow* parent)
 {
     _treeView = wxutil::FileSystemView::Create(parent, wxBORDER_STATIC | wxDV_NO_HEADER);
     _treeView->Bind(wxutil::EV_FSVIEW_SELECTION_CHANGED, &PrefabSelector::onSelectionChanged, this);
+
+    // Get the extensions from all possible patterns (e.g. *.pfb or *.pfbx)
+    FileTypePatterns patterns = GlobalFiletypes().getPatternsForType(filetype::TYPE_PREFAB);
+
+    std::set<std::string> fileExtensions;
+
+    for (const auto & pattern : patterns)
+    {
+        fileExtensions.insert(pattern.extension);
+    }
+
+    _treeView->SetFileExtensions(fileExtensions);
 }
 
 std::string PrefabSelector::getPrefabFolder()