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

3 files changed, 13 insertions, 27 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/AddProjectViewVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/AddProjectViewVM.cs
index 2d636a6d5..d6fb870d6 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/AddProjectViewVM.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/AddProjectViewVM.cs
@@ -9,10 +9,10 @@ namespace Tango.Scripting.IDE.Dialogs
 {
     public class AddProjectViewVM : BaseProjectDialogVM
     {
-        public AddProjectViewVM() : base()
+        public AddProjectViewVM(List<IProjectType> projectTypes) : base(projectTypes)
         {
             Title = "Add Project";
-            //ProjectName
+            //Project location
         }
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/BaseProjectDialogVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/BaseProjectDialogVM.cs
index 7742a3434..631aaaed3 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/BaseProjectDialogVM.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/BaseProjectDialogVM.cs
@@ -61,39 +61,25 @@ namespace Tango.Scripting.IDE.Dialogs
             get { return _projectLocation; }
             set { _projectLocation = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
-
+        public String GetFullProjectPath()
+        {
+            StringBuilder builder = new StringBuilder(ProjectLocation);
+            builder.AppendFormat(@"{0}\{1}", ProjectLocation, ProjectName);
+            return builder.ToString();
+        }
         #endregion
 
         #region constructor
 
-        public BaseProjectDialogVM() : base()
+        public BaseProjectDialogVM(List<IProjectType> project_types) : base()
         {
             ProjectTypes = new ObservableCollection<IProjectType>();
-            RegisterProjectType(new StubProjectType());
-            RegisterProjectType(new UnitTestProjectType());
-
+            project_types.ForEach(ProjectTypes.Add);
             _selectedProjectType = ProjectTypes.FirstOrDefault();
-
-            string workingDirectory = Environment.CurrentDirectory;
-            ProjectLocation = Directory.GetParent(workingDirectory).Parent.Parent.FullName;
         }
 
         #endregion
-
-        #region register_project_types
-
-        public void RegisterProjectType(IProjectType projectType)
-        {
-            ProjectTypes.Add(projectType);
-        }
-
-        public void UnRegisterProjectItemHandler(IProjectType projectType)
-        {
-            ProjectTypes.Remove(projectType);
-        }
-
-        #endregion
-
+        
         #region Override Methods
 
         protected override bool CanOK()
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/NewProjectViewVM.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/NewProjectViewVM.cs
index 69cf8034e..98558c7dc 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/NewProjectViewVM.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/Dialogs/NewProjectViewVM.cs
@@ -32,13 +32,13 @@ namespace Tango.Scripting.IDE.Dialogs
         public RelayCommand BrowseFileCommand { get; set; }
         #endregion
 
-        public NewProjectViewVM() : base()
+        public NewProjectViewVM(List<IProjectType> projectTypes) : base(projectTypes)
         {
             Title = "New Project";
             BrowseFileCommand = new RelayCommand(BrowseFile);
         }
 
-        public NewProjectViewVM(IEnumerable<String> lastSolutionFolders) : this()
+        public NewProjectViewVM(IEnumerable<String> lastSolutionFolders, List<IProjectType> projectTypes) : this(projectTypes)
         {
             LastSolutionPaths = new ObservableCollection<string>(lastSolutionFolders);
             ProjectLocation = LastSolutionPaths.FirstOrDefault();