fix(import): accessible, right-to-left safe Import screen after the visual review

- The folder path is validated only while Folder is the destination (no red
  box under Archive) and shows faint text when unused; typing one chooses
  Folder, as "…" does; a path change replans only for Folder.
- Session times are no longer cut: the Session column sizes to its content.
- Show plan lists file names under a two-line session heading (folder below),
  with full paths in tooltips; header and cells line up (scroll bar reserved).
- Failures say what happened in one localized sentence (source gone, disk
  full, access, server, other), wrap up to three lines, keep the raw text in
  the tooltip, and offer Retry only.
- The status sentence comes with one action (Folder…, Refresh devices,
  Library, Choose folder, Server, Retry).
- The form is locked once an import finished ("New import" plans again); the
  plan header drops the estimate and free space then.
- A card stays "new" until it has a nickname.
- Device entries show keyboard focus and a disabled state with its reason;
  row actions (Merge, Split here) are revealed on the row and named per row;
  composite buttons carry accessible names; tab order follows the layout;
  rows are 36 px.
- Live regions announce planning status, copy progress, the result and the
  failure; progress bars are labelled.
- Right-to-left: paths, templates, name previews and numbers stay left to
  right (numbers right-aligned), the session range uses its own arrow, and
  paths or serials inside sentences are embedded left to right.
- The 56 px number boxes fit four digits despite the kit's double padding.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
This commit is contained in:
Claude committed 2026-10-03 17:13:20 +00:00
1 parent 6e01995f7e
commit 0dada9bf47
14 files changed
+568 -134

No files matched your search

+11
View File
@@ -65,6 +65,7 @@
<data name="Import.Details.Files.other" xml:space="preserve"><value>{0:N0} files</value></data>
<data name="Import.Details.Session" xml:space="preserve"><value>Session {0} · {1}</value><comment>long</comment></data>
<data name="Import.Details.Split" xml:space="preserve"><value>Split here</value></data>
<data name="Import.Details.SplitName" xml:space="preserve"><value>Split at {0}</value></data>
<data name="Import.Details.Title" xml:space="preserve"><value>Plan</value></data>
<data name="Import.Details.Unreadable" xml:space="preserve"><value>Cannot read {0}: {1}</value><comment>long</comment></data>
<data name="Import.Device.Away" xml:space="preserve"><value>{0} · not inserted</value><comment>long</comment></data>
@@ -103,7 +104,12 @@
<data name="Import.Erase.Verdict.SourceMissing" xml:space="preserve"><value>no longer on the card</value></data>
<data name="Import.Erase.Verified.one" xml:space="preserve"><value>{0:N0} verified on the card</value></data>
<data name="Import.Erase.Verified.other" xml:space="preserve"><value>{0:N0} verified on the card</value></data>
<data name="Import.Failed.Access" xml:space="preserve"><value>Titano may not write to the destination.</value><comment>long</comment></data>
<data name="Import.Failed.Full" xml:space="preserve"><value>The destination is full.</value><comment>long</comment></data>
<data name="Import.Failed.Other" xml:space="preserve"><value>The import stopped before the end.</value><comment>long</comment></data>
<data name="Import.Failed.Retry" xml:space="preserve"><value>Retry</value></data>
<data name="Import.Failed.Server" xml:space="preserve"><value>The server did not accept the photos.</value><comment>long</comment></data>
<data name="Import.Failed.SourceGone" xml:space="preserve"><value>{0} is no longer available.</value><comment>long</comment></data>
<data name="Import.Folder.PickDestination" xml:space="preserve"><value>Import into folder</value></data>
<data name="Import.Folder.PickSource" xml:space="preserve"><value>Import from folder</value></data>
<data name="Import.Label.After" xml:space="preserve"><value>After import</value></data>
@@ -171,20 +177,25 @@
<data name="Import.Session.Column.Size" xml:space="preserve"><value>Size</value></data>
<data name="Import.Session.Frames" xml:space="preserve"><value>{0} · {1}</value><comment>invariant</comment></data>
<data name="Import.Session.Merge" xml:space="preserve"><value>Merge</value></data>
<data name="Import.Session.MergeName" xml:space="preserve"><value>Merge session {0}</value></data>
<data name="Import.Session.New" xml:space="preserve"><value>New · {0}</value><comment>long</comment></data>
<data name="Import.Session.NewShort" xml:space="preserve"><value>new</value></data>
<data name="Import.Session.Server" xml:space="preserve"><value>Server</value></data>
<data name="Import.Session.Time" xml:space="preserve"><value>{0} · {1} → {2}</value><comment>invariant</comment></data>
<data name="Import.Session.TimeRtl" xml:space="preserve"><value>{0} · {1} ← {2}</value><comment>invariant</comment></data>
<data name="Import.Session.TitleName" xml:space="preserve"><value>Sequence of session {0}</value></data>
<data name="Import.Start.one" xml:space="preserve"><value>Import {0:N0} photo</value></data>
<data name="Import.Start.other" xml:space="preserve"><value>Import {0:N0} photos</value></data>
<data name="Import.StartPlain" xml:space="preserve"><value>Import</value></data>
<data name="Import.Status.Cancelled" xml:space="preserve"><value>Import cancelled</value></data>
<data name="Import.Status.Choose" xml:space="preserve"><value>Choose a card or a folder.</value><comment>long</comment></data>
<data name="Import.Status.NotInserted" xml:space="preserve"><value>Insert this card to plan its import.</value><comment>long</comment></data>
<data name="Import.Status.PlanError" xml:space="preserve"><value>The import could not be planned.</value><comment>long</comment></data>
<data name="Import.Status.PlanFailed" xml:space="preserve"><value>The card could not be read: {0}</value><comment>long</comment></data>
<data name="Import.Status.Reading" xml:space="preserve"><value>Reading the card…</value></data>
<data name="Import.Status.ReadingCount.one" xml:space="preserve"><value>{0:N0} photo read</value></data>
<data name="Import.Status.ReadingCount.other" xml:space="preserve"><value>{0:N0} photos read</value></data>
<data name="Import.Status.Unreadable" xml:space="preserve"><value>{0} could not be read.</value><comment>long</comment></data>
<data name="Import.Toast.AutoMessage" xml:space="preserve"><value>Importing with its saved settings</value><comment>long</comment></data>
<data name="Import.Toast.Cancel" xml:space="preserve"><value>Cancel</value></data>
<data name="Import.Toast.CardChanged" xml:space="preserve"><value>{0} changed since it was checked</value><comment>long</comment></data>
+10
View File
@@ -65,6 +65,7 @@
<data name="Import.Details.Files.other" xml:space="preserve"><value>{0:N0} file</value></data>
<data name="Import.Details.Session" xml:space="preserve"><value>Sessione {0} · {1}</value></data>
<data name="Import.Details.Split" xml:space="preserve"><value>Dividi qui</value></data>
<data name="Import.Details.SplitName" xml:space="preserve"><value>Dividi a partire da {0}</value></data>
<data name="Import.Details.Title" xml:space="preserve"><value>Piano</value></data>
<data name="Import.Details.Unreadable" xml:space="preserve"><value>Impossibile leggere {0}: {1}</value></data>
<data name="Import.Device.Away" xml:space="preserve"><value>{0} · non inserita</value></data>
@@ -101,7 +102,12 @@
<data name="Import.Erase.Verdict.SourceMissing" xml:space="preserve"><value>non più sulla scheda</value></data>
<data name="Import.Erase.Verified.one" xml:space="preserve"><value>{0:N0} verificata sulla scheda</value></data>
<data name="Import.Erase.Verified.other" xml:space="preserve"><value>{0:N0} verificate sulla scheda</value></data>
<data name="Import.Failed.Access" xml:space="preserve"><value>Titano non può scrivere nella destinazione.</value></data>
<data name="Import.Failed.Full" xml:space="preserve"><value>La destinazione è piena.</value></data>
<data name="Import.Failed.Other" xml:space="preserve"><value>L'importazione si è interrotta prima della fine.</value></data>
<data name="Import.Failed.Retry" xml:space="preserve"><value>Riprova</value></data>
<data name="Import.Failed.Server" xml:space="preserve"><value>Il server non ha accettato le foto.</value></data>
<data name="Import.Failed.SourceGone" xml:space="preserve"><value>{0} non è più disponibile.</value></data>
<data name="Import.Folder.PickDestination" xml:space="preserve"><value>Importa nella cartella</value></data>
<data name="Import.Folder.PickSource" xml:space="preserve"><value>Importa dalla cartella</value></data>
<data name="Import.Label.After" xml:space="preserve"><value>Dopo l'importazione</value></data>
@@ -166,19 +172,23 @@
<data name="Import.Session.Column.Session" xml:space="preserve"><value>Sessione</value></data>
<data name="Import.Session.Column.Size" xml:space="preserve"><value>Dimensione</value></data>
<data name="Import.Session.Merge" xml:space="preserve"><value>Unisci</value></data>
<data name="Import.Session.MergeName" xml:space="preserve"><value>Unisci la sessione {0}</value></data>
<data name="Import.Session.New" xml:space="preserve"><value>Nuova · {0}</value></data>
<data name="Import.Session.NewShort" xml:space="preserve"><value>nuova</value></data>
<data name="Import.Session.Server" xml:space="preserve"><value>Server</value></data>
<data name="Import.Session.TitleName" xml:space="preserve"><value>Sequenza della sessione {0}</value></data>
<data name="Import.Start.one" xml:space="preserve"><value>Importa {0:N0} foto</value></data>
<data name="Import.Start.other" xml:space="preserve"><value>Importa {0:N0} foto</value></data>
<data name="Import.StartPlain" xml:space="preserve"><value>Importa</value></data>
<data name="Import.Status.Cancelled" xml:space="preserve"><value>Importazione annullata</value></data>
<data name="Import.Status.Choose" xml:space="preserve"><value>Scegli una scheda o una cartella.</value></data>
<data name="Import.Status.NotInserted" xml:space="preserve"><value>Inserisci questa scheda per pianificarne l'importazione.</value></data>
<data name="Import.Status.PlanError" xml:space="preserve"><value>Impossibile preparare il piano di importazione.</value></data>
<data name="Import.Status.PlanFailed" xml:space="preserve"><value>Impossibile leggere la scheda: {0}</value></data>
<data name="Import.Status.Reading" xml:space="preserve"><value>Lettura della scheda…</value></data>
<data name="Import.Status.ReadingCount.one" xml:space="preserve"><value>{0:N0} foto letta</value></data>
<data name="Import.Status.ReadingCount.other" xml:space="preserve"><value>{0:N0} foto lette</value></data>
<data name="Import.Status.Unreadable" xml:space="preserve"><value>Impossibile leggere {0}.</value></data>
<data name="Import.Toast.AutoMessage" xml:space="preserve"><value>Importazione con le impostazioni salvate</value></data>
<data name="Import.Toast.Cancel" xml:space="preserve"><value>Annulla</value></data>
<data name="Import.Toast.CardChanged" xml:space="preserve"><value>{0} è cambiata dopo il controllo</value></data>
+17
View File
@@ -0,0 +1,17 @@
using Titano.Core.Localization;
namespace Titano.App.Import;
/// <summary>
/// Paths, volume serials and other left-to-right fragments inside a sentence of a right-to-left language (BRIEF §16):
/// without an embedding, a path that starts with a digit or ends in a separator is reordered and reads garbled.
/// </summary>
public static class BidiText
{
private const char LeftToRightEmbedding = '‪';
private const char PopDirectionalFormatting = '‬';
/// <summary><paramref name="text"/> kept left to right in a right-to-left UI language; unchanged otherwise.</summary>
public static string Ltr(string text) =>
Loc.IsRightToLeft && text.Length > 0 ? LeftToRightEmbedding + text + PopDirectionalFormatting : text;
}
+1 -1
View File
@@ -70,7 +70,7 @@ public sealed record CardActions(ImportDestinationKind Destination, bool IsKnown
/// <summary>Why each kept photo stays on the card ("IMG_0042.CR2 · the archive copy no longer matches").</summary>
public IReadOnlyList<string> KeptReasons =>
Erase is null ? [] : [.. Erase.Items.Where(i => i.Verdict != EraseVerdict.Delete).Select(i => Loc.L("Import.Erase.Reason", i.Candidate.SourcePath, Verdict(i.Verdict)))];
Erase is null ? [] : [.. Erase.Items.Where(i => i.Verdict != EraseVerdict.Delete).Select(i => Loc.L("Import.Erase.Reason", BidiText.Ltr(i.Candidate.SourcePath), Verdict(i.Verdict)))];
public static string Verdict(EraseVerdict verdict) => Loc.L("Import.Erase.Verdict." + verdict);
}
+15 -4
View File
@@ -55,7 +55,11 @@ public sealed record ImportSource(string Key, SourceKind Kind, CardDevice? Devic
{
public bool IsInserted => Device is not null || FolderPath is not null;
public bool IsKnown => Card is not null;
/// <summary>
/// The card has a nickname (BRIEF §12.4: known cards show their nickname, unknown ones ask for it). A card is
/// remembered as soon as its first plan reads it, but stays new until it is named.
/// </summary>
public bool IsKnown => Card is { Nickname.Length: > 0 };
/// <summary>Where the photos are read from; null for a remembered card that is not inserted.</summary>
public string? Root => Device?.Root ?? FolderPath;
@@ -63,12 +67,13 @@ public sealed record ImportSource(string Key, SourceKind Kind, CardDevice? Devic
/// <summary>"EOS R5 · card A", the volume label, or the drive.</summary>
public string Title => Card?.Nickname is { Length: > 0 } nickname ? nickname
: Device is { Label.Length: > 0 } labelled ? labelled.Label
: Device?.Root ?? FolderPath ?? Card?.Label ?? string.Empty;
: (Device?.Root ?? FolderPath) is { } path ? BidiText.Ltr(path)
: Card?.Label ?? string.Empty;
/// <summary>"128 GB · 96.2 GB used · 4,812 photos", "no DCIM · 1.8 TB free", "Canon EOS R5 · not inserted".</summary>
public string Subtitle => Kind switch
{
SourceKind.Folder => FolderPath ?? string.Empty,
SourceKind.Folder => BidiText.Ltr(FolderPath ?? string.Empty),
SourceKind.Drive => Loc.L("Import.Device.NoDcim", Formatting.Bytes(Device!.FreeBytes)),
_ when Device is not null && Contents is { } contents => Loc.L("Import.Device.CardPhotos", Formatting.Bytes(Device.TotalBytes),
Formatting.Bytes(Device.UsedBytes), Loc.Plural("Shell.Status.Photos", contents.Photos)),
@@ -86,6 +91,12 @@ public sealed record ImportSource(string Key, SourceKind Kind, CardDevice? Devic
_ => "Import.Device.State.New",
});
/// <summary>
/// "Known card · 128 GB · 96.2 GB used · 4,812 photos": the entry's tooltip, with what its subtitle may have to cut
/// (a drive's subtitle already says it has no DCIM).
/// </summary>
public string ToolTip => Kind == SourceKind.Drive ? Subtitle : string.Join(" · ", new[] { StateText, Subtitle }.Where(t => t.Length > 0));
/// <summary>"Canon EOS R5 · 4,812 photos": the insertion toast's line; "not yet known to Titano" for a new card.</summary>
public string ToastText
{
@@ -108,7 +119,7 @@ public sealed record ImportSource(string Key, SourceKind Kind, CardDevice? Devic
var capacity = Device?.TotalBytes ?? Card?.Capacity ?? 0;
if (capacity > 0) parts.Add(Formatting.Bytes(capacity));
var serial = Device?.SerialNumber ?? Card?.VolumeSerial;
if (serial is { } s && Kind != SourceKind.Folder) parts.Add(Loc.L("Import.Device.Serial", SerialText(s)));
if (serial is { } s && Kind != SourceKind.Folder) parts.Add(Loc.L("Import.Device.Serial", BidiText.Ltr(SerialText(s))));
if (CameraText(Card) is { Length: > 0 } camera) parts.Add(Card?.CameraSerial is { Length: > 0 } body ? Loc.L("Import.Device.Body", camera, body) : camera);
return string.Join(" · ", parts);
}
+1 -1
View File
@@ -86,7 +86,7 @@ public sealed record ImportChoices
/// <summary>True when a choice changes which photos form which session or where they go, so the card must be planned again.</summary>
public bool NeedsNewPlan(ImportChoices previous) =>
previous.Destination != Destination
|| !string.Equals(previous.FolderPath, FolderPath, StringComparison.OrdinalIgnoreCase)
|| (Destination == ImportDestinationKind.Folder && !string.Equals(previous.FolderPath, FolderPath, StringComparison.OrdinalIgnoreCase))
|| previous.IncludeSubfolders != IncludeSubfolders
|| previous.SplitSessions != SplitSessions
|| (SplitSessions && previous.GapMinutes != GapMinutes)
+36
View File
@@ -0,0 +1,36 @@
using System.IO;
using System.Net.Http;
using Titano.Core.Import;
using Titano.Core.Localization;
using Titano.Protocol.Client;
namespace Titano.App.Import;
/// <summary>
/// What the Import screen says when an import or its plan stops (BRIEF §0.2 rule 6: one sentence saying what
/// happened): a localized sentence chosen by cause. The exception's own text, which may hold full paths or several
/// sentences, goes to the tooltip and the log only.
/// </summary>
public static class ImportFailures
{
private const int DiskFull = unchecked((int)0x80070070);
private const int HandleDiskFull = unchecked((int)0x80070027);
/// <param name="source">The card or folder as the Devices list names it.</param>
public static string Import(Exception ex, string source) => ex switch
{
ImportSourceUnavailableException => Loc.L("Import.Failed.SourceGone", source),
IOException { HResult: DiskFull or HandleDiskFull } => Loc.L("Import.Failed.Full"),
UnauthorizedAccessException => Loc.L("Import.Failed.Access"),
TitanoApiException or HttpRequestException or UntrustedCertificateException => Loc.L("Import.Failed.Server"),
_ => Loc.L("Import.Failed.Other"),
};
/// <summary>Why the card or folder could not be planned.</summary>
public static string Plan(Exception ex, string source) => ex switch
{
DirectoryNotFoundException or DriveNotFoundException or ImportSourceUnavailableException => Loc.L("Import.Failed.SourceGone", source),
IOException or UnauthorizedAccessException => Loc.L("Import.Status.Unreadable", source),
_ => Loc.L("Import.Status.PlanError"),
};
}
+26 -8
View File
@@ -13,11 +13,13 @@ public sealed record PlanTotals(int Sessions, int Photos, int CopyCount, long Co
public bool HasEnoughSpace => FreeAfter is not < 0;
/// <summary>"3 sessions · 4,812 photos · 96.2 GB · about 12 min".</summary>
public string Text => string.Join(" · ",
public string Text => SummaryText + " · " + Loc.L("Import.Plan.About", Formatting.Duration(Estimate));
/// <summary>"3 sessions · 4,812 photos · 96.2 GB": the plan without its time estimate.</summary>
public string SummaryText => string.Join(" · ",
Loc.Plural("Import.Plan.Sessions", Sessions),
Loc.Plural("Shell.Status.Photos", Photos),
Formatting.Bytes(CopyBytes),
Loc.L("Import.Plan.About", Formatting.Duration(Estimate)));
Formatting.Bytes(CopyBytes));
/// <summary>"0 duplicates" (already in the archive by hash).</summary>
public string DuplicatesText => Loc.Plural("Import.Plan.Duplicates", Duplicates);
@@ -51,9 +53,21 @@ public enum PlanRowKind
File,
}
/// <summary>A line of "Show plan": a session heading or one file and its destination.</summary>
/// <summary>A line of "Show plan": a session heading and its folder, or one file (card path) and its destination path.</summary>
/// <param name="CanSplit">A file that is not the first of its session: a new session can start there.</param>
public sealed record PlanDetailRow(PlanRowKind Kind, string Source, string Destination, string ActionText, string SizeText, bool IsSkipped, bool CanSplit);
public sealed record PlanDetailRow(PlanRowKind Kind, string Source, string Destination, string ActionText, string SizeText, bool IsSkipped, bool CanSplit)
{
/// <summary>A file's name on the card (its session heading shows the rest); the heading itself for a session.</summary>
public string SourceText => Kind == PlanRowKind.File ? NameOf(Source) : Source;
/// <summary>The file's new name (its session shows the folder); the folder for a session.</summary>
public string DestinationText => Kind == PlanRowKind.File ? NameOf(Destination) : Destination;
/// <summary>"Split at IMG_0042.JPG": the row's split button as screen readers announce it.</summary>
public string SplitName => Loc.L("Import.Details.SplitName", SourceText);
private static string NameOf(string path) => path[(path.LastIndexOf('/') + 1)..];
}
/// <summary>Everything "Show plan" lists: every file to its destination, the totals and the conflicts.</summary>
public sealed record PlanDetails(IReadOnlyList<PlanDetailRow> Rows, string TotalsText, IReadOnlyList<string> Conflicts);
@@ -154,7 +168,7 @@ public static class ImportPlans
}
var totals = Totals(plan, verify);
var conflicts = new List<string>();
foreach (var problem in plan.Problems) conflicts.Add(Loc.L("Import.Details.Unreadable", problem.RelativePath, problem.Message));
foreach (var problem in plan.Problems) conflicts.Add(Loc.L("Import.Details.Unreadable", BidiText.Ltr(problem.RelativePath), problem.Message));
if (totals.Duplicates > 0) conflicts.Add(totals.DuplicatesText);
if (!totals.HasEnoughSpace) conflicts.Add(totals.SpaceText);
var text = string.Join(" · ", new[]
@@ -209,9 +223,13 @@ public static class ImportPlans
_ => Loc.L("Import.Action.Copy"),
};
/// <summary>"28/09/2026 · 18:02 → 20:04".</summary>
/// <summary>
/// "28/09/2026 · 18:02 → 20:04". Bidi never mirrors an arrow, so a right-to-left language reads it from its own
/// resource with the arrow pointing from the start to the end in its reading order.
/// </summary>
private static string TimeText(PlannedSession s) =>
Loc.L("Import.Session.Time", Formatting.Date(s.Start), s.Start.ToString("t", Loc.Culture), s.End.ToString("t", Loc.Culture));
Loc.L(Loc.IsRightToLeft ? "Import.Session.TimeRtl" : "Import.Session.Time", Formatting.Date(s.Start), s.Start.ToString("t", Loc.Culture),
s.End.ToString("t", Loc.Culture));
/// <summary>"3,600 · 2 s": photos and the median interval between them.</summary>
private static string FramesText(PlannedSession s)
@@ -46,7 +46,7 @@ public sealed class ImportResultViewModel : LocalizedViewModel
_device = device;
Outcome = outcome;
_actions = new CardActions(choices.Destination, card is not null, device is not null, device?.IsRemovable == true, outcome, null, null);
Failures = [.. outcome.Failures.Take(ListedFailures).Select(f => Loc.L("Import.Result.Failure", f.SourcePath, f.Message))];
Failures = [.. outcome.Failures.Take(ListedFailures).Select(f => Loc.L("Import.Result.Failure", BidiText.Ltr(f.SourcePath), f.Message))];
CheckCommand = new AsyncRelayCommand(CheckAsync, () => _actions.CanCheck && !_isBusy);
DeleteCommand = new AsyncRelayCommand(DeleteAsync, () => _actions.CanDelete && !_isBusy);
FormatCommand = new AsyncRelayCommand(FormatAsync, () => _actions.CanFormat && !_isBusy);
+4 -3
View File
@@ -1,7 +1,6 @@
using Titano.App.Sections;
using Titano.App.Shell;
using Titano.Core.Import;
using Titano.Core.Localization;
using Titano.Data;
namespace Titano.App.Import;
@@ -28,6 +27,8 @@ public static class ImportScenes
switch (state)
{
case "inserted":
// Each theme pass starts as the first: the new card of "newcard" is not remembered yet.
await ForgetAsync(shell, SampleCards.NewCard(data).Identity);
await ShowPlanAsync(import, SampleCards.Card(data));
await import.CardInsertedAsync(SampleCards.Card(data));
break;
@@ -43,7 +44,7 @@ public static class ImportScenes
import.ShowRunning(new ImportProgress(31, plan.FileCount, plan.CopyBytes * 31 / plan.FileCount, plan.CopyBytes, 31, 0, 0, null));
break;
case "failed":
import.ShowFailed(Loc.L("Archive.Error.SourceGone", SampleCards.Card(data).Root));
import.ShowFailed(new ImportSourceUnavailableException(SampleCards.Card(data).Root));
break;
case "done":
await ShowPlanAsync(import, SampleCards.Card(data));
@@ -83,7 +84,7 @@ public static class ImportScenes
private static ImportPlan Plan(ImportViewModel import) => import.Plan ?? throw new InvalidOperationException("The sample card has no plan.");
/// <summary>The new card stays new in every theme: an earlier state registered it on its first plan.</summary>
/// <summary>The new card stays new in every theme: its first plan in an earlier pass registered it.</summary>
private static async Task ForgetAsync(ShellViewModel shell, string identity)
{
if (shell.Services.Database is not { } db || await db.MediaCards.FindByIdentityAsync(identity) is not { } known) return;
@@ -51,4 +51,10 @@ public sealed class ImportSessionRowViewModel : ObservableObject
public string MergeToolTip => !IsEditable ? Loc.L("Import.Blocked.Copying")
: Row.MergesInto is { } target ? Loc.L("Tooltips.Import.Merge", target)
: string.Empty;
/// <summary>"Sequence of session 2": the title field as screen readers announce it, one per row.</summary>
public string TitleName => Loc.L("Import.Session.TitleName", Row.Number);
/// <summary>"Merge session 2".</summary>
public string MergeName => Loc.L("Import.Session.MergeName", Row.Number);
}
+223 -87
View File
@@ -9,14 +9,28 @@
<KeyBinding Key="Enter" Modifiers="Control" Command="{Binding StartCommand}" />
</UserControl.InputBindings>
<UserControl.Resources>
<!-- Devices list entry (Import.html): 54 px, Surface fill, Stroke border; selected = accent border. -->
<!-- Keyboard focus drawn inside the element: an outer ring would be clipped by the scroll viewer around lists. -->
<Style x:Key="Focus.Inset">
<Setter Property="Control.Template">
<Setter.Value>
<ControlTemplate>
<Border BorderBrush="{DynamicResource Brush.Accent}" BorderThickness="2" CornerRadius="{StaticResource Radius.Control}" SnapsToDevicePixels="True" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- Devices list entry (Import.html): 54 px, Surface fill, Stroke border; selected = accent border; disabled while copying. -->
<Style x:Key="ListBoxItem.Device" TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
<Setter Property="Height" Value="54" />
<Setter Property="Margin" Value="0,0,0,8" />
<Setter Property="Padding" Value="12,0" />
<Setter Property="Background" Value="{DynamicResource Brush.Surface}" />
<Setter Property="ToolTip" Value="{Binding StateText}" />
<Setter Property="FocusVisualStyle" Value="{StaticResource Focus.Inset}" />
<Setter Property="ToolTip" Value="{Binding ToolTip}" />
<Setter Property="ToolTipService.ShowOnDisabled" Value="True" />
<Setter Property="AutomationProperties.Name" Value="{Binding Title}" />
<Setter Property="AutomationProperties.HelpText" Value="{Binding ToolTip}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
@@ -32,10 +46,18 @@
<Setter TargetName="Bd" Property="Background" Value="{DynamicResource Brush.Card}" />
<Setter TargetName="Bd" Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.4" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="ToolTip" Value="{l:Loc Import.Blocked.Copying}" />
</Trigger>
</Style.Triggers>
</Style>
<!-- One form line: a label column at least 116 px wide, as wide as the longest label of the form, then the controls (Import.html grid). -->
@@ -68,15 +90,82 @@
<Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
<Setter Property="Margin" Value="0,4,18,4" />
</Style>
<!-- Unit words beside a field ("gap … min"): dimmed with the field they belong to. -->
<Style x:Key="Text.Unit" TargetType="TextBlock">
<Setter Property="Foreground" Value="{DynamicResource Brush.TextMuted}" />
<Setter Property="VerticalAlignment" Value="Center" />
<Style.Triggers>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.4" />
</Trigger>
</Style.Triggers>
</Style>
<!--
Up to four digits (gap ≤ 1440). The kit's text box applies its padding twice (reported to the shared controls),
so the side padding is halved here: four digits fit before and after that fix.
-->
<Style x:Key="TextBox.Small" TargetType="TextBox" BasedOn="{StaticResource TextBox.Number}">
<Setter Property="Width" Value="56" />
<Setter Property="Height" Value="30" />
<Setter Property="Padding" Value="4,0" />
<Setter Property="Margin" Value="6,0" />
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<!-- Session table columns, shared by header and rows. -->
<!-- File paths and name templates stay left to right in every language (BRIEF §16). -->
<Style x:Key="TextBox.Template" TargetType="TextBox" BasedOn="{StaticResource TextBox.Mono}">
<Setter Property="Height" Value="30" />
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<!-- The folder path is in use only with the Folder destination (Import.html: faint text otherwise). -->
<Style x:Key="TextBox.FolderPath" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
<Setter Property="Width" Value="190" />
<Setter Property="Height" Value="30" />
<Setter Property="FlowDirection" Value="LeftToRight" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsFolderDestination}" Value="False">
<Setter Property="Foreground" Value="{DynamicResource Brush.TextFaint}" />
</DataTrigger>
</Style.Triggers>
</Style>
<!-- A path or file name in a cell: left to right, at the start of the cell in either direction. -->
<Style x:Key="Text.CellPath" TargetType="TextBlock" BasedOn="{StaticResource Text.Cell}">
<Setter Property="FlowDirection" Value="LeftToRight" />
<Setter Property="HorizontalAlignment" Value="Left" />
</Style>
<!-- Numbers stay right-aligned in tables in both directions. -->
<Style x:Key="Text.CellNumberLtr" TargetType="TextBlock" BasedOn="{StaticResource Text.CellNumber}">
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<Style x:Key="Text.HeaderNumber" TargetType="TextBlock" BasedOn="{StaticResource Text.Header}">
<Setter Property="FlowDirection" Value="LeftToRight" />
<Setter Property="TextAlignment" Value="Right" />
</Style>
<!-- Row actions (DESIGN §4 tables): revealed on the row it acts on, still in the tab order. -->
<Style x:Key="Button.RowAction" TargetType="Button" BasedOn="{StaticResource Button.Row}">
<Setter Property="Opacity" Value="0" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=ListBoxItem}}" Value="True">
<Setter Property="Opacity" Value="1" />
</DataTrigger>
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem}}" Value="True">
<Setter Property="Opacity" Value="1" />
</DataTrigger>
<DataTrigger Binding="{Binding IsKeyboardFocusWithin, RelativeSource={RelativeSource AncestorType=ListBoxItem}}" Value="True">
<Setter Property="Opacity" Value="1" />
</DataTrigger>
</Style.Triggers>
</Style>
<!-- Session table rows (36 px). -->
<Style x:Key="Session.Grid" TargetType="Grid">
<Setter Property="Height" Value="34" />
<Setter Property="Height" Value="36" />
</Style>
<Style x:Key="ListBoxItem.Session" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.PlainRow}">
<Setter Property="AutomationProperties.Name" Value="{Binding Row.TimeText}" />
@@ -84,15 +173,19 @@
<!-- Show plan and failure rows: focusable, so the arrow keys move through a long list. -->
<Style x:Key="ListBoxItem.PlanRow" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.Row}">
<Setter Property="Padding" Value="0" />
<Setter Property="FocusVisualStyle" Value="{StaticResource Focus.Inset}" />
<Setter Property="AutomationProperties.Name" Value="{Binding Source}" />
<Setter Property="AutomationProperties.HelpText" Value="{Binding Destination}" />
</Style>
<Style x:Key="ListBoxItem.Failure" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.Row}">
<Setter Property="Padding" Value="0" />
<Setter Property="FocusVisualStyle" Value="{StaticResource Focus.Inset}" />
<Setter Property="AutomationProperties.Name" Value="{Binding}" />
</Style>
<!-- "Folder…" (Import.html): transparent, 1 px dashed Stroke border. -->
<Style x:Key="Button.Dashed" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="FocusVisualStyle" Value="{StaticResource Focus.Inset}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
@@ -104,9 +197,6 @@
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Edge" Property="Fill" Value="{DynamicResource Brush.Card}" />
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="True">
<Setter TargetName="Edge" Property="Stroke" Value="{DynamicResource Brush.Accent}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.4" />
</Trigger>
@@ -124,18 +214,19 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- ===================== Devices ===================== -->
<DockPanel>
<DockPanel DockPanel.Dock="Top" Height="32" Margin="0,0,0,8">
<!-- ===================== Devices (declared top to bottom: the tab order follows) ===================== -->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<DockPanel Height="32" Margin="0,0,0,8">
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Icon}" ui:ButtonIcon.Glyph="{StaticResource Icon.Refresh}" Command="{Binding RefreshCommand}"
ToolTip="{l:Loc Tooltips.Import.Refresh}" AutomationProperties.Name="{l:Loc Import.Devices.Refresh}" />
<TextBlock Text="{l:Loc Import.Devices.Title}" Style="{StaticResource Text.Section}" VerticalAlignment="Center" />
</DockPanel>
<CheckBox DockPanel.Dock="Bottom" Margin="0,8,0,0" IsChecked="{Binding AutoImport}" IsEnabled="{Binding CanAutoImport}" ToolTip="{Binding AutoImportToolTip}"
VerticalContentAlignment="Top">
<TextBlock Text="{l:Loc Import.Devices.Auto}" TextWrapping="Wrap" Foreground="{DynamicResource Brush.TextMuted}" />
</CheckBox>
<ScrollViewer VerticalScrollBarVisibility="Auto" Focusable="False" IsEnabled="{Binding CanChangeSource}">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Focusable="False" IsEnabled="{Binding CanChangeSource}">
<StackPanel>
<ListBox ItemsSource="{Binding Sources}" SelectedItem="{Binding SelectedSource}" ItemContainerStyle="{StaticResource ListBoxItem.Device}"
AutomationProperties.Name="{l:Loc Import.Devices.Title}">
@@ -158,7 +249,7 @@
<TextBlock Text="{Binding Title}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" />
<TextBlock Text="{Binding Subtitle}" Style="{StaticResource Text.Secondary}" TextTrimming="CharacterEllipsis" Margin="0,2,0,0" />
</StackPanel>
<ui:StatusGlyph x:Name="State" Grid.Column="2" Kind="Online" Margin="8,0,0,0" VerticalAlignment="Center" ToolTip="{Binding StateText}" />
<ui:StatusGlyph x:Name="State" Grid.Column="2" Kind="Online" Margin="8,0,0,0" VerticalAlignment="Center" />
</Grid>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding Kind}" Value="Drive">
@@ -181,7 +272,8 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Button Style="{StaticResource Button.Dashed}" Height="44" HorizontalContentAlignment="Left" Command="{Binding PickFolderCommand}" ToolTip="{l:Loc Tooltips.Import.Folder}">
<Button x:Name="FolderSourceButton" Style="{StaticResource Button.Dashed}" Height="44" HorizontalContentAlignment="Left" Command="{Binding PickFolderCommand}"
ToolTip="{Binding FolderSourceToolTip}" AutomationProperties.Name="{l:Loc Import.Devices.Folder}">
<StackPanel Orientation="Horizontal">
<ui:Icon Glyph="{StaticResource Icon.Folder}" Margin="0,0,10,0" Foreground="{DynamicResource Brush.TextMuted}" />
<TextBlock Text="{l:Loc Import.Devices.Folder}" Foreground="{DynamicResource Brush.TextMuted}" />
@@ -189,7 +281,11 @@
</Button>
</StackPanel>
</ScrollViewer>
</DockPanel>
<CheckBox Grid.Row="2" Margin="0,8,0,0" IsChecked="{Binding AutoImport}" IsEnabled="{Binding CanAutoImport}" ToolTip="{Binding AutoImportToolTip}"
VerticalContentAlignment="Top" AutomationProperties.Name="{l:Loc Import.Devices.Auto}">
<TextBlock Text="{l:Loc Import.Devices.Auto}" TextWrapping="Wrap" Foreground="{DynamicResource Brush.TextMuted}" />
</CheckBox>
</Grid>
<!-- ===================== Profile, form and plan ===================== -->
<Border Grid.Column="2" Style="{StaticResource Border.Panel}" Padding="20,16">
@@ -200,9 +296,22 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- Profile header: nickname (or its field for a new card), identity, Edit ▾. -->
<DockPanel Margin="0,0,0,14" MinHeight="32">
<Button x:Name="EditButton" DockPanel.Dock="Right" Click="OnOpenMenu" IsEnabled="{Binding CanEditProfile}" ToolTip="{Binding EditToolTip}">
<!-- Profile header: nickname (or its field for a new card), identity, Edit ▾ (declared in reading order for Tab). -->
<Grid Margin="0,0,0,14" MinHeight="32">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding SourceTitle}" Style="{StaticResource Text.Title}" VerticalAlignment="Center" MaxWidth="320" TextTrimming="CharacterEllipsis"
Visibility="{Binding IsNicknameOpen, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
<TextBox x:Name="NicknameBox" Width="240" Text="{Binding Nickname.Text, UpdateSourceTrigger=PropertyChanged}" shell:EditBehavior.Field="{Binding Nickname}"
ui:Field.Placeholder="{l:Loc Import.Profile.Nickname}" ToolTip="{Binding Nickname.ToolTip}" AutomationProperties.Name="{l:Loc Import.Profile.Nickname}"
Visibility="{Binding IsNicknameOpen, Converter={StaticResource BoolToVisibility}}" />
<TextBlock Grid.Column="1" Text="{Binding IdentityText}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" Margin="12,0,12,0"
TextTrimming="CharacterEllipsis" ToolTip="{Binding IdentityText}" />
<Button x:Name="EditButton" Grid.Column="2" Click="OnOpenMenu" IsEnabled="{Binding CanEditProfile}" ToolTip="{Binding EditToolTip}"
AutomationProperties.Name="{l:Loc Import.Profile.Edit}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{l:Loc Import.Profile.Edit}" VerticalAlignment="Center" />
<ui:Icon Glyph="{StaticResource Icon.ChevronDown}" Margin="6,0,0,0" />
@@ -226,16 +335,7 @@
</ContextMenu>
</Button.ContextMenu>
</Button>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock Text="{Binding SourceTitle}" Style="{StaticResource Text.Title}" VerticalAlignment="Center" MaxWidth="320" TextTrimming="CharacterEllipsis"
Visibility="{Binding IsNicknameOpen, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
<TextBox x:Name="NicknameBox" Width="240" Text="{Binding Nickname.Text, UpdateSourceTrigger=PropertyChanged}" shell:EditBehavior.Field="{Binding Nickname}"
ui:Field.Placeholder="{l:Loc Import.Profile.Nickname}" ToolTip="{Binding Nickname.ToolTip}" AutomationProperties.Name="{l:Loc Import.Profile.Nickname}"
Visibility="{Binding IsNicknameOpen, Converter={StaticResource BoolToVisibility}}" />
</StackPanel>
<TextBlock Text="{Binding IdentityText}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" Margin="12,0,12,0"
TextTrimming="CharacterEllipsis" ToolTip="{Binding IdentityText}" />
</DockPanel>
</Grid>
<!-- The form (Import.html grid). -->
<StackPanel Grid.Row="1" IsEnabled="{Binding IsFormEnabled}" Grid.IsSharedSizeScope="True">
@@ -245,12 +345,14 @@
IsEnabled="{Binding CanUseArchive}" ToolTip="{Binding ArchiveToolTip}" />
<RadioButton GroupName="Destination" Content="{l:Loc Import.Destination.Folder}" IsChecked="{Binding IsFolderDestination}"
ToolTip="{l:Loc Tooltips.Import.FolderDestination}" Margin="0,4,8,4" />
<TextBox Width="190" Height="30" Text="{Binding FolderPath.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding FolderPath}" ToolTip="{Binding FolderPath.ToolTip}" AutomationProperties.Name="{l:Loc Import.Destination.Folder}"
<TextBox x:Name="FolderPathBox" Style="{StaticResource TextBox.FolderPath}"
Text="{Binding FolderPath.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}" shell:EditBehavior.Field="{Binding FolderPath}"
ToolTip="{Binding FolderPath.ToolTip}" AutomationProperties.Name="{l:Loc Import.Destination.FolderPlaceholder}"
ui:Field.Placeholder="{l:Loc Import.Destination.FolderPlaceholder}" />
<Button Style="{StaticResource Button.Icon}" Width="30" MinWidth="30" Height="30" Margin="6,0,18,0" Content="…" Command="{Binding ChooseDestinationCommand}"
ToolTip="{l:Loc Tooltips.Import.ChooseFolder}" AutomationProperties.Name="{l:Loc Import.Destination.Choose}" />
<RadioButton GroupName="Destination" IsChecked="{Binding IsServerDestination}" IsEnabled="{Binding CanUseServer}" ToolTip="{Binding ServerToolTip}">
<RadioButton GroupName="Destination" IsChecked="{Binding IsServerDestination}" IsEnabled="{Binding CanUseServer}" ToolTip="{Binding ServerToolTip}"
AutomationProperties.Name="{Binding ServerChoiceName}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{l:Loc Import.Destination.Server}" />
<ui:Icon Glyph="{StaticResource Icon.Server}" Margin="10,0,6,0" Foreground="{DynamicResource Brush.Accent}" />
@@ -265,16 +367,16 @@
<CheckBox Content="{l:Loc Import.Scan.Subfolders}" IsChecked="{Binding IncludeSubfolders}" ToolTip="{l:Loc Tooltips.Import.Subfolders}" />
<CheckBox Content="{l:Loc Import.Scan.Sessions}" IsChecked="{Binding SplitSessions}" ToolTip="{l:Loc Tooltips.Import.Sessions}" />
<StackPanel Orientation="Horizontal" Style="{StaticResource Import.Choice}" IsEnabled="{Binding SplitSessions}">
<TextBlock Text="{l:Loc Import.Scan.Gap}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" />
<TextBox Style="{StaticResource TextBox.Small}" Text="{Binding GapMinutes.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<TextBlock Text="{l:Loc Import.Scan.Gap}" Style="{StaticResource Text.Unit}" />
<TextBox x:Name="GapBox" Style="{StaticResource TextBox.Small}" Text="{Binding GapMinutes.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding GapMinutes}" ToolTip="{Binding GapMinutes.ToolTip}" AutomationProperties.Name="{l:Loc Import.Scan.GapName}" />
<TextBlock Text="{l:Loc Import.Scan.Minutes}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" />
<TextBlock Text="{l:Loc Import.Scan.Minutes}" Style="{StaticResource Text.Unit}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Style="{StaticResource Import.Choice}">
<TextBlock Text="{l:Loc Import.Scan.Minimum}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" />
<TextBlock Text="{l:Loc Import.Scan.Minimum}" Style="{StaticResource Text.Unit}" />
<TextBox Style="{StaticResource TextBox.Small}" Text="{Binding MinimumFrames.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding MinimumFrames}" ToolTip="{Binding MinimumFrames.ToolTip}" AutomationProperties.Name="{l:Loc Import.Scan.MinimumName}" />
<TextBlock Text="{l:Loc Import.Scan.Frames}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" />
<TextBlock Text="{l:Loc Import.Scan.Frames}" Style="{StaticResource Text.Unit}" />
</StackPanel>
<CheckBox Content="{l:Loc Import.Scan.Verify}" IsChecked="{Binding VerifyCopies}" ToolTip="{l:Loc Tooltips.Import.Verify}" />
</WrapPanel>
@@ -289,11 +391,11 @@
<ColumnDefinition Width="*" MinWidth="140" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Mono}" Height="30" Text="{Binding FolderTemplate.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<TextBox Style="{StaticResource TextBox.Template}" Text="{Binding FolderTemplate.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding FolderTemplate}" ToolTip="{Binding FolderTemplate.ToolTip}" GotKeyboardFocus="OnFolderTemplateFocus"
AutomationProperties.Name="{l:Loc Import.Names.Folder}" />
<TextBlock Grid.Column="1" Text="/" Foreground="{DynamicResource Brush.TextFaint}" Margin="10,0" VerticalAlignment="Center" />
<TextBox Grid.Column="2" Style="{StaticResource TextBox.Mono}" Height="30"
<TextBlock Grid.Column="1" Text="/" Style="{StaticResource Text.Unit}" Foreground="{DynamicResource Brush.TextFaint}" Margin="10,0" />
<TextBox Grid.Column="2" Style="{StaticResource TextBox.Template}"
Text="{Binding FileTemplate.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}" shell:EditBehavior.Field="{Binding FileTemplate}"
ToolTip="{Binding FileTemplate.ToolTip}" GotKeyboardFocus="OnFileTemplateFocus" AutomationProperties.Name="{l:Loc Import.Names.File}" />
<Button x:Name="TokensButton" Grid.Column="3" Style="{StaticResource Button.Icon}" Width="30" MinWidth="30" Height="30" Margin="10,0,0,0" Content="{}{ }"
@@ -313,7 +415,7 @@
</Button>
</Grid>
<TextBlock Text="{Binding NamePreview}" Style="{StaticResource Text.Secondary}" Foreground="{DynamicResource Brush.TextFaint}" Margin="0,6,0,0"
TextTrimming="CharacterEllipsis" ToolTip="{Binding NamePreview}" />
TextTrimming="CharacterEllipsis" ToolTip="{Binding NamePreview}" FlowDirection="LeftToRight" HorizontalAlignment="Left" />
</StackPanel>
</HeaderedContentControl>
@@ -361,11 +463,15 @@
Typography.NumeralAlignment="Tabular" TextTrimming="CharacterEllipsis" ToolTip="{Binding TotalsText}" />
</DockPanel>
<!-- No source, reading the card, or the reason no plan can be made. -->
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding ShowsStatus, Converter={StaticResource BoolToVisibility}}">
<TextBlock Text="{Binding StatusText}" Foreground="{DynamicResource Brush.TextMuted}" TextAlignment="Center" TextWrapping="Wrap" MaxWidth="420" />
<ProgressBar IsIndeterminate="{Binding IsBusyPlanning}" Width="240" Margin="0,12,0,0"
<!-- No source, reading the card, or the reason no plan can be made: one sentence and one action. -->
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" MaxWidth="420"
Visibility="{Binding ShowsStatus, Converter={StaticResource BoolToVisibility}}">
<TextBlock x:Name="StatusLine" Text="{Binding StatusText, NotifyOnTargetUpdated=True}" ToolTip="{Binding StatusDetail}" Foreground="{DynamicResource Brush.TextMuted}"
TextAlignment="Center" TextWrapping="Wrap" AutomationProperties.LiveSetting="Polite" />
<ProgressBar IsIndeterminate="{Binding IsBusyPlanning}" Width="240" Margin="0,12,0,0" AutomationProperties.LabeledBy="{Binding ElementName=StatusLine}"
Visibility="{Binding IsBusyPlanning, Converter={StaticResource BoolToVisibility}}" />
<Button x:Name="StatusActionButton" Content="{Binding StatusActionText}" Command="{Binding StatusActionCommand}" ToolTip="{Binding StatusActionToolTip}"
HorizontalAlignment="Center" Margin="0,12,0,0" Visibility="{Binding HasStatusAction, Converter={StaticResource BoolToVisibility}}" />
</StackPanel>
<!-- Sessions of the plan with editable titles. -->
@@ -374,53 +480,59 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid TextElement.FontSize="12" Margin="0,0,0,4">
<!-- The right margin is the list's scroll bar (always shown, 10 px), so header and cells line up. -->
<Grid TextElement.FontSize="12" Margin="0,0,10,4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.35*" MinWidth="110" />
<ColumnDefinition Width="Auto" MinWidth="110" SharedSizeGroup="SessionTime" />
<ColumnDefinition Width="0.85*" MinWidth="70" />
<ColumnDefinition Width="0.6*" MinWidth="56" />
<ColumnDefinition Width="0.8*" MinWidth="64" />
<ColumnDefinition Width="1.9*" MinWidth="150" />
<ColumnDefinition Width="0.9*" MinWidth="64" />
<ColumnDefinition Width="1.6*" MinWidth="150" />
<ColumnDefinition Width="Auto" SharedSizeGroup="SessionAction" />
</Grid.ColumnDefinitions>
<TextBlock Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Session}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Frames}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Size}" Margin="10,0,0,0" TextAlignment="Right" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.HeaderNumber}" Text="{l:Loc Import.Session.Column.Size}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Camera}" Margin="10,0,0,0" />
<TextBlock Grid.Column="4" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Sequence}" Margin="10,0,0,0" />
</Grid>
<ListBox Grid.Row="1" ItemsSource="{Binding Sessions}" ItemContainerStyle="{StaticResource ListBoxItem.Session}" AutomationProperties.Name="{l:Loc Import.Plan.Title}"
KeyboardNavigation.TabNavigation="Continue">
<ListBox x:Name="SessionRows" Grid.Row="1" ItemsSource="{Binding Sessions}" ItemContainerStyle="{StaticResource ListBoxItem.Session}"
AutomationProperties.Name="{l:Loc Import.Plan.Title}" KeyboardNavigation.TabNavigation="Continue" ScrollViewer.VerticalScrollBarVisibility="Visible">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type imp:ImportSessionRowViewModel}">
<Grid Style="{StaticResource Session.Grid}" TextElement.FontSize="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.35*" MinWidth="110" />
<ColumnDefinition Width="Auto" MinWidth="110" SharedSizeGroup="SessionTime" />
<ColumnDefinition Width="0.85*" MinWidth="70" />
<ColumnDefinition Width="0.6*" MinWidth="56" />
<ColumnDefinition Width="0.8*" MinWidth="64" />
<ColumnDefinition Width="1.9*" MinWidth="150" />
<ColumnDefinition Width="0.9*" MinWidth="64" />
<ColumnDefinition Width="1.6*" MinWidth="150" />
<ColumnDefinition Width="Auto" SharedSizeGroup="SessionAction" />
</Grid.ColumnDefinitions>
<TextBlock Style="{StaticResource Text.Cell}" Text="{Binding Row.TimeText}" ToolTip="{Binding Row.TimeText}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Cell}" Text="{Binding Row.FramesText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.CellNumber}" Text="{Binding Row.SizeText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.CellNumberLtr}" Text="{Binding Row.SizeText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Cell}" Text="{Binding Row.CameraText}" Margin="10,0,0,0" ToolTip="{Binding Row.CameraText}" />
<DockPanel Grid.Column="4" Margin="10,0,0,0">
<TextBlock x:Name="Target" DockPanel.Dock="Right" Text="{l:Loc Import.Session.NewShort}" Foreground="{DynamicResource Brush.Accent}"
VerticalAlignment="Center" Margin="8,0,0,0" ToolTip="{Binding Row.TargetText}" />
<TextBox Height="26" Padding="8,0" Text="{Binding Title.Text, UpdateSourceTrigger=PropertyChanged}" shell:EditBehavior.Field="{Binding Title}"
IsEnabled="{Binding IsEditable}" ui:Field.Placeholder="{Binding Placeholder}" ToolTip="{Binding TitleToolTip}" ToolTipService.ShowOnDisabled="True"
AutomationProperties.Name="{l:Loc Import.Session.Column.Sequence}" />
AutomationProperties.Name="{Binding TitleName}" />
</DockPanel>
<Button Grid.Column="5" Style="{StaticResource Button.Row}" Margin="8,0,0,0" Content="{l:Loc Import.Session.Merge}" Command="{Binding MergeCommand}"
ToolTip="{Binding MergeToolTip}" Visibility="{Binding HasMerge, Converter={StaticResource BoolToVisibility}}" />
<Button x:Name="Merge" Grid.Column="5" Style="{StaticResource Button.RowAction}" Margin="8,0,0,0" Content="{l:Loc Import.Session.Merge}"
Command="{Binding MergeCommand}" ToolTip="{Binding MergeToolTip}" AutomationProperties.Name="{Binding MergeName}"
AutomationProperties.HelpText="{Binding MergeToolTip}" Visibility="{Binding HasMerge, Converter={StaticResource BoolToVisibility}}" />
</Grid>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding Row.IsNew}" Value="False">
<Setter TargetName="Target" Property="Text" Value="{l:Loc Import.Session.AddsShort}" />
<Setter TargetName="Target" Property="Foreground" Value="{DynamicResource Brush.TextMuted}" />
</DataTrigger>
<!-- While copying the plan is fixed: no row action to reveal. -->
<DataTrigger Binding="{Binding IsEditable}" Value="False">
<Setter TargetName="Merge" Property="Visibility" Value="Hidden" />
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ListBox.ItemTemplate>
@@ -436,7 +548,10 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<ui:StatusGlyph Kind="{Binding ResultKind}" Text="{Binding ResultText}" FontSize="16" FontWeight="SemiBold" ToolTip="{l:Loc Tooltips.Import.Result}" />
<!-- The glyph colours the result; the text beside it is what screen readers announce. -->
<ui:StatusGlyph x:Name="ResultGlyph" Kind="{Binding ResultKind}" VerticalAlignment="Center" />
<TextBlock Text="{Binding ResultText, NotifyOnTargetUpdated=True}" Foreground="{Binding Foreground, ElementName=ResultGlyph}" FontSize="16" FontWeight="SemiBold"
VerticalAlignment="Center" Typography.NumeralAlignment="Tabular" ToolTip="{l:Loc Tooltips.Import.Result}" AutomationProperties.LiveSetting="Polite" />
<TextBlock Text="{Binding DetailText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="14,0,0,0" VerticalAlignment="Center" />
</StackPanel>
<ListBox Grid.Row="1" ItemsSource="{Binding Failures}" Margin="0,8,0,0" ItemContainerStyle="{StaticResource ListBoxItem.Failure}"
@@ -449,8 +564,8 @@
</ListBox>
<StackPanel Grid.Row="2" Margin="0,10,0,0" Visibility="{Binding OffersCheck, Converter={StaticResource BoolToVisibility}}">
<TextBlock Text="{Binding EraseText}" Typography.NumeralAlignment="Tabular" />
<TextBlock Text="{Binding BusyText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="0,4,0,0"
Visibility="{Binding BusyText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
<TextBlock Text="{Binding BusyText, NotifyOnTargetUpdated=True}" Foreground="{DynamicResource Brush.TextMuted}" Margin="0,4,0,0"
AutomationProperties.LiveSetting="Polite" Visibility="{Binding BusyText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
<ItemsControl ItemsSource="{Binding KeptReasons}" Focusable="False" MaxHeight="80" Margin="0,4,0,0">
<ItemsControl.ItemTemplate>
<DataTemplate>
@@ -466,25 +581,28 @@
Margin="0,0,8,0" Visibility="{Binding OffersDelete, Converter={StaticResource BoolToVisibility}}" />
<Button Style="{StaticResource Button.Destructive}" Content="{l:Loc Import.Result.Format}" Command="{Binding FormatCommand}" ToolTip="{Binding FormatToolTip}"
Margin="0,0,8,0" Visibility="{Binding OffersFormat, Converter={StaticResource BoolToVisibility}}" />
<Button Command="{Binding EjectCommand}" ToolTip="{Binding EjectToolTip}" Margin="0,0,8,0">
<Button Command="{Binding EjectCommand}" ToolTip="{Binding EjectToolTip}" Margin="0,0,8,0" AutomationProperties.Name="{l:Loc Import.Result.Eject}">
<StackPanel Orientation="Horizontal">
<ui:Icon Glyph="{StaticResource Icon.Eject}" Margin="0,0,6,0" />
<TextBlock Text="{l:Loc Import.Result.Eject}" />
</StackPanel>
</Button>
<Button Content="{l:Loc Import.Result.Library}" Command="{Binding OpenLibraryCommand}" ToolTip="{l:Loc Tooltips.Import.Library}" Margin="0,0,8,0" />
<Button Content="{l:Loc Import.Result.New}" Command="{Binding DataContext.NewImportCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
<Button x:Name="NewImportButton" Content="{l:Loc Import.Result.New}" Command="{Binding DataContext.NewImportCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
ToolTip="{l:Loc Tooltips.Import.New}" />
</WrapPanel>
</Grid>
<!-- The import failed or was cancelled. -->
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding IsFailed, Converter={StaticResource BoolToVisibility}}">
<ui:StatusGlyph Kind="Failed" Text="{Binding ErrorText}" FontSize="13" HorizontalAlignment="Center" ToolTip="{l:Loc Tooltips.Import.Failed}" />
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,12,0,0">
<Button Content="{l:Loc Import.Failed.Retry}" Command="{Binding RetryCommand}" ToolTip="{l:Loc Tooltips.Import.Retry}" Margin="0,0,8,0" />
<Button Content="{l:Loc Shell.Nav.Jobs}" Command="{Binding Shell.NavigateCommand}" CommandParameter="Jobs" ToolTip="{l:Loc Tooltips.Nav.Jobs}" />
</StackPanel>
<!-- The import failed or was cancelled: what happened in one sentence (its full text in the tooltip), and Retry. -->
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" MaxWidth="520" Visibility="{Binding IsFailed, Converter={StaticResource BoolToVisibility}}">
<DockPanel>
<ui:Icon DockPanel.Dock="Left" Glyph="{StaticResource Icon.Cross}" Size="12" Foreground="{DynamicResource Brush.Error}" VerticalAlignment="Top" Margin="0,3,6,0" />
<TextBlock x:Name="FailureLine" Text="{Binding ErrorText, NotifyOnTargetUpdated=True}" Foreground="{DynamicResource Brush.Error}" TextWrapping="Wrap"
TextTrimming="CharacterEllipsis" LineHeight="18" LineStackingStrategy="BlockLineHeight" MaxHeight="54" ToolTip="{Binding FailureToolTip}"
AutomationProperties.LiveSetting="Assertive" />
</DockPanel>
<Button x:Name="RetryButton" Content="{l:Loc Import.Failed.Retry}" Command="{Binding RetryCommand}" ToolTip="{l:Loc Tooltips.Import.Retry}"
HorizontalAlignment="Center" Margin="0,12,0,0" />
</StackPanel>
<!-- Footer: Show plan and Import, or the progress while copying. -->
@@ -493,15 +611,16 @@
Visibility="{Binding IsRunning, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Primary}" Height="36" Padding="22,0" Content="{Binding StartText}" Command="{Binding StartCommand}"
ToolTip="{Binding StartToolTip}" Visibility="{Binding IsRunning, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
<Button DockPanel.Dock="Right" Content="{l:Loc Import.Progress.Cancel}" Command="{Binding CancelCommand}" ToolTip="{l:Loc Tooltips.Import.Cancel}" Margin="12,0,0,0"
<Button x:Name="CancelButton" DockPanel.Dock="Right" Content="{l:Loc Import.Progress.Cancel}" Command="{Binding CancelCommand}" ToolTip="{l:Loc Tooltips.Import.Cancel}" Margin="12,0,0,0"
Visibility="{Binding IsRunning, Converter={StaticResource BoolToVisibility}}" />
<Grid Visibility="{Binding IsRunning, Converter={StaticResource BoolToVisibility}}" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ProgressBar Maximum="1" Value="{Binding Progress, Mode=OneWay}" VerticalAlignment="Center" />
<TextBlock Grid.Column="1" Text="{Binding ProgressText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="12,0,0,0" Typography.NumeralAlignment="Tabular" />
<ProgressBar Maximum="1" Value="{Binding Progress, Mode=OneWay}" VerticalAlignment="Center" AutomationProperties.LabeledBy="{Binding ElementName=ProgressLine}" />
<TextBlock x:Name="ProgressLine" Grid.Column="1" Text="{Binding ProgressText, NotifyOnTargetUpdated=True}" Foreground="{DynamicResource Brush.TextMuted}" Margin="12,0,0,0"
Typography.NumeralAlignment="Tabular" AutomationProperties.LiveSetting="Polite" />
</Grid>
</DockPanel>
</Grid>
@@ -527,7 +646,7 @@
AutomationProperties.Name="{l:Loc Import.Details.Close}" />
<TextBlock Text="{l:Loc Import.Details.Title}" Style="{StaticResource Text.Title}" VerticalAlignment="Center" />
<TextBlock Text="{Binding TotalsText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="14,0,0,0" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"
Typography.NumeralAlignment="Tabular" />
Typography.NumeralAlignment="Tabular" ToolTip="{Binding TotalsText}" />
</DockPanel>
<ItemsControl Grid.Row="1" ItemsSource="{Binding Conflicts}" Focusable="False" Margin="0,8,0,0" MaxHeight="96">
<ItemsControl.ItemTemplate>
@@ -536,7 +655,8 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Grid Grid.Row="2" Margin="0,10,0,4" TextElement.FontSize="12">
<!-- The right margin is the list's scroll bar (always shown, 10 px), so header and cells line up. -->
<Grid Grid.Row="2" Margin="0,10,10,4" TextElement.FontSize="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.2*" MinWidth="140" />
<ColumnDefinition Width="1.8*" MinWidth="180" />
@@ -547,13 +667,18 @@
<TextBlock Style="{StaticResource Text.Header}" Text="{l:Loc Import.Details.Column.Source}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Details.Column.Destination}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Details.Column.Action}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Header}" Text="{l:Loc Import.Session.Column.Size}" Margin="10,0,0,0" TextAlignment="Right" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.HeaderNumber}" Text="{l:Loc Import.Session.Column.Size}" Margin="10,0,0,0" />
</Grid>
<ListBox x:Name="PlanRows" Grid.Row="3" ItemsSource="{Binding Rows}" ItemContainerStyle="{StaticResource ListBoxItem.PlanRow}" AutomationProperties.Name="{l:Loc Import.Details.Title}"
KeyboardNavigation.TabNavigation="Continue">
KeyboardNavigation.TabNavigation="Continue" ScrollViewer.VerticalScrollBarVisibility="Visible">
<ListBox.ItemTemplate>
<!-- A file: its name on the card, its new name, what happens, its size. A session: its heading over two columns, its folder below. -->
<DataTemplate DataType="{x:Type imp:PlanDetailRow}">
<Grid x:Name="Row" Height="30" TextElement.FontSize="12">
<Grid x:Name="Row" Height="36" TextElement.FontSize="12">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1.2*" MinWidth="140" />
<ColumnDefinition Width="1.8*" MinWidth="180" />
@@ -561,21 +686,32 @@
<ColumnDefinition Width="0.5*" MinWidth="64" />
<ColumnDefinition Width="Auto" SharedSizeGroup="PlanAction" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="Source" Style="{StaticResource Text.Cell}" Text="{Binding Source}" ToolTip="{Binding Source}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Cell}" Text="{Binding Destination}" Margin="10,0,0,0" ToolTip="{Binding Destination}" />
<TextBlock x:Name="Source" Style="{StaticResource Text.Cell}" Text="{Binding SourceText}" ToolTip="{Binding Source}" />
<TextBlock x:Name="Destination" Grid.Column="1" Style="{StaticResource Text.CellPath}" Text="{Binding DestinationText}" Margin="10,0,0,0"
ToolTip="{Binding Destination}" />
<TextBlock x:Name="Action" Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding ActionText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.CellNumber}" Text="{Binding SizeText}" Margin="10,0,0,0" />
<Button x:Name="Split" Grid.Column="4" Style="{StaticResource Button.Row}" Margin="10,0,4,0" Content="{l:Loc Import.Details.Split}"
<TextBlock Grid.Column="3" Style="{StaticResource Text.CellNumberLtr}" Text="{Binding SizeText}" Margin="10,0,0,0" />
<Button x:Name="Split" Grid.Column="4" Style="{StaticResource Button.RowAction}" Margin="10,0,4,0" Content="{l:Loc Import.Details.Split}"
Command="{Binding DataContext.SplitCommand, RelativeSource={RelativeSource AncestorType=UserControl}}" CommandParameter="{Binding}"
ToolTip="{l:Loc Tooltips.Import.Split}" Visibility="Hidden" />
ToolTip="{l:Loc Tooltips.Import.Split}" AutomationProperties.Name="{Binding SplitName}" Visibility="Hidden" />
</Grid>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding CanSplit}" Value="True">
<Setter TargetName="Split" Property="Visibility" Value="Visible" />
</DataTrigger>
<DataTrigger Binding="{Binding Kind}" Value="File">
<Setter TargetName="Source" Property="FlowDirection" Value="LeftToRight" />
<Setter TargetName="Source" Property="HorizontalAlignment" Value="Left" />
</DataTrigger>
<DataTrigger Binding="{Binding Kind}" Value="Session">
<Setter TargetName="Row" Property="Height" Value="50" />
<Setter TargetName="Source" Property="FontWeight" Value="SemiBold" />
<Setter TargetName="Row" Property="Height" Value="34" />
<Setter TargetName="Source" Property="Grid.ColumnSpan" Value="2" />
<Setter TargetName="Destination" Property="Grid.Row" Value="1" />
<Setter TargetName="Destination" Property="Grid.Column" Value="0" />
<Setter TargetName="Destination" Property="Grid.ColumnSpan" Value="4" />
<Setter TargetName="Destination" Property="Margin" Value="0,2,0,8" />
<Setter TargetName="Destination" Property="Foreground" Value="{DynamicResource Brush.TextMuted}" />
</DataTrigger>
<DataTrigger Binding="{Binding IsSkipped}" Value="True">
<Setter TargetName="Row" Property="Opacity" Value="0.6" />
+67 -2
View File
@@ -1,7 +1,10 @@
using System.ComponentModel;
using System.Windows;
using System.Windows.Automation;
using System.Windows.Automation.Peers;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Data;
using System.Windows.Input;
using System.Windows.Threading;
@@ -9,12 +12,19 @@ namespace Titano.App.Sections;
public partial class ImportView : UserControl
{
/// <summary>A polite text that keeps changing (copy progress) is announced at most this often.</summary>
private static readonly TimeSpan PoliteInterval = TimeSpan.FromSeconds(3);
private readonly Dictionary<UIElement, DateTime> _announced = [];
private readonly HashSet<UIElement> _pending = [];
private bool _nicknameOpen;
private bool _restoreFocus;
public ImportView()
{
InitializeComponent();
DataContextChanged += OnDataContextChanged;
AddHandler(Binding.TargetUpdatedEvent, new EventHandler<DataTransferEventArgs>(OnTargetUpdated));
}
private ImportViewModel? Model => DataContext as ImportViewModel;
@@ -42,7 +52,9 @@ public partial class ImportView : UserControl
/// <summary>
/// Keyboard focus follows what opens: the nickname field when it appears (a new card, Rename), and "Show plan"
/// (focus returns to its button when it closes).
/// (focus returns to its button when it closes). A change of phase that hides the focused button (Import, Retry,
/// New import, the status action, "Split here" closing the plan) moves focus to what replaced it, once the card
/// is planned again.
/// </summary>
private void OnModelChanged(object? sender, PropertyChangedEventArgs e)
{
@@ -54,9 +66,62 @@ public partial class ImportView : UserControl
if (opened && IsVisible) FocusLater(NicknameBox);
}
if (e.PropertyName is nameof(ImportViewModel.IsDetailsOpen) && IsVisible)
FocusLater(model.IsDetailsOpen ? ClosePlanButton : ShowPlanButton);
{
if (model.IsDetailsOpen) FocusLater(ClosePlanButton);
else _restoreFocus = true;
}
if (e.PropertyName is nameof(ImportViewModel.IsDetailsOpen) or "" && IsVisible) Dispatcher.BeginInvoke(DispatcherPriority.Input, RestoreFocus);
}
private void RestoreFocus()
{
if (Model is not { } model || model.IsBusyPlanning) return;
var lost = Keyboard.FocusedElement is UIElement { IsVisible: false } focused && IsAncestorOf(focused);
if (!_restoreFocus && !lost) return;
_restoreFocus = false;
UIElement? target = model.IsRunning ? CancelButton
: model.IsDone ? NewImportButton
: model.IsFailed ? RetryButton
: model.HasPlan ? ShowPlanButton
: model.HasStatusAction ? StatusActionButton
: null;
target?.Focus();
}
/// <summary>After layout: an element that just became visible cannot take focus yet.</summary>
private void FocusLater(UIElement element) => Dispatcher.BeginInvoke(DispatcherPriority.Input, () => element.Focus());
/// <summary>
/// Live texts (AutomationProperties.LiveSetting in XAML, their binding with NotifyOnTargetUpdated) tell screen
/// readers that they changed: planning status, copy progress, the result and the failure. WPF raises nothing by itself.
/// </summary>
private void OnTargetUpdated(object? sender, DataTransferEventArgs e)
{
if (e.TargetObject is not UIElement element || AutomationProperties.GetLiveSetting(element) is var setting && setting == AutomationLiveSetting.Off) return;
if (AutomationPeer.ListenerExists(AutomationEvents.LiveRegionChanged)) Announce(element, setting);
}
/// <summary>Polite texts at most every <see cref="PoliteInterval"/>, ending with their latest value; assertive ones at once.</summary>
private void Announce(UIElement element, AutomationLiveSetting setting)
{
var wait = setting == AutomationLiveSetting.Polite && _announced.TryGetValue(element, out var last) ? last + PoliteInterval - DateTime.UtcNow : TimeSpan.Zero;
if (wait > TimeSpan.Zero)
{
if (_pending.Add(element)) _ = AnnounceLaterAsync(element, setting, wait);
return;
}
_announced[element] = DateTime.UtcNow;
// After the bindings of the same change: a text that is being hidden is not announced.
Dispatcher.BeginInvoke(DispatcherPriority.Background, () =>
{
if (element.IsVisible) UIElementAutomationPeer.CreatePeerForElement(element)?.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
});
}
private async Task AnnounceLaterAsync(UIElement element, AutomationLiveSetting setting, TimeSpan wait)
{
await Task.Delay(wait);
_pending.Remove(element);
Announce(element, setting);
}
}
+150 -27
View File
@@ -35,6 +35,18 @@ public enum ImportPhase
Failed,
}
/// <summary>The one action offered with the Plan panel's status sentence (BRIEF §0.2 rule 6).</summary>
public enum StatusAction
{
None,
PickSource,
Refresh,
OpenLibrary,
ChooseDestination,
OpenServer,
Replan,
}
/// <summary>A template token offered by the "{ }" menu.</summary>
public sealed record TokenItem(string Text, string ToolTip);
@@ -65,6 +77,8 @@ public sealed class ImportViewModel : SectionViewModel
private ImportChoices _choices = new();
private ImportPhase _phase;
private string? _statusText;
private string? _statusDetail;
private StatusAction _statusAction;
private ImportPlan? _rawPlan;
private ImportPlan? _plan;
private PlanTotals? _totals;
@@ -78,6 +92,7 @@ public sealed class ImportViewModel : SectionViewModel
private string? _progressText;
private ImportResultViewModel? _result;
private string? _errorText;
private string? _errorDetail;
private Guid? _jobId;
private string? _jobSourceKey;
private Guid? _jobCardId;
@@ -98,11 +113,13 @@ public sealed class ImportViewModel : SectionViewModel
_planDelay.Tick += (_, _) =>
{
_planDelay.Stop();
Replan();
// A finished import keeps its result; "New import" plans again.
if (_phase != ImportPhase.Done) Replan();
};
Nickname = new EditableField(string.Empty, _ => null, text => _ = SaveCardAsync(text, null), () => Loc.L("Tooltips.Import.Nickname"));
FolderPath = new EditableField(string.Empty, ArchiveLocations.Validate, text => Choices = _choices with { FolderPath = text },
() => Loc.L("Tooltips.Import.FolderPath"));
// The path is checked only while Folder is the destination; typing one chooses Folder, as "…" does.
FolderPath = new EditableField(string.Empty, text => IsFolderDestination ? ArchiveLocations.Validate(text) : null,
text => Choices = _choices with { FolderPath = text, Destination = ImportDestinationKind.Folder }, () => Loc.L("Tooltips.Import.FolderPath"));
GapMinutes = NumberField(1, 24 * 60, () => _choices.GapMinutes, n => Choices = _choices with { GapMinutes = n }, "Tooltips.Import.Gap");
MinimumFrames = NumberField(1, 1000, () => _choices.MinimumFrames, n => Choices = _choices with { MinimumFrames = n }, "Tooltips.Import.MinimumFrames");
FolderTemplate = new EditableField(_choices.FolderTemplate, t => NamingPreview.Validate(t, isFolder: true),
@@ -136,6 +153,7 @@ public sealed class ImportViewModel : SectionViewModel
Replan();
});
RetryCommand = new AsyncRelayCommand(RetryAsync, () => _phase == ImportPhase.Failed);
StatusActionCommand = new RelayCommand(RunStatusAction, () => HasStatusAction);
shell.Services.Devices.Arrived += device => Dispatch(() => _ = CardInsertedAsync(device));
shell.Services.Devices.Removed += removed => Dispatch(() => _ = OnRemovedAsync());
@@ -168,6 +186,8 @@ public sealed class ImportViewModel : SectionViewModel
/// <summary>The source of a running import stays selected.</summary>
public bool CanChangeSource => _phase != ImportPhase.Running;
public string FolderSourceToolTip => CanChangeSource ? Loc.L("Tooltips.Import.Folder") : Loc.L("Import.Blocked.Copying");
/// <summary>Start the import with the card's profile as soon as this card is inserted (per card, BRIEF §12.4).</summary>
public bool AutoImport
{
@@ -243,6 +263,7 @@ public sealed class ImportViewModel : SectionViewModel
var previous = _choices;
if (previous == value) return;
_choices = value;
if (value.Destination != previous.Destination) FolderPath.Refresh();
OnPropertyChanged(string.Empty);
if (value.NeedsNewPlan(previous) || (value.TitlesChangeNames != previous.TitlesChangeNames && _titles.Count > 0)) SchedulePlan();
else ApplyPlan();
@@ -278,12 +299,15 @@ public sealed class ImportViewModel : SectionViewModel
public bool CanUseArchive => _archive is not null && Services.Archives is not null;
public string ArchiveToolTip => CanUseArchive ? Loc.L("Tooltips.Import.Archive", _archive!.RootPath) : Loc.L("Import.Blocked.NoArchive");
public string ArchiveToolTip => CanUseArchive ? Loc.L("Tooltips.Import.Archive", BidiText.Ltr(_archive!.RootPath)) : Loc.L("Import.Blocked.NoArchive");
public bool CanUseServer => Services.Server.IsConnected;
public string ServerName => Services.Server.ServerName ?? Loc.L("Import.Destination.NotConnected");
/// <summary>"Server · Studio NAS": the Server choice as screen readers announce it.</summary>
public string ServerChoiceName => Loc.L("Import.Destination.Server") + " · " + ServerName;
public string ServerToolTip => CanUseServer ? Loc.L("Tooltips.Import.Server") : Loc.L("Import.Blocked.NoServer");
public EditableField FolderPath { get; }
@@ -409,8 +433,11 @@ public sealed class ImportViewModel : SectionViewModel
public bool IsBusyPlanning => _phase == ImportPhase.Planning;
/// <summary>The form is fixed while copying, and behind "Show plan" while it is open.</summary>
public bool IsFormEnabled => _phase != ImportPhase.Running && _details is null;
/// <summary>
/// The form is fixed while copying and once the import finished ("New import" plans again, so the verification
/// result is never replaced by a silent new plan), and behind "Show plan" while it is open.
/// </summary>
public bool IsFormEnabled => _phase is not (ImportPhase.Running or ImportPhase.Done) && _details is null;
public bool IsPlanPanelEnabled => _details is null;
public bool HasPlan => _plan is not null && _phase is ImportPhase.Ready or ImportPhase.Running;
@@ -422,13 +449,48 @@ public sealed class ImportViewModel : SectionViewModel
/// <summary>"Reading 1,240 photos", "Choose a card or a folder", or why nothing can be planned.</summary>
public string? StatusText => _statusText;
public string TotalsText => _totals?.Text ?? string.Empty;
/// <summary>The cause behind a status sentence (an exception's own text), for its tooltip; null when there is none.</summary>
public string? StatusDetail => _statusDetail;
/// <summary>The status sentence comes with one action: Folder…, Refresh, Library, Choose folder, Server or Retry.</summary>
public bool HasStatusAction => _statusAction != StatusAction.None && _phase == ImportPhase.NoSource;
public string StatusActionText => _statusAction switch
{
StatusAction.PickSource => Loc.L("Import.Devices.Folder"),
StatusAction.Refresh => Loc.L("Import.Devices.Refresh"),
StatusAction.OpenLibrary => Loc.L("Shell.Nav.Library"),
StatusAction.ChooseDestination => Loc.L("Import.Destination.Choose"),
StatusAction.OpenServer => Loc.L("Shell.Nav.Server"),
StatusAction.Replan => Loc.L("Import.Failed.Retry"),
_ => string.Empty,
};
public string StatusActionToolTip => _statusAction switch
{
StatusAction.PickSource => Loc.L("Tooltips.Import.Folder"),
StatusAction.Refresh => Loc.L("Tooltips.Import.Refresh"),
StatusAction.OpenLibrary => Loc.L("Tooltips.Nav.Library"),
StatusAction.ChooseDestination => Loc.L("Tooltips.Import.ChooseFolder"),
StatusAction.OpenServer => Loc.L("Tooltips.Nav.Server"),
StatusAction.Replan => Loc.L("Tooltips.Import.New"),
_ => string.Empty,
};
public ICommand StatusActionCommand { get; }
/// <summary>"3 sessions · 4,812 photos · 96.2 GB · about 12 min"; without the estimate once the import finished.</summary>
public string TotalsText => (IsDone ? _totals?.SummaryText : _totals?.Text) ?? string.Empty;
public string DuplicatesText => _totals?.DuplicatesText ?? string.Empty;
public bool HasDuplicates => _totals?.Duplicates > 0;
public StatusKind DuplicatesKind => HasDuplicates ? StatusKind.Warning : StatusKind.Done;
public string ImportedBeforeText => _totals?.ImportedBeforeText ?? string.Empty;
public string SpaceText => _totals?.SpaceText ?? string.Empty;
public bool IsSpaceShort => _totals is { HasEnoughSpace: false };
/// <summary>Plan figures that no longer hold once the import finished are not shown then.</summary>
public string ImportedBeforeText => IsDone ? string.Empty : _totals?.ImportedBeforeText ?? string.Empty;
public string SpaceText => IsDone ? string.Empty : _totals?.SpaceText ?? string.Empty;
public bool IsSpaceShort => !IsDone && _totals is { HasEnoughSpace: false };
public ObservableCollection<ImportSessionRowViewModel> Sessions { get; } = [];
@@ -490,8 +552,12 @@ public sealed class ImportViewModel : SectionViewModel
}
}
/// <summary>Why the import stopped, in one sentence.</summary>
public string? ErrorText { get => _errorText; private set => Set(ref _errorText, value); }
/// <summary>The failure's own text when it says more than <see cref="ErrorText"/>, else what was kept.</summary>
public string FailureToolTip => _errorDetail is { Length: > 0 } detail && detail != _errorText ? detail : Loc.L("Tooltips.Import.Failed");
// ---------------- Lifecycle ----------------
protected override void OnActivated()
@@ -595,8 +661,8 @@ public sealed class ImportViewModel : SectionViewModel
ShowProgress(progress);
}
/// <summary>Shows an import that stopped with <paramref name="message"/>, without running it (capture).</summary>
public void ShowFailed(string message) => Fail(message);
/// <summary>Shows an import that stopped with <paramref name="error"/>, without running it (capture).</summary>
public void ShowFailed(Exception error) => Fail(ImportFailures.Import(error, SourceTitle), error.Message);
public override void Dispose()
{
@@ -844,6 +910,14 @@ public sealed class ImportViewModel : SectionViewModel
_ => null,
};
/// <summary>Where the user removes the destination's blocker: the Library (create or adopt an archive), the folder picker, the Server screen.</summary>
private StatusAction DestinationAction() => _choices.Destination switch
{
ImportDestinationKind.Archive => StatusAction.OpenLibrary,
ImportDestinationKind.Folder => StatusAction.ChooseDestination,
_ => StatusAction.OpenServer,
};
private IImportDestination? Destination() => DestinationBlocker() is not null ? null : _choices.Destination switch
{
ImportDestinationKind.Archive => new ArchiveDestination(Services.Archives!, _archive!),
@@ -867,12 +941,13 @@ public sealed class ImportViewModel : SectionViewModel
Sessions.Clear();
if (_selected?.Root is not { } root)
{
SetStatus(ImportPhase.NoSource, Loc.L(_selected is null ? "Import.Status.Choose" : "Import.Status.NotInserted"));
if (_selected is null) SetStatus(ImportPhase.NoSource, Loc.L("Import.Status.Choose"), StatusAction.PickSource);
else SetStatus(ImportPhase.NoSource, Loc.L("Import.Status.NotInserted"), StatusAction.Refresh);
return;
}
if (Destination() is not { } destination)
{
SetStatus(ImportPhase.NoSource, DestinationBlocker());
SetStatus(ImportPhase.NoSource, DestinationBlocker(), DestinationAction());
return;
}
SetStatus(ImportPhase.Planning, Loc.L("Import.Status.Reading"));
@@ -908,7 +983,7 @@ public sealed class ImportViewModel : SectionViewModel
catch (Exception ex) when (ex is IOException or UnauthorizedAccessException or DatabaseException or ArgumentException or InvalidOperationException)
{
Log.Warning("import", $"Planning the import of {root} failed", ex);
SetStatus(ImportPhase.NoSource, Loc.L("Import.Status.PlanFailed", ex.Message));
SetStatus(ImportPhase.NoSource, ImportFailures.Plan(ex, SourceTitle), StatusAction.Replan, ex.Message);
}
}
@@ -1014,11 +1089,43 @@ public sealed class ImportViewModel : SectionViewModel
Replan();
}
private void SetStatus(ImportPhase phase, string? text)
private void SetStatus(ImportPhase phase, string? text, StatusAction action = StatusAction.None, string? detail = null)
{
_statusText = text;
_statusAction = action;
_statusDetail = detail;
Phase = phase;
OnPropertyChanged(nameof(StatusText));
OnPropertyChanged(nameof(StatusDetail));
OnPropertyChanged(nameof(HasStatusAction));
OnPropertyChanged(nameof(StatusActionText));
OnPropertyChanged(nameof(StatusActionToolTip));
CommandManager.InvalidateRequerySuggested();
}
private void RunStatusAction()
{
switch (_statusAction)
{
case StatusAction.PickSource:
PickSourceFolder();
break;
case StatusAction.Refresh:
_ = RefreshSourcesAsync();
break;
case StatusAction.OpenLibrary:
Shell.Navigate(SectionKey.Library);
break;
case StatusAction.ChooseDestination:
ChooseDestinationFolder();
break;
case StatusAction.OpenServer:
Shell.Navigate(SectionKey.Server);
break;
case StatusAction.Replan:
Replan();
break;
}
}
// ---------------- Running ----------------
@@ -1033,7 +1140,7 @@ public sealed class ImportViewModel : SectionViewModel
_jobSourceKey = source.Key;
if (source.Card is { } card) await SaveProfileAsync(card, choices);
Details = null;
ErrorText = null;
ClearFailure();
Progress = 0;
ProgressText = Loc.L("Import.Progress.Starting");
Phase = ImportPhase.Running;
@@ -1046,9 +1153,16 @@ public sealed class ImportViewModel : SectionViewModel
return;
}
var progress = new Progress<ImportProgress>(ShowProgress);
var outcome = choices.Destination == ImportDestinationKind.Folder
? await Task.Run(() => LocalImport.RunAsync(plan, new FolderImportSink(choices.FolderPath!), choices.VerifyCopies, progress, cts.Token), cts.Token)
: await RunServerAsync(plan, choices, progress, cts.Token);
ImportOutcome outcome;
if (choices.Destination == ImportDestinationKind.Folder)
outcome = await Task.Run(() => LocalImport.RunAsync(plan, new FolderImportSink(choices.FolderPath!), choices.VerifyCopies, progress, cts.Token), cts.Token);
else if (Services.Server.Flow is { Address: { } address, Token: { } token })
outcome = await RunServerAsync(plan, choices, address, token, progress, cts.Token);
else
{
Fail(Loc.L("Import.Blocked.NoServer"));
return;
}
Finish(plan, outcome);
}
catch (OperationCanceledException) when (cts.IsCancellationRequested)
@@ -1059,14 +1173,13 @@ public sealed class ImportViewModel : SectionViewModel
{
// Whatever stopped it, the screen leaves Running: the form, the sources and Retry come back.
Log.Warning("import", $"Import of {root} failed", ex);
Fail(ex.Message);
Fail(ImportFailures.Import(ex, source.Title), ex.Message);
}
}
private async Task<ImportOutcome> RunServerAsync(ImportPlan plan, ImportChoices choices, IProgress<ImportProgress> progress, CancellationToken ct)
private async Task<ImportOutcome> RunServerAsync(ImportPlan plan, ImportChoices choices, Uri address, string token, IProgress<ImportProgress> progress,
CancellationToken ct)
{
var flow = Services.Server.Flow;
if (flow.Address is not { } address || flow.Token is not { } token) throw new InvalidOperationException(Loc.L("Import.Blocked.NoServer"));
var staging = Path.Combine(ServerStagingRoot, plan.Id.ToString("N"));
using var client = new TitanoClient(address, new CertificatePinning(Services.Server.Fingerprints), $"Titano ({Environment.MachineName})") { Token = token };
try
@@ -1147,7 +1260,8 @@ public sealed class ImportViewModel : SectionViewModel
await QueueDeepAnalysisAsync(plan);
break;
case JobState.Failed:
Fail(job.Error ?? Loc.L("Jobs.State.Failed"));
// The engine wrote the job's error (a localized sentence for the archive's own failures); the full text stays in the tooltip.
Fail(job.Error ?? Loc.L("Import.Failed.Other"), job.Error);
break;
case JobState.Cancelled:
_jobId = null;
@@ -1227,13 +1341,22 @@ public sealed class ImportViewModel : SectionViewModel
_ = Result.AutoEjectAsync();
}
private void Fail(string message)
private void Fail(string message, string? detail = null)
{
_runCts = null;
_errorDetail = detail;
ErrorText = message;
OnPropertyChanged(nameof(FailureToolTip));
Phase = ImportPhase.Failed;
}
private void ClearFailure()
{
_errorDetail = null;
ErrorText = null;
OnPropertyChanged(nameof(FailureToolTip));
}
private async Task CancelAsync()
{
if (_jobId is { } id && Services.Jobs is { } jobs) await jobs.CancelAsync(id);
@@ -1245,7 +1368,7 @@ public sealed class ImportViewModel : SectionViewModel
{
if (_jobId is { } id && Services.Jobs is { } jobs)
{
ErrorText = null;
ClearFailure();
Phase = ImportPhase.Running;
await jobs.ResumeAsync(id);
return;