Added new Images to AddNewControl and to ToolBar

28 files changed, 114 insertions, 25 deletions

diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
index e5857e5a5..e49925dad 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/AddNewControl.xaml
@@ -26,6 +26,7 @@
             <Style TargetType="Label">
                 <Setter Property="Foreground" Value="{DynamicResource ControlTextBrush}" />
             </Style>
+            <BooleanToVisibilityConverter x:Key="BoolToVis" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid Background="{DynamicResource Window.Background}">
@@ -115,13 +116,14 @@
 
                 <TextBlock Grid.Column="0" Grid.Row="0">Name:</TextBlock>
                 <TextBox Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Text="{Binding ProjectName}"/>
-                <TextBlock Grid.Column="0" Grid.Row="2" >Location</TextBlock>
-                <Border Background="{DynamicResource ListBorder}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" BorderBrush="{DynamicResource Button.Static.Border}">
+
+                <TextBlock Grid.Column="0" Grid.Row="2" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Text="Location"/>
+                <Border Background="{DynamicResource ListBorder}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" BorderBrush="{DynamicResource Button.Static.Border}" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}">
                     <ComboBox Style="{DynamicResource TangoComboboxStyle}"  VerticalAlignment="Stretch" SelectedItem="{Binding ProjectLocation}" ItemsSource="{Binding Locations}" HorizontalAlignment="Stretch"  BorderBrush="Transparent"/>
                 </Border>
-                <Button Style="{DynamicResource TangoButtonStyle}" Grid.Column="2" Grid.Row="2" Width="80" HorizontalAlignment="Left" Margin="20,0,0,0"> Browse...</Button>
-                <TextBlock Grid.Column="0" Grid.Row="4" >Solution name:</TextBlock>
-                <TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Text="{Binding SolutionName}"/>
+                <Button Style="{DynamicResource TangoButtonStyle}" Grid.Column="2" Grid.Row="2" Width="80" HorizontalAlignment="Left" Margin="20,0,0,0" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Content="Browse..."/>
+                <TextBlock Grid.Column="0" Grid.Row="4" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}" Text="Solution name:"/>
+                <TextBox Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" Text="{Binding SolutionName}" Visibility="{Binding Path=IsNewSolutionDialog, Converter={StaticResource BoolToVis}}"/>
 
             </Grid>
         </Border>
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
index 9fa8422c9..914740ede 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml
@@ -24,7 +24,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="40"/>
         </Grid.RowDefinitions>
-        <local:AddNewControl Grid.Row="0" Margin="10,10,10,0"/>
+        <local:AddNewControl x:Name="AddNewControl" Grid.Row="0" Margin="10,10,10,0"/>
         <Border Grid.Row="1">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
                 <Button Style="{DynamicResource TangoButtonStyle}" Click="OKDialog" IsDefault="True" Width="80" Height="24">OK</Button>
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
index f3e05e35f..24c9511e7 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialog.xaml.cs
@@ -32,8 +32,18 @@ namespace Tango.Scripting.IDE.Dialogs
 
             InitializeComponent();
             Title = bNewProject ? _sAddNewProjectTitle : _sNewProjectTitle;
+            Loaded += DialogLoaded;
+           
             
         }
+        private void DialogLoaded(object sender, RoutedEventArgs e)
+        {
+            if (AddNewControl.DataContext is NewProjectDialogVM)
+            {
+                (AddNewControl.DataContext as NewProjectDialogVM).IsNewSolutionDialog = _bNewProject;
+            }
+        }
+
         private void CancelDialog(object sender, RoutedEventArgs e)
         {
             // Dialog box canceled
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
index f7e31b75a..1dd0e3205 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Dialogs/NewProjectDialogVM.cs
@@ -64,6 +64,9 @@ namespace Tango.Scripting.IDE.Dialogs
             get { return _solutionName; }
             set { _solutionName = value; RaisePropertyChangedAuto(); }
         }
+
+        bool _isNewSolutionDialog = false;
+        public bool IsNewSolutionDialog { get { return _isNewSolutionDialog; } set { _isNewSolutionDialog = value; RaisePropertyChangedAuto(); } }
         public NewProjectDialogVM() : base()
         {
             ProjectTypes = new ObservableCollection<IProjectType>();
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/NewFileCollection_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/NewFileCollection_16x.png
index 8c383c1fc..bc5cef828 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/NewFileCollection_16x.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/NewFileCollection_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/OpenFolder_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/OpenFolder_16x.png
index 15795d522..9ba3e52d2 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/OpenFolder_16x.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/OpenFolder_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Pause_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Pause_16x.png
new file mode 100644
index 000000000..10cdfb53c
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Pause_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Redo_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Redo_16x.png
new file mode 100644
index 000000000..331e15706
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Redo_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveAll_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveAll_16x.png
index fea4fb0e1..aaffd1174 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveAll_16x.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveAll_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveStatusBar9_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveStatusBar9_16x.png
index 971471c89..ea9c23f2a 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveStatusBar9_16x.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/SaveStatusBar9_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Save_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Save_16x.png
index a88b09b5a..cbc55c22e 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Save_16x.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Save_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Undo_16x.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Undo_16x.png
new file mode 100644
index 000000000..3c563e72f
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/Undo_16x.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/algorithm.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/algorithm.png
new file mode 100644
index 000000000..ab6b4c30f
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/algorithm.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/checklist.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/checklist.png
deleted file mode 100644
index fc3e7a416..000000000
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/checklist.png
+++ /dev/null
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/clipboard.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/clipboard.png
new file mode 100644
index 000000000..22a9c8ee4
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/clipboard.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol.png
new file mode 100644
index 000000000..16c9b0194
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol1.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol1.png
new file mode 100644
index 000000000..ba64d6a89
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/redo-arrow-symbol1.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stop.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stop.png
new file mode 100644
index 000000000..7d1b1551a
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stop.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/storyboard_white_126.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_126.png
index a06e8e1c8..a06e8e1c8 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/storyboard_white_126.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_126.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_32.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_32.png
new file mode 100644
index 000000000..4dc3d53e5
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_32.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/storyboard_white32.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_whit_32.png
index 875611302..875611302 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/storyboard_white32.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/stub_project_whit_32.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/unitTest.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/unitTest.png
new file mode 100644
index 000000000..fcc6a4fb7
--- /dev/null
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/unitTest.png
diff --git a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/checklist_white126.png b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/unitTest_126.png
index a49c21379..a49c21379 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/checklist_white126.png
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/Images/unitTest_126.png
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 b26d45cff..42e40756e 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
@@ -41,7 +41,7 @@ namespace Tango.Scripting.IDE.ProjectTypes
 
         public override string Name => "Stub Project";
         public override string Description => "Create a stub project template.";
-        public override BitmapSource SmallImage => GetImage("Images/storyboard_white32.png");
-        public override BitmapSource LargeImage => GetImage("Images/storyboard_white_126.png");
+        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 01926a2ba..c4cdcc6ab 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
@@ -38,8 +38,8 @@ namespace Tango.Scripting.IDE.ProjectTypes
 
         public override string Name => "Unit Test Project";
         public override string Description => "Create a unit test project template.";
-        public override BitmapSource SmallImage => GetImage("Images/checklist_white_32.png");
-        public override BitmapSource LargeImage => GetImage("Images/checklist_white126.png");
+        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/ScriptIDEView2.xaml b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml
index e2f7de2ad..7dbf5541f 100644
--- a/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml
+++ b/Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml
@@ -14,6 +14,7 @@
                 <ResourceDictionary Source="Themes/DarkThemesColors.xaml"/>
                 <ResourceDictionary Source="Themes/Shared.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <BooleanToVisibilityConverter x:Key="BoolToVis" />
             </ResourceDictionary>
     </UserControl.Resources>
     <Grid Background="{DynamicResource Background.Static}">
@@ -25,10 +26,14 @@
         <Menu Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,0,0,0" Style="{DynamicResource TangoMenuStyle}">
             <MenuItem Header="File">
                 <MenuItem Header="New">
-                    <MenuItem Header="New Project" Command="{Binding NewProjectCommand}">
+                    <MenuItem Header="New Project..." Command="{Binding NewProjectCommand}">
+                        <MenuItem.Icon>
+                            <Image Source="/Tango.Scripting.IDE;component/Images/NewFileCollection_16x.png" Height="14"/>
+                        </MenuItem.Icon>
                     </MenuItem>
+                    <MenuItem Header="File"/>
                 </MenuItem>
-                <MenuItem Header="Open"></MenuItem>
+                <MenuItem Header="Open"/>
                 <MenuItem Header="Start page"></MenuItem>
                 <Separator/>
                 <MenuItem Header="Add"></MenuItem>
@@ -42,7 +47,7 @@
                 </MenuItem>
                 <MenuItem Header="SaveAll">
                     <MenuItem.Icon>
-                        <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="10"/>
+                        <Image Source="/Tango.Scripting.IDE;component/Images/Images/SaveAll_16x.png" Height="10"/>
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator/>
@@ -65,19 +70,63 @@
                 <Button  Click="Button_Click" ToolTip="Open File">
                     <Image Source="/Tango.Scripting.IDE;component/Images/OpenFolder_16x.png" Height="16"/>
                 </Button>
-                <Button  Click="Button_Click" ToolTip="Open File">
+                <Button  Click="Button_Click" ToolTip="Save File">
                     <Image Source="/Tango.Scripting.IDE;component/Images/Save_16x.png" Height="16"/>
                 </Button>
-                <Button  Click="Button_Click" ToolTip="Open File">
+                <Button  Click="Button_Click" ToolTip="Save All">
                     <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="16"/>
                 </Button>
                 <Separator ></Separator>
+                <Button  Click="Button_Click" ToolTip="Undo">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/Undo_16x.png" Height="16"/>
+                </Button>
+                <Button  Click="Button_Click" ToolTip="Redo">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/Redo_16x.png" Height="16"/>
+                </Button>
                 <ComboBox Style="{DynamicResource TangoComboboxStyle}" Margin="2" x:Name="cmb2" SelectedIndex="0" HorizontalContentAlignment="Stretch" Width="100"   >
                     <ComboBoxItem IsSelected="True">Debug</ComboBoxItem>
                     <ComboBoxItem >Release</ComboBoxItem>
                     <ComboBoxItem>Configuration Manager...</ComboBoxItem>
                 </ComboBox>
-                <Button Foreground="White" Click="Button_Click" Content="Cut" ToolBar.OverflowMode="Always" />
+                <Separator ></Separator>
+                <ToggleButton x:Name="Run_Button"  Command="{Binding RunProject}" IsChecked="False">
+                    <ToggleButton.Template>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <StackPanel Orientation="Horizontal" >
+                                <Path x:Name="RunArrow"
+                                            HorizontalAlignment="Left" VerticalAlignment="Center"                                           
+                                            Width="12" Height="10" Margin="2,0,0,0"
+                                            Stretch="Fill"  Fill="#FF8DD28A"
+                                            RenderTransformOrigin="0.6,0.4"
+                                            Data="M0,0 L1,0 0.5,1 z" >
+                                    <Path.RenderTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform/>
+                                            <SkewTransform/>
+                                            <RotateTransform Angle="270"/>
+                                            <TranslateTransform/>
+                                        </TransformGroup>
+                                    </Path.RenderTransform>
+                                </Path>
+                                <TextBlock x:Name="Run_Text" Margin="8,0,4,0" Text="Start" VerticalAlignment="Center"/>
+                        </StackPanel>
+                        <ControlTemplate.Triggers>
+                                <Trigger Property="IsChecked" Value="True">
+                                    <Setter Property="Foreground" TargetName="Run_Text" Value="{DynamicResource Inactive.Selection}"/>
+                                    <Setter Property="Fill" TargetName="RunArrow" Value="{DynamicResource Inactive.Selection}"/>
+                                    <Setter Property="Text" TargetName="Run_Text" Value="Continue"/>
+                                </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                        </ToggleButton.Template>
+                </ToggleButton>
+                <Button  Click="Button_Click" ToolTip="Pause" Visibility="{Binding IsChecked, ElementName=Run_Button, Converter={StaticResource BoolToVis}}">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/Pause_16x.png" Height="16"/>
+                </Button>
+                <Button  Click="Button_Click" ToolTip="Stop" Visibility="{Binding IsChecked, ElementName=Run_Button, Converter={StaticResource BoolToVis}}">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/stop.png" Height="16"/>
+                </Button>
+                
             </ToolBar>
         </ToolBarTray>
         <Grid Grid.Row="2">
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 634b4d64d..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
@@ -48,7 +48,7 @@ namespace Tango.Scripting.IDE
             get { return _openProjectItems; }
             set { _openProjectItems = value; RaisePropertyChangedAuto(); }
         }
-        
+
         #endregion
 
         #region Commands
@@ -56,6 +56,7 @@ namespace Tango.Scripting.IDE
         public RelayCommand<IProjectItem> OpenProjectItemCommand { get; set; }
 
         public RelayCommand<IProjectItem> CloseProjectItemCommand { get; set; }
+        public RelayCommand RunProject { get; set; }
 
         #endregion
 
@@ -77,6 +78,12 @@ namespace Tango.Scripting.IDE
             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
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 645978cac..0c53ed629 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
@@ -231,29 +231,47 @@
     <Resource Include="Images\Save_16x.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Images\NewFileCollection_16x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\OpenFolder_16x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\checklist_white_32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\unitTest_126.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\stub_project_whit_32.png" />
+    <Resource Include="Images\stub_project_126.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\test.png" />
+  </ItemGroup>
+  <ItemGroup>
     <Resource Include="Images\SaveAll_16x.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\NewFileCollection_16x.png" />
+    <Resource Include="Images\Redo_16x.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\OpenFolder_16x.png" />
+    <Resource Include="Images\Undo_16x.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\checklist.png" />
+    <Resource Include="Images\unitTest.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\checklist_white_32.png" />
+    <Resource Include="Images\stop.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\checklist_white126.png" />
+    <Resource Include="Images\stub_project_32.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\storyboard_white32.png" />
-    <Resource Include="Images\storyboard_white_126.png" />
+    <Resource Include="Images\redo-arrow-symbol1.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\test.png" />
+    <Resource Include="Images\Pause_16x.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file