Added BusyIndicator to Login View

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
index 233b4b9..9883c29 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ConflictsView.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org" 
         xmlns:cnv="clr-namespace:Pithos.Client.WPF.Converters"
         xmlns:model="clr-namespace:Pithos.Client.WPF.FileProperties"
-        Title="Conflicts" Height="300" Width="500" x:Name="This"
+        Title="Conflicts" Height="500" Width="500" x:Name="This"
                >
     <Window.Resources>
         <ResourceDictionary>

diff --git a/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml b/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml
index 77b6bc1..d6606bf 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml
@@ -1,6 +1,7 @@
 <Window x:Class="Pithos.Client.WPF.Preferences.LoginView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
         Title="Astakos Login" Height="800" Width="1024" Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         x:Name="TheView">
     <Grid>
@@ -20,6 +21,8 @@
             <TextBox Text="{Binding Path=Uri,ElementName=TheView}" Grid.Column="2" Margin="5,0,5,0" IsReadOnly="true"/>
             <Button Content="Retry" Grid.Column="3" x:Name="Retry" Click="Retry_Click" Padding="2"/>
         </Grid>
-        <WebBrowser Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Name="LoginBrowser" VerticalAlignment="Stretch" Navigating="LoginBrowser_Navigating" />
+        <extToolkit:BusyIndicator Grid.Row="1" x:Name="IsBusy">
+        <WebBrowser HorizontalAlignment="Stretch" Margin="5" Name="LoginBrowser" VerticalAlignment="Stretch" Navigating="LoginBrowser_Navigating" Navigated="LoginBrowser_Navigated" />
+        </extToolkit:BusyIndicator>
     </Grid>
 </Window>

diff --git a/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml.cs b/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml.cs
index 9da6c7d..a9ee875 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml.cs
+++ b/trunk/Pithos.Client.WPF/Preferences/LoginView.xaml.cs
@@ -65,6 +65,7 @@ namespace Pithos.Client.WPF.Preferences
 
         private void LoginBrowser_Navigating(object sender, System.Windows.Navigation.NavigatingCancelEventArgs e)
         {
+            IsBusy.IsBusy = true;
             Log.Debug(e.ToString());
 
             if (e.Uri.Scheme == "pithos")
@@ -97,5 +98,10 @@ namespace Pithos.Client.WPF.Preferences
         {
             LoginBrowser.Navigate(Uri);
         }
+
+        private void LoginBrowser_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs e)
+        {
+            IsBusy.IsBusy = false;
+        }
     }
 }