add loading animation

ShawnFumo · Sep 11, 2011 · 6786d50 · 6786d50
1 parent 1509ecf
commit 6786d50
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 4 deletions.
diff --git a/BasicSccProvider.csproj b/BasicSccProvider.csproj
@@ -145,6 +145,9 @@
     <Compile Include="UI\HistoryGraph.xaml.cs">
       <DependentUpon>HistoryGraph.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UI\Loading.xaml.cs">
+      <DependentUpon>Loading.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="HistoryToolWindow.resx">
@@ -170,6 +173,7 @@
     </Content>
     <Content Include="Resources\Images_24bit.bmp" />
     <Content Include="Resources\Images_32bit.bmp" />
+    <Resource Include="Resources\Loading.png" />
     <Content Include="Resources\SccGlyphs.bmp" />
     <Content Include="solution explorer.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -226,6 +230,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI\Loading.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="DiffClassifier\DiffClassifier.csproj">

diff --git a/Resources/Loading.png b/Resources/Loading.png
diff --git a/UI/HistoryGraph.xaml b/UI/HistoryGraph.xaml
@@ -1,12 +1,12 @@
-<UserControl x:Class="GitScc.UI.HistoryGraph"
+<UserControl xmlns:my1="clr-namespace:GitScc.UI"  xmlns:my="clr-namespace:GitScc"  x:Class="GitScc.UI.HistoryGraph"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
              d:DesignHeight="400" d:DesignWidth="600">
-
-    <ScrollViewer x:Name="scrollRoot" 
+    <Grid>
+        <ScrollViewer x:Name="scrollRoot" 
                   VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" 
                   PreviewMouseWheel="scrollRoot_PreviewMouseWheel">
         <Canvas x:Name="canvasRoot" Background="White">
@@ -20,6 +20,9 @@
                     </TransformGroup>
                 </Canvas.RenderTransform>
             </Canvas>
+
         </Canvas>
     </ScrollViewer>
+        <my1:Loading x:Name="loading"  HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Collapsed" />
+    </Grid>
 </UserControl>
diff --git a/UI/HistoryGraph.xaml.cs b/UI/HistoryGraph.xaml.cs
@@ -80,7 +80,9 @@ internal void Show(GitFileStatusTracker tracker)
             this.tracker = tracker;
             if (tracker == null) return;
 
+            loading.Visibility = Visibility.Visible;
             var dispatcher = Dispatcher.CurrentDispatcher;
+
             Action act = () =>
             {
                 this.tracker.RepositoryGraph.IsSimplified = showSimplifiedGraph;
@@ -270,8 +272,9 @@ internal void Show(GitFileStatusTracker tracker)
                 AdjustCanvasSize();
 
                 this.scrollRoot.ScrollToRightEnd();
-            };
 
+                loading.Visibility = Visibility.Collapsed;
+            };
             dispatcher.BeginInvoke(act, DispatcherPriority.ApplicationIdle);
         }
 

diff --git a/UI/Loading.xaml b/UI/Loading.xaml
@@ -0,0 +1,31 @@
+<UserControl x:Class="GitScc.UI.Loading"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="80" d:DesignWidth="280">
+    <Border Background="#84000000" CornerRadius="10" Height="80" Width="260">
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
+            <Canvas Width="32" Height="32" Margin="10">
+                <Canvas.Triggers>
+                    <EventTrigger RoutedEvent="Canvas.Loaded">
+                        <BeginStoryboard>
+                            <Storyboard>
+                                <DoubleAnimation From="0" To="360" RepeatBehavior="Forever" 
+                                Storyboard.TargetName="spin" Storyboard.TargetProperty="(RotateTransform.Angle)" />
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </EventTrigger>
+                </Canvas.Triggers>
+                <Canvas.RenderTransform>
+                    <RotateTransform x:Name="spin" Angle="0" CenterX="16" CenterY="16" />
+                </Canvas.RenderTransform>
+                <Image Source="/GitSccProvider;component/Resources/Loading.png" Width="32" Height="32" />
+            </Canvas>
+
+            <TextBlock Text="Analyzing Git repository ..." FontSize="12" Foreground="White" VerticalAlignment="Center" />
+
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/UI/Loading.xaml.cs b/UI/Loading.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GitScc.UI
+{
+    /// <summary>
+    /// Interaction logic for Loading.xaml
+    /// </summary>
+    public partial class Loading : UserControl
+    {
+        public Loading()
+        {
+            InitializeComponent();
+        }
+    }
+}