#5537: Move DeclarationSelector to wxutil namespace

codereader · Sep 17, 2022 · 7b31e0f · 7b31e0f
1 parent 7000412
commit 7b31e0f
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 27 deletions.
diff --git a/libs/wxutil/CMakeLists.txt b/libs/wxutil/CMakeLists.txt
@@ -9,6 +9,7 @@ add_library(wxutil
             dataview/TreeModelFilter.cpp
             dataview/TreeView.cpp
             dataview/VFSTreePopulator.cpp
+            decl/DeclarationSelector.cpp
             dialog/DialogBase.cpp
             dialog/Dialog.cpp
             dialog/MessageBox.cpp

diff --git a/radiant/ui/common/DeclarationSelector.cpp → libs/wxutil/decl/DeclarationSelector.cpp b/radiant/ui/common/DeclarationSelector.cpp → libs/wxutil/decl/DeclarationSelector.cpp
@@ -1,10 +1,10 @@
 #include "DeclarationSelector.h"
 
 #include <wx/sizer.h>
-#include "wxutil/dataview/ResourceTreeViewToolbar.h"
-#include "wxutil/DeclFileInfo.h"
+#include "../dataview/ResourceTreeViewToolbar.h"
+#include "../DeclFileInfo.h"
 
-namespace ui
+namespace wxutil
 {
 
 DeclarationSelector::DeclarationSelector(wxWindow* parent, decl::Type declType) :
@@ -40,7 +40,7 @@ DeclarationSelector::DeclarationSelector(wxWindow* parent, decl::Type declType,
     // a preview widget can be appended to the vertical sizer => AddPreviewToBottom
 }
 
-void DeclarationSelector::AddPreviewToRightPane(IDeclarationPreview* preview, int sizerProportion)
+void DeclarationSelector::AddPreviewToRightPane(ui::IDeclarationPreview* preview, int sizerProportion)
 {
     auto widget = preview->GetPreviewWidget();
 
@@ -56,7 +56,7 @@ void DeclarationSelector::AddPreviewToRightPane(IDeclarationPreview* preview, in
     _previews.push_back(preview);
 }
 
-void DeclarationSelector::AddPreviewToBottom(IDeclarationPreview* preview, int sizerProportion)
+void DeclarationSelector::AddPreviewToBottom(ui::IDeclarationPreview* preview, int sizerProportion)
 {
     auto widget = preview->GetPreviewWidget();
 

diff --git a/radiant/ui/common/DeclarationSelector.h → libs/wxutil/decl/DeclarationSelector.h b/radiant/ui/common/DeclarationSelector.h → libs/wxutil/decl/DeclarationSelector.h
@@ -3,15 +3,16 @@
 #include <vector>
 #include "idecltypes.h"
 #include <wx/panel.h>
+#include <wx/sizer.h>
 
 #include "ui/ideclpreview.h"
-#include "wxutil/dataview/DeclarationTreeView.h"
+#include "../dataview/DeclarationTreeView.h"
 
-namespace wxutil { class DeclFileInfo; }
-
-namespace ui
+namespace wxutil
 {
 
+class DeclFileInfo;
+
 /**
  * Common implementation of a declaration selector widget that can be added to a dialog.
  * It features a Declaration Tree View with an associated toolbar for favourite management.
@@ -30,7 +31,7 @@ class DeclarationSelector :
     wxSizerItem* _treeViewSizerItem;
 
     // Optional preview widget attached to this selector
-    std::vector<IDeclarationPreview*> _previews;
+    std::vector<ui::IDeclarationPreview*> _previews;
 
     wxutil::DeclFileInfo* _declFileInfo;
 
@@ -61,8 +62,8 @@ class DeclarationSelector :
     wxutil::DeclarationTreeView* GetTreeView() const;
 
     // Adds a preview widget to the right of the tree view
-    void AddPreviewToRightPane(IDeclarationPreview* preview, int sizerProportion = 1);
-    void AddPreviewToBottom(IDeclarationPreview* preview, int sizerProportion = 0);
+    void AddPreviewToRightPane(ui::IDeclarationPreview* preview, int sizerProportion = 1);
+    void AddPreviewToBottom(ui::IDeclarationPreview* preview, int sizerProportion = 0);
 
     const wxutil::DeclarationTreeView::Columns& GetColumns() const;
 

diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
@@ -32,7 +32,6 @@ add_executable(darkradiant
                ui/brush/QuerySidesDialog.cpp
                ui/commandlist/CommandList.cpp
                ui/commandlist/ShortcutChooser.cpp
-               ui/common/DeclarationSelector.cpp
                ui/common/EntityChooser.cpp
                ui/common/ImageFilePopulator.cpp
                ui/common/ImageFileSelector.cpp

diff --git a/radiant/ui/common/SoundShaderSelector.h b/radiant/ui/common/SoundShaderSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DeclarationSelector.h"
+#include "wxutil/decl/DeclarationSelector.h"
 #include "SoundShaderPreview.h"
 
 #include "wxutil/dataview/ThreadedDeclarationTreePopulator.h"
@@ -63,7 +63,7 @@ class ThreadedSoundShaderLoader :
 };
 
 class SoundShaderSelector :
-    public DeclarationSelector
+    public wxutil::DeclarationSelector
 {
 private:
     // The preview widget group

diff --git a/radiant/ui/materials/MaterialSelector.h b/radiant/ui/materials/MaterialSelector.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "../common/DeclarationSelector.h"
+#include "wxutil/decl/DeclarationSelector.h"
 
 // FORWARD DECLS
 class Material;
@@ -25,7 +25,7 @@ namespace ui
  * value to the constructor.
  */
 class MaterialSelector :
-	public DeclarationSelector
+	public wxutil::DeclarationSelector
 {
 public:
     enum class TextureFilter

diff --git a/radiant/ui/particles/ParticleSelector.h b/radiant/ui/particles/ParticleSelector.h
@@ -2,7 +2,7 @@
 
 #include <sigc++/trackable.h>
 
-#include "../common/DeclarationSelector.h"
+#include "wxutil/decl/DeclarationSelector.h"
 #include "wxutil/dataview/DeclarationTreeView.h"
 #include "wxutil/preview/ParticlePreview.h"
 
@@ -15,7 +15,7 @@ namespace ui
  * Features a resource tree view on the left and a render preview on the right.
  */
 class ParticleSelector :
-    public DeclarationSelector,
+    public wxutil::DeclarationSelector,
     public sigc::trackable
 {
 private:

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -229,7 +229,6 @@
     <ClCompile Include="..\..\radiant\ui\animationpreview\MD5AnimationViewer.cpp" />
     <ClCompile Include="..\..\radiant\ui\brush\FindBrush.cpp" />
     <ClCompile Include="..\..\radiant\ui\colourscheme\ColourSchemeEditor.cpp" />
-    <ClCompile Include="..\..\radiant\ui\common\DeclarationSelector.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\ImageFilePopulator.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\ImageFileSelector.cpp" />
@@ -421,7 +420,6 @@
     <ClInclude Include="..\..\radiant\ui\AutoSaveRequestHandler.h" />
     <ClInclude Include="..\..\radiant\ui\brush\FindBrush.h" />
     <ClInclude Include="..\..\radiant\ui\colourscheme\ColourSchemeEditor.h" />
-    <ClInclude Include="..\..\radiant\ui\common\DeclarationSelector.h" />
     <ClInclude Include="..\..\radiant\ui\common\DialogManager.h" />
     <ClInclude Include="..\..\radiant\ui\common\ImageFilePopulator.h" />
     <ClInclude Include="..\..\radiant\ui\common\ImageFileSelector.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -700,9 +700,6 @@
     <ClCompile Include="..\..\radiant\ui\console\Console.cpp">
       <Filter>src\ui\console</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\common\DeclarationSelector.cpp">
-      <Filter>src\ui\common</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\materials\MaterialSelector.cpp">
       <Filter>src\ui\materials</Filter>
     </ClCompile>
@@ -1371,9 +1368,6 @@
     <ClInclude Include="..\..\radiant\ui\einspector\TargetKey.h">
       <Filter>src\ui\einspector</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\common\DeclarationSelector.h">
-      <Filter>src\ui\common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\materials\MaterialSelector.h">
       <Filter>src\ui\materials</Filter>
     </ClInclude>

diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -149,6 +149,7 @@
     <ClInclude Include="..\..\libs\wxutil\dataview\TreeViewItemStyle.h" />
     <ClInclude Include="..\..\libs\wxutil\dataview\VFSTreePopulator.h" />
     <ClInclude Include="..\..\libs\wxutil\DeclFileInfo.h" />
+    <ClInclude Include="..\..\libs\wxutil\decl\DeclarationSelector.h" />
     <ClInclude Include="..\..\libs\wxutil\DeferredMotionDelta.h" />
     <ClInclude Include="..\..\libs\wxutil\dialog\AutoSaveRequestBlocker.h" />
     <ClInclude Include="..\..\libs\wxutil\dialog\Dialog.h" />
@@ -212,6 +213,7 @@
     <ClCompile Include="..\..\libs\wxutil\dataview\TreeModelFilter.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dataview\TreeView.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dataview\VFSTreePopulator.cpp" />
+    <ClCompile Include="..\..\libs\wxutil\decl\DeclarationSelector.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dialog\Dialog.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dialog\DialogBase.cpp" />
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -25,6 +25,9 @@
     <Filter Include="sourceview">
       <UniqueIdentifier>{7b81be5b-cc2f-43c2-bef8-fb9c7c1a31c0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="decl">
+      <UniqueIdentifier>{6d847c23-2205-43c6-b505-8cc8778c1251}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\libs\wxutil\dialog\DialogBase.h">
@@ -170,6 +173,9 @@
       <Filter>sourceview</Filter>
     </ClInclude>
     <ClInclude Include="..\..\libs\wxutil\Icon.h" />
+    <ClInclude Include="..\..\libs\wxutil\decl\DeclarationSelector.h">
+      <Filter>decl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">
@@ -260,5 +266,8 @@
     <ClCompile Include="..\..\libs\wxutil\sourceview\DeclarationSourceView.cpp">
       <Filter>sourceview</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\libs\wxutil\decl\DeclarationSelector.cpp">
+      <Filter>decl</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>