diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-01 14:44:53 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-01 14:44:53 +0300 |
| commit | 47fad304ebc8f056f1c5ffcde037c66029fc80c9 (patch) | |
| tree | 1e321a7099a3988785485f16e677cd3eb0803a73 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs | |
| parent | 52a09ecb4ae9577f6f1bb124d246ec1c3858ec23 (diff) | |
| download | Tango-47fad304ebc8f056f1c5ffcde037c66029fc80c9.tar.gz Tango-47fad304ebc8f056f1c5ffcde037c66029fc80c9.zip | |
Added device information for ConnectResponse.
Fixed issue with razor parser.
Added report issue option to application crash.
Added DeviceInformation to MachineOperator.
Added LastHardwareConfiguration to machine operator.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs index 8d3a2c6bf..6e337c0e9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModelLocator.cs @@ -13,6 +13,7 @@ using Tango.MachineStudio.Common.Speech; using Tango.MachineStudio.Common.StudioApplication; using Tango.MachineStudio.Common.Video; using Tango.MachineStudio.UI.Authentication; +using Tango.MachineStudio.UI.Console; using Tango.MachineStudio.UI.Html; using Tango.MachineStudio.UI.Modules; using Tango.MachineStudio.UI.Navigation; @@ -85,6 +86,7 @@ namespace Tango.MachineStudio.UI TangoIOC.Default.Register<ConnectedMachineViewVM>(); TangoIOC.Default.Register<MachineLoginViewVM>(); TangoIOC.Default.Register<UpdateViewVM>(); + TangoIOC.Default.Register<ConsoleWindowVM>(); //Register View (Supervising Controller Pattern). //if (!ViewModelBase.IsInDesignModeStatic) @@ -157,5 +159,13 @@ namespace Tango.MachineStudio.UI return TangoIOC.Default.GetInstance<UpdateViewVM>(); } } + + public ConsoleWindowVM ConsoleWindowVM + { + get + { + return TangoIOC.Default.GetInstance<ConsoleWindowVM>(); + } + } } }
\ No newline at end of file |
