diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-05 13:26:20 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-05 13:26:20 +0200 |
| commit | 9bd5c9c4af9dc29e637368f52b816ea2d812aeb6 (patch) | |
| tree | a5d139de26c7df27c22d7487c112e85cf621b3ba /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels | |
| parent | 027afa7e01a5fd7d07102d96436bb4caed95e3ce (diff) | |
| parent | 99ce3aa122c0d8f4703e0d5c43776f2658ac5392 (diff) | |
| download | Tango-9bd5c9c4af9dc29e637368f52b816ea2d812aeb6.tar.gz Tango-9bd5c9c4af9dc29e637368f52b816ea2d812aeb6.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs index 0b8a205f7..e8d33b0ca 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.Core; +using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.StudioApplication; using Tango.Settings; using Tango.SharedUI; @@ -16,10 +17,13 @@ namespace Tango.MachineStudio.UI.ViewModels public CoreSettings Settings { get; set; } + public MachineStudioSettings MachineStudioSettings { get; set; } + public AboutViewVM(IStudioApplicationManager applicationManager) { ApplicationManager = applicationManager; Settings = SettingsManager.Default.GetOrCreate<CoreSettings>(); + MachineStudioSettings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>(); } } } |
