#5108: Remove now unused PrefabPopulator. Add some default file icon …

…handling code.
codereader · Nov 19, 2020 · f47cb2c · f47cb2c
1 parent dbcb3ff
commit f47cb2c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 224 deletions.
diff --git a/install/bitmaps/file.png b/install/bitmaps/file.png
diff --git a/libs/wxutil/fsview/FileSystemView.cpp b/libs/wxutil/fsview/FileSystemView.cpp
@@ -7,6 +7,11 @@
 namespace wxutil
 {
 
+namespace
+{
+    const char* const DEFAULT_FILE_ICON = "file.png";
+}
+
 wxDEFINE_EVENT(EV_FSVIEW_SELECTION_CHANGED, FileSystemView::SelectionChangedEvent);
 
 FileSystemView::SelectionChangedEvent::SelectionChangedEvent(int id) :
@@ -36,7 +41,8 @@ bool FileSystemView::SelectionChangedEvent::SelectionIsFolder()
 
 FileSystemView::FileSystemView(wxWindow* parent, const TreeModel::Ptr& model, long style) :
     TreeView(parent, model, style),
-    _treeStore(model)
+    _treeStore(model),
+    _fileIcon(DEFAULT_FILE_ICON)
 {
     // Single visible column, containing the directory/shader name and the icon
     AppendIconTextColumn(_("File"), Columns().filename.getColumnIndex(),
@@ -72,9 +78,15 @@ void FileSystemView::SetBasePath(const std::string& basePath)
     _basePath = basePath;
 }
 
+void FileSystemView::SetDefaultFileIcon(const std::string& fileIcon)
+{
+    _fileIcon = fileIcon;
+}
+
 void FileSystemView::Populate(const std::string& preselectPath)
 {
     _populated = true;
+    _preselectPath = preselectPath;
 
     if (_populator && _populator->GetBasePath() == GetBasePath())
     {
@@ -100,6 +112,7 @@ void FileSystemView::Populate(const std::string& preselectPath)
     row.SendItemAdded();
 
     _populator.reset(new fsview::Populator(Columns(), this, GetBasePath()));
+    _populator->SetDefaultFileIcon(_fileIcon);
 
     // Start the thread, will send an event when finished
     _populator->Populate();

diff --git a/libs/wxutil/fsview/FileSystemView.h b/libs/wxutil/fsview/FileSystemView.h
@@ -15,6 +15,7 @@ class FileSystemView :
     TreeModel::Ptr _treeStore;
 
     std::string _basePath;
+    std::string _fileIcon;
 
     // TRUE if the treeview has been populated
     bool _populated;
@@ -52,6 +53,9 @@ 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);
 
+    // Set the default icon used for files (e.g. "cmenu_add_prefab.png", relative to the bitmaps/ folder)
+    void SetDefaultFileIcon(const std::string& fileIcon);
+
     // (Re-)populates the tree view, looking for files in the defined paths
     // If the preselectPath argument is not empty, the item will be selected after population
     void Populate(const std::string& preselectPath = std::string());

diff --git a/libs/wxutil/fsview/Populator.cpp b/libs/wxutil/fsview/Populator.cpp
@@ -15,7 +15,7 @@ namespace fsview
 namespace
 {
     const char* const FOLDER_ICON = "folder.png";
-    const char* const FILE_ICON = "cmenu_add_prefab.png";
+    const char* const FILE_ICON = "file.png";
 }
 
 Populator::Populator(const TreeColumns& columns,
@@ -42,6 +42,11 @@ Populator::~Populator()
     }
 }
 
+void Populator::SetDefaultFileIcon(const std::string& fileIcon)
+{
+    _fileIcon.CopyFromBitmap(wxArtProvider::GetBitmap(GlobalUIManager().ArtIdPrefix() + fileIcon));
+}
+
 void Populator::visitFile(const vfs::FileInfo& fileInfo)
 {
     if (TestDestroy())

diff --git a/libs/wxutil/fsview/Populator.h b/libs/wxutil/fsview/Populator.h
@@ -61,6 +61,8 @@ class Populator :
     void visit(wxutil::TreeModel& store, wxutil::TreeModel::Row& row,
         const std::string& path, bool isExplicit);
 
+    void SetDefaultFileIcon(const std::string& fileIcon);
+
 protected:
     // Thread entry point
     ExitCode Entry();

diff --git a/radiant/Makefile.am b/radiant/Makefile.am
@@ -53,7 +53,6 @@ darkradiant_SOURCES = main.cpp \
                       ui/eclasstree/EClassTreeBuilder.cpp \
                       ui/entitylist/EntityList.cpp \
                       ui/entitylist/GraphTreeModel.cpp \
-                      ui/prefabselector/PrefabPopulator.cpp \
                       ui/prefabselector/PrefabSelector.cpp \
                       ui/texturebrowser/TextureBrowser.cpp \
                       ui/texturebrowser/TextureBrowserManager.cpp \

diff --git a/radiant/ui/prefabselector/PrefabPopulator.cpp b/radiant/ui/prefabselector/PrefabPopulator.cpp
diff --git a/radiant/ui/prefabselector/PrefabPopulator.h b/radiant/ui/prefabselector/PrefabPopulator.h
diff --git a/radiant/ui/prefabselector/PrefabSelector.cpp b/radiant/ui/prefabselector/PrefabSelector.cpp
@@ -24,7 +24,6 @@
 #include <wx/textctrl.h>
 #include <wx/radiobut.h>
 
-#include "PrefabPopulator.h"
 #include "entitylib.h"
 
 #include "string/trim.h"
@@ -56,7 +55,6 @@ PrefabSelector::PrefabSelector() :
 	DialogBase(_(PREFABSELECTOR_TITLE)),
     _treeView(nullptr),
 	_lastPrefab(""),
-	_populated(false),
     _description(nullptr),
     _useModPath(nullptr),
     _useCustomPath(nullptr),
@@ -226,16 +224,8 @@ void PrefabSelector::addCustomPathToRecentList()
 
 int PrefabSelector::ShowModal()
 {
-	if (!_populated)
-	{
-		// Populate the tree
-		populatePrefabs();
-	}
-	else if (!_lastPrefab.empty()) 
-	{
-		// Preselect the item, tree is already loaded
-        _treeView->SelectPath(_lastPrefab);
-	}
+	// Populate the tree
+	populatePrefabs();
 
 	// Enter the main loop
 	int returnCode = DialogBase::ShowModal();

diff --git a/radiant/ui/prefabselector/PrefabSelector.h b/radiant/ui/prefabselector/PrefabSelector.h
@@ -32,21 +32,6 @@ class PrefabSelector :
 	public wxutil::DialogBase
 {
 public:
-	// Treemodel definition
-	struct TreeColumns :
-		public wxutil::TreeModel::ColumnRecord
-	{
-		TreeColumns() :
-			filename(add(wxutil::TreeModel::Column::IconText)),
-			vfspath(add(wxutil::TreeModel::Column::String)),
-			isFolder(add(wxutil::TreeModel::Column::Boolean))
-		{}
-
-		wxutil::TreeModel::Column filename;	// e.g. "chair1.pfb"
-		wxutil::TreeModel::Column vfspath;	// e.g. "prefabs/chair1.pfb"
-		wxutil::TreeModel::Column isFolder;	// whether this is a folder
-	};
-
 	struct Result
 	{
 		std::string prefabPath; // VFS path of the prefab
@@ -56,8 +41,6 @@ class PrefabSelector :
 private:
 	wxPanel* _dialogPanel;
 
-	TreeColumns _columns;
-
 	// Model preview widget
 	std::unique_ptr<ui::MapPreview> _preview;
 
@@ -71,10 +54,6 @@ class PrefabSelector :
 	// Last selected prefab, 
 	std::string _lastPrefab;
 
-	// TRUE if the treeview has been populated
-	bool _populated;
-	std::unique_ptr<PrefabPopulator> _populator;
-
 	IMapResourcePtr _mapResource;
 
 	wxTextCtrl* _description;
@@ -117,7 +96,6 @@ class PrefabSelector :
 	std::string getSelectedPath();
 	bool getInsertAsGroup();
 
-    void handleSelectionChange();
 	void updateUsageInfo();
     void addCustomPathToRecentList();
 

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -329,7 +329,6 @@
     <ClCompile Include="..\..\radiant\ui\patch\PatchCreateDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\patch\PatchInspector.cpp" />
     <ClCompile Include="..\..\radiant\ui\patch\PatchThickenDialog.cpp" />
-    <ClCompile Include="..\..\radiant\ui\prefabselector\PrefabPopulator.cpp" />
     <ClCompile Include="..\..\radiant\ui\prefabselector\PrefabSelector.cpp" />
     <ClCompile Include="..\..\radiant\ui\prefdialog\GameSetupDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\prefdialog\GameSetupPage.cpp" />
@@ -527,7 +526,6 @@
     <ClInclude Include="..\..\radiant\ui\patch\PatchCreateDialog.h" />
     <ClInclude Include="..\..\radiant\ui\patch\PatchInspector.h" />
     <ClInclude Include="..\..\radiant\ui\patch\PatchThickenDialog.h" />
-    <ClInclude Include="..\..\radiant\ui\prefabselector\PrefabPopulator.h" />
     <ClInclude Include="..\..\radiant\ui\prefabselector\PrefabSelector.h" />
     <ClInclude Include="..\..\radiant\ui\prefdialog\GameSetupDialog.h" />
     <ClInclude Include="..\..\radiant\ui\prefdialog\GameSetupPage.h" />