MERGE

9 files changed, 34 insertions, 15 deletions

diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/CommonOpenFileDialog.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/CommonOpenFileDialog.cs
deleted file mode 100644
index 6664e2d9c..000000000
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/CommonOpenFileDialog.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Tango.Scripting.IDE.Dialogs
-{
-    //internal class CommonOpenFileDialog
-    //{
-    //    public string InitialDirectory { get; internal set; }
-    //}
-}
\ No newline at end of file
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/IDESettings.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/IDESettings.cs
new file mode 100644
index 000000000..608ca0bdc
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/IDESettings.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Scripting.IDE
+{
+    public class IDESettings
+    {
+    }
+}
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectType.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectType.cs
index 4b3f6085b..86efc4330 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectType.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectType.cs
@@ -19,6 +19,7 @@ namespace Tango.Scripting.IDE
 
         public abstract string Name { get; }
         public abstract string Description { get; }
+        public abstract string Extention { get; }
         public abstract BitmapSource SmallImage { get; }
         public abstract BitmapSource LargeImage { get; }
 
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/StubProjectType.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/StubProjectType.cs
index 42e40756e..6fe1316f4 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/StubProjectType.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/StubProjectType.cs
@@ -16,7 +16,7 @@ namespace Tango.Scripting.IDE.ProjectTypes
         {
             StubProject project = new StubProject();
 
-            project.FilePath = projectPath;
+            project.FilePath = projectPath + Extention; ;
 
             var referenceAssembliesItem = new ReferenceAssembliesItem();
 
@@ -41,6 +41,7 @@ namespace Tango.Scripting.IDE.ProjectTypes
 
         public override string Name => "Stub Project";
         public override string Description => "Create a stub project template.";
+        public override string Extention => ".stub";
         public override BitmapSource SmallImage => GetImage("Images/stub_project_32.png");
         public override BitmapSource LargeImage => GetImage("Images/stub_project_126.png");
     }
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/UnitTestProjectType.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/UnitTestProjectType.cs
index c4cdcc6ab..42bab7059 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/UnitTestProjectType.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ProjectTypes/UnitTestProjectType.cs
@@ -16,7 +16,7 @@ namespace Tango.Scripting.IDE.ProjectTypes
         {
             UnitTestProject project = new UnitTestProject();
 
-            project.FilePath = projectPath;
+            project.FilePath = projectPath + Extention; ;
 
             var referenceAssembliesItem = new ReferenceAssembliesItem();
 
@@ -38,6 +38,7 @@ namespace Tango.Scripting.IDE.ProjectTypes
 
         public override string Name => "Unit Test Project";
         public override string Description => "Create a unit test project template.";
+        public override string Extention => ".unit";
         public override BitmapSource SmallImage => GetImage("Images/unitTest.png");
         public override BitmapSource LargeImage => GetImage("Images/unitTest_126.png");
 
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
index d8a744fea..b156371c5 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
@@ -89,6 +89,7 @@ namespace Tango.Scripting.IDE
             RegisterProjectType(new UnitTestProjectType());
 
             Solution = new Solution();
+            Solution.SolutionLocation = @"C:\Test";
             Solution.Projects.Add(_projectTypes.First().NewProject("Test Project.stub"));
 
             //Init Commands
@@ -150,21 +151,29 @@ namespace Tango.Scripting.IDE
             
             if (vm.DialogResult)
             {
-
+                Solution newSolution = new Solution();
+                newSolution.Name = vm.SolutionName;
+                newSolution.SolutionLocation = vm.ProjectLocation;
+                Solution = newSolution;
+                StringBuilder builder = new StringBuilder(vm.ProjectLocation);
+                builder.AppendFormat(@"\{0}", vm.ProjectName);
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(builder.ToString()));
             }
         }
         private async void AddProject()
         {
             var vm = await NotificationManager.ShowDialog<AddProjectViewVM>(new AddProjectViewVM()
             {
-                //ProjectLocation = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.FullName
+                ProjectLocation = Solution.SolutionLocation
                 //ProjectLocation = Path.GetDirectoryName(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase))
                 //ProjectLocation = "Current Solution folder..."
             });
 
             if (vm.DialogResult)
             {
-
+                StringBuilder builder = new StringBuilder(vm.ProjectLocation);
+                builder.AppendFormat(@"\{0}", vm.ProjectName);
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(builder.ToString()));
             }
         }
         public bool IsSolutionProject(IProject SelectedItem)
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Solution.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Solution.cs
index eded27413..cd7806698 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Solution.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Solution.cs
@@ -10,6 +10,8 @@ namespace Tango.Scripting.IDE
     public class Solution
     {
         public ObservableCollection<IProject> Projects { get; set; }
+        public string Name{get; set;}
+        public string SolutionLocation { get; set; }
 
         public Solution()
         {
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 ea47eb8f7..803815df4 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
@@ -77,7 +77,6 @@
     <Compile Include="Controls\SolutionItemControl.cs" />
     <Compile Include="Controls\TabConrolClose.cs" />
     <Compile Include="Converters\LeftMarginMultiplierConverter.cs" />
-    <Compile Include="Dialogs\CommonOpenFileDialog.cs" />
     <Compile Include="Dialogs\NewProjectView.xaml.cs">
       <DependentUpon>NewProjectView.xaml</DependentUpon>
     </Compile>
@@ -88,6 +87,7 @@
     <Compile Include="Dialogs\BaseProjectDialogVM.cs" />
     <Compile Include="Dialogs\NewProjectViewVM.cs" />
     <Compile Include="IDEDialogViewModel.cs" />
+    <Compile Include="IDESettings.cs" />
     <Compile Include="IDEViewModel.cs" />
     <Compile Include="IProjectType.cs" />
     <Compile Include="ISolutionItem.cs" />
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Windows/DialogWindow.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Windows/DialogWindow.xaml
index 218a92302..683391afd 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Windows/DialogWindow.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Windows/DialogWindow.xaml
@@ -6,13 +6,13 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Tango.Scripting.IDE.Windows"
         mc:Ignorable="d"
-        Title="Some Title" Height="800" Width="800" 
+        Title="Some Title" Height="720" Width="1280" 
         SizeToContent="WidthAndHeight" 
         ResizeMode="NoResize" 
         ShowMaxRestoreButton="False" 
         ShowMinButton="False" 
         ShowCloseButton="False" 
-        BorderThickness="1" BorderBrush="Gray">
+        BorderThickness="1" BorderBrush="Gray" TitleCaps="False">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>