diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-31 10:56:22 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-31 10:56:22 +0300 |
| commit | 28d5e3b892df893ea3c918392566d1842fd85937 (patch) | |
| tree | 9b99e2fa17321243cf91407719b291ae729303f5 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | |
| parent | eab3bef002de013b902499341266c79b92349594 (diff) | |
| parent | b6b2f9ad4c96deface6763adbb2ac533e9706d1b (diff) | |
| download | Tango-28d5e3b892df893ea3c918392566d1842fd85937.tar.gz Tango-28d5e3b892df893ea3c918392566d1842fd85937.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml index 91fc11a22..2a63ae00f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/LoadingView.xaml @@ -16,7 +16,7 @@ </StackPanel> <TextBlock HorizontalAlignment="Right" FontSize="18" Margin="0 0 -50 0" Foreground="{StaticResource AccentColorBrush}">Twine Solutions</TextBlock> <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing> - <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic">Loading, please wait...</TextBlock> + <TextBlock HorizontalAlignment="Center" FontSize="18" FontStyle="Italic" Text="{Binding Status,TargetNullValue='Loading, please wait...'}"></TextBlock> </StackPanel> </Grid> |