diff options
Diffstat (limited to 'Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml')
| -rw-r--r-- | Software/Visual_Studio/TEMP/Tango.Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml | 188 |
1 files changed, 130 insertions, 58 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 7dbf5541f..67a673d3b 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 @@ -23,7 +23,7 @@ <RowDefinition Height="Auto"></RowDefinition> <RowDefinition Height="*"></RowDefinition> </Grid.RowDefinitions> - <Menu Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,0,0,0" Style="{DynamicResource TangoMenuStyle}"> + <Menu Grid.Row="0" HorizontalAlignment="Stretch" Margin="2,0,0,0" Style="{DynamicResource TangoMenuStyle}" BorderBrush="Transparent"> <MenuItem Header="File"> <MenuItem Header="New"> <MenuItem Header="New Project..." Command="{Binding NewProjectCommand}"> @@ -47,13 +47,17 @@ </MenuItem> <MenuItem Header="SaveAll"> <MenuItem.Icon> - <Image Source="/Tango.Scripting.IDE;component/Images/Images/SaveAll_16x.png" Height="10"/> + <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="10"/> </MenuItem.Icon> </MenuItem> <Separator/> <MenuItem Header="Exit"></MenuItem> </MenuItem> - <MenuItem Header="Edit"></MenuItem> + <MenuItem Header="Edit"> + <MenuItem Header="Cut"/> + <MenuItem Header="Copy"/> + <MenuItem Header="Paste"/> + </MenuItem> <MenuItem Header="View"></MenuItem> <MenuItem Header="Project"></MenuItem> <MenuItem Header="Build"></MenuItem> @@ -62,26 +66,52 @@ <MenuItem Header="Theme"></MenuItem> </Menu> <ToolBarTray Grid.Row="1" Background="{DynamicResource Background.Static}" Width="Auto" Orientation="Horizontal"> - <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"/> + <ToolBar Style="{DynamicResource TangoToolBarStyle}" Background="{DynamicResource Background.Static}" Height="30" HorizontalAlignment="Left" Foreground="{DynamicResource ControlForegroundKey}" Margin="0,0,0,6"> + <ToolBar.Resources> + <Style TargetType="{x:Type Button}"> + <Setter Property="Width" Value="26"/> + <Style.Triggers> + <Trigger Property="IsMouseOver" Value="False"> + <Setter Property="Background" Value="Transparent" /> + <Setter Property="Opacity" Value="1.0" /> + </Trigger> + <EventTrigger RoutedEvent="MouseLeave"> + <BeginStoryboard> + <Storyboard> + <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0.2" To="1"></DoubleAnimation> + </Storyboard> + </BeginStoryboard> + </EventTrigger> + <EventTrigger RoutedEvent="MouseEnter"> + <BeginStoryboard> + <Storyboard> + <DoubleAnimation Storyboard.TargetProperty="Opacity" From="0.2" To="0.2"></DoubleAnimation> + </Storyboard> + </BeginStoryboard> + </EventTrigger> + </Style.Triggers> + </Style> + </ToolBar.Resources> + + <Button Click="Button_Click" ToolTip="New Project" Style="{DynamicResource TangoToolBarButtonStyle}" > + <Image Source="/Tango.Scripting.IDE;component/Images/NewFileCollection_16x.png" Height="16" Width="16"/> + </Button> - <Button Click="Button_Click" ToolTip="Open File"> - <Image Source="/Tango.Scripting.IDE;component/Images/OpenFolder_16x.png" Height="16"/> + <Button Click="Button_Click" ToolTip="Open File" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/OpenFolder_16x.png" Height="16" Width="16"/> </Button> - <Button Click="Button_Click" ToolTip="Save File"> - <Image Source="/Tango.Scripting.IDE;component/Images/Save_16x.png" Height="16"/> + <Button Click="Button_Click" ToolTip="Save File" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/Save_16x.png" Height="16" Width="16"/> </Button> - <Button Click="Button_Click" ToolTip="Save All"> - <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="16"/> + <Button Click="Button_Click" ToolTip="Save All" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/SaveAll_16x.png" Height="16" Width="16"/> </Button> <Separator ></Separator> - <Button Click="Button_Click" ToolTip="Undo"> - <Image Source="/Tango.Scripting.IDE;component/Images/Undo_16x.png" Height="16"/> + <Button Click="Button_Click" ToolTip="Undo" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/Undo_16x.png" Height="16" Width="16"/> </Button> - <Button Click="Button_Click" ToolTip="Redo"> - <Image Source="/Tango.Scripting.IDE;component/Images/Redo_16x.png" Height="16"/> + <Button Click="Button_Click" ToolTip="Redo" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/Redo_16x.png" Height="16" Width="16"/> </Button> <ComboBox Style="{DynamicResource TangoComboboxStyle}" Margin="2" x:Name="cmb2" SelectedIndex="0" HorizontalContentAlignment="Stretch" Width="100" > <ComboBoxItem IsSelected="True">Debug</ComboBoxItem> @@ -89,54 +119,65 @@ <ComboBoxItem>Configuration Manager...</ComboBoxItem> </ComboBox> <Separator ></Separator> - <ToggleButton x:Name="Run_Button" Command="{Binding RunProject}" IsChecked="False"> + <ToggleButton x:Name="Run_Button" Command="{Binding RunProject}" IsChecked="{Binding IsRunProject, Mode=TwoWay}" ToolTip="Start"> <ToggleButton.Template> <ControlTemplate TargetType="{x:Type ToggleButton}"> - <StackPanel Orientation="Horizontal" > - <Path x:Name="RunArrow" + <Grid> + <Rectangle x:Name="background" Fill="Transparent" Opacity="1"/> + <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> + <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> + </Grid> + <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="Foreground" TargetName="Run_Text" Value="{DynamicResource ToggleButton.Checked.Foreground}"/> + <Setter Property="Fill" TargetName="RunArrow" Value="{DynamicResource ToggleButton.Checked.Foreground}"/> <Setter Property="Text" TargetName="Run_Text" Value="Continue"/> + <Setter Property="ToggleButton.ToolTip" Value="Continue"/> </Trigger> - </ControlTemplate.Triggers> - </ControlTemplate> - </ToggleButton.Template> + <MultiTrigger> + <MultiTrigger.Conditions> + <Condition Property="IsChecked" Value="False" /> + <Condition Property="IsMouseOver" Value="True" /> + </MultiTrigger.Conditions> + <Setter Property="Fill" TargetName="background" Value="{DynamicResource Toolbar.Button.MaouseMove.Background}"/> + </MultiTrigger> + </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 Click="Button_Click" ToolTip="Pause" Visibility="{Binding IsChecked, ElementName=Run_Button, Converter={StaticResource BoolToVis}}" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/Pause_16x.png" Height="16" Width="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 x:Name="StopButton" ToolTip="Stop" Command="{Binding StopProject}" Visibility="{Binding IsChecked, ElementName=Run_Button, Converter={StaticResource BoolToVis}}" Style="{DynamicResource TangoToolBarButtonStyle}"> + <Image Source="/Tango.Scripting.IDE;component/Images/stop.png" Height="16" Width="16"/> </Button> - </ToolBar> </ToolBarTray> <Grid Grid.Row="2"> <Grid.ColumnDefinitions> + <ColumnDefinition Width="15" /> <ColumnDefinition Width="1*" MinWidth="100" /> <ColumnDefinition Width="5"/> <ColumnDefinition Width="300" MinWidth="20" /> </Grid.ColumnDefinitions> - <Grid> + <Grid Grid.Column="1"> <Grid.RowDefinitions> <RowDefinition Height="1*" MinHeight="100" /> <RowDefinition Height="5"/> @@ -161,38 +202,69 @@ <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"> + <!--<Border BorderThickness="0" Margin="1,0,0,2">--> <TabControl TabStripPlacement="Bottom" Style="{DynamicResource TangoTabControlStyle}"> <TabItem Header="Error list"> - <DataGrid Background="{DynamicResource TabItem.Content.Static}" Style="{DynamicResource TangoDataGridStyle}" Padding="2,5,2,0" - ColumnHeaderStyle="{DynamicResource TangoDataGridColumnHeaderStyle}" ItemsSource="{Binding ErrorList}" - CanUserSortColumns="True" - CanUserResizeColumns="True" - IsReadOnly="True"/> + <GroupBox Header="Error List" BorderThickness="1" Style="{DynamicResource TangoGroupBoxStyle}" Margin="-1"> + <DataGrid Background="{DynamicResource TabItem.Content.Static}" Style="{DynamicResource TangoDataGridStyle}" Padding="2,5,2,0" + ColumnHeaderStyle="{DynamicResource TangoDataGridColumnHeaderStyle}" ItemsSource="{Binding ErrorList}" + CanUserSortColumns="True" CanUserResizeColumns="True" IsReadOnly="True"/> + </GroupBox> </TabItem> <TabItem Header="Output"> - <ListBox ScrollViewer.VerticalScrollBarVisibility="Visible" - ScrollViewer.HorizontalScrollBarVisibility="Visible"> - - </ListBox> + <GroupBox Header="Output" BorderThickness="1" Style="{DynamicResource TangoGroupBoxStyle}" Margin="-1"> + <TextBox TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" Name="OutputText" Background="{DynamicResource TabItem.Content.Static}" /> + </GroupBox> </TabItem> </TabControl> - </Border> + <!--</Border>--> </Grid> </Grid> - <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="1" Background="{DynamicResource Background.Static}" /> + <GridSplitter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="2" Background="{DynamicResource Background.Static}" /> - <Grid Grid.Column="2"> - <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}" Padding="0,8,0,0"> + <Grid Grid.Column="3"> + <Grid.RowDefinitions> + <RowDefinition Height="1*" MinHeight="100"/> + <RowDefinition Height="5"/> + <RowDefinition Height="100" MinHeight="20"/> + <RowDefinition Height="4"/> + </Grid.RowDefinitions> + <GroupBox Grid.Row="0" Margin="0,0,5,0" Header="Solution Explorer" BorderThickness="1" Style="{DynamicResource TangoGroupBoxStyle}" > + <TreeView Style="{DynamicResource TangoTreeViewStyle}" x:Name="SolutionTree" ItemsSource="{Binding Solution.Projects}" Background="{DynamicResource TabItem.Content.Static}" Padding="0,8,0,0" SelectedItemChanged="TreeViewControl_SelectedItemChanged" PreviewMouseRightButtonDown="SolutionTree_PreviewMouseRightButtonDown" > <TreeView.ItemTemplate> <HierarchicalDataTemplate ItemsSource="{Binding Path=Items}" DataType="{x:Type local:IProject}"> <controls:SolutionItemControl SolutionItem="{Binding}" OpenCommand="{Binding ElementName=control,Path=DataContext.OpenProjectItemCommand}" /> </HierarchicalDataTemplate> </TreeView.ItemTemplate> + <TreeView.Resources> + <ContextMenu x:Key ="SolutionContext" StaysOpen="true" BorderBrush="{DynamicResource Background.Static}" Foreground="{DynamicResource ControlForegroundKey}"> + <MenuItem Header="Add" > + <MenuItem Header="New Project..." Command="{Binding AddProjectCommand}"/> + </MenuItem> + <MenuItem Header="Rename"/> + </ContextMenu> + <ContextMenu x:Key="FolderContext" StaysOpen="true" > + <MenuItem Header="Rename"/> + <MenuItem Header="Remove"/> + <Separator/> + <MenuItem Header="Copy"/> + <MenuItem Header="Cut"/> + <MenuItem Header="Paste"/> + <MenuItem Header="Move"/> + </ContextMenu> + </TreeView.Resources> + </TreeView> </GroupBox> + <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="{DynamicResource Background.Static}" /> + <GroupBox Grid.Row="2" Margin="0,0,5,2" Header="Properties" BorderThickness="1" Style="{DynamicResource TangoGroupBoxStyle}" > + <!--<Border BorderThickness="0" Margin="1,0,0,2">--> + <DataGrid Background="{DynamicResource TabItem.Content.Static}" Style="{DynamicResource TangoDataGridStyle}" Padding="2,5,2,0" + ColumnHeaderStyle="{DynamicResource TangoDataGridColumnHeaderStyle}" ItemsSource="{Binding ErrorList}" + CanUserSortColumns="True" CanUserResizeColumns="True" IsReadOnly="True"/> + <!--</Border>--> + </GroupBox> </Grid> </Grid> </Grid> |
