aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2019-02-20 12:22:27 +0200
committerAvi Levkovich <avi@twine-s.com>2019-02-20 12:22:27 +0200
commita576283d2a9288938796491582dd9f575f3ff571 (patch)
treebba67d4b69f337fa209b5050fb69378e28e6f4eb /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views
parentb30e6dc276f95c9db3d500d267a273b6486e0dac (diff)
parent9646611a494ed9e1ef0673c881ffc66b997f7bb9 (diff)
downloadTango-a576283d2a9288938796491582dd9f575f3ff571.tar.gz
Tango-a576283d2a9288938796491582dd9f575f3ff571.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml8
1 files changed, 3 insertions, 5 deletions
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 696cc051f..640c3c1df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -50,18 +50,16 @@
<TextBlock><Run>v</Run><Run Text="{Binding ApplicationManager.CoreVersion,Mode=OneWay}"></Run></TextBlock>
<TextBlock FontWeight="SemiBold">Build Date:</TextBlock>
<TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock>
- <TextBlock FontWeight="SemiBold">Environment Mode:</TextBlock>
+ <TextBlock FontWeight="SemiBold">Data Mode:</TextBlock>
<TextBlock Text="{Binding MachineStudioSettings.Environment,Mode=OneWay}"></TextBlock>
- <TextBlock FontWeight="SemiBold">Environment Slot:</TextBlock>
+ <TextBlock FontWeight="SemiBold">Environment:</TextBlock>
<TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Mode=OneWay}"></TextBlock>
<TextBlock FontWeight="SemiBold">Machine Service:</TextBlock>
- <TextBlock Text="{Binding MachineStudioSettings.DeploymentSlot,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay}"></TextBlock>
+ <TextBlock Text="{Binding MachineStudioSettings.MachineServiceAddress}"></TextBlock>
<TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
<TextBlock><Run Text="{Binding DataSource.Address,Mode=OneWay}"></Run>
<Run>(</Run><Run Foreground="Gray" Text="{Binding DataSource.Catalog,Mode=OneWay}"></Run><Run>)</Run>
</TextBlock>
- <TextBlock FontWeight="SemiBold">Allow BETA Updates:</TextBlock>
- <ToggleButton IsChecked="{Binding MachineStudioSettings.AcceptBetaRelease,Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Bottom"></ToggleButton>
</controls:TableGrid>
<DockPanel Margin="0 0 0 0">