From d80cb5f8a7b29e18170615b05ea1c6cda12b4019 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 3 Oct 2026 17:23:59 +0000 Subject: [PATCH] fix(app): Server, Jobs, Settings, About and Welcome after the accessibility and RTL review - Keyboard: Tab follows the visual order (toolbars, section list, dialog buttons), reaches every Jobs row button, stays inside the Welcome dialog (which opens focused); the Settings section list shows a focus ring. - Screen readers: sync and job rows read as their sequence or job with the state as item status; row buttons name their row; filter chips are radio buttons; the connection state, errors, sync retries, update checks and self-test results are announced; Auto values are text, not dead buttons. - Right to left: paths, addresses, templates, fingerprints, the job log, sizes and the logo stay left to right; numbers stay right-aligned. - Layout: Jobs and sync headers line up with their rows (shared padding, shared actions column, constant scroll-bar gutter); toolbars wrap before anything is cut; Settings labels share a column as wide as the longest one; path rows give way instead of wrapping; conflict rows use the warning tint. - Behaviour: Settings reloads the archive folder and default server set elsewhere; forgetting a certificate in Settings asks first and disconnects the session on it; transfers count in the Local only and Remote chips; the Workers readout counts this PC's workers; badge, status strip and Running chip agree; the admin link shows for administrators only; Reset section is gone from Advanced; empty states carry one action; shorter labels; the encoders a render node offers and the presets each encoder serves. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC --- i18n/en/Jobs.resx | 4 + i18n/en/Server.resx | 4 +- i18n/en/Settings.resx | 9 +- i18n/en/Tooltips.resx | 6 + i18n/it/Jobs.it.resx | 4 + i18n/it/Server.it.resx | 4 +- i18n/it/Settings.it.resx | 9 +- i18n/it/Tooltips.it.resx | 6 + src/Titano.App/Jobs/JobListModel.cs | 3 + src/Titano.App/Jobs/JobRowViewModel.cs | 11 +- src/Titano.App/Jobs/JobText.cs | 16 +- src/Titano.App/Sections/AboutView.xaml | 15 +- src/Titano.App/Sections/JobsView.xaml | 180 ++++++++----- src/Titano.App/Sections/JobsViewModel.cs | 58 +++-- src/Titano.App/Sections/ServerView.xaml | 178 ++++++++----- src/Titano.App/Sections/ServerViewModel.cs | 63 +++-- src/Titano.App/Sections/SettingsView.xaml | 253 +++++++++++++------ src/Titano.App/Sections/SettingsViewModel.cs | 41 ++- src/Titano.App/Sections/WelcomeView.xaml | 27 +- src/Titano.App/Sections/WelcomeView.xaml.cs | 19 +- src/Titano.App/Sections/WelcomeViewModel.cs | 10 +- src/Titano.App/Server/ServerSession.cs | 32 ++- src/Titano.App/Server/SyncRow.cs | 26 +- src/Titano.App/Server/SyncTableViewModel.cs | 44 +++- src/Titano.App/Server/SyncText.cs | 9 +- src/Titano.App/Settings/EncoderInventory.cs | 22 -- src/Titano.App/Settings/EncoderUse.cs | 53 ++++ src/Titano.App/Settings/SettingsRows.cs | 14 +- 28 files changed, 801 insertions(+), 319 deletions(-) create mode 100644 src/Titano.App/Settings/EncoderUse.cs diff --git a/i18n/en/Jobs.resx b/i18n/en/Jobs.resx index 723aaee7..b8ab8847 100644 --- a/i18n/en/Jobs.resx +++ b/i18n/en/Jobs.resx @@ -13,6 +13,7 @@ Resume Retry Show + {0}: {1} {0} left Clear done Kind @@ -50,8 +51,11 @@ after {0} next No log lines yet + Hide log + Show log Pause all Rendering settings + {0} · {1} Search target or kind {0} fps {0}/s diff --git a/i18n/en/Server.resx b/i18n/en/Server.resx index 3d9acadf..341cfbb2 100644 --- a/i18n/en/Server.resx +++ b/i18n/en/Server.resx @@ -95,7 +95,7 @@ Pause metered uploads {0} of {1} {0} used - Offer this PC as render node + Act as render node Admin Editor Uploader @@ -157,8 +157,10 @@ Sync settings Take server Upload + {0}: {1} Server archive {1} · {0} sequencelong; {0} sequence count, {1} archive size Server archive {1} · {0} sequenceslong; {0} sequence count, {1} archive size + Show all This PC Sequence Server diff --git a/i18n/en/Settings.resx b/i18n/en/Settings.resx index 1604e694..e3e90a41 100644 --- a/i18n/en/Settings.resx +++ b/i18n/en/Settings.resx @@ -54,13 +54,15 @@ Storage Updates Auto · {0} - Low priority while editing + Background priority Codec Encoder Max Self-test 10-bit + Used for of {0} logical cores + Custom only {0} (built in) {0} (hardware) {0} (software) @@ -76,12 +78,13 @@ Parallelism {0} fps · ok Prefer hardware - Hardware for previews only + Hardware for previews Quality profile Balanced Best Fast Re-detect + {0} {1}: {2} Run self-test Software only 10-bit @@ -90,7 +93,9 @@ Search settings Trusted certificates Default server + Forget: {0} None + Offer this PC Render node Clear Spilled frames and decoded thumbnails are deleted and rebuilt when needed. Originals, proxies and renders are not touched.long diff --git a/i18n/en/Tooltips.resx b/i18n/en/Tooltips.resx index 2601110d..11c0ea73 100644 --- a/i18n/en/Tooltips.resx +++ b/i18n/en/Tooltips.resx @@ -274,6 +274,7 @@ Show the folder in Explorer Hide the log Finished jobs older than this are removed when Titano starts + Bring photos in from a card or a folder; imports, analyses and renders then show up here Raise the priority: it runs before jobs of lower priority Open what this job worked on Pause at the next checkpoint; Resume continues from there @@ -355,6 +356,7 @@ Close without changing either copy The settings that differ: this PC's value, then the server's Identify the server, confirm a new certificate, then sign in · Enter + Type the address of the Titano Server first Close the session and work with the local archive only; you stay signed in Do not connect; nothing is sent to this server SHA-256 fingerprint of the server certificate @@ -365,6 +367,8 @@ Close without signing in · Esc Sent only to this server; Titano keeps a session token, never the password Your user name on the server + Video encoders the server can use on this PC: {0} + No server found on this network yet; type its address Pause uploads while Windows reports this connection as metered; they resume by themselves when it is notlong Space you use on the server out of your quota Let the server send render jobs to this PC when it is idle; uses your GPU encoders @@ -376,6 +380,7 @@ Sign out; the token is removed from this PC Connection to the server Size and sequences of the server archive + Clear the search and the filter to list every sequence again Fetch the originals to this PC, verified by hash ({0}){0} size All sequences on this PC and on the server Settings differ between this PC and the server @@ -383,6 +388,7 @@ Only on the server Copy the server's render to this PC ({1}){0} count, {1} size Copy the {0} server renders to this PC ({1}){0} count, {1} size + Bring photos in from a card or a folder, then upload them from here Overwrite the server copy with this PC's settings When this PC last compared every sequence with the server, and how long it took Open the web admin in your browser (admins only) diff --git a/i18n/it/Jobs.it.resx b/i18n/it/Jobs.it.resx index 58ed4e7c..ec6f193b 100644 --- a/i18n/it/Jobs.it.resx +++ b/i18n/it/Jobs.it.resx @@ -13,6 +13,7 @@ Riprendi Riprova Mostra + {0}: {1} {0} rimanenti Rimuovi concluse Tipo @@ -50,8 +51,11 @@ dopo {0} prossima Ancora nessuna riga di log + Nascondi log + Mostra log Sospendi tutte Impostazioni di rendering + {0} · {1} Cerca oggetto o tipo {0} fps {0}/s diff --git a/i18n/it/Server.it.resx b/i18n/it/Server.it.resx index ab68efee..148043a7 100644 --- a/i18n/it/Server.it.resx +++ b/i18n/it/Server.it.resx @@ -93,7 +93,7 @@ Pausa su reti a consumo {0} di {1} {0} usati - Offri questo PC per il rendering + Usa come nodo di rendering Amministratore Editor Caricatore @@ -155,8 +155,10 @@ Sincronizza Usa il server Carica + {0}: {1} Archivio del server {1} · {0} sequenza Archivio del server {1} · {0} sequenze + Mostra tutte Questo PC Sequenza Server diff --git a/i18n/it/Settings.it.resx b/i18n/it/Settings.it.resx index 198c180c..a79933c8 100644 --- a/i18n/it/Settings.it.resx +++ b/i18n/it/Settings.it.resx @@ -54,13 +54,15 @@ Spazio su disco Aggiornamenti Auto · {0} - Priorità bassa in modifica + Priorità bassa Codec Encoder Massimo Autotest 10 bit + Usato per di {0} core logici + Solo Personalizzato {0} (integrato) {0} (hardware) {0} (software) @@ -76,12 +78,13 @@ Parallelismo {0} fps · ok Preferisci hardware - Hardware solo per anteprime + Hardware per anteprime Profilo di qualità Bilanciato Massima qualità Veloce Rileva di nuovo + {0} {1}: {2} Esegui autotest Solo software 10 bit @@ -90,7 +93,9 @@ Cerca impostazioni Certificati attendibili Server predefinito + Dimentica: {0} Nessuno + Offri questo PC Nodo di rendering Svuota I fotogrammi temporanei e le miniature vengono eliminati e ricreati quando servono. Originali, proxy ed esportazioni restano intatti. diff --git a/i18n/it/Tooltips.it.resx b/i18n/it/Tooltips.it.resx index 2d899232..94527f4f 100644 --- a/i18n/it/Tooltips.it.resx +++ b/i18n/it/Tooltips.it.resx @@ -274,6 +274,7 @@ Mostra la cartella in Esplora file Nasconde il log Le attività concluse più vecchie vengono rimosse all'avvio di Titano + Porta dentro le foto da una scheda o da una cartella; importazioni, analisi e rendering compaiono poi qui Alza la priorità: verrà eseguita prima delle attività a priorità più bassa Apre l'oggetto di questa attività Mette in pausa al prossimo punto di ripresa; Riprendi continua da lì @@ -355,6 +356,7 @@ Chiudi senza modificare nessuna delle due copie Le impostazioni diverse: il valore di questo PC, poi quello del server Identifica il server, conferma un certificato nuovo e poi accedi · Invio + Scrivi prima l'indirizzo del Titano Server Chiude la sessione e lavora solo con l'archivio locale; l'accesso resta salvato Non connetterti; a questo server non viene inviato nulla Impronta SHA-256 del certificato del server @@ -365,6 +367,8 @@ Chiude senza accedere · Esc Inviata solo a questo server; Titano conserva un token di sessione, mai la password Il tuo nome utente sul server + Encoder video che il server può usare su questo PC: {0} + Nessun server trovato ancora in questa rete; scrivi il suo indirizzo Mette in pausa i caricamenti mentre Windows segnala questa connessione come a consumo; riprendono da soli quando non lo è Spazio che usi sul server rispetto alla tua quota Permette al server di inviare rendering a questo PC quando è inattivo; usa gli encoder della tua GPU @@ -376,6 +380,7 @@ Esci; il token viene rimosso da questo PC Connessione al server Dimensione e sequenze dell'archivio del server + Cancella la ricerca e il filtro per rivedere tutte le sequenze Scarica gli originali su questo PC, verificati con l'hash ({0}) Tutte le sequenze di questo PC e del server Le impostazioni differiscono tra questo PC e il server @@ -383,6 +388,7 @@ Solo sul server Copia su questo PC il render del server ({1}) Copia su questo PC i {0} render del server ({1}) + Porta dentro le foto da una scheda o da una cartella, poi caricale da qui Sovrascrivi la copia del server con le impostazioni di questo PC Quando questo PC ha confrontato per l'ultima volta tutte le sequenze con il server, e quanto ha impiegato Apri l'amministrazione web nel browser (solo amministratori) diff --git a/src/Titano.App/Jobs/JobListModel.cs b/src/Titano.App/Jobs/JobListModel.cs index cd72b0c8..4621ace1 100644 --- a/src/Titano.App/Jobs/JobListModel.cs +++ b/src/Titano.App/Jobs/JobListModel.cs @@ -132,6 +132,9 @@ public sealed class JobListModel public int RunningCount => _entries.Values.Count(e => e.State == JobState.Running); + /// Running jobs claimed by this machine's workers (), not by render nodes or other PCs. + public int RunningOn(string localWorkerId) => _entries.Values.Count(e => e.State == JobState.Running && JobText.IsLocal(e.Job.NodeId, localWorkerId)); + public int QueuedCount => _entries.Values.Count(e => e.State == JobState.Queued); /// Same order as JobRepository.ClaimNextAsync: priority descending, then creation time and id. diff --git a/src/Titano.App/Jobs/JobRowViewModel.cs b/src/Titano.App/Jobs/JobRowViewModel.cs index 7aed3470..5f9a5e2e 100644 --- a/src/Titano.App/Jobs/JobRowViewModel.cs +++ b/src/Titano.App/Jobs/JobRowViewModel.cs @@ -8,8 +8,8 @@ using Titano.Ui.Mvvm; namespace Titano.App.Jobs; -/// A row action: label, tooltip and command (26-px row buttons, DESIGN §4 tables). -public sealed record JobAction(string Text, string ToolTip, ICommand Command, bool IsDestructive = false); +/// A row action: label, tooltip, the name screen readers hear (label and row) and command (26-px row buttons, DESIGN §4 tables). +public sealed record JobAction(string Text, string ToolTip, string AccessibleName, ICommand Command); /// One row of the Jobs table (Jobs.html): kind, target, progress, speed, left, where, state, actions, log. public sealed class JobRowViewModel : ObservableObject @@ -36,6 +36,9 @@ public sealed class JobRowViewModel : ObservableObject public string Target => _entry.Job.TargetLabel ?? string.Empty; + /// "Render · Harbour sunset → 4K HEVC": the row's name for screen readers. + public string AccessibleName => JobText.Name(_entry.Job); + /// Progress 0…1 (0 while unknown). public double Progress => _entry.State == JobState.Done ? 1 : _entry.Fraction ?? 0; @@ -81,12 +84,16 @@ public sealed class JobRowViewModel : ObservableObject { if (!Set(ref _isExpanded, value)) return; OnPropertyChanged(nameof(ToggleToolTip)); + OnPropertyChanged(nameof(ToggleName)); if (value) _ = _actions.LoadLogAsync(this); } } public string ToggleToolTip => Loc.L(_isExpanded ? "Tooltips.Jobs.HideLog" : "Tooltips.Jobs.ShowLog"); + /// "Show log: Render · Harbour sunset": the expander names its row. + public string ToggleName => Loc.L("Jobs.ActionFor", Loc.L(_isExpanded ? "Jobs.Log.Hide" : "Jobs.Log.Show"), AccessibleName); + /// The last lines of the job log, plus the live message while it runs. public string LogText { diff --git a/src/Titano.App/Jobs/JobText.cs b/src/Titano.App/Jobs/JobText.cs index 4bec41c4..72da9fa3 100644 --- a/src/Titano.App/Jobs/JobText.cs +++ b/src/Titano.App/Jobs/JobText.cs @@ -48,9 +48,21 @@ public static class JobText public static string Where(string? nodeId, string localWorkerId) { if (string.IsNullOrEmpty(nodeId)) return string.Empty; + return IsLocal(nodeId, localWorkerId) ? Loc.L("Jobs.Where.ThisPc") : NodeName(nodeId); + } + + /// The job was claimed by one of this machine's numbered workers ("node#0", "node#1", …). + public static bool IsLocal(string? nodeId, string localWorkerId) => + !string.IsNullOrEmpty(nodeId) && NodeName(nodeId).Equals(localWorkerId, StringComparison.OrdinalIgnoreCase); + + /// "Kind: target" ("Render: Harbour sunset → 4K HEVC"), what a row is called for screen readers. + public static string Name(Job job) => + string.IsNullOrWhiteSpace(job.TargetLabel) ? Kind(job.Kind) : Loc.L("Jobs.Row.Name", Kind(job.Kind), job.TargetLabel); + + private static string NodeName(string nodeId) + { var hash = nodeId.IndexOf('#', StringComparison.Ordinal); - var name = hash < 0 ? nodeId : nodeId[..hash]; - return name.Equals(localWorkerId, StringComparison.OrdinalIgnoreCase) ? Loc.L("Jobs.Where.ThisPc") : name; + return hash < 0 ? nodeId : nodeId[..hash]; } /// diff --git a/src/Titano.App/Sections/AboutView.xaml b/src/Titano.App/Sections/AboutView.xaml index 805a251a..bf79c9a9 100644 --- a/src/Titano.App/Sections/AboutView.xaml +++ b/src/Titano.App/Sections/AboutView.xaml @@ -2,13 +2,15 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ui="clr-namespace:Titano.Ui.Controls;assembly=Titano.Ui" - xmlns:l="clr-namespace:Titano.Ui.Localization;assembly=Titano.Ui"> + xmlns:l="clr-namespace:Titano.Ui.Localization;assembly=Titano.Ui" + xmlns:infra="clr-namespace:Titano.App.Infrastructure"> - + + @@ -35,14 +37,16 @@ - + - - - - - - +