Restore SEBPatch
This commit is contained in:
@@ -17,6 +17,6 @@
|
||||
<ContentControl Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Panel.ZIndex="2" Name="Icon" Margin="10" Width="25" />
|
||||
<ProgressBar Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2" Panel.ZIndex="1" Name="Progress" BorderThickness="0" />
|
||||
<TextBlock Grid.Row="0" Grid.Column="1" Panel.ZIndex="2" Name="ItemName" FontWeight="Bold" Margin="0,10,10,0" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Panel.ZIndex="2" Name="Status" FontStyle="Italic" Margin="0,0,10,10" />
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Panel.ZIndex="2" Name="Status" Margin="0,0,10,10" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2024 ETH Zürich, IT Services
|
||||
* Copyright (c) 2025 ETH Zürich, IT Services
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
@@ -17,7 +17,7 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Browser
|
||||
{
|
||||
public partial class DownloadItemControl : UserControl
|
||||
{
|
||||
private IText text;
|
||||
private readonly IText text;
|
||||
|
||||
public Guid Id { get; }
|
||||
|
||||
@@ -29,28 +29,77 @@ namespace SafeExamBrowser.UserInterface.Mobile.Controls.Browser
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
public void Update(DownloadItemState state)
|
||||
internal void Update(DownloadItemState state)
|
||||
{
|
||||
ItemName.Text = Uri.TryCreate(state.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.AbsolutePath) : state.Url;
|
||||
Progress.Value = state.Completion * 100;
|
||||
Status.Text = $"{text.Get(TextKey.BrowserWindow_Downloading)} ({state.Completion * 100}%)";
|
||||
|
||||
if (File.Exists(state.FullPath))
|
||||
{
|
||||
ItemName.Text = Path.GetFileName(state.FullPath);
|
||||
Icon.Content = new Image { Source = IconLoader.LoadIconFor(new FileInfo(state.FullPath)) };
|
||||
}
|
||||
InitializeIcon(state);
|
||||
InitializeName(state);
|
||||
|
||||
if (state.IsCancelled)
|
||||
{
|
||||
Progress.Visibility = System.Windows.Visibility.Collapsed;
|
||||
Status.Text = text.Get(TextKey.BrowserWindow_DownloadCancelled);
|
||||
ShowCancelled();
|
||||
}
|
||||
else if (state.IsComplete)
|
||||
{
|
||||
Progress.Visibility = System.Windows.Visibility.Collapsed;
|
||||
Status.Text = text.Get(TextKey.BrowserWindow_DownloadComplete);
|
||||
ShowCompleted(state);
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowProgress(state);
|
||||
}
|
||||
}
|
||||
|
||||
private string BuildSizeInfo(DownloadItemState state)
|
||||
{
|
||||
return state.Size > 1000000 ? $"{state.Size / 1000000.0:N1} MB" : $"{state.Size / 1000.0:N1} kB";
|
||||
}
|
||||
|
||||
private void InitializeIcon(DownloadItemState state)
|
||||
{
|
||||
if (Icon.Content == default && File.Exists(state.FullPath))
|
||||
{
|
||||
Icon.Content = new Image { Source = IconLoader.LoadIconFor(new FileInfo(state.FullPath)) };
|
||||
}
|
||||
}
|
||||
|
||||
private void InitializeName(DownloadItemState state)
|
||||
{
|
||||
var fileName = Path.GetFileName(state.FullPath);
|
||||
|
||||
if (ItemName.Text != fileName && File.Exists(state.FullPath))
|
||||
{
|
||||
ItemName.Text = fileName;
|
||||
}
|
||||
else if (string.IsNullOrEmpty(ItemName.Text))
|
||||
{
|
||||
ItemName.Text = Uri.TryCreate(state.Url, UriKind.Absolute, out var uri) ? Path.GetFileName(uri.AbsolutePath) : state.Url;
|
||||
}
|
||||
}
|
||||
|
||||
private void ShowCancelled()
|
||||
{
|
||||
Progress.IsIndeterminate = false;
|
||||
Progress.Visibility = System.Windows.Visibility.Collapsed;
|
||||
Status.Text = text.Get(TextKey.BrowserWindow_DownloadCancelled);
|
||||
}
|
||||
|
||||
private void ShowCompleted(DownloadItemState state)
|
||||
{
|
||||
Progress.IsIndeterminate = false;
|
||||
Progress.Visibility = System.Windows.Visibility.Collapsed;
|
||||
Status.Text = $"{BuildSizeInfo(state)} — {text.Get(TextKey.BrowserWindow_DownloadComplete)}";
|
||||
|
||||
if (File.Exists(state.FullPath))
|
||||
{
|
||||
Icon.Content = new Image { Source = IconLoader.LoadIconFor(new FileInfo(state.FullPath)) };
|
||||
ItemName.Text = Path.GetFileName(state.FullPath);
|
||||
}
|
||||
}
|
||||
|
||||
private void ShowProgress(DownloadItemState state)
|
||||
{
|
||||
Progress.IsIndeterminate = state.IsIndeterminate;
|
||||
Progress.Value = state.Completion * 100;
|
||||
Status.Text = $"{BuildSizeInfo(state)} — {text.Get(TextKey.BrowserWindow_Downloading)}{(state.IsIndeterminate ? "" : $" ({state.Completion * 100}%)")}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user