diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-12 16:30:36 +0300 |
| commit | 04bc3b7e0070ed810ce2255f944f1caa87b03d52 (patch) | |
| tree | 1c6141cf42d9ce94cd837bda7bff05014049a09a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views | |
| parent | 0de74a76e7002a1b960c3fa68f8b4cd530865e15 (diff) | |
| parent | bd695634133b6e5683b7aae50f8a1df96be54b1a (diff) | |
| download | Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.tar.gz Tango-04bc3b7e0070ed810ce2255f944f1caa87b03d52.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views')
3 files changed, 17 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml index 8c934545a..c7ebcaf02 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml @@ -6,6 +6,7 @@ xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI" + xmlns:localConverters="clr-namespace:Tango.MachineStudio.Logging.Converters" xmlns:vm="clr-namespace:Tango.MachineStudio.Logging.ViewModels" xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL" xmlns:local="clr-namespace:Tango.MachineStudio.Logging.Views" @@ -14,6 +15,7 @@ <UserControl.Resources> <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" /> + <localConverters:LogItemToMessageConverter x:Key="LogItemToMessageConverter" /> </UserControl.Resources> <Grid> @@ -71,7 +73,7 @@ </Grid> <Border Padding="5" BorderThickness="1" BorderBrush="Gainsboro"> - <TextBox BorderThickness="0" Text="{Binding Log.Message}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Background="Transparent" /> + <TextBox BorderThickness="0" Text="{Binding Log,Converter={StaticResource LogItemToMessageConverter}}" Style="{x:Null}" TextWrapping="Wrap" IsReadOnly="True" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Background="Transparent" /> </Border> </DockPanel> </Grid> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml index 9115b6a7c..3ca10f370 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml @@ -92,6 +92,13 @@ </materialDesign:PackIcon.Style> </materialDesign:PackIcon> </Button> + + <Button Margin="20 0 0 0" Background="#FF7777" BorderBrush="#FF7777" ToolTip="Clear real-time logs" Command="{Binding ClearRealTimeLogsCommand}"> + <StackPanel Orientation="Horizontal"> + <materialDesign:PackIcon Width="24" Height="24" Kind="DeleteSweep" /> + <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">CLEAR</TextBlock> + </StackPanel> + </Button> </StackPanel> </Grid> </Border> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml index 3b54c1d35..d70149bbb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml @@ -92,6 +92,13 @@ </materialDesign:PackIcon.Style> </materialDesign:PackIcon> </Button> + + <Button Margin="20 0 0 0" Background="#FF7777" BorderBrush="#FF7777" ToolTip="Clear real-time logs" Command="{Binding ClearRealTimeLogsCommand}"> + <StackPanel Orientation="Horizontal"> + <materialDesign:PackIcon Width="24" Height="24" Kind="DeleteSweep" /> + <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">CLEAR</TextBlock> + </StackPanel> + </Button> </StackPanel> </Grid> </Border> |