aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-26 20:09:38 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-26 20:09:38 +0300
commit7d7281f91edfb2d0e7d0e92bd282403f0426f94d (patch)
tree4672bd653c0abdb6612032a819f670993a31a17a /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
parentf98cac2d6e331eaf62167d63524134d53db921ef (diff)
downloadTango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.tar.gz
Tango-7d7281f91edfb2d0e7d0e92bd282403f0426f94d.zip
Added new colorized static text widget to tech board.
Added option to go back to job/jobs from running job view. Fixed issue with bug reporting. Fixed other bugs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index 4e1c36593..9c69bee75 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -22,6 +22,7 @@ using Tango.MachineStudio.UI.ViewModels;
using Tango.MachineStudio.UI.Views;
using Tango.MachineStudio.Common;
using Tango.Core;
+using Tango.BL;
namespace Tango.MachineStudio.UI
{
@@ -35,6 +36,8 @@ namespace Tango.MachineStudio.UI
protected override void OnStartup(StartupEventArgs e)
{
+ ObservableEntityCollectionSettings.SetDispatcher(Application.Current.Dispatcher);
+
#if DEBUG
CoreSettings.DefaultDataSource = new DataSource()