diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-07-26 08:18:07 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-07-26 08:18:07 +0300 |
| commit | 3038323fb9bb7f37bf0cb35f3b7e08adae075b99 (patch) | |
| tree | c7e3d3418d0ce46e1e5c02c30d196994e4ad35cf /Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance | |
| parent | 3eeb82b7319e45119c9ac0a3e00c3661c458344a (diff) | |
| download | Tango-3038323fb9bb7f37bf0cb35f3b7e08adae075b99.tar.gz Tango-3038323fb9bb7f37bf0cb35f3b7e08adae075b99.zip | |
Maintenance GUI little changes
Related Work Items: #8835
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml index 11a8a9a1d..faef8be1a 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/EurekaMaintenanceView.xaml @@ -133,8 +133,8 @@ <StackPanel Orientation="Vertical"> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="30 0 30 0" Height="116"> <TextBlock VerticalAlignment="Center" Text="Reset Specific Board:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="210"></TextBlock> - <Border Margin="49 0 0 0" BorderThickness="1" Height="50" CornerRadius="22" BorderBrush="{StaticResource TangoMidAccentBrush}"> - <touch:TouchComboBox Margin="20 0 10 0" ItemsSource="{Binding ListBoards}" SelectedItem="{Binding SelecteadBoard,Mode=TwoWay}" Focusable="False" KeyboardNavigation.TabNavigation ="None" Width="260"> + <Border Margin="55 0 0 0" x:Name="emborder" BorderThickness="1 1 1 1" Height="50" CornerRadius="25" BorderBrush="{StaticResource TangoMidAccentBrush}"> + <touch:TouchComboBox Margin="20 0 10 0" ItemsSource="{Binding ListBoards}" SelectedItem="{Binding SelecteadBoard,Mode=TwoWay}" Focusable="False" KeyboardNavigation.TabNavigation ="None" Width="260" DisplayMemberPath=""> <touch:TouchComboBox.ItemTemplate> <DataTemplate> <TextBlock Margin="20 10 10 10" TextTrimming="CharacterEllipsis" FontSize="{StaticResource TangoDialogFontSize}" Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"/> @@ -143,7 +143,7 @@ </touch:TouchComboBox.ItemTemplate> <touch:TouchComboBox.SelectedItemTemplate> <DataTemplate> - <TextBlock Margin="0 0 0 5" FontSize="{StaticResource TangoDialogFontSize}" Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}" VerticalAlignment="Center" Height="36"></TextBlock> + <TextBlock Margin="0 0 0 5" FontSize="{StaticResource TangoDialogFontSize}" Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}" VerticalAlignment="Center" Height="36"></TextBlock> </DataTemplate> </touch:TouchComboBox.SelectedItemTemplate> </touch:TouchComboBox> @@ -153,19 +153,27 @@ </StackPanel> <StackPanel Orientation="Horizontal" Margin="30 0 30 0" Height="100"> <TextBlock VerticalAlignment="Center" Text="Machine Heaters:" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Width="210"></TextBlock> - <touch:TouchToggleSlider IsChecked="{Binding EnableHeaters}" Margin="50 0 0 0" HorizontalAlignment="Right" Width="90"> + <touch:TouchToggleSlider IsChecked="{Binding EnableHeaters}" Margin="55 0 0 0" HorizontalAlignment="Right" Width="90"> <touch:TouchToggleSlider.Style> <Style TargetType="touch:TouchToggleSlider" BasedOn="{StaticResource TangoToggleButtonGrayAccent}"> <Setter Property="IsEnabled" Value="False" /> + <Setter Property="touch:TouchToggleSlider.BorderBrush" Value="{StaticResource TangoGrayBrush}" /> + <Setter Property="touch:TouchToggleSlider.ThumbBrush" Value="{StaticResource TangoGrayBrush}" /> <Style.Triggers> <DataTrigger Binding="{Binding MachineProvider.MachineOperator.CanPrint}" Value="True" > <Setter Property="touch:TouchToggleSlider.IsEnabled" Value="True" /> + <Setter Property="touch:TouchToggleSlider.BorderBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> + <Setter Property="touch:TouchToggleSlider.ThumbBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> </DataTrigger> <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="9" > <Setter Property="IsEnabled" Value="true" /> + <Setter Property="touch:TouchToggleSlider.BorderBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> + <Setter Property="touch:TouchToggleSlider.ThumbBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> </DataTrigger> <DataTrigger Binding="{Binding EnableHeaters}" Value="False" > <Setter Property="IsEnabled" Value="true" /> + <Setter Property="touch:TouchToggleSlider.BorderBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> + <Setter Property="touch:TouchToggleSlider.ThumbBrush" Value="{StaticResource TangoPrimaryAccentBrush}" /> </DataTrigger> </Style.Triggers> |