diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-05 11:09:01 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-05 11:09:01 +0200 |
| commit | 99ce3aa122c0d8f4703e0d5c43776f2658ac5392 (patch) | |
| tree | 3e0e72d3c16be19c10716ec7683a6e32b7bbcc45 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | bb9b7c977623e3fbcc14ecc65f9642e8993bef47 (diff) | |
| download | Tango-99ce3aa122c0d8f4703e0d5c43776f2658ac5392.tar.gz Tango-99ce3aa122c0d8f4703e0d5c43776f2658ac5392.zip | |
Added 'allow beta updates' on about view.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/AboutViewVM.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml | 6 |
2 files changed, 8 insertions, 2 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>(); } } } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml index 6d47e8191..682cc9ed9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml @@ -13,7 +13,7 @@ <UserControl.Resources> <converters:VersionToShortVersionConverter x:Key="VersionToShortVersionConverter" /> </UserControl.Resources> - + <Grid> <Grid> <Grid.RowDefinitions> @@ -42,7 +42,7 @@ - <controls:TableGrid RowHeight="25" Height="120" DockPanel.Dock="Top"> + <controls:TableGrid RowHeight="25" Height="150" DockPanel.Dock="Top"> <TextBlock FontWeight="SemiBold">Machine Studio:</TextBlock> <TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.Version,Mode=OneWay}"></Run></TextBlock> <TextBlock FontWeight="SemiBold">Core Libraries:</TextBlock> @@ -51,6 +51,8 @@ <TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock> <TextBlock FontWeight="SemiBold">Data Source:</TextBlock> <TextBlock Text="{Binding Settings.DataSource.Address,Mode=OneWay}"></TextBlock> + <TextBlock FontWeight="SemiBold">Allow BETA Updates:</TextBlock> + <ToggleButton IsChecked="{Binding MachineStudioSettings.AcceptBetaRelease,Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></ToggleButton> </controls:TableGrid> <DockPanel> |