Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 91 insertions, 3 deletions

diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj
index 7c3b47ea6..a98e1a848 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Tango.Scripting.IDE.csproj
@@ -31,11 +31,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="FontAwesome.WPF, Version=4.7.0.37774, Culture=neutral, PublicKeyToken=0758b07a11a4f466, processorArchitecture=MSIL">
+      <HintPath>..\packages\FontAwesome.WPF.4.7.0.9\lib\net40\FontAwesome.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
     </Reference>
@@ -60,13 +65,46 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IScriptFile.cs" />
-    <Compile Include="IScriptProject.cs" />
+    <Compile Include="Controls\SharedResourceDictionary.cs" />
+    <Compile Include="Controls\SolutionItemControl.cs" />
+    <Compile Include="Controls\TabConrolClose.cs" />
+    <Compile Include="Dialogs\NewProjectDialog.xaml.cs">
+      <DependentUpon>NewProjectDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\NewProjectDialogVM.cs" />
+    <Compile Include="IProjectType.cs" />
+    <Compile Include="ISolutionItem.cs" />
+    <Compile Include="ProjectItem.cs" />
+    <Compile Include="ProjectItemsViews\CSharpScriptItemView.xaml.cs">
+      <DependentUpon>CSharpScriptItemView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ProjectItems\CSharpScriptItem.cs" />
+    <Compile Include="ProjectItems\ReferenceAssembliesItem.cs" />
+    <Compile Include="ProjectItems\ReferenceAssemblyItem.cs" />
+    <Compile Include="Projects\CSharpProject.cs" />
+    <Compile Include="IProjectItem.cs" />
+    <Compile Include="IProject.cs" />
+    <Compile Include="Project.cs" />
+    <Compile Include="Projects\UnitTestProject.cs" />
+    <Compile Include="ProjectTypes\StubProjectType.cs" />
+    <Compile Include="ProjectTypes\UnitTestProjectType.cs" />
     <Compile Include="ScriptIDEView.xaml.cs">
       <DependentUpon>ScriptIDEView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ScriptIDEView2.xaml.cs">
+      <DependentUpon>ScriptIDEView2.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ScriptIDEViewVM.cs" />
-    <Compile Include="StubsProject.cs" />
+    <Compile Include="Solution.cs" />
+    <Compile Include="Projects\StubProject.cs" />
+    <Page Include="Dialogs\NewProjectDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ProjectItemsViews\CSharpScriptItemView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -75,10 +113,38 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ScriptIDEView2.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\DarkThemesColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Themes\LightThemesColors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\MenuDict.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Shared.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\TabConrolStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\ToolbarStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -98,6 +164,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -114,5 +181,26 @@
       <Name>Tango.Scripting</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\CSharpScriptItem.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Reference.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\CSharpProject.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\StubProject.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Converters\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Save_16x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\SaveAll_16x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file