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

1 files changed, 26 insertions, 2 deletions

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 e52b58775..3fc0ce0e1 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
@@ -4,7 +4,10 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
 using Tango.Core.Commands;
+using Tango.Scripting.IDE.Controls;
 using Tango.Scripting.IDE.Projects;
 using Tango.Scripting.IDE.ProjectTypes;
 using Tango.SharedUI;
@@ -14,6 +17,7 @@ namespace Tango.Scripting.IDE
     public class ScriptIDEViewVM : ViewModel
     {
         private List<IProjectType> _projectTypes;
+        public ObservableCollection<ErrorData> ErrorList { get; set; }
 
         #region Properties
 
@@ -48,10 +52,11 @@ namespace Tango.Scripting.IDE
         #endregion
 
         #region Commands
-
+        public RelayCommand NewProjectCommand { get; set; }
         public RelayCommand<IProjectItem> OpenProjectItemCommand { get; set; }
 
         public RelayCommand<IProjectItem> CloseProjectItemCommand { get; set; }
+        public RelayCommand RunProject { get; set; }
 
         #endregion
 
@@ -61,15 +66,24 @@ namespace Tango.Scripting.IDE
         {
             _projectTypes = new List<IProjectType>();
             OpenProjectItems = new ObservableCollection<IProjectItem>();
+            ErrorList = new ObservableCollection<ErrorData>();
 
             RegisterProjectType(new StubProjectType());
+            RegisterProjectType(new UnitTestProjectType());
 
             Solution = new Solution();
             Solution.Projects.Add(_projectTypes.First().NewProject("Test Project.stub"));
 
             //Init Commands
+            NewProjectCommand = new RelayCommand(AddNewProject);
             OpenProjectItemCommand = new RelayCommand<IProjectItem>(OpenProjectItem);
             CloseProjectItemCommand = new RelayCommand<IProjectItem>(CloseProjectItem);
+            RunProject = new RelayCommand(RunProjectCommand);
+        }
+
+        private void RunProjectCommand(object obj)
+        {
+            MessageBox.Show("You said: RunProjectCommand");
         }
 
         #endregion
@@ -102,7 +116,17 @@ namespace Tango.Scripting.IDE
         {
             _projectTypes.Remove(projectType);
         }
-
+        /// <summary>
+        /// Open a dialog to create a new project 
+        /// </summary>
+        private void AddNewProject()
+        {
+            Dialogs.NewProjectDialog dialog = new Dialogs.NewProjectDialog(true);
+            if(dialog.ShowDialog() == true)
+            {
+                MessageBox.Show("You said: OK");
+            }
+        }
         #endregion
     }
 }