aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-09-06 12:27:53 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-09-06 12:27:53 +0300
commit00407d74fff2b4ca5357eeca7feffd3fda65aaf4 (patch)
tree309c3ab067e94fd25371db4414fbcb67835f50c5 /Software
parentd503f7f5ebedf2d1ed1bb87adccceacad1d16280 (diff)
downloadTango-00407d74fff2b4ca5357eeca7feffd3fda65aaf4.tar.gz
Tango-00407d74fff2b4ca5357eeca7feffd3fda65aaf4.zip
Changed wording of FSE events history section to "Resolved".
Diffstat (limited to 'Software')
-rw-r--r--Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml4
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml8
2 files changed, 5 insertions, 7 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml
index 8b0d3fa48..3482bdc81 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml
@@ -112,7 +112,6 @@
</Border>
</DataTemplate>
-
<DataTemplate x:Key="InsightEventTemplate" DataType="{x:Type commonInsights:InsightsReadyEvent}">
<Border Tag="{Binding DataContext,RelativeSource={RelativeSource AncestorType=views:InsightsView}}" IsHitTestVisible="True" BorderThickness="1" CornerRadius="3" Padding="10 5" >
<Border.Visibility>
@@ -213,7 +212,7 @@
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="../Images/machine_off.png"></Setter>
- <Setter Property="Opacity" Value="1"></Setter>
+ <Setter Property="Opacity" Value="0.9"></Setter>
<Setter Property="ContextMenu">
<Setter.Value>
<ContextMenu>
@@ -476,7 +475,6 @@
</Border>
</DataTemplate>
-
<DataTemplate x:Key="InsightUpdateTemplate" DataType="{x:Type commonInsights:InsightsReadyUpdate}">
<Border Visibility="{Binding RelativeSource={RelativeSource AncestorType=views:InsightsView},Path=DataContext.AnnotationsConfiguration.DisplayUpdates,Converter={StaticResource BooleanToVisibilityConverter}}" Tag="{Binding DataContext,RelativeSource={RelativeSource AncestorType=views:InsightsView}}">
<Border.ToolTip>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml
index 8789cc05c..1093c1ff7 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml
@@ -20,7 +20,7 @@
<Image Source="/Images/menu/events.png" Stretch="None" />
<StackPanel Margin="10 15 0 0">
<TextBlock FontSize="{StaticResource FSE_ModuleHeaderFontSize}" Foreground="{StaticResource FSE_PrimaryAccentBrush}" >Machine Events</TextBlock>
- <TextBlock>Below you can find the list of active and history machine events.</TextBlock>
+ <TextBlock>Below you can find the list of active and resolved machine events.</TextBlock>
</StackPanel>
</DockPanel>
</Grid>
@@ -86,14 +86,14 @@
<DockPanel Margin="0 60 0 0">
<material:PackIcon Kind="History" Width="24" Height="24" />
<DockPanel VerticalAlignment="Center" Margin="5 0 0 0" >
- <controls:ToggleIconButton Cursor="Hand" x:Name="chkHistory" DockPanel.Dock="Right" ToolTip="Show/Hide history" UncheckedIcon="ChevronDown" CheckedIcon="ChevronUp" />
- <TextBlock VerticalAlignment="Center" Foreground="{StaticResource FSE_PrimaryAccentBrush}" FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold">Events History</TextBlock>
+ <controls:ToggleIconButton Cursor="Hand" x:Name="chkHistory" DockPanel.Dock="Right" ToolTip="Show/Hide resolved" UncheckedIcon="ChevronDown" CheckedIcon="ChevronUp" />
+ <TextBlock VerticalAlignment="Center" Foreground="{StaticResource FSE_PrimaryAccentBrush}" FontSize="{StaticResource FSE_LargeFontSize}" FontWeight="SemiBold">Resolved Events</TextBlock>
</DockPanel>
</DockPanel>
<StackPanel Visibility="{Binding ElementName=chkHistory,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}">
<DockPanel Opacity="0.5" Margin="20 20 0 0" TextElement.Foreground="{StaticResource FSE_GrayBrush}" Visibility="{Binding EventsProvider.EventsHistory.Count,Converter={StaticResource IsEqualToVisibilityConverter},ConverterParameter=0}">
<material:PackIcon VerticalAlignment="Top" Kind="InfoOutline" Width="32" Height="32" />
- <TextBlock Margin="10 6 0 0" VerticalAlignment="Top" FontSize="{StaticResource FSE_LargeFontSize}">no events history</TextBlock>
+ <TextBlock Margin="10 6 0 0" VerticalAlignment="Top" FontSize="{StaticResource FSE_LargeFontSize}">no resolved events</TextBlock>
</DockPanel>
<ItemsControl Opacity="0.6" Background="Transparent" HorizontalContentAlignment="Stretch" Margin="15 5 0 0" ItemsSource="{Binding EventsProvider.EventsHistory}">
<ItemsControl.ItemTemplate>