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

1 files changed, 55 insertions, 8 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 3fc0ce0e1..d8a744fea 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
@@ -1,20 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media.Imaging;
 using Tango.Core.Commands;
 using Tango.Scripting.IDE.Controls;
+using Tango.Scripting.IDE.Dialogs;
+using Tango.Scripting.IDE.Notifications;
 using Tango.Scripting.IDE.Projects;
 using Tango.Scripting.IDE.ProjectTypes;
 using Tango.SharedUI;
 
 namespace Tango.Scripting.IDE
 {
-    public class ScriptIDEViewVM : ViewModel
+    public class ScriptIDEViewVM : IDEViewModel
     {
         private List<IProjectType> _projectTypes;
         public ObservableCollection<ErrorData> ErrorList { get; set; }
@@ -48,21 +52,34 @@ namespace Tango.Scripting.IDE
             get { return _openProjectItems; }
             set { _openProjectItems = value; RaisePropertyChangedAuto(); }
         }
-
+        private bool _isRunProject = false;
+        public bool IsRunProject
+        {
+            get { return _isRunProject; }
+            set
+            {
+                if (_isRunProject != value)
+                {
+                    _isRunProject = value; RaisePropertyChangedAuto();
+                }
+            }
+        }
         #endregion
 
         #region Commands
         public RelayCommand NewProjectCommand { get; set; }
+        public RelayCommand AddProjectCommand { get; set; }
         public RelayCommand<IProjectItem> OpenProjectItemCommand { get; set; }
 
         public RelayCommand<IProjectItem> CloseProjectItemCommand { get; set; }
         public RelayCommand RunProject { get; set; }
+        public RelayCommand StopProject { get; set; }
 
         #endregion
 
         #region Constructors
 
-        public ScriptIDEViewVM()
+        public ScriptIDEViewVM() : base()
         {
             _projectTypes = new List<IProjectType>();
             OpenProjectItems = new ObservableCollection<IProjectItem>();
@@ -76,14 +93,22 @@ namespace Tango.Scripting.IDE
 
             //Init Commands
             NewProjectCommand = new RelayCommand(AddNewProject);
+            AddProjectCommand = new RelayCommand(AddProject);
             OpenProjectItemCommand = new RelayCommand<IProjectItem>(OpenProjectItem);
             CloseProjectItemCommand = new RelayCommand<IProjectItem>(CloseProjectItem);
             RunProject = new RelayCommand(RunProjectCommand);
+            StopProject = new RelayCommand(StopRunProjectCommand);
+
+            NotificationManager = new DefaultNotificationManager();
         }
 
         private void RunProjectCommand(object obj)
         {
-            MessageBox.Show("You said: RunProjectCommand");
+            // MessageBox.Show("You said: RunProjectCommand");
+        }
+        private void StopRunProjectCommand(object obj)
+        {
+            IsRunProject = false;
         }
 
         #endregion
@@ -119,14 +144,36 @@ namespace Tango.Scripting.IDE
         /// <summary>
         /// Open a dialog to create a new project 
         /// </summary>
-        private void AddNewProject()
+        private async void AddNewProject()
         {
-            Dialogs.NewProjectDialog dialog = new Dialogs.NewProjectDialog(true);
-            if(dialog.ShowDialog() == true)
+            var vm = await NotificationManager.ShowDialog<NewProjectViewVM>();
+            
+            if (vm.DialogResult)
             {
-                MessageBox.Show("You said: OK");
+
             }
         }
+        private async void AddProject()
+        {
+            var vm = await NotificationManager.ShowDialog<AddProjectViewVM>(new AddProjectViewVM()
+            {
+                //ProjectLocation = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.FullName
+                //ProjectLocation = Path.GetDirectoryName(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase))
+                //ProjectLocation = "Current Solution folder..."
+            });
+
+            if (vm.DialogResult)
+            {
+
+            }
+        }
+        public bool IsSolutionProject(IProject SelectedItem)
+        {
+            if (SelectedItem is StubProject)
+                return true;
+            return false;
+
+        }
         #endregion
     }
 }