diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml | 53 |
1 files changed, 20 insertions, 33 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml index ec21ebade..9287203aa 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml @@ -107,7 +107,7 @@ </DataTemplate> <DataTemplate x:Key="BrushStop_Template" DataType="{x:Type entities:BrushStop}"> - <Grid Margin="50 20 140 20" RenderOptions.EdgeMode="Aliased"> + <Grid Margin="50 20 140 20"> <StackPanel> <StackPanel Orientation="Horizontal"> <Border Width="48" Height="48" CornerRadius="5" BorderThickness="1" BorderBrush="{StaticResource TangoGrayBrush}"> @@ -548,12 +548,21 @@ <Border x:Name="borderDockFloat" Height="80"> <DockPanel x:Name="dockEdit" LastChildFill="False" Style="{StaticResource Level2ContainerExtraMargin}" Height="40" Width="640"> <StackPanel DockPanel.Dock="Left" Orientation="Horizontal"> - <touch:TouchToggleIconButton x:Name="toggle_small_list" IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ListSolid" CheckedIcon="ListSolid" Padding="8" CornerRadius="20" /> - <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" /> - <touch:TouchToggleIconButton x:Name="toggle_large_list" IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ThListSolid" CheckedIcon="ThListSolid" Padding="8" CornerRadius="20" /> + <touch:TouchToggleImageButton x:Name="toggle_small_list" UncheckedImage="../Images/small-cards-view.png" CheckedImage="../Images/small-cards-view - blue.png" + IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" + Padding="8" CornerRadius="30" Width="44" /> + <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" /> + <touch:TouchToggleImageButton x:Name="toggle_large_list" UncheckedImage="../Images/large-cards-view.png" CheckedImage="../Images/large-cards-view - blue.png" + IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" + Padding="8" CornerRadius="30" Width="44" /> </StackPanel> - - <touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" /> + <touch:TouchToggleImageButton x:Name="toggleEdit" UncheckedImage="../Images/pencil-gray.png" + CheckedImage="../Images/pencil-blue.png" + DockPanel.Dock="Right" + IsChecked="{Binding IsSelected}" + Padding="8" CornerRadius="30" Width="40" Height="40"> + </touch:TouchToggleImageButton> + <!--<touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" />--> </DockPanel> </Border> @@ -562,8 +571,8 @@ <StackPanel HorizontalAlignment="Right" Style="{StaticResource Level2Container}" Orientation="Horizontal"> <touch:TouchButton Command="{Binding AddSolidSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="170" CornerRadius="20" Padding="0 10" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}"> <StackPanel Orientation="Horizontal"> - <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> - <TextBlock Margin="10 0 0 0">SOLID SEGMENT</TextBlock> + <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/> + <TextBlock Margin="10 2 0 0">SOLID SEGMENT</TextBlock> </StackPanel> </touch:TouchButton> <touch:TouchButton Command="{Binding AddGradientSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" Margin="30 0 0 0" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Padding="0 10" Width="200" CornerRadius="20" Background="Transparent" BorderThickness="2"> @@ -575,8 +584,8 @@ </touch:TouchButton.BorderBrush> <StackPanel Orientation="Horizontal"> - <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" /> - <TextBlock Margin="10 0 0 0">GRADIENT SEGMENT</TextBlock> + <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/> + <TextBlock Margin="10 2 0 0">GRADIENT SEGMENT</TextBlock> </StackPanel> </touch:TouchButton> </StackPanel> @@ -648,7 +657,7 @@ <StackPanel Style="{StaticResource Level2ContainerExtraMargin}"> <Grid> - <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" /> + <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/> </Grid> <DockPanel Margin="0 30 0 0" LastChildFill="False"> @@ -694,28 +703,6 @@ <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Additional Tools</TextBlock> </StackPanel> - <!--<Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40"> - <StackPanel> - <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}"> - <Image Source="../Images/JobView/additional-tools.png" Width="39" /> - <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Additional Tools</TextBlock> - </StackPanel> - - <StackPanel Style="{StaticResource Level2Container}" HorizontalAlignment="Left"> - - <DockPanel LastChildFill="False"> - <TextBlock Text="Make a sample dye" VerticalAlignment="Center"></TextBlock> - <touch:TouchToggleSlider x:Name="toggle_sample_dye" DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" /> - </DockPanel> - - <DockPanel Margin="0 25 0 0" LastChildFill="False"> - <TextBlock Text="Run color fine tuning" VerticalAlignment="Center"></TextBlock> - <touch:TouchToggleSlider DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" /> - </DockPanel> - </StackPanel> - </StackPanel> - </Border>--> - <touch:TouchVirtualizedContentControl> <touch:TouchExpander x:Name="expander_sample_dye" Margin="0 0 0 0" Padding="20 15"> <touch:TouchExpander.Header> |