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

1 files changed, 16 insertions, 11 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
index facebe061..d41de8cd1 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEViewVM.cs
@@ -29,7 +29,16 @@ namespace Tango.Scripting.IDE
         public Solution Solution
         {
             get { return _solution; }
-            set { _solution = value; RaisePropertyChangedAuto(); }
+            set {
+                if (_solution != value)
+                {
+                    if(_solution != null)
+                        _solution.AddProjectEvent -= delegate { AddProject(); };
+                    _solution = value;
+                    _solution.AddProjectEvent += delegate { AddProject(); };
+                    RaisePropertyChangedAuto();
+                }
+            }
         }
 
         private IProject _selectedProject;
@@ -89,6 +98,7 @@ namespace Tango.Scripting.IDE
             RegisterProjectType(new UnitTestProjectType());
 
             Solution = new Solution();
+            Solution.Name = "Test Solution";
             Solution.SolutionLocation = @"C:\Test";
             Solution.Projects.Add(_projectTypes.First().NewProject("Test Project.stub"));
 
@@ -147,7 +157,7 @@ namespace Tango.Scripting.IDE
         /// </summary>
         private async void AddNewProject()
         {
-            var vm = await NotificationManager.ShowDialog<NewProjectViewVM>(new NewProjectViewVM(Settings.LastSolutionLocations));
+            var vm = await NotificationManager.ShowDialog<NewProjectViewVM>(new NewProjectViewVM(Settings.LastSolutionLocations, _projectTypes));
 
             if (vm.DialogResult)
             {
@@ -155,9 +165,8 @@ namespace Tango.Scripting.IDE
                 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()));
+                
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(vm.GetFullProjectPath()));
 
                 Settings.LastSolutionLocations.Insert(0, vm.ProjectLocation);
                 Settings.Save();
@@ -165,18 +174,14 @@ namespace Tango.Scripting.IDE
         }
         private async void AddProject()
         {
-            var vm = await NotificationManager.ShowDialog<AddProjectViewVM>(new AddProjectViewVM()
+            var vm = await NotificationManager.ShowDialog<AddProjectViewVM>(new AddProjectViewVM(_projectTypes)
             {
                 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()));
+                Solution.Projects.Add(vm.SelectedProjectType.NewProject(vm.GetFullProjectPath()));
             }
         }
         public bool IsSolutionProject(IProject SelectedItem)