#6022: Remove decl::Type::Model, since it's not a declaration

codereader · Jul 24, 2022 · 2086a1c · 2086a1c
1 parent 667e01b
commit 2086a1c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/include/idecltypes.h b/include/idecltypes.h
@@ -20,7 +20,6 @@ enum class Type
     Table,
     EntityDef,
     SoundShader,
-    Model,
     ModelDef,
     Particle,
     Skin,
@@ -39,7 +38,6 @@ inline std::string getTypeName(Type type)
     case Type::Material: return "Material";
     case Type::EntityDef: return "EntityDef";
     case Type::SoundShader: return "SoundShader";
-    case Type::Model: return "Model";
     case Type::ModelDef: return "ModelDef";
     case Type::Particle: return "Particle";
     case Type::Skin: return "Skin";

diff --git a/libs/wxutil/EntityClassChooser.cpp b/libs/wxutil/EntityClassChooser.cpp
@@ -321,7 +321,7 @@ void EntityClassChooser::setupTreeView()
     _treeView = new ResourceTreeView(parent, _columns, wxDV_NO_HEADER);
     _treeView->AddSearchColumn(_columns.iconAndName);
     _treeView->SetExpandTopLevelItemsAfterPopulation(true);
-    _treeView->EnableFavouriteManagement(decl::Type::EntityDef);
+    _treeView->EnableFavouriteManagement(decl::getTypeName(decl::Type::EntityDef));
 
     _treeView->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, &EntityClassChooser::onSelectionChanged, this);
 

diff --git a/libs/wxutil/dataview/ResourceTreeView.cpp b/libs/wxutil/dataview/ResourceTreeView.cpp
@@ -45,7 +45,6 @@ ResourceTreeView::ResourceTreeView(wxWindow* parent, const TreeModel::Ptr& model
     _mode(TreeMode::ShowAll),
     _expandTopLevelItemsAfterPopulation(false),
     _columnToSelectAfterPopulation(nullptr),
-    _declType(decl::Type::None),
     _declPathColumn(_columns.fullName)
 {
     _treeStore = model;
@@ -186,14 +185,14 @@ void ResourceTreeView::PopulateContextMenu(wxutil::PopupMenu& popupMenu)
         new StockIconTextMenuItem(_(ADD_TO_FAVOURITES), wxART_ADD_BOOKMARK),
         std::bind(&ResourceTreeView::_onSetFavourite, this, true),
         std::bind(&ResourceTreeView::_testAddToFavourites, this),
-        [this]() { return _declType != decl::Type::None; }
+        [this]() { return !_favouriteTypeName.empty(); }
     );
 
     popupMenu.addItem(
         new StockIconTextMenuItem(_(REMOVE_FROM_FAVOURITES), wxART_DEL_BOOKMARK),
         std::bind(&ResourceTreeView::_onSetFavourite, this, false),
         std::bind(&ResourceTreeView::_testRemoveFromFavourites, this),
-        [this]() { return _declType != decl::Type::None; }
+        [this]() { return !_favouriteTypeName.empty(); }
     );
 
     popupMenu.addSeparator();
@@ -378,14 +377,14 @@ void ResourceTreeView::Clear()
     _emptyFavouritesLabel = wxDataViewItem();
 }
 
-void ResourceTreeView::EnableFavouriteManagement(decl::Type declType)
+void ResourceTreeView::EnableFavouriteManagement(const std::string& typeName)
 {
-    _declType = declType;
+    _favouriteTypeName = typeName;
 }
 
 void ResourceTreeView::DisableFavouriteManagement()
 {
-    _declType = decl::Type::None;
+    _favouriteTypeName.clear();
     SetTreeMode(TreeMode::ShowAll);
 }
 
@@ -513,11 +512,11 @@ void ResourceTreeView::SetFavouriteRecursively(TreeModel::Row& row, bool isFavou
     // Keep track of this choice
     if (isFavourite)
     {
-        GlobalFavouritesManager().addFavourite(decl::getTypeName(_declType), row[_columns.fullName]);
+        GlobalFavouritesManager().addFavourite(_favouriteTypeName, row[_columns.fullName]);
     }
     else
     {
-        GlobalFavouritesManager().removeFavourite(decl::getTypeName(_declType), row[_columns.fullName]);
+        GlobalFavouritesManager().removeFavourite(_favouriteTypeName, row[_columns.fullName]);
     }
 
     row.SendItemChanged();

diff --git a/libs/wxutil/dataview/ResourceTreeView.h b/libs/wxutil/dataview/ResourceTreeView.h
@@ -87,7 +87,8 @@ class ResourceTreeView :
 
     std::vector<ui::IMenuItemPtr> _customMenuItems;
 
-    decl::Type _declType;
+    // Typename used to store favourites. Favourites disabled if empty.
+    std::string _favouriteTypeName;
 
     wxString _filterText;
 
@@ -130,8 +131,8 @@ class ResourceTreeView :
 
     virtual void Clear();
 
-    // Enable favourite management for the given declaration type
-    virtual void EnableFavouriteManagement(decl::Type declType);
+    // Enable favourite management for the given favourite type name
+    virtual void EnableFavouriteManagement(const std::string& typeName);
     // Disable favourite management features
     virtual void DisableFavouriteManagement();
 

diff --git a/radiant/ui/common/SoundChooser.cpp b/radiant/ui/common/SoundChooser.cpp
@@ -196,7 +196,7 @@ wxutil::ResourceTreeView* SoundChooser::createTreeView(wxWindow* parent)
 	// Use the TreeModel's full string search function
 	_treeView->AddSearchColumn(_columns.iconAndName);
     _treeView->SetExpandTopLevelItemsAfterPopulation(true);
-    _treeView->EnableFavouriteManagement(decl::Type::SoundShader);
+    _treeView->EnableFavouriteManagement(decl::getTypeName(decl::Type::SoundShader));
 
 	// Get selection and connect the changed callback
 	_treeView->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, &SoundChooser::_onSelectionChange, this);

diff --git a/radiant/ui/materials/MaterialTreeView.cpp b/radiant/ui/materials/MaterialTreeView.cpp
@@ -17,7 +17,7 @@ MaterialTreeView::MaterialTreeView(wxWindow* parent) :
     textCol->SetWidth(300);
 
     AddSearchColumn(Columns().iconAndName);
-    EnableFavouriteManagement(decl::Type::Material);
+    EnableFavouriteManagement(decl::getTypeName(decl::Type::Material));
 
     // The wxWidgets algorithm sucks at sorting large flat lists of strings,
     // so we do that ourselves

diff --git a/radiant/ui/modelselector/ModelTreeView.cpp b/radiant/ui/modelselector/ModelTreeView.cpp
@@ -18,7 +18,7 @@ ModelTreeView::ModelTreeView(wxWindow* parent) :
 
     // Use the TreeModel's full string search function
     AddSearchColumn(Columns().iconAndName);
-    EnableFavouriteManagement(decl::Type::Model);
+    EnableFavouriteManagement("model");
 }
 
 const ModelTreeView::TreeColumns& ModelTreeView::Columns() const

diff --git a/radiant/ui/particles/ParticleSelector.cpp b/radiant/ui/particles/ParticleSelector.cpp
@@ -43,7 +43,7 @@ wxutil::ResourceTreeView* ParticleSelector::createTreeView(wxWindow* parent)
 
     // Apply full-text search to the column
     _treeView->AddSearchColumn(_columns.leafName);
-    _treeView->EnableFavouriteManagement(decl::Type::Particle);
+    _treeView->EnableFavouriteManagement(decl::getTypeName(decl::Type::Particle));
 
     // Start loading particles into the view
     populateParticleList();