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

1 files changed, 24 insertions, 28 deletions

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 5caf20329..a28101a17 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
@@ -22,7 +22,7 @@
             <RowDefinition Height="Auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <Menu Grid.Row="0" HorizontalAlignment="Stretch" Margin="5,0,0,0">
+        <Menu Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,0,0,0" Style="{DynamicResource TangoMenuStyle}">
             <MenuItem Header="File">
                 <MenuItem Header="New"></MenuItem>
                 <MenuItem Header="Open"></MenuItem>
@@ -54,21 +54,26 @@
             <MenuItem Header="Theme"></MenuItem>
         </Menu>
         <ToolBarTray Grid.Row="1" Background="{DynamicResource Background.Static}"  Width="Auto" Orientation="Horizontal">
-            <ToolBar  Background="{DynamicResource Background.Static}" Height="30" HorizontalAlignment="Left">
-                <Label Foreground="{DynamicResource ControlForegroundKey}" FontSize="12" Content="Stitches"/>
-                <Button Click="Button_Click" ToolTip="Cut selection to Windows Clipboard.">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="3,0,0,0"><Run Text="Cut"/></TextBlock>
-                    </StackPanel>
+            <ToolBar  Style="{DynamicResource TangoToolBarStyle}"  Background="{DynamicResource Background.Static}" Height="30" HorizontalAlignment="Left"  Foreground="{DynamicResource ControlForegroundKey}">
+               
+                <Button Click="Button_Click" ToolTip="New Project">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/NewFileCollection_16x.png" Height="16"/>
                 </Button>
-                <Button  Click="Button_Click" ToolTip="Copy selection to Windows Clipboard.">
-                    Copy
+                <Button  Click="Button_Click" ToolTip="Open File">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/OpenFolder_16x.png" Height="16"/>
                 </Button>
-                <Button Foreground="White" Click="Button_Click" ToolTip="Paste from Windows Clipboard.">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Margin="3,0,0,0"><Run Text="Paste"/></TextBlock>
-                    </StackPanel>
+                <Button  Click="Button_Click" ToolTip="Open File">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/Save_16x.png" Height="16"/>
                 </Button>
+                <Button  Click="Button_Click" ToolTip="Open File">
+                    <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="16"/>
+                </Button>
+                <Separator ></Separator>
+                <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" />
             </ToolBar>
         </ToolBarTray>
@@ -87,7 +92,7 @@
                 </Grid.RowDefinitions>
 
                 <Grid>
-                    <TabControl Foreground="{DynamicResource ControlForegroundKey}" ItemsSource="{Binding OpenProjectItems}" SelectedItem="{Binding SelectedProjectItem}">
+                    <TabControl Foreground="{DynamicResource ControlForegroundKey}" ItemsSource="{Binding OpenProjectItems}" SelectedItem="{Binding SelectedProjectItem}" Style="{DynamicResource TangoTabControlStyle}">
                         <TabControl.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Name}" Foreground="Gainsboro" VerticalAlignment="Center"></TextBlock>
@@ -99,15 +104,16 @@
                             </DataTemplate>
                         </TabControl.ContentTemplate>
                     </TabControl>
+                   
                 </Grid>
 
                 <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" Background="{DynamicResource Background.Static}" />
                 <Grid Grid.Row="2"  Background="{DynamicResource Background.Static}">
                     <Border  BorderThickness="0" Margin="1,0,0,2">
-                        <TabControl TabStripPlacement="Bottom">
+                        <TabControl TabStripPlacement="Bottom" Style="{DynamicResource TangoTabControlStyle}">
                             <TabItem Header="Error list">error list</TabItem>
                             <TabItem Header="Output">output</TabItem>
-                    </TabControl>
+                        </TabControl>
                     </Border>
                 </Grid>
             </Grid>
@@ -115,18 +121,8 @@
             <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Background="{DynamicResource Background.Static}" />
 
             <Grid Grid.Column="2">
-                <GroupBox Margin="0" Header="Solution Explorer" BorderThickness="1"  >
-                    <TreeView ItemsSource="{Binding Solution.Projects}" Background="{DynamicResource TabItem.Content.Static}" >
-                        <TreeView.ItemContainerStyle>
-                            <Style TargetType="TreeViewItem" BasedOn="{StaticResource {x:Type TreeViewItem}}">
-                                <Setter Property="Background" Value="Transparent"></Setter>
-                                <Style.Triggers>
-                                    <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="Transparent"></Setter>
-                                    </Trigger>
-                                </Style.Triggers>
-                            </Style>
-                        </TreeView.ItemContainerStyle>
+                <GroupBox Margin="0,0,5,5" Header="Solution Explorer" BorderThickness="1" Style="{DynamicResource TangoGroupBoxStyle}" >
+                    <TreeView Style="{DynamicResource TangoTreeViewStyle}" ItemsSource="{Binding Solution.Projects}" Background="{DynamicResource TabItem.Content.Static}" >
                         <TreeView.ItemTemplate>
                             <HierarchicalDataTemplate ItemsSource="{Binding Path=Items}" DataType="{x:Type local:IProject}">
                                 <controls:SolutionItemControl SolutionItem="{Binding}" OpenCommand="{Binding ElementName=control,Path=DataContext.OpenProjectItemCommand}" />