Browse Source

Removed progress value from startup

LukePulverenti Luke Pulverenti luke pulverenti 13 years ago
parent
commit
fe427bc7f4

+ 4 - 4
MediaBrowser.Common/Kernel/BaseKernel.cs

@@ -78,7 +78,7 @@ namespace MediaBrowser.Common.Kernel
             // Performs initializations that can be reloaded at anytime
             // Performs initializations that can be reloaded at anytime
             await Reload(progress).ConfigureAwait(false);
             await Reload(progress).ConfigureAwait(false);
 
 
-            progress.Report(new TaskProgress { Description = "Loading Complete", PercentComplete = 100 });
+            progress.Report(new TaskProgress { Description = "Loading Complete" });
         }
         }
 
 
         /// <summary>
         /// <summary>
@@ -90,10 +90,10 @@ namespace MediaBrowser.Common.Kernel
             
             
             ReloadLogger();
             ReloadLogger();
 
 
-            progress.Report(new TaskProgress { Description = "Loading configuration", PercentComplete = 0 });
+            progress.Report(new TaskProgress { Description = "Loading configuration" });
             ReloadConfiguration();
             ReloadConfiguration();
 
 
-            progress.Report(new TaskProgress { Description = "Starting Http server", PercentComplete = 5 });
+            progress.Report(new TaskProgress { Description = "Starting Http server" });
             ReloadHttpServer();
             ReloadHttpServer();
         }
         }
 
 
@@ -104,7 +104,7 @@ namespace MediaBrowser.Common.Kernel
         {
         {
             await Task.Run(() =>
             await Task.Run(() =>
             {
             {
-                progress.Report(new TaskProgress { Description = "Loading Plugins", PercentComplete = 10 });
+                progress.Report(new TaskProgress { Description = "Loading Plugins" });
                 ReloadComposableParts();
                 ReloadComposableParts();
 
 
             }).ConfigureAwait(false);
             }).ConfigureAwait(false);

+ 3 - 0
MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -148,6 +148,9 @@
   <ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Images\mblogowhite.png" />
     <Resource Include="Resources\Images\mblogowhite.png" />
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\spinner.gif" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
        Other similar extension points exist, see Microsoft.Common.targets.

BIN
MediaBrowser.Common/Resources/Images/Icon.ico


BIN
MediaBrowser.Common/Resources/Images/spinner.gif


+ 4 - 3
MediaBrowser.Common/UI/Splash.xaml

@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         Title="MediaBrowser" 
         Title="MediaBrowser" 
-        Height="280" 
+        Height="230" 
         Width="520" 
         Width="520" 
         ShowInTaskbar="True" 
         ShowInTaskbar="True" 
         ResizeMode="NoResize" 
         ResizeMode="NoResize" 
@@ -26,7 +26,8 @@
     </Window.Background>
     </Window.Background>
     <Grid Name="splashGrid">
     <Grid Name="splashGrid">
         <Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10" Source="../Resources/Images/mblogoblack.png"/>
         <Image x:Name="imgLogo" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform" Grid.Row="0" Margin="10 10 10 10" Source="../Resources/Images/mblogoblack.png"/>
-        <ProgressBar Name="pbProgress" Minimum="0" Maximum="100" HorizontalAlignment="Left" Height="24" Margin="30,110,30,0" Width="460" Grid.Row="1"/>
-        <TextBlock Name="lblProgress" Margin="0,190,10,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" FontSize="18" Foreground="Black" Text="Label"></TextBlock>
+        <StackPanel Margin="0,130,10,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="2" Orientation="Horizontal">
+            <TextBlock Name="lblProgress" FontSize="18" Foreground="Black" Text="Label"></TextBlock>
+        </StackPanel>
     </Grid>
     </Grid>
 </Controls:MetroWindow>
 </Controls:MetroWindow>

+ 1 - 2
MediaBrowser.Common/UI/Splash.xaml.cs

@@ -20,8 +20,7 @@ namespace MediaBrowser.Common.UI
 
 
         void ProgressChanged(object sender, TaskProgress e)
         void ProgressChanged(object sender, TaskProgress e)
         {
         {
-            lblProgress.Text = e.Description;
-            pbProgress.Value = (double)e.PercentComplete;
+            lblProgress.Text = e.Description + "...";
         }
         }
 
 
         private void SplashLoaded(object sender, RoutedEventArgs e)
         private void SplashLoaded(object sender, RoutedEventArgs e)

+ 2 - 2
MediaBrowser.Controller/Kernel.cs

@@ -105,10 +105,10 @@ namespace MediaBrowser.Controller
 
 
             ExtractFFMpeg();
             ExtractFFMpeg();
 
 
-            progress.Report(new TaskProgress { Description = "Loading Users", PercentComplete = 15 });
+            progress.Report(new TaskProgress { Description = "Loading Users" });
             ReloadUsers();
             ReloadUsers();
 
 
-            progress.Report(new TaskProgress { Description = "Loading Media Library", PercentComplete = 25 });
+            progress.Report(new TaskProgress { Description = "Loading Media Library" });
             await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);
             await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);
         }
         }
 
 

+ 4 - 4
MediaBrowser.Model/Progress/TaskProgress.cs

@@ -7,13 +7,13 @@ namespace MediaBrowser.Model.Progress
     public class TaskProgress
     public class TaskProgress
     {
     {
         /// <summary>
         /// <summary>
-        /// Gets or sets the current completion percentage
+        /// Gets or sets a description of the actions currently executing
         /// </summary>
         /// </summary>
-        public decimal PercentComplete { get; set; }
+        public string Description { get; set; }
 
 
         /// <summary>
         /// <summary>
-        /// Gets or sets a description of the actions currently executing
+        /// Gets or sets the current completion percentage
         /// </summary>
         /// </summary>
-        public string Description { get; set; }
+        public decimal? PercentComplete { get; set; }
     }
     }
 }
 }