DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up project structure in Visual Studio (#8)

Browse Source 
A few small changes to improve the view of the code in Solution Explorer:
* Delete folders from solution explorer which don't appear on disk (Resource Files, PerfTrack)
* Delete files on disk which aren't compiled into the project (Type.xaml)
* Rename CalculatorHistory.Cpp to CalculatorHistory.cpp, for consistency with other files
This commit is contained in:
Matt Cooley 2019-02-04 11:52:28 -08:00 committed by GitHub
parent 4cadfb204d
commit 177a606012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CalcManager/CalcManager.vcxproj
View File

@ -288,7 +288,7 @@
<ClInclude Include="UnitConverter.h" /> <ClInclude Include="UnitConverter.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="CalculatorHistory.Cpp" /> <ClCompile Include="CalculatorHistory.cpp" />
<ClCompile Include="CalculatorManager.cpp" /> <ClCompile Include="CalculatorManager.cpp" />
<ClCompile Include="CEngine\calc.cpp" /> <ClCompile Include="CEngine\calc.cpp" />
<ClCompile Include="CEngine\CalcUtils.cpp" /> <ClCompile Include="CEngine\CalcUtils.cpp" />

6
src/CalcManager/CalcManager.vcxproj.filters
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="CEngine"> <Filter Include="CEngine">
<UniqueIdentifier>{957a8e3c-00c7-48bc-b63c-83b2140a8251}</UniqueIdentifier> <UniqueIdentifier>{957a8e3c-00c7-48bc-b63c-83b2140a8251}</UniqueIdentifier>
</Filter> </Filter>
@ -81,7 +77,7 @@
<ClCompile Include="Ratpack\transh.cpp"> <ClCompile Include="Ratpack\transh.cpp">
<Filter>RatPack</Filter> <Filter>RatPack</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="CalculatorHistory.Cpp" /> <ClCompile Include="CalculatorHistory.cpp" />
<ClCompile Include="CalculatorManager.cpp" /> <ClCompile Include="CalculatorManager.cpp" />
<ClCompile Include="UnitConverter.cpp" /> <ClCompile Include="UnitConverter.cpp" />
<ClCompile Include="CEngine\CalcInput.cpp"> <ClCompile Include="CEngine\CalcInput.cpp">

0
src/CalcManager/CalculatorHistory.Cpp → src/CalcManager/CalculatorHistory.cpp
View File

4
src/CalcViewModel/CalcViewModel.vcxproj.filters
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Common"> <Filter Include="Common">
<UniqueIdentifier>{1daab7c4-63f6-4266-a259-f34acad66d09}</UniqueIdentifier> <UniqueIdentifier>{1daab7c4-63f6-4266-a259-f34acad66d09}</UniqueIdentifier>
</Filter> </Filter>

3
src/Calculator/Calculator.vcxproj.filters
View File

@ -14,9 +14,6 @@
<Filter Include="Converters"> <Filter Include="Converters">
<UniqueIdentifier>{5a666ef7-54fb-46cc-9588-5cbcfaed3465}</UniqueIdentifier> <UniqueIdentifier>{5a666ef7-54fb-46cc-9588-5cbcfaed3465}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="PerfTrack">
<UniqueIdentifier>{1cba827f-63eb-4cda-8bf0-eea60190725e}</UniqueIdentifier>
</Filter>
<Filter Include="Resources"> <Filter Include="Resources">
<UniqueIdentifier>{f9b88d9e-918b-49ac-869b-a1a380ec3201}</UniqueIdentifier> <UniqueIdentifier>{f9b88d9e-918b-49ac-869b-a1a380ec3201}</UniqueIdentifier>
</Filter> </Filter>

53
src/Calculator/Themes/Type.xaml
View File

@ -1,53 +0,0 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="CaptionFontSize">12</x:Double>
<x:Double x:Key="BodyFontSize">15</x:Double>
<x:Double x:Key="BaseFontSize">15</x:Double>
<x:Double x:Key="SubtitleFontSize">20</x:Double>
<x:Double x:Key="TitleFontSize">24</x:Double>
<x:Double x:Key="SubheaderFontSize">34</x:Double>
<x:Double x:Key="HeaderFontSize">46</x:Double>
<Style x:Key="CaptionTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource CaptionFontSize}" />
<Setter Property="LineHeight" Value="14" />
<Setter Property="FontWeight" Value="Normal" />
</Style>
<Style x:Key="BodyTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource BodyFontSize}" />
<Setter Property="LineHeight" Value="20" />
<Setter Property="FontWeight" Value="Normal" />
</Style>
<Style x:Key="BaseTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BodyTextBlockStyle}">
<Setter Property="FontWeight" Value="SemiBold" />
</Style>
<Style x:Key="SubtitleTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource SubtitleFontSize}" />
<Setter Property="LineHeight" Value="24" />
<Setter Property="FontWeight" Value="Normal" />
</Style>
<Style x:Key="TitleTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource TitleFontSize}" />
<Setter Property="LineHeight" Value="28" />
<Setter Property="FontWeight" Value="SemiLight" />
</Style>
<Style x:Key="SubheaderTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource SubheaderFontSize}" />
<Setter Property="LineHeight" Value="40" />
<Setter Property="FontWeight" Value="Light" />
</Style>
<Style x:Key="HeaderTextBlockStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource HeaderFontSize}" />
<Setter Property="LineHeight" Value="56" />
<Setter Property="FontWeight" Value="Light" />
</Style>
</ResourceDictionary>

46
src/CalculatorUnitTests/CalculatorUnitTests.vcxproj.filters
View File

@ -17,7 +17,6 @@
<ClCompile Include="CurrencyConverterUnitTests.cpp" /> <ClCompile Include="CurrencyConverterUnitTests.cpp" />
<ClCompile Include="DateCalculatorUnitTests.cpp" /> <ClCompile Include="DateCalculatorUnitTests.cpp" />
<ClCompile Include="HistoryTests.cpp" /> <ClCompile Include="HistoryTests.cpp" />
<ClCompile Include="Mocks\CurrencyHttpClient.cpp" />
<ClCompile Include="Module.cpp" /> <ClCompile Include="Module.cpp" />
<ClCompile Include="MultiWindowUnitTests.cpp" /> <ClCompile Include="MultiWindowUnitTests.cpp" />
<ClCompile Include="NavCategoryUnitTests.cpp" /> <ClCompile Include="NavCategoryUnitTests.cpp" />
@ -27,31 +26,50 @@
<ClCompile Include="UnitTestApp.xaml.cpp" /> <ClCompile Include="UnitTestApp.xaml.cpp" />
<ClCompile Include="pch.cpp" /> <ClCompile Include="pch.cpp" />
<ClCompile Include="UtilsTests.cpp" /> <ClCompile Include="UtilsTests.cpp" />
<ClCompile Include="Mocks\CurrencyHttpClient.cpp">
<Filter>Mocks</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="AsyncHelper.h" /> <ClInclude Include="AsyncHelper.h" />
<ClInclude Include="DateUtils.h" /> <ClInclude Include="DateUtils.h" />
<ClInclude Include="Helpers.h" /> <ClInclude Include="Helpers.h" />
<ClInclude Include="Mocks\CurrencyHttpClient.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />
<ClInclude Include="UnitConverterViewModelUnitTests.h" /> <ClInclude Include="UnitConverterViewModelUnitTests.h" />
<ClInclude Include="UnitTestApp.xaml.h" /> <ClInclude Include="UnitTestApp.xaml.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="Mocks\CurrencyHttpClient.h">
<Filter>Mocks</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="CalculatorUnitTests_VS.rc" /> <ResourceCompile Include="CalculatorUnitTests.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Xml Include="UnitTestApp.rd.xml" /> <Xml Include="UnitTestApp.rd.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\LockScreenLogo.scale-200.png" /> <Image Include="Assets\SplashScreen.scale-200.png">
<Image Include="Assets\SplashScreen.scale-200.png" /> <Filter>Assets</Filter>
<Image Include="Assets\Square44x44Logo.scale-200.png" /> </Image>
<Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> <Image Include="Assets\Square44x44Logo.scale-200.png">
<Image Include="Assets\Square150x150Logo.scale-200.png" /> <Filter>Assets</Filter>
<Image Include="Assets\StoreLogo.png" /> </Image>
<Image Include="Assets\Wide310x150Logo.scale-200.png" /> <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LockScreenLogo.scale-200.png">
<Filter>Assets</Filter>
</Image>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AppxManifest Include="Package.appxmanifest" /> <AppxManifest Include="Package.appxmanifest" />
@ -59,4 +77,12 @@
<ItemGroup> <ItemGroup>
<None Include="CalculatorUnitTests_TemporaryKey.pfx" /> <None Include="CalculatorUnitTests_TemporaryKey.pfx" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Filter Include="Assets">
<UniqueIdentifier>{f2987b0a-9832-46fc-b818-d5347362b3d8}</UniqueIdentifier>
</Filter>
<Filter Include="Mocks">
<UniqueIdentifier>{d3ec8922-022d-4531-8744-f65a872f3841}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project> </Project>