Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
#5527: Move remaining files from uimanager/ to ui/common/
  • Loading branch information
codereader committed Feb 7, 2021
1 parent 8822414 commit 63790cb
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 22 deletions.
4 changes: 2 additions & 2 deletions radiant/CMakeLists.txt
Expand Up @@ -48,6 +48,8 @@ add_executable(darkradiant
ui/common/ShaderSelector.cpp
ui/common/SoundShaderDefinitionView.cpp
ui/common/TexturePreviewCombo.cpp
ui/common/SoundChooser.cpp
ui/common/SoundShaderPreview.cpp
ui/DispatchEvent.cpp
ui/Documentation.cpp
ui/eclasstree/EClassTreeBuilder.cpp
Expand Down Expand Up @@ -111,8 +113,6 @@ add_executable(darkradiant
ui/menu/MenuItem.cpp
ui/menu/MenuManager.cpp
ui/menu/MenuSeparator.cpp
uimanager/SoundChooser.cpp
uimanager/SoundShaderPreview.cpp
ui/toolbar/ToolbarManager.cpp
ui/MapCommands.cpp
ui/MapFileProgressHandler.cpp
Expand Down
2 changes: 1 addition & 1 deletion radiant/ui/common/DialogManager.cpp
Expand Up @@ -6,7 +6,7 @@
#include "wxutil/dialog/MessageBox.h"
#include "wxutil/FileChooser.h"
#include "wxutil/DirChooser.h"
#include "uimanager/SoundChooser.h"
#include "ui/common/SoundChooser.h"
#include "ui/animationpreview/MD5AnimationChooser.h"
#include "module/StaticModule.h"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions tools/msvc/DarkRadiant.vcxproj
Expand Up @@ -223,8 +223,6 @@
<ClCompile Include="..\..\radiant\settings\LocalisationModule.cpp" />
<ClCompile Include="..\..\radiant\settings\LocalisationProvider.cpp" />
<ClCompile Include="..\..\radiant\settings\Win32Registry.cpp" />
<ClCompile Include="..\..\radiant\uimanager\SoundChooser.cpp" />
<ClCompile Include="..\..\radiant\uimanager\SoundShaderPreview.cpp" />
<ClCompile Include="..\..\radiant\ui\aas\AasControl.cpp" />
<ClCompile Include="..\..\radiant\ui\aas\AasControlDialog.cpp" />
<ClCompile Include="..\..\radiant\ui\aas\RenderableAasFile.cpp" />
Expand All @@ -236,7 +234,9 @@
<ClCompile Include="..\..\radiant\ui\common\DefinitionView.cpp" />
<ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp" />
<ClCompile Include="..\..\radiant\ui\common\MaterialDefinitionView.cpp" />
<ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp" />
<ClCompile Include="..\..\radiant\ui\common\SoundShaderDefinitionView.cpp" />
<ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp" />
<ClCompile Include="..\..\radiant\ui\DispatchEvent.cpp" />
<ClCompile Include="..\..\radiant\ui\Documentation.cpp" />
<ClCompile Include="..\..\radiant\ui\eclasstree\EClassTree.cpp" />
Expand Down Expand Up @@ -405,8 +405,6 @@
<ClInclude Include="..\..\radiant\settings\LocalisationModule.h" />
<ClInclude Include="..\..\radiant\settings\LocalisationProvider.h" />
<ClInclude Include="..\..\radiant\settings\Win32Registry.h" />
<ClInclude Include="..\..\radiant\uimanager\SoundChooser.h" />
<ClInclude Include="..\..\radiant\uimanager\SoundShaderPreview.h" />
<ClInclude Include="..\..\radiant\ui\aas\AasControl.h" />
<ClInclude Include="..\..\radiant\ui\aas\AasControlDialog.h" />
<ClInclude Include="..\..\radiant\ui\aas\RenderableAasFile.h" />
Expand All @@ -419,7 +417,9 @@
<ClInclude Include="..\..\radiant\ui\common\DefinitionView.h" />
<ClInclude Include="..\..\radiant\ui\common\DialogManager.h" />
<ClInclude Include="..\..\radiant\ui\common\MaterialDefinitionView.h" />
<ClInclude Include="..\..\radiant\ui\common\SoundChooser.h" />
<ClInclude Include="..\..\radiant\ui\common\SoundShaderDefinitionView.h" />
<ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h" />
<ClInclude Include="..\..\radiant\ui\DispatchEvent.h" />
<ClInclude Include="..\..\radiant\ui\Documentation.h" />
<ClInclude Include="..\..\radiant\ui\eclasstree\EClassTree.h" />
Expand Down
27 changes: 12 additions & 15 deletions tools/msvc/DarkRadiant.vcxproj.filters
Expand Up @@ -125,9 +125,6 @@
<Filter Include="src\ui\entitylist">
<UniqueIdentifier>{cf31bdd4-5049-41b1-bfe6-fafd3b1e8692}</UniqueIdentifier>
</Filter>
<Filter Include="src\uimanager">
<UniqueIdentifier>{9447d2a6-4742-4c6b-b53c-cd25985c034e}</UniqueIdentifier>
</Filter>
<Filter Include="src\eventmanager">
<UniqueIdentifier>{9215c909-e37e-4fef-b0ce-04455bf61cf2}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -490,12 +487,6 @@
<ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp">
<Filter>src\ui\entitylist</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\uimanager\SoundChooser.cpp">
<Filter>src\uimanager</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\uimanager\SoundShaderPreview.cpp">
<Filter>src\uimanager</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\eventmanager\Accelerator.cpp">
<Filter>src\eventmanager</Filter>
</ClCompile>
Expand Down Expand Up @@ -688,6 +679,12 @@
<ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp">
<Filter>src\ui\common</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp">
<Filter>src\ui\common</Filter>
</ClCompile>
<ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp">
<Filter>src\ui\common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\radiant\camera\CameraSettings.h">
Expand Down Expand Up @@ -1068,12 +1065,6 @@
<ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeNode.h">
<Filter>src\ui\entitylist</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\uimanager\SoundChooser.h">
<Filter>src\uimanager</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\uimanager\SoundShaderPreview.h">
<Filter>src\uimanager</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\eventmanager\Accelerator.h">
<Filter>src\eventmanager</Filter>
</ClInclude>
Expand Down Expand Up @@ -1314,6 +1305,12 @@
<ClInclude Include="..\..\radiant\ui\common\DialogManager.h">
<Filter>src\ui\common</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\ui\common\SoundChooser.h">
<Filter>src\ui\common</Filter>
</ClInclude>
<ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h">
<Filter>src\ui\common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\radiant\darkradiant.rc" />
Expand Down

0 comments on commit 63790cb

Please sign in to comment.