Download progress

Fixed OutOfMemoryException
WOA-Project · Mar 6, 2019 · 6fff8ea · 6fff8ea
1 parent 227df8a
commit 6fff8ea
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/Source/Deployer.Lumia.Gui/Locator.cs b/Source/Deployer.Lumia.Gui/Locator.cs
@@ -39,7 +39,7 @@ public Locator()
 
             container.Configure(x =>
             {
-                x.Configure(optionsProvider);
+                x.ConfigureForTesting(optionsProvider);
                 x.Export<WpfMarkdownDisplayer>().As<IMarkdownDisplayer>();
                 x.ExportFactory(() => new BehaviorSubject<double>(double.NaN))
                     .As<IObserver<double>>()

diff --git a/Source/Deployer.Lumia.Gui/Views/Parts/StatusPart.xaml b/Source/Deployer.Lumia.Gui/Views/Parts/StatusPart.xaml
@@ -8,10 +8,20 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance viewModels:MainViewModel}">
     <StatusBar>
-        <StatusBarItem>
-            <TextBlock Text="{Binding Status.Message}" />
+        <StatusBar.ItemsPanel>
+            <ItemsPanelTemplate>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                </Grid>
+            </ItemsPanelTemplate>
+        </StatusBar.ItemsPanel>
+        <StatusBarItem ToolTip="{Binding Status.Message}">
+            <TextBlock Text="{Binding Status.Message}" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" />
         </StatusBarItem>
-        <StatusBarItem HorizontalContentAlignment="Stretch"
+        <StatusBarItem Grid.Column="1" MinWidth="200" HorizontalContentAlignment="Stretch" 
                        Visibility="{Binding IsProgressVisible, Converter={StaticResource BooleanToVisibilityConverter}}">
             <Grid>
                 <mah:MetroProgressBar Minimum="0"

diff --git a/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs b/Source/Deployer.Lumia.NetFx/Properties/SharedAssemblyInfo.cs
@@ -27,5 +27,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2")]
+[assembly: AssemblyVersion("2.2.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Source/DeployerPlatform b/Source/DeployerPlatform