aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs9
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs5
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs12
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs38
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs17
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs33
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs64
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml32
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml20
10 files changed, 174 insertions, 58 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
index 9989aa091..feb1e41b3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
@@ -41,7 +41,14 @@ namespace Tango.MachineStudio.UI
{
InitializeComponent();
- _is_testing = TestHelper.IsRunningUnderTestStudio();
+ try
+ {
+ _is_testing = TestHelper.IsRunningUnderTestStudio();
+ }
+ catch (Exception ex)
+ {
+ LogManager.Log(ex, LogCategory.Warning, "An error occurred while trying to get the parent process of machine studio.");
+ }
if (!_is_testing)
{
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
index 0def3c943..28f56e521 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Modules/DefaultStudioModuleLoader.cs
@@ -44,7 +44,10 @@ namespace Tango.MachineStudio.UI.Modules
/// <param name="e">The e.</param>
private void _authenticationProvider_CurrentUserChanged(object sender, User e)
{
- LoadModules();
+ if (e != null)
+ {
+ LoadModules();
+ }
}
private SynchronizedObservableCollection<IStudioModule> _allModules;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
index 899ba846e..13ec6161d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Navigation/DefaultNavigationManager.cs
@@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Tango.Core;
using Tango.Core.Commands;
+using Tango.Core.DI;
using Tango.MachineStudio.Common;
using Tango.MachineStudio.Common.Modules;
using Tango.MachineStudio.Common.Navigation;
@@ -384,5 +385,16 @@ namespace Tango.MachineStudio.UI.Navigation
RaisePropertyChanged(nameof(CanNavigateBack));
}
+
+ public void NavigateToModule<T>() where T : IStudioModule
+ {
+ var loader = TangoIOC.Default.GetInstance<IStudioModuleLoader>();
+ var module = loader.UserModules.SingleOrDefault(x => x.GetType() == typeof(T));
+
+ if (module != null)
+ {
+ TangoIOC.Default.GetInstance<ViewModels.MainViewVM>().StartModule(module);
+ }
+ }
}
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 6cff1ba17..80509e6c0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -11,6 +11,7 @@ using System.Windows.Media;
using Tango.Core;
using System.Collections.ObjectModel;
using Tango.SharedUI;
+using System.Collections.Concurrent;
namespace Tango.MachineStudio.UI.Notifications
{
@@ -21,6 +22,8 @@ namespace Tango.MachineStudio.UI.Notifications
/// <seealso cref="Tango.MachineStudio.Common.Notifications.INotificationProvider" />
public class DefaultNotificationProvider : ExtendedObject, INotificationProvider
{
+ private int _message_count = 0;
+
/// <summary>
/// The view types
/// </summary>
@@ -79,6 +82,8 @@ namespace Tango.MachineStudio.UI.Notifications
{
MainWindow.Instance.shadowGrid.Visibility = Visibility.Visible;
+ _message_count++;
+
var result = new MessageBoxWindow()
{
Owner = Application.Current.MainWindow,
@@ -89,7 +94,13 @@ namespace Tango.MachineStudio.UI.Notifications
}.ShowDialog();
- MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+ _message_count--;
+
+ if (_message_count == 0)
+ {
+ MainWindow.Instance.shadowGrid.Visibility = Visibility.Hidden;
+ }
+
return result;
}
@@ -377,8 +388,11 @@ namespace Tango.MachineStudio.UI.Notifications
/// <param name="taskItem">The task item.</param>
public void PushTaskItem(TaskItem taskItem)
{
- TaskItems.Add(taskItem);
- CurrentTaskItem = taskItem;
+ InvokeUI(() =>
+ {
+ TaskItems.Add(taskItem);
+ CurrentTaskItem = taskItem;
+ });
}
/// <summary>
@@ -400,14 +414,20 @@ namespace Tango.MachineStudio.UI.Notifications
/// <param name="taskItem">The task item.</param>
public void PopTaskItem(TaskItem taskItem)
{
- TaskItems.Remove(taskItem);
-
- if (TaskItems.Count > 0)
+ Task.Delay(1000).ContinueWith((x) =>
{
- CurrentTaskItem = TaskItems.Last();
- }
+ InvokeUI(() =>
+ {
+ TaskItems.Remove(taskItem);
- RaisePropertyChanged(nameof(HasTaskItems));
+ if (TaskItems.Count > 0)
+ {
+ CurrentTaskItem = TaskItems.Last();
+ }
+
+ RaisePropertyChanged(nameof(HasTaskItems));
+ });
+ });
}
/// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 075832b06..01a7ac3da 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
[assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
[assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.5.51.18238")]
+[assembly: AssemblyVersion("3.5.56.18238")]
[assembly: ComVisible(false)] \ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 8be7f486a..3864708fc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -25,6 +25,7 @@ using Tango.MachineStudio.UI.ViewModels;
using Tango.MachineStudio.Common.Notifications;
using Tango.MachineStudio.UI.Views;
using Tango.Integration.Operation;
+using Tango.MachineStudio.UI.Windows;
namespace Tango.MachineStudio.UI.StudioApplication
{
@@ -39,6 +40,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
private IStudioModuleLoader _moduleLoader;
private INotificationProvider _notification;
private List<Window> _openedWindows;
+ private List<IStudioViewModel> _notified_view_models;
/// <summary>
/// Initializes a new instance of the <see cref="DefaultStudioApplicationManager" /> class.
@@ -50,6 +52,7 @@ namespace Tango.MachineStudio.UI.StudioApplication
_navigationManager = navigationManager;
_notification = notification;
_openedWindows = new List<Window>();
+ _notified_view_models = new List<IStudioViewModel>();
Application.Current.MainWindow.ContentRendered += (_, __) =>
{
@@ -286,6 +289,11 @@ namespace Tango.MachineStudio.UI.StudioApplication
window.Closed += (x, y) => { _openedWindows.Remove(window); };
}
+ public bool IsModuleInNewWindow(IStudioModule module)
+ {
+ return _openedWindows.Exists(x => (x as ModuleWindow).ModuleContext.Module == module);
+ }
+
/// <summary>
/// Gets the core libraries version.
/// </summary>
@@ -324,7 +332,14 @@ namespace Tango.MachineStudio.UI.StudioApplication
/// </summary>
public void NotifyApplicationReady()
{
- TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationReady());
+ TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x =>
+ {
+ if (!_notified_view_models.Contains(x))
+ {
+ x.OnApplicationReady();
+ _notified_view_models.Add(x);
+ }
+ });
}
/// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 51b7168ed..7737911e0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -52,6 +52,8 @@ namespace Tango.MachineStudio.UI.ViewModels
/// <param name="scanner">The scanner.</param>
public MachineConnectionViewVM(ExternalBridgeScanner scanner)
{
+ EnableDiagnostics = true;
+ UploadHardwareConfiguration = true;
Scanner = scanner;
ConnectCommand = new RelayCommand(Connect, (x) => SelectedMachine != null);
}
@@ -97,5 +99,36 @@ namespace Tango.MachineStudio.UI.ViewModels
Scanner.AvailableMachines.Add(_emulator);
Scanner.Start();
}
+
+ private bool _enableDiagnostics;
+ /// <summary>
+ /// Gets or sets a value indicating whether to enable diagnostics after connection.
+ /// </summary>
+ public bool EnableDiagnostics
+ {
+ get { return _enableDiagnostics; }
+ set { _enableDiagnostics = value; RaisePropertyChangedAuto(); }
+ }
+
+ private bool _uploadHardwareConfiguration;
+ /// <summary>
+ /// Gets or sets a value indicating whether to upload hardware configuration after connection.
+ /// </summary>
+ public bool UploadHardwareConfiguration
+ {
+ get { return _uploadHardwareConfiguration; }
+ set { _uploadHardwareConfiguration = value; RaisePropertyChangedAuto(); }
+ }
+
+ private bool _enableKeepAlive;
+ /// <summary>
+ /// Gets or sets a value indicating whether to use the keep alive mechanism.
+ /// </summary>
+ public bool EnableKeepAlive
+ {
+ get { return _enableKeepAlive; }
+ set { _enableKeepAlive = value; RaisePropertyChangedAuto(); }
+ }
+
}
}
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 49a8ca807..31e297cd1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -445,6 +445,11 @@ namespace Tango.MachineStudio.UI.ViewModels
}
}
+ x.SelectedMachine.EnableDiagnostics = x.EnableDiagnostics;
+ x.SelectedMachine.EnableEmbeddedDebugging = x.EnableDiagnostics;
+ x.SelectedMachine.EnableEventsNotification = x.EnableDiagnostics;
+ x.SelectedMachine.UseKeepAlive = x.EnableKeepAlive;
+
if (x.SelectedMachine.RequiresAuthentication)
{
_notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) =>
@@ -453,11 +458,6 @@ namespace Tango.MachineStudio.UI.ViewModels
{
try
{
- if (x.SelectedMachine.EnableDiagnostics)
- {
- x.SelectedMachine.EnableEmbeddedDebugging = true;
- }
-
await x.SelectedMachine.As<IExternalBridgeSecureClient>().Connect(new PMR.Integration.ExternalBridgeLoginRequest()
{
AppID = "Machine Studio",
@@ -479,6 +479,11 @@ namespace Tango.MachineStudio.UI.ViewModels
PostMessage(new MachineConnectionChangedMessage() { Machine = x.SelectedMachine });
_eventLogger.Log(String.Format("Successfully connected to machine {0} via TCP", x.SelectedMachine.SerialNumber));
+ if (x.UploadHardwareConfiguration)
+ {
+ UploadHardwareConfiguration();
+ }
+
}
catch (ResponseErrorException ex)
{
@@ -507,11 +512,6 @@ namespace Tango.MachineStudio.UI.ViewModels
{
try
{
- if (x.SelectedMachine.EnableDiagnostics)
- {
- x.SelectedMachine.EnableEmbeddedDebugging = true;
- }
-
await x.SelectedMachine.Connect();
x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber;
ApplicationManager.SetConnectedMachine(x.SelectedMachine);
@@ -520,6 +520,11 @@ namespace Tango.MachineStudio.UI.ViewModels
_eventLogger.Log(String.Format("Successfully connected to machine {0} via USB", x.SelectedMachine.SerialNumber));
_settings.LastVirtualMachineSerialNumber = vm.SelectedMachine.SerialNumber;
_settings.Save();
+
+ if (x.UploadHardwareConfiguration)
+ {
+ UploadHardwareConfiguration();
+ }
}
catch (Exception ex)
{
@@ -560,22 +565,7 @@ namespace Tango.MachineStudio.UI.ViewModels
{
using (NotificationProvider.PushTaskItem("Uploading hardware configuration..."))
{
- try
- {
- using (ObservablesContext db = ObservablesContext.CreateDefault())
- {
- var config = db.Adapter.GetConfiguration(s => s.Guid == ApplicationManager.Machine.ConfigurationGuid);
- var hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid);
-
- await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(hw, config);
- }
- NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
- }
- catch (Exception ex)
- {
- LogManager.Log(ex, "Error uploading hardware configuration.");
- NotificationProvider.ShowError("Error uploading hardware configuration." + Environment.NewLine + ex.Message);
- }
+ UploadHardwareConfiguration();
}
}
}
@@ -623,6 +613,26 @@ namespace Tango.MachineStudio.UI.ViewModels
InvalidateRelayCommands();
}
+ private async void UploadHardwareConfiguration()
+ {
+ try
+ {
+ using (ObservablesContext db = ObservablesContext.CreateDefault())
+ {
+ var config = db.Adapter.GetConfiguration(s => s.Guid == ApplicationManager.Machine.ConfigurationGuid);
+ var hw = db.Adapter.GetHardwareVersionByMachine(ApplicationManager.Machine.Guid);
+
+ await ApplicationManager.ConnectedMachine.UploadHardwareConfiguration(hw, config);
+ }
+ NotificationProvider.ShowInfo("Hardware configuration uploaded successfully.");
+ }
+ catch (Exception ex)
+ {
+ LogManager.Log(ex, "Error uploading hardware configuration.");
+ NotificationProvider.ShowError("Error uploading hardware configuration." + Environment.NewLine + ex.Message);
+ }
+ }
+
/// <summary>
/// Navigates to the home screen.
/// </summary>
@@ -639,6 +649,8 @@ namespace Tango.MachineStudio.UI.ViewModels
{
IsMenuOpened = false;
+ if ((_applicationManager as DefaultStudioApplicationManager).IsModuleInNewWindow(module)) return;
+
if (module != null)
{
LogManager.Log(String.Format("Starting module '{0}'...", module.Name));
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 180a2a8e0..9794404b9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -10,7 +10,7 @@
xmlns:emulations="clr-namespace:Tango.Emulations.ExternalBridge;assembly=Tango.Emulations"
xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
mc:Ignorable="d"
- d:DesignHeight="300" d:DesignWidth="300" Width="600" Height="400" Background="White" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}">
+ d:DesignHeight="300" d:DesignWidth="300" Width="630" Height="400" Background="White" DataContext="{Binding MachineConnectionViewVM, Source={StaticResource Locator}}">
<UserControl.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
@@ -57,10 +57,6 @@
<ListBox.Resources>
<DataTemplate DataType="{x:Type integration:ExternalBridgeTcpClient}">
<DockPanel>
- <StackPanel Orientation="Vertical" VerticalAlignment="Center" DockPanel.Dock="Right" ToolTip="Allow incoming diagnostics data">
- <ToggleButton IsChecked="{Binding EnableDiagnostics}" VerticalAlignment="Center"></ToggleButton>
- <TextBlock VerticalAlignment="Center" FontSize="10">Diagnostics/Debugging</TextBlock>
- </StackPanel>
<StackPanel Orientation="Horizontal">
<Image Source="/Images/external-bridge-tcp.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
<StackPanel Margin="10 0 0 0">
@@ -79,10 +75,6 @@
</DataTemplate>
<DataTemplate DataType="{x:Type integration:ExternalBridgeUsbClient}">
<DockPanel>
- <StackPanel Orientation="Vertical" VerticalAlignment="Center" DockPanel.Dock="Right" ToolTip="Allow incoming diagnostics data">
- <ToggleButton IsChecked="{Binding EnableDiagnostics}" VerticalAlignment="Center"></ToggleButton>
- <TextBlock VerticalAlignment="Center" FontSize="10">Diagnostics</TextBlock>
- </StackPanel>
<StackPanel Orientation="Horizontal">
<Image Source="/Images/external-bridge-usb.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
<StackPanel Margin="10 0 0 0">
@@ -98,10 +90,6 @@
</DataTemplate>
<DataTemplate DataType="{x:Type emulations:EmulatorExternalBridge}">
<DockPanel>
- <StackPanel Orientation="Vertical" VerticalAlignment="Center" DockPanel.Dock="Right" ToolTip="Allow incoming diagnostics data">
- <ToggleButton IsChecked="{Binding EnableDiagnostics}" VerticalAlignment="Center"></ToggleButton>
- <TextBlock VerticalAlignment="Center" FontSize="10">Diagnostics</TextBlock>
- </StackPanel>
<StackPanel Orientation="Horizontal">
<Image Source="/Images/external-bridge-emulator.png" Width="38" Height="38" RenderOptions.BitmapScalingMode="Fant"></Image>
<StackPanel Margin="10 0 0 0">
@@ -123,6 +111,24 @@
</Grid>
<Grid Grid.Row="1">
+
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+ <ToggleButton IsChecked="{Binding EnableDiagnostics}" VerticalAlignment="Center" ToolTip="Allow incoming diagnostics data, debug logs and hardware events"></ToggleButton>
+ <TextBlock VerticalAlignment="Center" FontSize="10" Margin="5 0 0 0">Diagnostics, Debug &amp; Events</TextBlock>
+ </StackPanel>
+
+ <StackPanel Margin="20 0 0 0" Orientation="Horizontal" VerticalAlignment="Center">
+ <ToggleButton IsChecked="{Binding UploadHardwareConfiguration}" VerticalAlignment="Center" ToolTip="Upload hardware configuration after connection is successful"></ToggleButton>
+ <TextBlock VerticalAlignment="Center" FontSize="10" Margin="5 0 0 0">Upload HW Configuration</TextBlock>
+ </StackPanel>
+
+ <StackPanel Margin="20 0 0 0" Orientation="Horizontal" VerticalAlignment="Center">
+ <ToggleButton IsChecked="{Binding EnableKeepAlive}" VerticalAlignment="Center" ToolTip="Upload hardware configuration after connection is successful"></ToggleButton>
+ <TextBlock VerticalAlignment="Center" FontSize="10" Margin="5 0 0 0">Keep Alive</TextBlock>
+ </StackPanel>
+ </StackPanel>
+
<Button HorizontalAlignment="Right" Width="140" Command="{Binding ConnectCommand}">CONNECT</Button>
</Grid>
</Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index 7edfa50c6..f66e247a9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -467,7 +467,7 @@
</Grid>
</Grid>
- <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="40" Padding="5" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
+ <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="Auto" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
<Border.Style>
<Style TargetType="Border">
<Setter Property="RenderTransform">
@@ -487,7 +487,7 @@
<DataTrigger.ExitActions>
<BeginStoryboard HandoffBehavior="Compose">
<Storyboard>
- <DoubleAnimation BeginTime="00:00:02" FillBehavior="HoldEnd" Storyboard.TargetProperty="RenderTransform.ScaleY" To="0" From="1" Duration="00:00:0.5"></DoubleAnimation>
+ <DoubleAnimation FillBehavior="HoldEnd" Storyboard.TargetProperty="RenderTransform.ScaleY" To="0" From="1" Duration="00:00:0.5"></DoubleAnimation>
</Storyboard>
</BeginStoryboard>
</DataTrigger.ExitActions>
@@ -502,10 +502,18 @@
</LinearGradientBrush>
</Border.Background>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20 0 0 0">
- <mahapps:ProgressRing Width="24" Height="24" Foreground="White"></mahapps:ProgressRing>
- <TextBlock Text="{Binding NotificationProvider.CurrentTaskItem.Message,Converter={StaticResource StringEllipsisConverter},ConverterParameter=35}" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" TextWrapping="Wrap"></TextBlock>
- </StackPanel>
+ <ItemsControl ItemsSource="{Binding NotificationProvider.TaskItems}">
+ <ItemsControl.ItemTemplate>
+ <DataTemplate>
+ <Border Margin="5">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20 0 0 0">
+ <mahapps:ProgressRing Width="24" Height="24" Foreground="White"></mahapps:ProgressRing>
+ <TextBlock Text="{Binding Message,Converter={StaticResource StringEllipsisConverter},ConverterParameter=35}" Foreground="White" VerticalAlignment="Center" Margin="10 0 0 0" TextWrapping="Wrap"></TextBlock>
+ </StackPanel>
+ </Border>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
</Border>
<Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10" Visibility="{Binding IsMachineErrorsOpened,Converter={StaticResource BooleanToVisibilityConverter}}">