Fixed concerning warnings, and a couple resource exceptions.

Renamed the Resources folder to what it originally was, res. Fixed the
designer file references, and did some reorganizing.  Made two images
embedded, so this increased the exe size. Odd how much it increased by
though, I will look into this; all the other images didn't bloat it this
much. Moved the cs related res files into the src folder since they tie
directly together with the cs files.
This commit is contained in:
Brian 2013-12-22 17:33:10 -07:00
parent 89a4cc061a
commit fa10b8b2ee
47 changed files with 117 additions and 291 deletions

View file

@ -39,6 +39,7 @@
<WarningLevel>4</WarningLevel>
<RunCodeAnalysis>true</RunCodeAnalysis>
<UseVSHostingProcess>true</UseVSHostingProcess>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -48,6 +49,10 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>res\stock_3d-texture-and-shading_32x32.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
@ -116,18 +121,13 @@
<DependentUpon>Preferences.cs</DependentUpon>
</Compile>
<Compile Include="..\src\Program.cs" />
<Compile Include="About.cs">
<Compile Include="..\src\About.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="About.designer.cs">
<Compile Include="..\src\About.designer.cs">
<DependentUpon>About.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="..\src\Reflector.cs" />
<Compile Include="..\src\RichTextBoxExtensions.cs" />
<Compile Include="..\src\Script.cs" />
@ -142,31 +142,41 @@
<SubType>Component</SubType>
</Compile>
<Compile Include="..\src\Utils.cs" />
<EmbeddedResource Include="Properties\FileGroupSettings.resx">
<DependentUpon>..\..\src\FileGroupSettings.cs</DependentUpon>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<EmbeddedResource Include="..\src\Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\FileGroupSettings.resx" />
<EmbeddedResource Include="Properties\FileGroupTab.resx">
<DependentUpon>..\..\src\FileGroupTab.cs</DependentUpon>
<EmbeddedResource Include="..\src\About.resx">
<DependentUpon>About.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Form1.resx">
<DependentUpon>..\..\src\Form1.cs</DependentUpon>
<EmbeddedResource Include="..\src\FileGroupSettings.resx">
<DependentUpon>FileGroupSettings.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\NewFileGroup.resx" />
<EmbeddedResource Include="Properties\Preferences.resx">
<DependentUpon>..\..\src\Preferences.cs</DependentUpon>
<EmbeddedResource Include="..\src\FileGroupTab.resx">
<DependentUpon>FileGroupTab.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="..\src\NewFileGroup.resx">
<DependentUpon>NewFileGroup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="..\src\Preferences.resx">
<DependentUpon>Preferences.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources1.Designer.cs</LastGenOutput>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\ScriptManager.resx">
<DependentUpon>..\..\src\ScriptManager.cs</DependentUpon>
<EmbeddedResource Include="..\src\ScriptManager.resx">
<DependentUpon>ScriptManager.cs</DependentUpon>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
@ -177,42 +187,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\play.png" />
<None Include="Resources\folder.gif" />
<None Include="Resources\drop_box.gif" />
<None Include="Resources\cross.gif" />
<None Include="Resources\block.gif" />
<None Include="Resources\arrow_mini_up.gif" />
<None Include="Resources\arrow_mini_down.gif" />
<None Include="Resources\arrow_fat_up.gif" />
<None Include="Resources\arrow_fat_down.gif" />
<None Include="Resources\warning.gif" />
<None Include="Resources\trash.gif" />
<None Include="Resources\stop.png" />
<None Include="Resources\stock_3d-texture-spherical_32x32.ico" />
<None Include="Resources\stock_3d-texture-spherical_16x16.ico" />
<None Include="Resources\stock_3d-texture-and-shading_256x256.png" />
<None Include="Resources\stock_3d-texture-and-shading_128x128.png" />
<None Include="Resources\stock_3d-texture-and-shading_32x32.ico" />
<None Include="Resources\stock_3d-texture-and-shading_16x16.ico" />
<None Include="Resources\settings.png" />
<None Include="Resources\script.gif" />
<None Include="Resources\save.gif" />
<None Include="Resources\plus.gif" />
<None Include="Resources\stock_3d-texture-and-shading_32x32.png" />
<None Include="Resources\stock_3d-texture-and-shading_16x16.png" />
<None Include="Resources\stock_3d-texture-spherical_256x256.png" />
<None Include="Resources\stock_3d-texture-spherical_256x256.ico" />
<None Include="Resources\stock_3d-texture-spherical_128x128.png" />
<None Include="Resources\stock_3d-texture-spherical_128x128.ico" />
<None Include="Resources\stock_3d-texture-spherical_48x48.png" />
<None Include="Resources\stock_3d-texture-spherical_32x32.png" />
<None Include="Resources\stock_3d-texture-spherical_16x16.png" />
<None Include="Resources\stock_3d-texture-and-shading_256x256.ico" />
<None Include="Resources\stock_3d-texture-and-shading_128x128.ico" />
<None Include="Resources\stock_3d-texture-and-shading_48x48.png" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
<Visible>False</Visible>
@ -230,6 +204,42 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="res\arrow_fat_down.gif" />
<None Include="res\arrow_fat_up.gif" />
<None Include="res\arrow_mini_down.gif" />
<None Include="res\arrow_mini_up.gif" />
<None Include="res\block.gif" />
<None Include="res\cross.gif" />
<None Include="res\drop_box.gif" />
<None Include="res\folder.gif" />
<None Include="res\play.png" />
<None Include="res\plus.gif" />
<None Include="res\save.gif" />
<None Include="res\script.gif" />
<None Include="res\settings.png" />
<None Include="res\stock_3d-texture-and-shading_128x128.ico" />
<None Include="res\stock_3d-texture-and-shading_128x128.png" />
<EmbeddedResource Include="res\stock_3d-texture-and-shading_16x16.ico" />
<None Include="res\stock_3d-texture-and-shading_16x16.png" />
<None Include="res\stock_3d-texture-and-shading_256x256.ico" />
<None Include="res\stock_3d-texture-and-shading_256x256.png" />
<Content Include="res\stock_3d-texture-and-shading_32x32.ico" />
<None Include="res\stock_3d-texture-and-shading_32x32.png" />
<None Include="res\stock_3d-texture-and-shading_48x48.png" />
<None Include="res\stock_3d-texture-spherical_128x128.ico" />
<None Include="res\stock_3d-texture-spherical_128x128.png" />
<EmbeddedResource Include="res\stock_3d-texture-spherical_16x16.ico" />
<None Include="res\stock_3d-texture-spherical_16x16.png" />
<None Include="res\stock_3d-texture-spherical_256x256.ico" />
<None Include="res\stock_3d-texture-spherical_256x256.png" />
<Content Include="res\stock_3d-texture-spherical_32x32.ico" />
<None Include="res\stock_3d-texture-spherical_32x32.png" />
<None Include="res\stock_3d-texture-spherical_48x48.png" />
<None Include="res\stop.png" />
<None Include="res\trash.gif" />
<None Include="res\warning.gif" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.