diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-02-19 00:13:53 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-02-19 00:13:53 +0200 |
| commit | a054f1ab36fe3cbe816f78fa5ea68b30cde1bd43 (patch) | |
| tree | 2cdcfb86f298ba32e28b4f29c9b31d1faa05d5da /Software/Visual_Studio/FSE/Modules | |
| parent | a4cd972fd023425fa9414e56748665cb2821f412 (diff) | |
| download | Tango-a054f1ab36fe3cbe816f78fa5ea68b30cde1bd43.tar.gz Tango-a054f1ab36fe3cbe816f78fa5ea68b30cde1bd43.zip | |
FSE Eureka Design Support.
Diffstat (limited to 'Software/Visual_Studio/FSE/Modules')
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml index d33966e18..3de00198c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/MachineView.xaml @@ -27,7 +27,7 @@ <DockPanel> <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" HorizontalAlignment="Left"> - <Image Source="{StaticResource FSE_Machine_Full}" Width="100" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" /> + <commonControls:MachineIconFull Height="80" DataContext="{Binding EditingComposition.Machine}" /> <StackPanel Margin="5 0 0 0"> <TextBlock Text="{Binding EditingComposition.Machine.SerialNumber,FallbackValue='101010'}" FontSize="{StaticResource FSE_ModuleHeaderFontSize}"></TextBlock> <TextBlock Text="{Binding EditingComposition.Machine.Organization.Name,FallbackValue='Organization'}" FontSize="{StaticResource FSE_LargerFontSize}" Foreground="{StaticResource FSE_GrayBrush}"></TextBlock> diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml index a2aa7240b..ca6d3ca4c 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Views/SelectionView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Tango.FSE.MachineConfiguration.Views" + xmlns:controls="clr-namespace:Tango.FSE.Common.Controls;assembly=Tango.FSE.Common" xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:global="clr-namespace:Tango.FSE.MachineConfiguration" xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete" @@ -28,7 +29,7 @@ <autoComplete:AutoCompleteTextBox.SelectedItemTemplate> <DataTemplate> <DockPanel VerticalAlignment="Center"> - <Image RenderOptions.BitmapScalingMode="Fant" Source="{StaticResource FSE_Machine_Small}" Width="24" /> + <controls:MachineIcon RenderOptions.BitmapScalingMode="Fant" Height="24" /> <StackPanel VerticalAlignment="Center" Margin="10 0 0 0" Orientation="Horizontal"> <TextBlock Text="{Binding SerialNumber}" FontSize="{StaticResource FSE_SmallFontSize}"></TextBlock> <TextBlock Margin="10 0 0 0" FontSize="{StaticResource FSE_SmallFontSize}" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding Name}"></TextBlock> @@ -39,7 +40,7 @@ <autoComplete:AutoCompleteTextBox.ItemTemplate> <DataTemplate> <DockPanel VerticalAlignment="Center"> - <Image RenderOptions.BitmapScalingMode="Fant" Source="{StaticResource FSE_Machine_Small}" Width="32" /> + <controls:MachineIcon Height="32" /> <StackPanel Margin="5 0 0 0"> <TextBlock Text="{Binding SerialNumber}"></TextBlock> <TextBlock Margin="0 5 0 0" FontSize="{StaticResource FSE_SmallerFontSize}" Foreground="{StaticResource FSE_GrayBrush}" Text="{Binding Name}"></TextBlock> |