diff --git a/i18n/en/Common.resx b/i18n/en/Common.resx
index bcf09a3a..7df05c2e 100644
--- a/i18n/en/Common.resx
+++ b/i18n/en/Common.resx
@@ -13,4 +13,10 @@
OpenOpen logs{0} %
+ {0} B
+ {0} GB
+ {0} KB
+ {0} MB
+ {0} PB
+ {0} TB
diff --git a/i18n/en/Setup.resx b/i18n/en/Setup.resx
index 23dab393..651318ff 100644
--- a/i18n/en/Setup.resx
+++ b/i18n/en/Setup.resx
@@ -43,6 +43,9 @@
All usersJust me{0} needed
+ {0:N0} more item
+ {0:N0} more items
+ Deletes {0}Remove my data{0} SetupRemove {0}
diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx
index 2601110d..242cbb88 100644
--- a/i18n/en/Tooltips.resx
+++ b/i18n/en/Tooltips.resx
@@ -473,6 +473,7 @@
Install in Program Files for every account · asks for administrator approvalReturn to the options without changing anythingChoose the installation folder
+ Close setup without changing anythingClose setupAsk the running programs to close · each one handles its unsaved workInstall this program
@@ -489,7 +490,8 @@
Open the program when setup finishesOpen the installed programAlready installed here · uninstall it first to change folder or scope
- Also delete database, settings and logs in %LOCALAPPDATA%\Titano · photos in archives are not touched
+ Select at least one program to install
+ Also delete %LOCALAPPDATA%\Titano: database, backups, cache, settings, logs, the uploader queue and sign-in · photos in archives are keptRun the same step againAdd the programs to the Start menuRemove programs, shortcuts and file types · your data is kept unless selected
@@ -515,13 +517,16 @@
Title of the new sequence; leave empty to let the server name itYour password; only a sign-in token is kept, encrypted for your Windows accountPause; the queue survives a restart
+ Nothing queuedSpace left in your quota on the serverStop watching this folder; files already uploaded stay on the serverResume uploadingTry againTry this file again now
+ Select Sequence to choose oneAddress of the Titano Server, such as https://nas.local:8443Server, sign in, bandwidth, startup, tray
+ Show the first file that failed · press Enter on it to try againCheck the server certificate and sign inSign out and forget the saved tokenRun when you sign in to Windows
diff --git a/i18n/en/Uploader.resx b/i18n/en/Uploader.resx
index 4dbacf76..de0537a2 100644
--- a/i18n/en/Uploader.resx
+++ b/i18n/en/Uploader.resx
@@ -45,7 +45,7 @@
Not connected{0} free of {1}Limit
- MB/sinvariant
+ MB/sDelete after uploadMinimise to trayStart with Windows
@@ -60,7 +60,9 @@
{0:N0} filesQueue{0} left
+ Files in queuePaused
+ Upload progressWaiting for serverBandwidthFiles
@@ -102,6 +104,7 @@
{0}/s{0} · every {1}Every {0}
+ every {0}Watch foldersRemove
diff --git a/i18n/it/Common.it.resx b/i18n/it/Common.it.resx
index 8794e75b..8f944d39 100644
--- a/i18n/it/Common.it.resx
+++ b/i18n/it/Common.it.resx
@@ -13,4 +13,10 @@
ApriApri log{0}%
+ {0} byte
+ {0} GB
+ {0} KB
+ {0} MB
+ {0} PB
+ {0} TB
diff --git a/i18n/it/Setup.it.resx b/i18n/it/Setup.it.resx
index b2588356..57e525ae 100644
--- a/i18n/it/Setup.it.resx
+++ b/i18n/it/Setup.it.resx
@@ -43,6 +43,9 @@
Tutti gli utentiSolo per me{0} necessari
+ {0:N0} altro elemento
+ altri {0:N0} elementi
+ Elimina {0}Rimuovi i miei datiInstallazione di {0}Rimozione di {0}
diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx
index 2d899232..a7c9fa04 100644
--- a/i18n/it/Tooltips.it.resx
+++ b/i18n/it/Tooltips.it.resx
@@ -473,6 +473,7 @@
Installa in Programmi per tutti gli account · chiede l'autorizzazione di amministratoreTorna alle opzioni senza modificare nullaScegli la cartella di installazione
+ Chiudi l'installazione senza modificare nullaChiudi l'installazioneChiedi ai programmi aperti di chiudersi · ognuno gestisce il lavoro non salvatoInstalla questo programma
@@ -489,7 +490,8 @@
Apri il programma al termine dell'installazioneApri il programma installatoGià installato qui · disinstallalo prima per cambiare cartella o ambito
- Elimina anche database, impostazioni e log in %LOCALAPPDATA%\Titano · le foto negli archivi non vengono toccate
+ Seleziona almeno un programma da installare
+ Elimina anche %LOCALAPPDATA%\Titano: database, backup, cache, impostazioni, log, coda e accesso dell'uploader · le foto negli archivi restanoEsegui di nuovo lo stesso passaggioAggiungi i programmi al menu StartRimuovi programmi, collegamenti e tipi di file · i dati restano salvo diversa scelta
@@ -515,13 +517,16 @@
Titolo della nuova sequenza; lascialo vuoto per farlo scegliere al serverLa tua password; viene conservato solo un token di accesso, cifrato per il tuo account WindowsMetti in pausa; la coda sopravvive a un riavvio
+ Nessun file in codaSpazio rimasto nella tua quota sul serverSmetti di controllare questa cartella; i file già inviati restano sul serverRiprendi l'invioRiprovaRiprova subito questo file
+ Seleziona Sequenza per sceglierne unaIndirizzo del Titano Server, ad esempio https://nas.local:8443Server, accesso, banda, avvio, area di notifica
+ Mostra il primo file non riuscito · premi Invio per riprovarloControlla il certificato del server e accediEsci e dimentica il token salvatoAvvia quando accedi a Windows
diff --git a/i18n/it/Uploader.it.resx b/i18n/it/Uploader.it.resx
index e4eb6bb7..013dcd0c 100644
--- a/i18n/it/Uploader.it.resx
+++ b/i18n/it/Uploader.it.resx
@@ -43,6 +43,7 @@
Non connesso{0} liberi su {1}Limite
+ MB/sElimina dopo l'invioRiduci nell'area notificheAvvia con Windows
@@ -57,7 +58,9 @@
{0:N0} fileCodamancano {0}
+ File in codaIn pausa
+ Avanzamento caricamentoIn attesa del serverBandaFile
@@ -99,6 +102,7 @@
{0}/s{0} · ogni {1}Ogni {0}
+ ogni {0}Cartelle controllateRimuovi
diff --git a/src/Titano.Setup/Engine/UserDataPlan.cs b/src/Titano.Setup/Engine/UserDataPlan.cs
new file mode 100644
index 00000000..1e773ba1
--- /dev/null
+++ b/src/Titano.Setup/Engine/UserDataPlan.cs
@@ -0,0 +1,42 @@
+using System.IO;
+
+namespace Titano.Setup.Engine;
+
+/// One top-level file or folder of the user data folder and the bytes it holds.
+internal sealed record UserDataEntry(string Name, long Bytes);
+
+///
+/// Dry run of "Remove my data" (BRIEF §0.2 rule 8: a destructive operation shows its plan first): every top-level
+/// entry of the user data folder with its size, largest first. Links are not followed, as the deletion does not
+/// follow them either.
+///
+internal sealed record UserDataPlan(IReadOnlyList Entries)
+{
+ private static readonly EnumerationOptions TopLevel = new() { IgnoreInaccessible = true, AttributesToSkip = 0 };
+
+ private static readonly EnumerationOptions Contents = new()
+ {
+ RecurseSubdirectories = true,
+ IgnoreInaccessible = true,
+ AttributesToSkip = FileAttributes.ReparsePoint,
+ };
+
+ public long TotalBytes => Entries.Sum(e => e.Bytes);
+
+ /// Measures ; empty when it does not exist. Reads sizes only, changes nothing.
+ public static UserDataPlan Measure(string folder)
+ {
+ var root = new DirectoryInfo(folder);
+ if (!root.Exists) return new UserDataPlan([]);
+ var entries = root.EnumerateFileSystemInfos("*", TopLevel).Select(e => new UserDataEntry(e.Name, SizeOf(e)));
+ return new UserDataPlan([.. entries.OrderByDescending(e => e.Bytes).ThenBy(e => e.Name, StringComparer.OrdinalIgnoreCase)]);
+ }
+
+ private static long SizeOf(FileSystemInfo entry) => entry switch
+ {
+ _ when entry.Attributes.HasFlag(FileAttributes.ReparsePoint) => 0,
+ DirectoryInfo folder => folder.EnumerateFiles("*", Contents).Sum(f => f.Length),
+ FileInfo file => file.Length,
+ _ => 0,
+ };
+}
diff --git a/src/Titano.Setup/Views/ComponentOption.cs b/src/Titano.Setup/Views/ComponentOption.cs
index 062ba257..45b8336f 100644
--- a/src/Titano.Setup/Views/ComponentOption.cs
+++ b/src/Titano.Setup/Views/ComponentOption.cs
@@ -30,20 +30,20 @@ internal sealed class ComponentOption(PayloadComponent component, bool selected,
/// Language offered in the picker.
internal sealed record LanguageOption(string Code, string Name);
-/// Decimal byte sizes as Explorer shows them for drives ("1.5 MB").
+/// Decimal byte sizes as Explorer shows them for drives ("1.5 MB"), units in the UI language ("1,5 Mo").
internal static class ByteSize
{
- private static readonly string[] Units = ["B", "KB", "MB", "GB", "TB"];
+ private static readonly string[] Formats = ["Common.Size.B", "Common.Size.KB", "Common.Size.MB", "Common.Size.GB", "Common.Size.TB"];
public static string Format(long bytes)
{
double value = bytes;
var unit = 0;
- while (value >= 1000 && unit < Units.Length - 1)
+ while (value >= 1000 && unit < Formats.Length - 1)
{
value /= 1000;
unit++;
}
- return value.ToString(unit == 0 || value >= 100 ? "0" : "0.#", Loc.Culture) + " " + Units[unit];
+ return Loc.L(Formats[unit], value.ToString(unit == 0 || value >= 100 ? "0" : "0.#", Loc.Culture));
}
}
diff --git a/src/Titano.Setup/Views/SetupViewModel.cs b/src/Titano.Setup/Views/SetupViewModel.cs
index 3a68e5aa..d97f6046 100644
--- a/src/Titano.Setup/Views/SetupViewModel.cs
+++ b/src/Titano.Setup/Views/SetupViewModel.cs
@@ -11,6 +11,9 @@ using Titano.Ui.Mvvm;
namespace Titano.Setup.Views;
+/// A line of the "Remove my data" dry run: a file or folder name (or "3 more items") and its size.
+internal sealed record DataPlanRow(string Name, string Size, bool IsFileName);
+
/// What the setup screen currently shows.
internal enum SetupStage
{
@@ -28,6 +31,10 @@ internal enum SetupStage
internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
{
private const string FallbackProduct = "Titano";
+
+ /// Largest entries listed in the data plan; the rest are summed in one line.
+ private const int PlanRows = 6;
+
private readonly SetupArguments _arguments;
private readonly PayloadReader? _payload;
private readonly InstallEngine? _engine;
@@ -42,6 +49,8 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
private bool _startMenu;
private bool _launchAfter;
private bool _removeUserData;
+ private UserDataPlan? _dataPlan;
+ private bool _measuring;
private bool _closeConfirmed;
private double _progress;
private bool _indeterminate;
@@ -197,6 +206,7 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
if (!Set(ref _directory, value ?? string.Empty)) return;
ErrorsChanged?.Invoke(this, new DataErrorsChangedEventArgs(nameof(Directory)));
OnPropertyChanged(nameof(DirectoryToolTip));
+ OnPropertyChanged(nameof(InstallToolTip));
}
}
@@ -206,6 +216,9 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
? Loc.L("Tooltips.Setup.Locked")
: IsDirectoryValid ? Loc.L("Tooltips.Setup.Folder") : Loc.L("Tooltips.Setup.FolderInvalid");
+ /// Browse is disabled when upgrading; its tooltip then says why (DESIGN §4).
+ public string BrowseToolTip => CanChangeLocation ? Loc.L("Tooltips.Setup.Browse") : Loc.L("Tooltips.Setup.Locked");
+
public string JustMeToolTip => CanChangeLocation ? Loc.L("Tooltips.Setup.JustMe") : Loc.L("Tooltips.Setup.Locked");
public string AllUsersToolTip => CanChangeLocation ? Loc.L("Tooltips.Setup.AllUsers") : Loc.L("Tooltips.Setup.Locked");
@@ -232,16 +245,45 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
public bool HasLaunchOption => _engine?.LaunchTarget(SelectedComponents) is not null;
public string InstallText => CanChangeLocation ? Loc.L("Setup.Action.Install") : Loc.L("Setup.Action.Update");
- public string InstallToolTip => CanChangeLocation ? Loc.L("Tooltips.Setup.Install") : Loc.L("Tooltips.Setup.Update");
+ /// What Install does, or why it is disabled: no program selected, or a folder it cannot use.
+ public string InstallToolTip => !Components.Any(c => c.IsSelected) ? Loc.L("Tooltips.Setup.NoComponent")
+ : !IsDirectoryValid ? Loc.L("Tooltips.Setup.FolderInvalid")
+ : CanChangeLocation ? Loc.L("Tooltips.Setup.Install") : Loc.L("Tooltips.Setup.Update");
- private bool CanStart => IsOptions && (IsUninstall || (IsInstall && IsDirectoryValid && Components.Any(c => c.IsSelected)));
+ /// Removing user data waits for its plan, so the user has seen what goes before choosing Uninstall.
+ private bool CanStart => IsOptions && (IsUninstall ? !_removeUserData || _dataPlan is not null : IsInstall && IsDirectoryValid && Components.Any(c => c.IsSelected));
// ---- Uninstall options ----
+ /// Checking it measures the user data folder; the plan is shown before Uninstall can run.
public bool RemoveUserData
{
get => _removeUserData;
- set => Set(ref _removeUserData, value);
+ set
+ {
+ if (!Set(ref _removeUserData, value)) return;
+ OnPropertyChanged(nameof(IsDataPlanVisible));
+ CommandManager.InvalidateRequerySuggested();
+ if (value && _dataPlan is null) _ = MeasureUserDataAsync();
+ }
+ }
+
+ public bool IsDataPlanVisible => _removeUserData && _dataPlan is not null;
+
+ /// "Deletes 3.4 GB" over the plan's lines.
+ public string DataPlanText => _dataPlan is null ? string.Empty : Loc.L("Setup.Uninstall.Plan", ByteSize.Format(_dataPlan.TotalBytes));
+
+ /// The largest entries of the user data folder, then one line for the rest.
+ public IReadOnlyList DataPlanRows
+ {
+ get
+ {
+ if (_dataPlan is null) return [];
+ var rows = _dataPlan.Entries.Take(PlanRows).Select(e => new DataPlanRow(e.Name, ByteSize.Format(e.Bytes), IsFileName: true)).ToList();
+ var rest = _dataPlan.Entries.Skip(PlanRows).ToList();
+ if (rest.Count > 0) rows.Add(new DataPlanRow(Loc.Plural("Setup.Uninstall.More", rest.Count), ByteSize.Format(rest.Sum(e => e.Bytes)), IsFileName: false));
+ return rows;
+ }
}
// ---- Confirm, progress, outcome ----
@@ -294,6 +336,12 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
public bool CanRetry => IsFailed && _failure is not (SetupExitCode.PayloadInvalid or SetupExitCode.NotInstalled or SetupExitCode.InvalidArguments);
+ /// Done or failed: Close is offered (and Esc closes).
+ public bool IsFinished => IsDone || IsFailed;
+
+ /// Close is the default action when there is nothing to launch or retry.
+ public bool IsCloseDefault => IsFinished && !CanLaunch && !CanRetry;
+
public ICommand PrimaryCommand { get; }
public ICommand BrowseCommand { get; }
public ICommand CloseProgramsCommand { get; }
@@ -498,9 +546,33 @@ internal sealed class SetupViewModel : LocalizedViewModel, INotifyDataErrorInfo
Stage = SetupStage.Failed;
}
+ private async Task MeasureUserDataAsync()
+ {
+ if (_measuring) return;
+ _measuring = true;
+ try
+ {
+ _dataPlan = await Task.Run(() => UserDataPlan.Measure(SetupPaths.UserData));
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ Log.Warning("setup", $"User data '{SetupPaths.UserData}' not measured", ex);
+ _dataPlan = new UserDataPlan([]);
+ }
+ finally
+ {
+ _measuring = false;
+ }
+ OnPropertyChanged(nameof(IsDataPlanVisible));
+ OnPropertyChanged(nameof(DataPlanText));
+ OnPropertyChanged(nameof(DataPlanRows));
+ CommandManager.InvalidateRequerySuggested();
+ }
+
private void OnComponentsChanged()
{
OnPropertyChanged(nameof(RequiredSpaceText));
+ OnPropertyChanged(nameof(InstallToolTip));
OnPropertyChanged(nameof(HasDesktopOption));
OnPropertyChanged(nameof(HasStartMenuOption));
OnPropertyChanged(nameof(HasLaunchOption));
diff --git a/src/Titano.Setup/Views/SetupWindow.xaml b/src/Titano.Setup/Views/SetupWindow.xaml
index 9b4495b6..467ddbf3 100644
--- a/src/Titano.Setup/Views/SetupWindow.xaml
+++ b/src/Titano.Setup/Views/SetupWindow.xaml
@@ -18,7 +18,8 @@
-
+
+
@@ -43,7 +44,7 @@
-
+
@@ -58,13 +59,18 @@
ToolTipService.ShowOnDisabled="True" ToolTip="{Binding AllUsersToolTip}" />
+
-
-
-
+
+
+
+
+
-
+
+
@@ -77,7 +83,7 @@
-
+
@@ -86,66 +92,103 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
+
+ ToolTipService.ShowOnDisabled="True" IsDefault="{Binding IsInstallOptions}" Visibility="{Binding IsInstallOptions, Converter={StaticResource BoolToVisibility}}" />
-
+
+ IsCancel="{Binding IsFinished}" IsDefault="{Binding IsCloseDefault}" Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibility}}" />
-
-
+ IsDefault="{Binding CanLaunch}" Visibility="{Binding CanLaunch, Converter={StaticResource BoolToVisibility}}" />
+ IsDefault="{Binding CanRetry}" Visibility="{Binding CanRetry, Converter={StaticResource BoolToVisibility}}" />
diff --git a/src/Titano.Setup/Views/SetupWindow.xaml.cs b/src/Titano.Setup/Views/SetupWindow.xaml.cs
index 680ad6ad..8cf8e360 100644
--- a/src/Titano.Setup/Views/SetupWindow.xaml.cs
+++ b/src/Titano.Setup/Views/SetupWindow.xaml.cs
@@ -1,28 +1,41 @@
using System.ComponentModel;
using System.Windows;
+using System.Windows.Automation.Peers;
+using System.Windows.Controls;
+using System.Windows.Input;
using System.Windows.Interop;
+using System.Windows.Threading;
using Titano.Core.Localization;
using Titano.Setup.Interop;
using Titano.Ui.Controls;
namespace Titano.Setup.Views;
-/// The one setup screen (~720×520, dialog chrome). Closing is blocked while files are being written.
+///
+/// The one setup screen (~720×520, dialog chrome). Closing is blocked while files are being written, and the
+/// title-bar Close is disabled then. Each stage gives the keyboard to its default button and announces its outcome.
+///
internal sealed partial class SetupWindow : TitanoWindow
{
private readonly SetupViewModel _model;
+ private SetupStage _shownStage;
public SetupWindow(SetupViewModel model)
{
_model = model;
+ _shownStage = model.Stage;
DataContext = model;
InitializeComponent();
ApplyFlowDirection();
Loc.CultureChanged += OnCultureChanged;
+ // Ahead of the chrome's own Close binding, which is always enabled.
+ CommandBindings.Insert(0, new CommandBinding(SystemCommands.CloseWindowCommand, null, OnCanClose));
model.PickFolder = initial => FolderPicker.Pick(new WindowInteropHelper(this).Handle, Loc.L("Setup.Field.Folder"), initial);
model.Finished += (_, _) => Close();
model.VisibilityRequested += (_, visible) => Visibility = visible ? Visibility.Visible : Visibility.Hidden;
+ model.PropertyChanged += OnModelChanged;
SourceInitialized += (_, _) => model.WindowHandle = new WindowInteropHelper(this).Handle;
+ Loaded += (_, _) => FocusDefault();
ContentRendered += (_, _) => model.OnShown();
}
@@ -39,6 +52,42 @@ internal sealed partial class SetupWindow : TitanoWindow
base.OnClosed(e);
}
+ private void OnCanClose(object sender, CanExecuteRoutedEventArgs e)
+ {
+ if (!_model.IsWorking) return;
+ e.CanExecute = false;
+ e.Handled = true;
+ }
+
+ /// A new stage collapses the focused button: the keyboard moves to the new default and the outcome is read out.
+ private void OnModelChanged(object? sender, PropertyChangedEventArgs e)
+ {
+ if (_model.Stage == _shownStage) return;
+ _shownStage = _model.Stage;
+ Dispatcher.BeginInvoke(DispatcherPriority.Loaded, () =>
+ {
+ FocusDefault();
+ if (StageMessage() is { IsVisible: true } message)
+ UIElementAutomationPeer.CreatePeerForElement(message)?.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
+ });
+ }
+
+ private TextBlock? StageMessage() => _model.Stage switch
+ {
+ SetupStage.Confirm => ConfirmMessage,
+ SetupStage.Working => WorkingMessage,
+ SetupStage.Done => DoneMessage,
+ SetupStage.Failed => FailedMessage,
+ _ => null,
+ };
+
+ /// Focuses the visible default button of the footer, else its first visible one.
+ private void FocusDefault()
+ {
+ var buttons = Footer.Children.OfType