merge

2 files changed, 15 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
index 5adec916a..fe8b4bdef 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
@@ -63,5 +63,7 @@
                 <TextBlock Text="{Binding ElementName=control,Path=TangoVersion.FirmwareVersion}"></TextBlock>
             </controls:TableGrid>
         </StackPanel>
+
+        <ProgressBar VerticalAlignment="Bottom" Height="5" Background="Transparent" BorderThickness="0" Foreground="Silver" IsIndeterminate="{Binding ElementName=control,Path=IsBusy}"></ProgressBar>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs
index f71f236c7..ea7475fb1 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs
@@ -55,6 +55,13 @@ namespace Tango.AzureUtils.UI.Controls
         public static readonly DependencyProperty MachineStudioVersionProperty =
             DependencyProperty.Register("MachineStudioVersion", typeof(MachineStudioVersion), typeof(WebAppPropertiesControl), new PropertyMetadata(null));
 
+        public bool IsBusy
+        {
+            get { return (bool)GetValue(IsBusyProperty); }
+            set { SetValue(IsBusyProperty, value); }
+        }
+        public static readonly DependencyProperty IsBusyProperty =
+            DependencyProperty.Register("IsBusy", typeof(bool), typeof(WebAppPropertiesControl), new PropertyMetadata(false));
 
         public WebAppPropertiesControl()
         {
@@ -71,6 +78,8 @@ namespace Tango.AzureUtils.UI.Controls
 
                 try
                 {
+                    IsBusy = true;
+
                     HostNames = app.HostNames.Select(x => x).ToList();
 
                     Settings = await app.GetMachineServiceSettingsAsync(false);
@@ -81,6 +90,10 @@ namespace Tango.AzureUtils.UI.Controls
                     MachineStudioVersion = await databaseManager.GetLatestMachineStudioVersion(app);
                 }
                 catch { }
+                finally
+                {
+                    IsBusy = false;
+                }
             }
         }
     }