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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012iLMBNwBE2GnphAsu4cjaC
This commit is contained in:
Claude committed 2026-10-03 17:23:59 +00:00
1 parent baf3c6bddd
commit d80cb5f8a7
28 files changed
+801 -319

No files matched your search

+4
View File
@@ -13,6 +13,7 @@
<data name="Jobs.Action.Resume" xml:space="preserve"><value>Resume</value></data>
<data name="Jobs.Action.Retry" xml:space="preserve"><value>Retry</value></data>
<data name="Jobs.Action.Show" xml:space="preserve"><value>Show</value></data>
<data name="Jobs.ActionFor" xml:space="preserve"><value>{0}: {1}</value></data>
<data name="Jobs.Bar.Left" xml:space="preserve"><value>{0} left</value></data>
<data name="Jobs.ClearDone" xml:space="preserve"><value>Clear done</value></data>
<data name="Jobs.Column.Kind" xml:space="preserve"><value>Kind</value></data>
@@ -50,8 +51,11 @@
<data name="Jobs.Left.After" xml:space="preserve"><value>after {0}</value></data>
<data name="Jobs.Left.Next" xml:space="preserve"><value>next</value></data>
<data name="Jobs.Log.Empty" xml:space="preserve"><value>No log lines yet</value></data>
<data name="Jobs.Log.Hide" xml:space="preserve"><value>Hide log</value></data>
<data name="Jobs.Log.Show" xml:space="preserve"><value>Show log</value></data>
<data name="Jobs.PauseAll" xml:space="preserve"><value>Pause all</value></data>
<data name="Jobs.RenderingSettings" xml:space="preserve"><value>Rendering settings</value></data>
<data name="Jobs.Row.Name" xml:space="preserve"><value>{0} · {1}</value></data>
<data name="Jobs.Search" xml:space="preserve"><value>Search target or kind</value></data>
<data name="Jobs.Speed.Fps" xml:space="preserve"><value>{0} fps</value></data>
<data name="Jobs.Speed.PerSecond" xml:space="preserve"><value>{0}/s</value></data>
+3 -1
View File
@@ -95,7 +95,7 @@
<data name="Server.PauseMetered" xml:space="preserve"><value>Pause metered uploads</value></data>
<data name="Server.Quota" xml:space="preserve"><value>{0} of {1}</value></data>
<data name="Server.QuotaUnlimited" xml:space="preserve"><value>{0} used</value></data>
<data name="Server.RenderNode" xml:space="preserve"><value>Offer this PC as render node</value></data>
<data name="Server.RenderNode" xml:space="preserve"><value>Act as render node</value></data>
<data name="Server.Role.Admin" xml:space="preserve"><value>Admin</value></data>
<data name="Server.Role.Editor" xml:space="preserve"><value>Editor</value></data>
<data name="Server.Role.Uploader" xml:space="preserve"><value>Uploader</value></data>
@@ -157,8 +157,10 @@
<data name="Server.Sync.Action.SyncSettings" xml:space="preserve"><value>Sync settings</value></data>
<data name="Server.Sync.Action.TakeServer" xml:space="preserve"><value>Take server</value></data>
<data name="Server.Sync.Action.Upload" xml:space="preserve"><value>Upload</value></data>
<data name="Server.Sync.ActionFor" xml:space="preserve"><value>{0}: {1}</value></data>
<data name="Server.Sync.Archive.one" xml:space="preserve"><value>Server archive {1} · {0} sequence</value><comment>long; {0} sequence count, {1} archive size</comment></data>
<data name="Server.Sync.Archive.other" xml:space="preserve"><value>Server archive {1} · {0} sequences</value><comment>long; {0} sequence count, {1} archive size</comment></data>
<data name="Server.Sync.ClearFilters" xml:space="preserve"><value>Show all</value></data>
<data name="Server.Sync.Column.Local" xml:space="preserve"><value>This PC</value></data>
<data name="Server.Sync.Column.Sequence" xml:space="preserve"><value>Sequence</value></data>
<data name="Server.Sync.Column.Server" xml:space="preserve"><value>Server</value></data>
+7 -2
View File
@@ -54,13 +54,15 @@
<data name="Settings.Page.Storage" xml:space="preserve"><value>Storage</value></data>
<data name="Settings.Page.Updates" xml:space="preserve"><value>Updates</value></data>
<data name="Settings.Rendering.AutoValue" xml:space="preserve"><value>Auto · {0}</value></data>
<data name="Settings.Rendering.Background" xml:space="preserve"><value>Low priority while editing</value></data>
<data name="Settings.Rendering.Background" xml:space="preserve"><value>Background priority</value></data>
<data name="Settings.Rendering.Column.Codec" xml:space="preserve"><value>Codec</value></data>
<data name="Settings.Rendering.Column.Encoder" xml:space="preserve"><value>Encoder</value></data>
<data name="Settings.Rendering.Column.Max" xml:space="preserve"><value>Max</value></data>
<data name="Settings.Rendering.Column.SelfTest" xml:space="preserve"><value>Self-test</value></data>
<data name="Settings.Rendering.Column.TenBit" xml:space="preserve"><value>10-bit</value></data>
<data name="Settings.Rendering.Column.UsedFor" xml:space="preserve"><value>Used for</value></data>
<data name="Settings.Rendering.Cores" xml:space="preserve"><value>of {0} logical cores</value></data>
<data name="Settings.Rendering.CustomOnly" xml:space="preserve"><value>Custom only</value></data>
<data name="Settings.Rendering.Encoder.BuiltIn" xml:space="preserve"><value>{0} (built in)</value></data>
<data name="Settings.Rendering.Encoder.Hardware" xml:space="preserve"><value>{0} (hardware)</value></data>
<data name="Settings.Rendering.Encoder.Software" xml:space="preserve"><value>{0} (software)</value></data>
@@ -76,12 +78,13 @@
<data name="Settings.Rendering.Parallelism" xml:space="preserve"><value>Parallelism</value></data>
<data name="Settings.Rendering.Passed" xml:space="preserve"><value>{0} fps · ok</value></data>
<data name="Settings.Rendering.PreferHardware" xml:space="preserve"><value>Prefer hardware</value></data>
<data name="Settings.Rendering.PreviewsOnly" xml:space="preserve"><value>Hardware for previews only</value></data>
<data name="Settings.Rendering.PreviewsOnly" xml:space="preserve"><value>Hardware for previews</value></data>
<data name="Settings.Rendering.Quality" xml:space="preserve"><value>Quality profile</value></data>
<data name="Settings.Rendering.Quality.Balanced" xml:space="preserve"><value>Balanced</value></data>
<data name="Settings.Rendering.Quality.Best" xml:space="preserve"><value>Best</value></data>
<data name="Settings.Rendering.Quality.Fast" xml:space="preserve"><value>Fast</value></data>
<data name="Settings.Rendering.Redetect" xml:space="preserve"><value>Re-detect</value></data>
<data name="Settings.Rendering.ResultFor" xml:space="preserve"><value>{0} {1}: {2}</value></data>
<data name="Settings.Rendering.SelfTest" xml:space="preserve"><value>Run self-test</value></data>
<data name="Settings.Rendering.SoftwareOnly" xml:space="preserve"><value>Software only</value></data>
<data name="Settings.Rendering.TenBit" xml:space="preserve"><value>10-bit</value></data>
@@ -90,7 +93,9 @@
<data name="Settings.Search" xml:space="preserve"><value>Search settings</value></data>
<data name="Settings.Server.Certificates" xml:space="preserve"><value>Trusted certificates</value></data>
<data name="Settings.Server.Default" xml:space="preserve"><value>Default server</value></data>
<data name="Settings.Server.ForgetName" xml:space="preserve"><value>Forget: {0}</value></data>
<data name="Settings.Server.NoCertificates" xml:space="preserve"><value>None</value></data>
<data name="Settings.Server.OfferPc" xml:space="preserve"><value>Offer this PC</value></data>
<data name="Settings.Server.RenderNode" xml:space="preserve"><value>Render node</value></data>
<data name="Settings.Storage.Clear" xml:space="preserve"><value>Clear</value></data>
<data name="Settings.Storage.ClearMessage" xml:space="preserve"><value>Spilled frames and decoded thumbnails are deleted and rebuilt when needed. Originals, proxies and renders are not touched.</value><comment>long</comment></data>
+6
View File
@@ -274,6 +274,7 @@
<data name="Tooltips.Jobs.Folder" xml:space="preserve"><value>Show the folder in Explorer</value></data>
<data name="Tooltips.Jobs.HideLog" xml:space="preserve"><value>Hide the log</value></data>
<data name="Tooltips.Jobs.History" xml:space="preserve"><value>Finished jobs older than this are removed when Titano starts</value></data>
<data name="Tooltips.Jobs.Import" xml:space="preserve"><value>Bring photos in from a card or a folder; imports, analyses and renders then show up here</value></data>
<data name="Tooltips.Jobs.MoveUp" xml:space="preserve"><value>Raise the priority: it runs before jobs of lower priority</value></data>
<data name="Tooltips.Jobs.Open" xml:space="preserve"><value>Open what this job worked on</value></data>
<data name="Tooltips.Jobs.Pause" xml:space="preserve"><value>Pause at the next checkpoint; Resume continues from there</value></data>
@@ -355,6 +356,7 @@
<data name="Tooltips.Server.Conflict.Cancel" xml:space="preserve"><value>Close without changing either copy</value></data>
<data name="Tooltips.Server.Conflict.Detail" xml:space="preserve"><value>The settings that differ: this PC's value, then the server's</value></data>
<data name="Tooltips.Server.Connect" xml:space="preserve"><value>Identify the server, confirm a new certificate, then sign in · Enter</value></data>
<data name="Tooltips.Server.ConnectNoAddress" xml:space="preserve"><value>Type the address of the Titano Server first</value></data>
<data name="Tooltips.Server.Disconnect" xml:space="preserve"><value>Close the session and work with the local archive only; you stay signed in</value></data>
<data name="Tooltips.Server.DontTrust" xml:space="preserve"><value>Do not connect; nothing is sent to this server</value></data>
<data name="Tooltips.Server.Fingerprint" xml:space="preserve"><value>SHA-256 fingerprint of the server certificate</value></data>
@@ -365,6 +367,8 @@
<data name="Tooltips.Server.LoginCancel" xml:space="preserve"><value>Close without signing in · Esc</value></data>
<data name="Tooltips.Server.LoginPassword" xml:space="preserve"><value>Sent only to this server; Titano keeps a session token, never the password</value></data>
<data name="Tooltips.Server.LoginUser" xml:space="preserve"><value>Your user name on the server</value></data>
<data name="Tooltips.Server.NodeEncoders" xml:space="preserve"><value>Video encoders the server can use on this PC: {0}</value></data>
<data name="Tooltips.Server.NoneFound" xml:space="preserve"><value>No server found on this network yet; type its address</value></data>
<data name="Tooltips.Server.PauseMetered" xml:space="preserve"><value>Pause uploads while Windows reports this connection as metered; they resume by themselves when it is not</value><comment>long</comment></data>
<data name="Tooltips.Server.Quota" xml:space="preserve"><value>Space you use on the server out of your quota</value></data>
<data name="Tooltips.Server.RenderNode" xml:space="preserve"><value>Let the server send render jobs to this PC when it is idle; uses your GPU encoders</value></data>
@@ -376,6 +380,7 @@
<data name="Tooltips.Server.SignOut" xml:space="preserve"><value>Sign out; the token is removed from this PC</value></data>
<data name="Tooltips.Server.Status" xml:space="preserve"><value>Connection to the server</value></data>
<data name="Tooltips.Server.Sync.Archive" xml:space="preserve"><value>Size and sequences of the server archive</value></data>
<data name="Tooltips.Server.Sync.ClearFilters" xml:space="preserve"><value>Clear the search and the filter to list every sequence again</value></data>
<data name="Tooltips.Server.Sync.DownloadOriginals" xml:space="preserve"><value>Fetch the originals to this PC, verified by hash ({0})</value><comment>{0} size</comment></data>
<data name="Tooltips.Server.Sync.Filter.All" xml:space="preserve"><value>All sequences on this PC and on the server</value></data>
<data name="Tooltips.Server.Sync.Filter.Conflicts" xml:space="preserve"><value>Settings differ between this PC and the server</value></data>
@@ -383,6 +388,7 @@
<data name="Tooltips.Server.Sync.Filter.Remote" xml:space="preserve"><value>Only on the server</value></data>
<data name="Tooltips.Server.Sync.GetExports.one" xml:space="preserve"><value>Copy the server's render to this PC ({1})</value><comment>{0} count, {1} size</comment></data>
<data name="Tooltips.Server.Sync.GetExports.other" xml:space="preserve"><value>Copy the {0} server renders to this PC ({1})</value><comment>{0} count, {1} size</comment></data>
<data name="Tooltips.Server.Sync.Import" xml:space="preserve"><value>Bring photos in from a card or a folder, then upload them from here</value></data>
<data name="Tooltips.Server.Sync.KeepMine" xml:space="preserve"><value>Overwrite the server copy with this PC's settings</value></data>
<data name="Tooltips.Server.Sync.LastSync" xml:space="preserve"><value>When this PC last compared every sequence with the server, and how long it took</value></data>
<data name="Tooltips.Server.Sync.OpenAdmin" xml:space="preserve"><value>Open the web admin in your browser (admins only)</value></data>
+4
View File
@@ -13,6 +13,7 @@
<data name="Jobs.Action.Resume" xml:space="preserve"><value>Riprendi</value></data>
<data name="Jobs.Action.Retry" xml:space="preserve"><value>Riprova</value></data>
<data name="Jobs.Action.Show" xml:space="preserve"><value>Mostra</value></data>
<data name="Jobs.ActionFor" xml:space="preserve"><value>{0}: {1}</value></data>
<data name="Jobs.Bar.Left" xml:space="preserve"><value>{0} rimanenti</value></data>
<data name="Jobs.ClearDone" xml:space="preserve"><value>Rimuovi concluse</value></data>
<data name="Jobs.Column.Kind" xml:space="preserve"><value>Tipo</value></data>
@@ -50,8 +51,11 @@
<data name="Jobs.Left.After" xml:space="preserve"><value>dopo {0}</value></data>
<data name="Jobs.Left.Next" xml:space="preserve"><value>prossima</value></data>
<data name="Jobs.Log.Empty" xml:space="preserve"><value>Ancora nessuna riga di log</value></data>
<data name="Jobs.Log.Hide" xml:space="preserve"><value>Nascondi log</value></data>
<data name="Jobs.Log.Show" xml:space="preserve"><value>Mostra log</value></data>
<data name="Jobs.PauseAll" xml:space="preserve"><value>Sospendi tutte</value></data>
<data name="Jobs.RenderingSettings" xml:space="preserve"><value>Impostazioni di rendering</value></data>
<data name="Jobs.Row.Name" xml:space="preserve"><value>{0} · {1}</value></data>
<data name="Jobs.Search" xml:space="preserve"><value>Cerca oggetto o tipo</value></data>
<data name="Jobs.Speed.Fps" xml:space="preserve"><value>{0} fps</value></data>
<data name="Jobs.Speed.PerSecond" xml:space="preserve"><value>{0}/s</value></data>
+3 -1
View File
@@ -93,7 +93,7 @@
<data name="Server.PauseMetered" xml:space="preserve"><value>Pausa su reti a consumo</value></data>
<data name="Server.Quota" xml:space="preserve"><value>{0} di {1}</value></data>
<data name="Server.QuotaUnlimited" xml:space="preserve"><value>{0} usati</value></data>
<data name="Server.RenderNode" xml:space="preserve"><value>Offri questo PC per il rendering</value></data>
<data name="Server.RenderNode" xml:space="preserve"><value>Usa come nodo di rendering</value></data>
<data name="Server.Role.Admin" xml:space="preserve"><value>Amministratore</value></data>
<data name="Server.Role.Editor" xml:space="preserve"><value>Editor</value></data>
<data name="Server.Role.Uploader" xml:space="preserve"><value>Caricatore</value></data>
@@ -155,8 +155,10 @@
<data name="Server.Sync.Action.SyncSettings" xml:space="preserve"><value>Sincronizza</value></data>
<data name="Server.Sync.Action.TakeServer" xml:space="preserve"><value>Usa il server</value></data>
<data name="Server.Sync.Action.Upload" xml:space="preserve"><value>Carica</value></data>
<data name="Server.Sync.ActionFor" xml:space="preserve"><value>{0}: {1}</value></data>
<data name="Server.Sync.Archive.one" xml:space="preserve"><value>Archivio del server {1} · {0} sequenza</value></data>
<data name="Server.Sync.Archive.other" xml:space="preserve"><value>Archivio del server {1} · {0} sequenze</value></data>
<data name="Server.Sync.ClearFilters" xml:space="preserve"><value>Mostra tutte</value></data>
<data name="Server.Sync.Column.Local" xml:space="preserve"><value>Questo PC</value></data>
<data name="Server.Sync.Column.Sequence" xml:space="preserve"><value>Sequenza</value></data>
<data name="Server.Sync.Column.Server" xml:space="preserve"><value>Server</value></data>
+7 -2
View File
@@ -54,13 +54,15 @@
<data name="Settings.Page.Storage" xml:space="preserve"><value>Spazio su disco</value></data>
<data name="Settings.Page.Updates" xml:space="preserve"><value>Aggiornamenti</value></data>
<data name="Settings.Rendering.AutoValue" xml:space="preserve"><value>Auto · {0}</value></data>
<data name="Settings.Rendering.Background" xml:space="preserve"><value>Priorità bassa in modifica</value></data>
<data name="Settings.Rendering.Background" xml:space="preserve"><value>Priorità bassa</value></data>
<data name="Settings.Rendering.Column.Codec" xml:space="preserve"><value>Codec</value></data>
<data name="Settings.Rendering.Column.Encoder" xml:space="preserve"><value>Encoder</value></data>
<data name="Settings.Rendering.Column.Max" xml:space="preserve"><value>Massimo</value></data>
<data name="Settings.Rendering.Column.SelfTest" xml:space="preserve"><value>Autotest</value></data>
<data name="Settings.Rendering.Column.TenBit" xml:space="preserve"><value>10 bit</value></data>
<data name="Settings.Rendering.Column.UsedFor" xml:space="preserve"><value>Usato per</value></data>
<data name="Settings.Rendering.Cores" xml:space="preserve"><value>di {0} core logici</value></data>
<data name="Settings.Rendering.CustomOnly" xml:space="preserve"><value>Solo Personalizzato</value></data>
<data name="Settings.Rendering.Encoder.BuiltIn" xml:space="preserve"><value>{0} (integrato)</value></data>
<data name="Settings.Rendering.Encoder.Hardware" xml:space="preserve"><value>{0} (hardware)</value></data>
<data name="Settings.Rendering.Encoder.Software" xml:space="preserve"><value>{0} (software)</value></data>
@@ -76,12 +78,13 @@
<data name="Settings.Rendering.Parallelism" xml:space="preserve"><value>Parallelismo</value></data>
<data name="Settings.Rendering.Passed" xml:space="preserve"><value>{0} fps · ok</value></data>
<data name="Settings.Rendering.PreferHardware" xml:space="preserve"><value>Preferisci hardware</value></data>
<data name="Settings.Rendering.PreviewsOnly" xml:space="preserve"><value>Hardware solo per anteprime</value></data>
<data name="Settings.Rendering.PreviewsOnly" xml:space="preserve"><value>Hardware per anteprime</value></data>
<data name="Settings.Rendering.Quality" xml:space="preserve"><value>Profilo di qualità</value></data>
<data name="Settings.Rendering.Quality.Balanced" xml:space="preserve"><value>Bilanciato</value></data>
<data name="Settings.Rendering.Quality.Best" xml:space="preserve"><value>Massima qualità</value></data>
<data name="Settings.Rendering.Quality.Fast" xml:space="preserve"><value>Veloce</value></data>
<data name="Settings.Rendering.Redetect" xml:space="preserve"><value>Rileva di nuovo</value></data>
<data name="Settings.Rendering.ResultFor" xml:space="preserve"><value>{0} {1}: {2}</value></data>
<data name="Settings.Rendering.SelfTest" xml:space="preserve"><value>Esegui autotest</value></data>
<data name="Settings.Rendering.SoftwareOnly" xml:space="preserve"><value>Solo software</value></data>
<data name="Settings.Rendering.TenBit" xml:space="preserve"><value>10 bit</value></data>
@@ -90,7 +93,9 @@
<data name="Settings.Search" xml:space="preserve"><value>Cerca impostazioni</value></data>
<data name="Settings.Server.Certificates" xml:space="preserve"><value>Certificati attendibili</value></data>
<data name="Settings.Server.Default" xml:space="preserve"><value>Server predefinito</value></data>
<data name="Settings.Server.ForgetName" xml:space="preserve"><value>Dimentica: {0}</value></data>
<data name="Settings.Server.NoCertificates" xml:space="preserve"><value>Nessuno</value></data>
<data name="Settings.Server.OfferPc" xml:space="preserve"><value>Offri questo PC</value></data>
<data name="Settings.Server.RenderNode" xml:space="preserve"><value>Nodo di rendering</value></data>
<data name="Settings.Storage.Clear" xml:space="preserve"><value>Svuota</value></data>
<data name="Settings.Storage.ClearMessage" xml:space="preserve"><value>I fotogrammi temporanei e le miniature vengono eliminati e ricreati quando servono. Originali, proxy ed esportazioni restano intatti.</value></data>
+6
View File
@@ -274,6 +274,7 @@
<data name="Tooltips.Jobs.Folder" xml:space="preserve"><value>Mostra la cartella in Esplora file</value></data>
<data name="Tooltips.Jobs.HideLog" xml:space="preserve"><value>Nasconde il log</value></data>
<data name="Tooltips.Jobs.History" xml:space="preserve"><value>Le attività concluse più vecchie vengono rimosse all'avvio di Titano</value></data>
<data name="Tooltips.Jobs.Import" xml:space="preserve"><value>Porta dentro le foto da una scheda o da una cartella; importazioni, analisi e rendering compaiono poi qui</value></data>
<data name="Tooltips.Jobs.MoveUp" xml:space="preserve"><value>Alza la priorità: verrà eseguita prima delle attività a priorità più bassa</value></data>
<data name="Tooltips.Jobs.Open" xml:space="preserve"><value>Apre l'oggetto di questa attività</value></data>
<data name="Tooltips.Jobs.Pause" xml:space="preserve"><value>Mette in pausa al prossimo punto di ripresa; Riprendi continua da lì</value></data>
@@ -355,6 +356,7 @@
<data name="Tooltips.Server.Conflict.Cancel" xml:space="preserve"><value>Chiudi senza modificare nessuna delle due copie</value></data>
<data name="Tooltips.Server.Conflict.Detail" xml:space="preserve"><value>Le impostazioni diverse: il valore di questo PC, poi quello del server</value></data>
<data name="Tooltips.Server.Connect" xml:space="preserve"><value>Identifica il server, conferma un certificato nuovo e poi accedi · Invio</value></data>
<data name="Tooltips.Server.ConnectNoAddress" xml:space="preserve"><value>Scrivi prima l'indirizzo del Titano Server</value></data>
<data name="Tooltips.Server.Disconnect" xml:space="preserve"><value>Chiude la sessione e lavora solo con l'archivio locale; l'accesso resta salvato</value></data>
<data name="Tooltips.Server.DontTrust" xml:space="preserve"><value>Non connetterti; a questo server non viene inviato nulla</value></data>
<data name="Tooltips.Server.Fingerprint" xml:space="preserve"><value>Impronta SHA-256 del certificato del server</value></data>
@@ -365,6 +367,8 @@
<data name="Tooltips.Server.LoginCancel" xml:space="preserve"><value>Chiude senza accedere · Esc</value></data>
<data name="Tooltips.Server.LoginPassword" xml:space="preserve"><value>Inviata solo a questo server; Titano conserva un token di sessione, mai la password</value></data>
<data name="Tooltips.Server.LoginUser" xml:space="preserve"><value>Il tuo nome utente sul server</value></data>
<data name="Tooltips.Server.NodeEncoders" xml:space="preserve"><value>Encoder video che il server può usare su questo PC: {0}</value></data>
<data name="Tooltips.Server.NoneFound" xml:space="preserve"><value>Nessun server trovato ancora in questa rete; scrivi il suo indirizzo</value></data>
<data name="Tooltips.Server.PauseMetered" xml:space="preserve"><value>Mette in pausa i caricamenti mentre Windows segnala questa connessione come a consumo; riprendono da soli quando non lo è</value></data>
<data name="Tooltips.Server.Quota" xml:space="preserve"><value>Spazio che usi sul server rispetto alla tua quota</value></data>
<data name="Tooltips.Server.RenderNode" xml:space="preserve"><value>Permette al server di inviare rendering a questo PC quando è inattivo; usa gli encoder della tua GPU</value></data>
@@ -376,6 +380,7 @@
<data name="Tooltips.Server.SignOut" xml:space="preserve"><value>Esci; il token viene rimosso da questo PC</value></data>
<data name="Tooltips.Server.Status" xml:space="preserve"><value>Connessione al server</value></data>
<data name="Tooltips.Server.Sync.Archive" xml:space="preserve"><value>Dimensione e sequenze dell'archivio del server</value></data>
<data name="Tooltips.Server.Sync.ClearFilters" xml:space="preserve"><value>Cancella la ricerca e il filtro per rivedere tutte le sequenze</value></data>
<data name="Tooltips.Server.Sync.DownloadOriginals" xml:space="preserve"><value>Scarica gli originali su questo PC, verificati con l'hash ({0})</value></data>
<data name="Tooltips.Server.Sync.Filter.All" xml:space="preserve"><value>Tutte le sequenze di questo PC e del server</value></data>
<data name="Tooltips.Server.Sync.Filter.Conflicts" xml:space="preserve"><value>Le impostazioni differiscono tra questo PC e il server</value></data>
@@ -383,6 +388,7 @@
<data name="Tooltips.Server.Sync.Filter.Remote" xml:space="preserve"><value>Solo sul server</value></data>
<data name="Tooltips.Server.Sync.GetExports.one" xml:space="preserve"><value>Copia su questo PC il render del server ({1})</value></data>
<data name="Tooltips.Server.Sync.GetExports.other" xml:space="preserve"><value>Copia su questo PC i {0} render del server ({1})</value></data>
<data name="Tooltips.Server.Sync.Import" xml:space="preserve"><value>Porta dentro le foto da una scheda o da una cartella, poi caricale da qui</value></data>
<data name="Tooltips.Server.Sync.KeepMine" xml:space="preserve"><value>Sovrascrivi la copia del server con le impostazioni di questo PC</value></data>
<data name="Tooltips.Server.Sync.LastSync" xml:space="preserve"><value>Quando questo PC ha confrontato per l'ultima volta tutte le sequenze con il server, e quanto ha impiegato</value></data>
<data name="Tooltips.Server.Sync.OpenAdmin" xml:space="preserve"><value>Apri l'amministrazione web nel browser (solo amministratori)</value></data>
+3
View File
@@ -132,6 +132,9 @@ public sealed class JobListModel
public int RunningCount => _entries.Values.Count(e => e.State == JobState.Running);
/// <summary>Running jobs claimed by this machine's workers (<paramref name="localWorkerId"/>), not by render nodes or other PCs.</summary>
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);
/// <summary>Same order as <c>JobRepository.ClaimNextAsync</c>: priority descending, then creation time and id.</summary>
+9 -2
View File
@@ -8,8 +8,8 @@ using Titano.Ui.Mvvm;
namespace Titano.App.Jobs;
/// <summary>A row action: label, tooltip and command (26-px row buttons, DESIGN §4 tables).</summary>
public sealed record JobAction(string Text, string ToolTip, ICommand Command, bool IsDestructive = false);
/// <summary>A row action: label, tooltip, the name screen readers hear (label and row) and command (26-px row buttons, DESIGN §4 tables).</summary>
public sealed record JobAction(string Text, string ToolTip, string AccessibleName, ICommand Command);
/// <summary>One row of the Jobs table (Jobs.html): kind, target, progress, speed, left, where, state, actions, log.</summary>
public sealed class JobRowViewModel : ObservableObject
@@ -36,6 +36,9 @@ public sealed class JobRowViewModel : ObservableObject
public string Target => _entry.Job.TargetLabel ?? string.Empty;
/// <summary>"Render · Harbour sunset → 4K HEVC": the row's name for screen readers.</summary>
public string AccessibleName => JobText.Name(_entry.Job);
/// <summary>Progress 0…1 (0 while unknown).</summary>
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");
/// <summary>"Show log: Render · Harbour sunset": the expander names its row.</summary>
public string ToggleName => Loc.L("Jobs.ActionFor", Loc.L(_isExpanded ? "Jobs.Log.Hide" : "Jobs.Log.Show"), AccessibleName);
/// <summary>The last lines of the job log, plus the live message while it runs.</summary>
public string LogText
{
+14 -2
View File
@@ -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);
}
/// <summary>The job was claimed by one of this machine's numbered workers ("node#0", "node#1", …).</summary>
public static bool IsLocal(string? nodeId, string localWorkerId) =>
!string.IsNullOrEmpty(nodeId) && NodeName(nodeId).Equals(localWorkerId, StringComparison.OrdinalIgnoreCase);
/// <summary>"Kind: target" ("Render: Harbour sunset → 4K HEVC"), what a row is called for screen readers.</summary>
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];
}
/// <summary>
+10 -5
View File
@@ -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">
<!-- BRIEF §12.9 (no mockup): built from the kit — panel, label column, one primary action. -->
<Grid Margin="20,16,20,20">
<Border Style="{StaticResource Border.Panel}" Padding="28,24" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="600">
<StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,0,0,22">
<ui:BrandMarkIcon Width="56" Height="56" ShowPlate="True" />
<!-- The mark keeps its clockwise ring and its sun on the right in every reading direction. -->
<ui:BrandMarkIcon Width="56" Height="56" ShowPlate="True" FlowDirection="LeftToRight" />
<StackPanel Margin="16,0,0,0" VerticalAlignment="Center">
<TextBlock Text="{l:Loc Shell.AppName}" Style="{StaticResource Text.PageTitle}" FontSize="22" />
<TextBlock Text="{Binding Version}" Style="{StaticResource Text.Secondary}" Margin="0,2,0,0" Typography.NumeralAlignment="Tabular" />
@@ -35,14 +37,16 @@
<TextBlock Grid.Row="1" Style="{StaticResource Text.Label}" Text="{l:Loc About.Runtime}" />
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Runtime}" VerticalAlignment="Center" />
<TextBlock Grid.Row="2" Style="{StaticResource Text.Label}" Text="{l:Loc About.System}" />
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding OperatingSystem}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding OperatingSystem}" ToolTip="{Binding OperatingSystem}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
<TextBlock Grid.Row="3" Style="{StaticResource Text.Label}" Text="{l:Loc About.Licence}" />
<Button Grid.Row="3" Grid.Column="1" Style="{StaticResource Button.Link}" FontSize="13" HorizontalAlignment="Left" VerticalAlignment="Center"
Content="{l:Loc About.LicenceLink}" Command="{Binding OpenLicenceCommand}" ToolTip="{l:Loc Tooltips.About.Licence}" />
<TextBlock Grid.Row="4" Style="{StaticResource Text.Label}" Text="{l:Loc About.ThirdParty}" />
<TextBlock Grid.Row="4" Grid.Column="1" Text="{l:Loc About.ThirdPartyNone}" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.About.ThirdParty}" />
<TextBlock Grid.Row="5" Style="{StaticResource Text.Label}" Text="{l:Loc About.Data}" />
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding DataFolder}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
<!-- A path reads left to right in every language and shows whole in its tooltip when cut. -->
<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding DataFolder}" ToolTip="{Binding DataFolder}" VerticalAlignment="Center" HorizontalAlignment="Left"
TextTrimming="CharacterEllipsis" FlowDirection="LeftToRight" />
<TextBlock Grid.Row="6" Style="{StaticResource Text.Label}" Text="{l:Loc About.Translation}" Height="28"
Visibility="{Binding IsTranslated, Converter={StaticResource BoolToVisibility}}" />
<StackPanel Grid.Row="6" Grid.Column="1" Orientation="Horizontal" Height="28" Visibility="{Binding IsTranslated, Converter={StaticResource BoolToVisibility}}">
@@ -53,7 +57,8 @@
<TextBlock Grid.Row="7" Style="{StaticResource Text.Label}" Text="{l:Loc About.Updates}" />
<StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal">
<ui:StatusGlyph Kind="{Binding UpdateKind}" Text="{Binding UpdateText}" FontSize="13" VerticalAlignment="Center"
Visibility="{Binding HasUpdateText, Converter={StaticResource BoolToVisibility}}" />
Visibility="{Binding HasUpdateText, Converter={StaticResource BoolToVisibility}}"
AutomationProperties.LiveSetting="Polite" infra:LiveRegion.Text="{Binding UpdateText}" />
<Button Style="{StaticResource Button.Link}" FontSize="13" Margin="12,0,0,0" VerticalAlignment="Center" Content="{l:Loc About.Update.Download}"
Command="{Binding DownloadCommand}" ToolTip="{Binding DownloadToolTip}"
Visibility="{Binding IsUpdateAvailable, Converter={StaticResource BoolToVisibility}}" />
+114 -66
View File
@@ -6,7 +6,6 @@
xmlns:s="clr-namespace:Titano.App.Sections"
xmlns:j="clr-namespace:Titano.App.Jobs">
<UserControl.Resources>
<!-- Column layout shared by the header and the rows (Jobs.html grid-template-columns). -->
<Style x:Key="Text.Muted" TargetType="TextBlock" BasedOn="{StaticResource Text.Cell}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsDimmed}" Value="True">
@@ -14,8 +13,14 @@
</DataTrigger>
</Style.Triggers>
</Style>
<!-- Numbers stay right-aligned in both reading directions (DESIGN §4 tables). -->
<Style x:Key="Text.MutedNumber" TargetType="TextBlock" BasedOn="{StaticResource Text.Muted}">
<Setter Property="TextAlignment" Value="Right" />
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<Style x:Key="Text.HeaderNumber" TargetType="TextBlock" BasedOn="{StaticResource Text.Header}">
<Setter Property="TextAlignment" Value="Right" />
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<Style x:Key="ProgressBar.Job" TargetType="ProgressBar" BasedOn="{StaticResource {x:Type ProgressBar}}">
<Style.Triggers>
@@ -30,35 +35,70 @@
<ItemsPanelTemplate x:Key="Panel.Row">
<StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
<ItemsPanelTemplate x:Key="Panel.Wrap">
<WrapPanel />
</ItemsPanelTemplate>
<!-- Filter chip (Jobs.html, aria-pressed): one of a group, so screen readers hear which filter is on. -->
<Style x:Key="RadioButton.Chip" TargetType="RadioButton" BasedOn="{StaticResource Button.Base}">
<Setter Property="Height" Value="30" />
<Setter Property="Padding" Value="12,0" />
<Setter Property="Typography.NumeralAlignment" Value="Tabular" />
<Setter Property="ui:ControlState.CornerRadius" Value="15" />
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
<Setter Property="Foreground" Value="{DynamicResource Brush.Accent}" />
<Setter Property="ui:ControlState.HoverBorderBrush" Value="{DynamicResource Brush.Accent}" />
</Trigger>
</Style.Triggers>
</Style>
<!-- A row reads as its job and state; Tab goes to its buttons. -->
<Style x:Key="ListBoxItem.Job" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.PlainRow}">
<Setter Property="AutomationProperties.Name" Value="{Binding AccessibleName}" />
<Setter Property="AutomationProperties.ItemStatus" Value="{Binding StateText}" />
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="56" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<!-- Toolbar: state chips · search · workers, Pause all, Clear done. -->
<DockPanel Margin="20,0" LastChildFill="False">
<Button DockPanel.Dock="Right" Content="{l:Loc Jobs.ClearDone}" Command="{Binding ClearDoneCommand}" ToolTip="{l:Loc Tooltips.Jobs.ClearDone}" Margin="8,0,0,0" />
<Button DockPanel.Dock="Right" Content="{l:Loc Jobs.PauseAll}" Command="{Binding PauseAllCommand}" ToolTip="{l:Loc Tooltips.Jobs.PauseAll}" Margin="12,0,0,0" />
<TextBlock DockPanel.Dock="Right" Text="{Binding WorkersText}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center"
Typography.NumeralAlignment="Tabular" ToolTip="{l:Loc Tooltips.Jobs.Workers}" />
<ItemsControl ItemsSource="{Binding Chips}" ItemsPanel="{StaticResource Panel.Row}" Focusable="False" VerticalAlignment="Center">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type s:JobFilterChip}">
<Button Style="{StaticResource Button.Chip}" Content="{Binding Text}" Tag="{Binding IsSelected}" Command="{Binding SelectCommand}"
ToolTip="{Binding ToolTip}" Margin="0,0,8,0" Typography.NumeralAlignment="Tabular" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Border Width="1" Height="22" Background="{DynamicResource Brush.Stroke}" Margin="6,0,14,0" VerticalAlignment="Center" />
<TextBox Width="240" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
ui:Field.Placeholder="{l:Loc Jobs.Search}" ToolTip="{l:Loc Tooltips.Jobs.Search}" AutomationProperties.Name="{l:Loc Jobs.Search}" />
</DockPanel>
<!-- Toolbar in visual (and Tab) order: state chips · search, then workers, Pause all, Clear done. The search moves under
the chips before anything is cut (+40 % text at 1200 px). -->
<Grid Margin="20,12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<WrapPanel VerticalAlignment="Center">
<ItemsControl ItemsSource="{Binding Chips}" ItemsPanel="{StaticResource Panel.Wrap}" Focusable="False" VerticalAlignment="Center">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type s:JobFilterChip}">
<RadioButton Style="{StaticResource RadioButton.Chip}" GroupName="JobFilters" Content="{Binding Text}" IsChecked="{Binding IsSelected, Mode=OneWay}"
Command="{Binding SelectCommand}" ToolTip="{Binding ToolTip}" Margin="0,1,8,1" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<StackPanel Orientation="Horizontal" Margin="0,1,0,1">
<Border Width="1" Height="22" Background="{DynamicResource Brush.Stroke}" Margin="6,0,14,0" VerticalAlignment="Center" />
<TextBox Width="240" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
ui:Field.Placeholder="{l:Loc Jobs.Search}" ToolTip="{l:Loc Tooltips.Jobs.Search}" AutomationProperties.Name="{l:Loc Jobs.Search}" />
</StackPanel>
</WrapPanel>
<TextBlock Grid.Column="1" Text="{Binding WorkersText}" Foreground="{DynamicResource Brush.TextMuted}" VerticalAlignment="Center" Margin="12,0,0,0"
Typography.NumeralAlignment="Tabular" ToolTip="{l:Loc Tooltips.Jobs.Workers}" Visibility="{Binding HasWorkers, Converter={StaticResource BoolToVisibility}}" />
<Button Grid.Column="2" Content="{l:Loc Jobs.PauseAll}" Command="{Binding PauseAllCommand}" ToolTip="{l:Loc Tooltips.Jobs.PauseAll}" Margin="12,0,0,0" VerticalAlignment="Center" />
<Button Grid.Column="3" Content="{l:Loc Jobs.ClearDone}" Command="{Binding ClearDoneCommand}" ToolTip="{l:Loc Tooltips.Jobs.ClearDone}" Margin="8,0,0,0" VerticalAlignment="Center" />
</Grid>
<Border Grid.Row="1" Style="{StaticResource Border.Panel}" Margin="20,0,20,12" Visibility="{Binding HasRows, Converter={StaticResource BoolToVisibility}}">
<Grid>
<!-- Header and rows share their columns (Jobs.html grid-template-columns): the same 14 px padding, the actions column sized
by its widest row in every row, and the list's scroll-bar gutter always kept (10 px), mirrored on the header's right. -->
<Grid Grid.IsSharedSizeScope="True">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@@ -66,7 +106,7 @@
</Grid.RowDefinitions>
<!-- Header -->
<Border BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,0,0,1" Padding="14,8">
<Border BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,0,0,1" Padding="14,8,24,8">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="28" />
@@ -77,67 +117,73 @@
<ColumnDefinition Width="80" />
<ColumnDefinition Width="110" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="Auto" MinWidth="150" />
<ColumnDefinition Width="Auto" MinWidth="150" SharedSizeGroup="JobActions" />
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="1" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Kind}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Target}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Progress}" Margin="10,0,0,0" />
<TextBlock Grid.Column="4" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Speed}" Margin="10,0,0,0" TextAlignment="Right" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Left}" Margin="10,0,0,0" TextAlignment="Right" />
<TextBlock Grid.Column="4" Style="{StaticResource Text.HeaderNumber}" Text="{l:Loc Jobs.Column.Speed}" Margin="10,0,0,0" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.HeaderNumber}" Text="{l:Loc Jobs.Column.Left}" Margin="10,0,0,0" />
<TextBlock Grid.Column="6" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.Where}" Margin="16,0,0,0" />
<TextBlock Grid.Column="7" Style="{StaticResource Text.Header}" Text="{l:Loc Jobs.Column.State}" Margin="10,0,0,0" />
</Grid>
</Border>
<!-- Rows: queue order, then the history; expandable log tail. -->
<ListBox Grid.Row="1" ItemsSource="{Binding Rows}" ItemContainerStyle="{StaticResource ListBoxItem.PlainRow}"
<!-- Rows: queue order, then the history; expandable log tail. Tab walks every row button (the rows take no focus). -->
<ListBox x:Name="JobList" Grid.Row="1" ItemsSource="{Binding Rows}" ItemContainerStyle="{StaticResource ListBoxItem.Job}"
VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.ScrollUnit="Pixel"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.ScrollChanged="OnScrollChanged" AutomationProperties.Name="{l:Loc Shell.Nav.Jobs}">
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.ScrollChanged="OnScrollChanged"
KeyboardNavigation.TabNavigation="Continue" AutomationProperties.Name="{l:Loc Shell.Nav.Jobs}">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type j:JobRowViewModel}">
<StackPanel>
<Grid x:Name="Row" Height="38" Background="Transparent">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="28" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="1.6*" MinWidth="120" />
<ColumnDefinition Width="*" MinWidth="120" MaxWidth="240" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="80" />
<ColumnDefinition Width="110" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="Auto" MinWidth="150" />
</Grid.ColumnDefinitions>
<Button x:Name="Toggle" Style="{StaticResource Button.IconSubtle}" Width="22" Height="22" MinWidth="22" Margin="14,0,0,0"
ui:ButtonIcon.Glyph="{StaticResource Icon.ChevronRight}" Command="{Binding ToggleLogCommand}"
ToolTip="{Binding ToggleToolTip}" AutomationProperties.Name="{Binding ToggleToolTip}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Muted}" Text="{Binding Kind}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding Target}" Margin="10,0,0,0" ToolTip="{Binding Target}" />
<Grid Grid.Column="3" Margin="10,0,0,0">
<Border x:Name="Row" Height="38" Background="Transparent" Padding="14,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="44" />
<ColumnDefinition Width="28" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="1.6*" MinWidth="120" />
<ColumnDefinition Width="*" MinWidth="120" MaxWidth="240" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="80" />
<ColumnDefinition Width="110" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="Auto" MinWidth="150" SharedSizeGroup="JobActions" />
</Grid.ColumnDefinitions>
<ProgressBar Style="{StaticResource ProgressBar.Job}" Maximum="1" Value="{Binding Progress, Mode=OneWay}" VerticalAlignment="Center" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.MutedNumber}" Text="{Binding PercentText}" />
<Button x:Name="Toggle" Style="{StaticResource Button.IconSubtle}" Width="22" Height="22" MinWidth="22" HorizontalAlignment="Left"
ui:ButtonIcon.Glyph="{StaticResource Icon.ChevronRight}" Command="{Binding ToggleLogCommand}"
ToolTip="{Binding ToggleToolTip}" AutomationProperties.Name="{Binding ToggleName}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Muted}" Text="{Binding Kind}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding Target}" Margin="10,0,0,0" ToolTip="{Binding Target}" />
<Grid Grid.Column="3" Margin="10,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="44" />
</Grid.ColumnDefinitions>
<ProgressBar Style="{StaticResource ProgressBar.Job}" Maximum="1" Value="{Binding Progress, Mode=OneWay}" VerticalAlignment="Center"
AutomationProperties.Name="{Binding AccessibleName}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.MutedNumber}" Text="{Binding PercentText}" />
</Grid>
<TextBlock Grid.Column="4" Style="{StaticResource Text.MutedNumber}" Text="{Binding SpeedText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.MutedNumber}" Text="{Binding LeftText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="6" Style="{StaticResource Text.Muted}" Text="{Binding WhereText}" Margin="16,0,0,0" />
<ui:StatusGlyph Grid.Column="7" Kind="{Binding StateKind}" Text="{Binding StateText}" ToolTip="{Binding StateToolTip}"
FontSize="13" VerticalAlignment="Center" Margin="10,0,0,0" />
<ItemsControl Grid.Column="8" ItemsSource="{Binding Actions}" ItemsPanel="{StaticResource Panel.Row}" Focusable="False"
VerticalAlignment="Center" Margin="10,0,0,0">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type j:JobAction}">
<Button Style="{StaticResource Button.Row}" Content="{Binding Text}" Command="{Binding Command}" ToolTip="{Binding ToolTip}"
AutomationProperties.Name="{Binding AccessibleName}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
<TextBlock Grid.Column="4" Style="{StaticResource Text.MutedNumber}" Text="{Binding SpeedText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.MutedNumber}" Text="{Binding LeftText}" Margin="10,0,0,0" />
<TextBlock Grid.Column="6" Style="{StaticResource Text.Muted}" Text="{Binding WhereText}" Margin="16,0,0,0" />
<ui:StatusGlyph Grid.Column="7" Kind="{Binding StateKind}" Text="{Binding StateText}" ToolTip="{Binding StateToolTip}"
FontSize="13" VerticalAlignment="Center" Margin="10,0,0,0" />
<ItemsControl Grid.Column="8" ItemsSource="{Binding Actions}" ItemsPanel="{StaticResource Panel.Row}" Focusable="False"
VerticalAlignment="Center" Margin="10,0,8,0">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type j:JobAction}">
<Button Style="{StaticResource Button.Row}" Content="{Binding Text}" Command="{Binding Command}" ToolTip="{Binding ToolTip}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</Border>
<!-- The log keeps its left-to-right lines (times, paths, numbers) in every language. -->
<Border x:Name="Log" Background="{DynamicResource Brush.Bg}" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,0"
Padding="52,10,14,12" Visibility="Collapsed">
<TextBlock Style="{StaticResource Text.Log}" Text="{Binding LogText}" />
<TextBlock Style="{StaticResource Text.Log}" Text="{Binding LogText}" FlowDirection="LeftToRight" />
</Border>
</StackPanel>
<DataTemplate.Triggers>
@@ -162,6 +208,8 @@
</Grid>
</Border>
<ui:EmptyState Grid.Row="1" Message="{l:Loc Jobs.Empty}" Visibility="{Binding IsEmpty, Converter={StaticResource BoolToVisibility}}" />
<ui:EmptyState Grid.Row="1" Message="{l:Loc Jobs.Empty}" Visibility="{Binding IsEmpty, Converter={StaticResource BoolToVisibility}}">
<Button Content="{l:Loc Shell.Nav.Import}" Command="{Binding ImportCommand}" ToolTip="{l:Loc Tooltips.Jobs.Import}" />
</ui:EmptyState>
</Grid>
</UserControl>
+38 -20
View File
@@ -84,6 +84,7 @@ public sealed class JobsViewModel : SectionViewModel
Shell.Navigate(SectionKey.Settings);
});
LoadMoreCommand = new RelayCommand(() => _ = LoadMoreAsync());
ImportCommand = new RelayCommand(() => Shell.Navigate(SectionKey.Import));
}
public ShellViewModel Shell { get; }
@@ -99,6 +100,9 @@ public sealed class JobsViewModel : SectionViewModel
public ICommand RenderingSettingsCommand { get; }
public ICommand LoadMoreCommand { get; }
/// <summary>The empty state's one action: jobs start with an import.</summary>
public ICommand ImportCommand { get; }
public JobFilter Filter
{
get => _filter;
@@ -119,8 +123,11 @@ public sealed class JobsViewModel : SectionViewModel
}
}
/// <summary>"Workers 1 / 4".</summary>
public string WorkersText => Loc.L("Jobs.Workers", _model.RunningCount, _queue?.Workers ?? 0);
/// <summary>"Workers 1 / 4": jobs this PC's workers run out of its workers.</summary>
public string WorkersText => Loc.L("Jobs.Workers", _queue is { } queue ? _model.RunningOn(queue.WorkerId) : 0, _queue?.Workers ?? 0);
/// <summary>The engine of this PC runs workers (it has none before it starts).</summary>
public bool HasWorkers => _queue is { Workers: > 0 };
/// <summary>"History keeps 90 days".</summary>
public string HistoryText => Loc.Plural("Jobs.History", (long)new JobEngineOptions().HistoryRetention.TotalDays);
@@ -258,9 +265,12 @@ public sealed class JobsViewModel : SectionViewModel
Shell.SetJob(JobText.Bar(current), current.Fraction ?? 0, indeterminate: current.Fraction is null);
else
Shell.SetJob(null, 0);
Shell.SetJobCount(_model.RunningCount + _model.QueuedCount, _model.QueuedCount);
Badge = _model.RunningCount;
// The rail badge, the status strip and the Running chip count the same jobs: running or paused (Jobs.html).
var active = _model.CountOf(JobFilter.Running);
Shell.SetJobCount(active, _model.QueuedCount);
Badge = active;
OnPropertyChanged(nameof(WorkersText));
OnPropertyChanged(nameof(HasWorkers));
CommandManager.InvalidateRequerySuggested();
}
@@ -318,41 +328,42 @@ internal sealed class JobActions(JobsViewModel owner)
public IReadOnlyList<JobAction> For(JobEntry entry)
{
var job = entry.Job;
var row = JobText.Name(job);
return entry.State switch
{
JobState.Running =>
[
Make("Jobs.Action.Pause", "Tooltips.Jobs.Pause", q => q.PauseAsync(job.Id)),
Make("Jobs.Action.Cancel", "Tooltips.Jobs.Cancel", q => q.CancelAsync(job.Id)),
OnQueue("Jobs.Action.Pause", "Tooltips.Jobs.Pause", row, q => q.PauseAsync(job.Id)),
OnQueue("Jobs.Action.Cancel", "Tooltips.Jobs.Cancel", row, q => q.CancelAsync(job.Id)),
],
JobState.Paused =>
[
Make("Jobs.Action.Resume", "Tooltips.Jobs.Resume", q => q.ResumeAsync(job.Id)),
Make("Jobs.Action.Cancel", "Tooltips.Jobs.Cancel", q => q.CancelAsync(job.Id)),
OnQueue("Jobs.Action.Resume", "Tooltips.Jobs.Resume", row, q => q.ResumeAsync(job.Id)),
OnQueue("Jobs.Action.Cancel", "Tooltips.Jobs.Cancel", row, q => q.CancelAsync(job.Id)),
],
JobState.Queued when job.Priority < JobPriority.User =>
[
Make("Jobs.Action.MoveUp", "Tooltips.Jobs.MoveUp", q => q.RaisePriorityAsync(job.Id)),
Make("Jobs.Action.Remove", "Tooltips.Jobs.Remove", q => q.CancelAsync(job.Id)),
OnQueue("Jobs.Action.MoveUp", "Tooltips.Jobs.MoveUp", row, q => q.RaisePriorityAsync(job.Id)),
OnQueue("Jobs.Action.Remove", "Tooltips.Jobs.Remove", row, q => q.CancelAsync(job.Id)),
],
JobState.Queued =>
[
Make("Jobs.Action.Pause", "Tooltips.Jobs.PauseQueued", q => q.PauseAsync(job.Id)),
Make("Jobs.Action.Remove", "Tooltips.Jobs.Remove", q => q.CancelAsync(job.Id)),
OnQueue("Jobs.Action.Pause", "Tooltips.Jobs.PauseQueued", row, q => q.PauseAsync(job.Id)),
OnQueue("Jobs.Action.Remove", "Tooltips.Jobs.Remove", row, q => q.CancelAsync(job.Id)),
],
JobState.Failed =>
[
Make("Jobs.Action.Retry", "Tooltips.Jobs.Retry", q => q.ResumeAsync(job.Id)),
new JobAction(Loc.L("Jobs.Action.Show"), Loc.L("Tooltips.Jobs.Show"), new AsyncRelayCommand(() => owner.OpenTargetAsync(job))),
OnQueue("Jobs.Action.Retry", "Tooltips.Jobs.Retry", row, q => q.ResumeAsync(job.Id)),
Action("Jobs.Action.Show", "Tooltips.Jobs.Show", row, () => owner.OpenTargetAsync(job)),
],
JobState.Cancelled =>
[
Make("Jobs.Action.Retry", "Tooltips.Jobs.Retry", q => q.ResumeAsync(job.Id)),
OnQueue("Jobs.Action.Retry", "Tooltips.Jobs.Retry", row, q => q.ResumeAsync(job.Id)),
],
_ =>
[
new JobAction(Loc.L("Jobs.Action.Open"), Loc.L("Tooltips.Jobs.Open"), new AsyncRelayCommand(() => owner.OpenTargetAsync(job))),
new JobAction(Loc.L("Jobs.Action.Folder"), Loc.L("Tooltips.Jobs.Folder"), new AsyncRelayCommand(() => owner.RevealTargetAsync(job))),
Action("Jobs.Action.Open", "Tooltips.Jobs.Open", row, () => owner.OpenTargetAsync(job)),
Action("Jobs.Action.Folder", "Tooltips.Jobs.Folder", row, () => owner.RevealTargetAsync(job)),
],
};
}
@@ -371,9 +382,16 @@ internal sealed class JobActions(JobsViewModel owner)
}
}
private JobAction Make(string textKey, string toolTipKey, Func<IJobQueue, Task> run) =>
new(Loc.L(textKey), Loc.L(toolTipKey), new AsyncRelayCommand(async () =>
/// <summary>A row button named with its row for screen readers ("Pause: Render · Harbour sunset").</summary>
private static JobAction Action(string textKey, string toolTipKey, string row, Func<Task> run)
{
var text = Loc.L(textKey);
return new JobAction(text, Loc.L(toolTipKey), Loc.L("Jobs.ActionFor", text, row), new AsyncRelayCommand(run));
}
private JobAction OnQueue(string textKey, string toolTipKey, string row, Func<IJobQueue, Task> run) =>
Action(textKey, toolTipKey, row, async () =>
{
if (owner.Queue is { } queue) await run(queue);
}));
});
}
+112 -66
View File
@@ -3,6 +3,8 @@
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:infra="clr-namespace:Titano.App.Infrastructure"
xmlns:shell="clr-namespace:Titano.App.Shell"
xmlns:srv="clr-namespace:Titano.App.Server">
<UserControl.Resources>
<Style x:Key="Text.RowLabel" TargetType="TextBlock" BasedOn="{StaticResource Text.Label}">
@@ -15,12 +17,32 @@
<Setter Property="Margin" Value="8,0" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<ItemsPanelTemplate x:Key="Panel.Row">
<StackPanel Orientation="Horizontal" />
<ItemsPanelTemplate x:Key="Panel.Wrap">
<WrapPanel />
</ItemsPanelTemplate>
<!-- Filter chip (Server.html, aria-pressed): one of a group, so screen readers hear which filter is on. -->
<Style x:Key="RadioButton.Chip" TargetType="RadioButton" BasedOn="{StaticResource Button.Base}">
<Setter Property="Height" Value="28" />
<Setter Property="Padding" Value="12,0" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Typography.NumeralAlignment" Value="Tabular" />
<Setter Property="ui:ControlState.CornerRadius" Value="14" />
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Accent}" />
<Setter Property="Foreground" Value="{DynamicResource Brush.Accent}" />
<Setter Property="ui:ControlState.HoverBorderBrush" Value="{DynamicResource Brush.Accent}" />
</Trigger>
</Style.Triggers>
</Style>
<!-- A row reads as its sequence and state; Tab goes to its buttons. -->
<Style x:Key="ListBoxItem.Sync" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.PlainRow}">
<Setter Property="AutomationProperties.Name" Value="{Binding Title}" />
<Setter Property="AutomationProperties.ItemStatus" Value="{Binding StateText}" />
</Style>
</UserControl.Resources>
<!-- Server.html: the connection panel, then the sync table; the render-node panel joins the connection panel. -->
<!-- Server.html: the connection panel, then the sync table. The render-node status panel is not built (see the decisions). -->
<Grid Margin="20,16,20,12">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -40,16 +62,23 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Address, servers found on the LAN, connect / disconnect. -->
<!-- Address (read-only while connected, still selectable), servers found on the LAN, connect / disconnect; Tab follows this order. -->
<TextBlock Style="{StaticResource Text.RowLabel}" Text="{l:Loc Server.Label.Server}" />
<DockPanel Grid.Column="1" LastChildFill="True">
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Primary}" Content="{l:Loc Server.Connect}" Command="{Binding ConnectCommand}"
ToolTip="{l:Loc Tooltips.Server.Connect}" Margin="10,0,0,0" MinWidth="96"
Visibility="{Binding IsDisconnected, Converter={StaticResource BoolToVisibility}}" />
<Button DockPanel.Dock="Right" Content="{l:Loc Server.Disconnect}" Command="{Binding DisconnectCommand}" ToolTip="{l:Loc Tooltips.Server.Disconnect}"
Margin="10,0,0,0" MinWidth="96" Visibility="{Binding IsConnected, Converter={StaticResource BoolToVisibility}}" />
<Button x:Name="KnownButton" DockPanel.Dock="Right" Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.ChevronDown}"
IsEnabled="{Binding HasKnownServers}" Click="OnShowKnown" ToolTip="{l:Loc Tooltips.Server.Found}" AutomationProperties.Name="{l:Loc Server.Found}">
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox x:Name="AddressBox" Text="{Binding Address, UpdateSourceTrigger=PropertyChanged}" ui:Field.Placeholder="{l:Loc Server.AddressPlaceholder}"
ToolTip="{l:Loc Tooltips.Server.Address}" AutomationProperties.Name="{l:Loc Server.Label.Server}" IsReadOnly="{Binding IsConnected}"
FlowDirection="LeftToRight">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding ConnectCommand}" />
</TextBox.InputBindings>
</TextBox>
<Button x:Name="KnownButton" Grid.Column="1" Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.ChevronDown}"
IsEnabled="{Binding HasKnownServers}" Click="OnShowKnown" ToolTip="{Binding KnownToolTip}" AutomationProperties.Name="{l:Loc Server.Found}">
<Button.ContextMenu>
<ContextMenu ItemsSource="{Binding KnownServers}">
<ContextMenu.ItemContainerStyle>
@@ -64,18 +93,18 @@
</ContextMenu>
</Button.ContextMenu>
</Button>
<TextBox x:Name="AddressBox" Text="{Binding Address, UpdateSourceTrigger=PropertyChanged}" ui:Field.Placeholder="{l:Loc Server.AddressPlaceholder}"
ToolTip="{l:Loc Tooltips.Server.Address}" AutomationProperties.Name="{l:Loc Server.Label.Server}" IsEnabled="{Binding IsDisconnected}">
<TextBox.InputBindings>
<KeyBinding Key="Enter" Command="{Binding ConnectCommand}" />
</TextBox.InputBindings>
</TextBox>
</DockPanel>
<Button Grid.Column="2" Style="{StaticResource Button.Primary}" Content="{l:Loc Server.Connect}" Command="{Binding ConnectCommand}"
ToolTip="{Binding ConnectToolTip}" Margin="10,0,0,0" MinWidth="96"
Visibility="{Binding IsDisconnected, Converter={StaticResource BoolToVisibility}}" />
<Button Grid.Column="2" Content="{l:Loc Server.Disconnect}" Command="{Binding DisconnectCommand}" ToolTip="{l:Loc Tooltips.Server.Disconnect}"
Margin="10,0,0,0" MinWidth="96" Visibility="{Binding IsConnected, Converter={StaticResource BoolToVisibility}}" />
</Grid>
<!-- Status: state · server · version · latency · trusted certificate. -->
<!-- Status: state · server · version · latency · trusted certificate; screen readers hear the state and the error change. -->
<TextBlock Grid.Row="1" Style="{StaticResource Text.RowLabel}" Text="{l:Loc Server.Label.Status}" Margin="0,12,10,0" />
<WrapPanel Grid.Row="1" Grid.Column="1" Margin="0,12,0,0" VerticalAlignment="Center">
<ui:StatusGlyph Kind="{Binding StatusKind}" Text="{Binding StatusText}" FontSize="13" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Server.Status}" />
<ui:StatusGlyph Kind="{Binding StatusKind}" Text="{Binding StatusText}" FontSize="13" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Server.Status}"
AutomationProperties.LiveSetting="Polite" infra:LiveRegion.Text="{Binding StatusText}" />
<StackPanel Orientation="Horizontal" Visibility="{Binding ServerText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}">
<TextBlock Style="{StaticResource Text.Dot}" />
<TextBlock Text="{Binding ServerText}" VerticalAlignment="Center" Typography.NumeralAlignment="Tabular" />
@@ -88,7 +117,8 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding ErrorText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}">
<TextBlock Style="{StaticResource Text.Dot}" />
<ui:StatusGlyph Kind="Error" Text="{Binding ErrorText}" FontSize="13" VerticalAlignment="Center" />
<ui:StatusGlyph Kind="Error" Text="{Binding ErrorText}" FontSize="13" VerticalAlignment="Center"
AutomationProperties.LiveSetting="Assertive" infra:LiveRegion.Text="{Binding ErrorText}" />
</StackPanel>
</WrapPanel>
@@ -105,16 +135,21 @@
<TextBlock Text="{Binding RoleText}" ToolTip="{Binding RoleToolTip}" VerticalAlignment="Center" />
<StackPanel Orientation="Horizontal" Visibility="{Binding HasQuota, Converter={StaticResource BoolToVisibility}}">
<TextBlock Style="{StaticResource Text.Dot}" />
<ProgressBar Width="160" Maximum="1" Value="{Binding QuotaFraction, Mode=OneWay}" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Server.Quota}" />
<ProgressBar Width="160" Maximum="1" Value="{Binding QuotaFraction, Mode=OneWay}" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Server.Quota}"
AutomationProperties.Name="{Binding QuotaText}" />
</StackPanel>
<TextBlock Text="{Binding QuotaText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="10,0,0,0" VerticalAlignment="Center"
Typography.NumeralAlignment="Tabular" ToolTip="{l:Loc Tooltips.Server.Quota}" />
</DockPanel>
<!-- Options of this PC. -->
<!-- Options of this PC; the render-node option names the encoders it offers. -->
<Border Grid.Row="3" Grid.ColumnSpan="2" Margin="0,14,0,0" Padding="0,10,0,0" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,0">
<WrapPanel>
<CheckBox Content="{l:Loc Server.RenderNode}" IsChecked="{Binding RenderNodeOptIn}" ToolTip="{l:Loc Tooltips.Server.RenderNode}" Margin="0,0,22,0" />
<StackPanel Orientation="Horizontal" Margin="0,0,22,0">
<CheckBox Content="{l:Loc Server.RenderNode}" IsChecked="{Binding RenderNodeOptIn}" ToolTip="{l:Loc Tooltips.Server.RenderNode}" VerticalAlignment="Center" />
<TextBlock Text="{Binding NodeCodecsText}" ToolTip="{Binding NodeCodecsToolTip}" Foreground="{DynamicResource Brush.TextMuted}" Margin="10,0,0,0"
VerticalAlignment="Center" Visibility="{Binding NodeCodecsText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
</StackPanel>
<CheckBox Content="{l:Loc Server.KeepProxies}" IsChecked="{Binding KeepProxiesOffline}" ToolTip="{l:Loc Tooltips.Server.KeepProxies}" Margin="0,0,22,0" />
<CheckBox Content="{l:Loc Server.AutoSync}" IsChecked="{Binding SyncSettingsAutomatically}" ToolTip="{l:Loc Tooltips.Server.AutoSync}" Margin="0,0,22,0" />
<CheckBox Content="{l:Loc Server.PauseMetered}" IsChecked="{Binding PauseUploadsOnMetered}" ToolTip="{l:Loc Tooltips.Server.PauseMetered}" Margin="0,0,22,0" />
@@ -133,43 +168,46 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- Toolbar in visual (and Tab) order: title, chips, search, Upload all local. -->
<!-- Toolbar in visual (and Tab) order: title, chips, search, Upload all local. Chips wrap before anything is cut;
the filters and search show only while signed in. -->
<Grid Margin="14,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Text="{l:Loc Server.Sync.Title}" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,10,0" />
<ItemsControl Grid.Column="1" ItemsSource="{Binding Chips}" ItemsPanel="{StaticResource Panel.Row}" Focusable="False" VerticalAlignment="Center">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type srv:SyncFilterChip}">
<Button x:Name="Chip" Style="{StaticResource Button.Chip}" Content="{Binding Text}" Tag="{Binding IsSelected}" Command="{Binding SelectCommand}"
ToolTip="{Binding ToolTip}" Height="28" FontSize="12" Margin="0,0,10,0" Typography.NumeralAlignment="Tabular" />
<DataTemplate.Triggers>
<!-- Conflicts waiting are drawn in warning colours, unless the chip is the chosen one (then Accent, DESIGN §4). -->
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding NeedsAttention}" Value="True" />
<Condition Binding="{Binding IsSelected}" Value="False" />
</MultiDataTrigger.Conditions>
<Setter TargetName="Chip" Property="BorderBrush" Value="{DynamicResource Brush.Warning}" />
<Setter TargetName="Chip" Property="Foreground" Value="{DynamicResource Brush.Warning}" />
</MultiDataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<TextBox Grid.Column="3" Width="200" Height="30" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
ui:Field.Placeholder="{l:Loc Server.Sync.Search}" ToolTip="{l:Loc Tooltips.Server.Sync.Search}" AutomationProperties.Name="{l:Loc Server.Sync.Search}" />
<Button Grid.Column="4" Content="{l:Loc Server.Sync.UploadAll}" Command="{Binding UploadAllCommand}" ToolTip="{Binding UploadAllToolTip}"
<WrapPanel VerticalAlignment="Center">
<TextBlock Text="{l:Loc Server.Sync.Title}" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,4,10,4" />
<ItemsControl ItemsSource="{Binding Chips}" ItemsPanel="{StaticResource Panel.Wrap}" Focusable="False" VerticalAlignment="Center"
Visibility="{Binding IsActive, Converter={StaticResource BoolToVisibility}}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type srv:SyncFilterChip}">
<RadioButton x:Name="Chip" Style="{StaticResource RadioButton.Chip}" GroupName="SyncFilters" Content="{Binding Text}"
IsChecked="{Binding IsSelected, Mode=OneWay}" Command="{Binding SelectCommand}" ToolTip="{Binding ToolTip}" Margin="0,1,10,1" />
<DataTemplate.Triggers>
<!-- Conflicts waiting are drawn in warning colours, unless the chip is the chosen one (then Accent, DESIGN §4). -->
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Binding="{Binding NeedsAttention}" Value="True" />
<Condition Binding="{Binding IsSelected}" Value="False" />
</MultiDataTrigger.Conditions>
<Setter TargetName="Chip" Property="BorderBrush" Value="{DynamicResource Brush.Warning}" />
<Setter TargetName="Chip" Property="Foreground" Value="{DynamicResource Brush.Warning}" />
</MultiDataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</WrapPanel>
<TextBox Grid.Column="1" Width="200" Height="30" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
ui:Field.Placeholder="{l:Loc Server.Sync.Search}" ToolTip="{l:Loc Tooltips.Server.Sync.Search}" AutomationProperties.Name="{l:Loc Server.Sync.Search}"
Margin="10,0,0,0" Visibility="{Binding IsActive, Converter={StaticResource BoolToVisibility}}" />
<Button Grid.Column="2" Content="{l:Loc Server.Sync.UploadAll}" Command="{Binding UploadAllCommand}" ToolTip="{Binding UploadAllToolTip}"
ToolTipService.ShowOnDisabled="True" Height="30" Margin="10,0,0,0" />
</Grid>
<!-- Header; the rows repeat its columns (Server.html: 1.6fr 150px 150px 150px 1.4fr with 10 px gaps). The right padding
keeps the space of the rows' scroll bar, so the columns line up. -->
<!-- Header; the rows repeat its columns (Server.html: 1.6fr 150px 150px 150px 1.4fr with 10 px gaps). The list always
keeps its 10 px scroll-bar gutter and the header the same on its right, so the columns line up with or without scrolling. -->
<Border Grid.Row="1" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,1" Padding="14,8,24,8">
<Grid>
<Grid.ColumnDefinitions>
@@ -186,11 +224,11 @@
</Grid>
</Border>
<!-- Rows (virtualised): this PC, the server, the state and the actions that apply; conflicts on the card colour.
<!-- Rows (virtualised): this PC, the server, the state and the actions that apply; conflicts on the warning tint.
Tab walks every row button (the rows themselves take no focus). Actions wrap when longer labels need it. -->
<ListBox x:Name="SyncList" Grid.Row="2" ItemsSource="{Binding Rows}" ItemContainerStyle="{StaticResource ListBoxItem.PlainRow}"
<ListBox x:Name="SyncList" Grid.Row="2" ItemsSource="{Binding Rows}" ItemContainerStyle="{StaticResource ListBoxItem.Sync}"
VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.ScrollUnit="Pixel"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" KeyboardNavigation.TabNavigation="Continue"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" KeyboardNavigation.TabNavigation="Continue"
AutomationProperties.Name="{l:Loc Server.Sync.Title}" Visibility="{Binding HasRows, Converter={StaticResource BoolToVisibility}}">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type srv:SyncRow}">
@@ -208,16 +246,11 @@
<TextBlock Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding ServerText}" ToolTip="{Binding ServerText}" Margin="10,0,0,0" />
<ui:StatusGlyph Grid.Column="3" Kind="{Binding StateKind}" Text="{Binding StateText}" ToolTip="{Binding StateToolTip}"
FontSize="13" VerticalAlignment="Center" Margin="10,0,0,0" />
<ItemsControl Grid.Column="4" ItemsSource="{Binding Actions}" Focusable="False" VerticalAlignment="Center" Margin="10,4,0,4">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl Grid.Column="4" ItemsSource="{Binding Actions}" ItemsPanel="{StaticResource Panel.Wrap}" Focusable="False" VerticalAlignment="Center" Margin="10,4,0,4">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type srv:SyncRowAction}">
<Button Style="{StaticResource Button.Row}" Content="{Binding Text}" Command="{Binding Command}" ToolTip="{Binding ToolTip}"
FontSize="12" Margin="0,2,6,2" />
AutomationProperties.Name="{Binding AccessibleName}" FontSize="12" Margin="0,2,6,2" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@@ -225,15 +258,27 @@
</Border>
<DataTemplate.Triggers>
<DataTrigger Binding="{Binding IsConflict}" Value="True">
<Setter TargetName="RowBorder" Property="Background" Value="{DynamicResource Brush.Card}" />
<Setter TargetName="RowBorder" Property="Background" Value="{DynamicResource Brush.WarningSubtle}" />
</DataTrigger>
</DataTemplate.Triggers>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<ui:EmptyState Grid.Row="2" Message="{Binding EmptyText}" Visibility="{Binding EmptyText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
<!-- Footer: last comparison · server archive · retry state · admin panel. -->
<!-- One sentence and its one action: connect, bring photos in, or show every sequence again. -->
<ui:EmptyState Grid.Row="2" Message="{Binding EmptyText}" Visibility="{Binding EmptyText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}">
<Grid>
<Button Content="{l:Loc Server.Connect}" Command="{Binding DataContext.ConnectCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
ToolTip="{Binding DataContext.ConnectToolTip, RelativeSource={RelativeSource AncestorType=UserControl}}"
Visibility="{Binding Empty, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=SignedOut}" />
<Button Content="{l:Loc Shell.Nav.Import}" Command="{Binding ImportCommand}" ToolTip="{l:Loc Tooltips.Server.Sync.Import}"
Visibility="{Binding Empty, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=Nothing}" />
<Button Content="{l:Loc Server.Sync.ClearFilters}" Command="{Binding ClearFiltersCommand}" ToolTip="{l:Loc Tooltips.Server.Sync.ClearFilters}"
Visibility="{Binding Empty, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=NoMatch}" />
</Grid>
</ui:EmptyState>
<!-- Footer: last comparison · server archive · retry state (announced) · admin panel for administrators. -->
<Border Grid.Row="3" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,0" Padding="14,8">
<DockPanel LastChildFill="False" TextElement.FontSize="12">
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Link}" Content="{l:Loc Server.Sync.OpenAdmin}" Command="{Binding OpenAdminCommand}"
@@ -245,6 +290,7 @@
Typography.NumeralAlignment="Tabular" ToolTip="{l:Loc Tooltips.Server.Sync.Archive}"
Visibility="{Binding ArchiveText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
<ui:StatusGlyph Kind="Warning" Text="{Binding ErrorText}" ToolTip="{Binding ErrorToolTip}" FontSize="12" VerticalAlignment="Center"
AutomationProperties.LiveSetting="Polite" infra:LiveRegion.Text="{Binding ErrorText}"
Visibility="{Binding ErrorText, Converter={x:Static ui:NullToCollapsedConverter.Instance}}" />
</DockPanel>
</Border>
+43 -20
View File
@@ -2,7 +2,9 @@ using System.ComponentModel;
using System.Windows.Input;
using Titano.App.Infrastructure;
using Titano.App.Server;
using Titano.App.Settings;
using Titano.App.Shell;
using Titano.Core.Export;
using Titano.Core.Localization;
using Titano.Ui.Controls;
using Titano.Ui.Mvvm;
@@ -58,12 +60,20 @@ public sealed class ServerViewModel : SectionViewModel
public bool HasKnownServers => KnownServers.Any();
/// <summary>What ▾ lists, or why it is disabled.</summary>
public string KnownToolTip => Loc.L(HasKnownServers ? "Tooltips.Server.Found" : "Tooltips.Server.NoneFound");
/// <summary>What Connect does, or why it is disabled.</summary>
public string ConnectToolTip => Loc.L(Address.Trim().Length > 0 ? "Tooltips.Server.Connect" : "Tooltips.Server.ConnectNoAddress");
public string Address
{
get => _address;
set
{
if (Set(ref _address, value ?? string.Empty)) CommandManager.InvalidateRequerySuggested();
if (!Set(ref _address, value ?? string.Empty)) return;
OnPropertyChanged(nameof(ConnectToolTip));
CommandManager.InvalidateRequerySuggested();
}
}
@@ -103,7 +113,7 @@ public sealed class ServerViewModel : SectionViewModel
/// <summary>"TLS 9A:3C:71:E0:… trusted 2026-09-01".</summary>
public string? CertificateText => Fingerprint is { } fp && Session.TrustOf(fp) is { } trust
? Loc.L("Server.Certificate.Trusted", ServerSession.ShortFingerprint(fp), Formatting.Date(trust.TrustedAt))
? Loc.L("Server.Certificate.Trusted", Formatting.LeftToRight(ServerSession.ShortFingerprint(fp)), Formatting.Date(trust.TrustedAt))
: null;
public string CertificateToolTip => Loc.L("Tooltips.Server.CertificateTrusted");
@@ -138,6 +148,15 @@ public sealed class ServerViewModel : SectionViewModel
}
}
/// <summary>The video encoders a render node on this PC offers the server.</summary>
private IReadOnlyList<EncoderRow> NodeEncoders => EncoderUse.Node(Shell.Settings.Encoders.Select(e => e.Row),
AppServices.AllowsHardware(Shell.Services.Settings.HardwareEncoding, ExportResolver.CustomId));
/// <summary>"HEVC · H.264 · AV1" beside "Offer this PC as render node" (BRIEF §12.7); null before the encoders are known.</summary>
public string? NodeCodecsText => EncoderUse.Codecs(NodeEncoders);
public string NodeCodecsToolTip => Loc.L("Tooltips.Server.NodeEncoders", string.Join(", ", NodeEncoders.Select(e => e.DisplayName)));
/// <summary>Keep the proxy caches of server sequences opened with proxies up to date on this PC.</summary>
public bool KeepProxiesOffline
{
@@ -166,8 +185,13 @@ public sealed class ServerViewModel : SectionViewModel
}
}
/// <summary>Re-reads values another screen changed (Settings › Server).</summary>
public void Refresh() => OnPropertyChanged(nameof(RenderNodeOptIn));
/// <summary>Re-reads values another screen changed (Settings › Server and Rendering).</summary>
public void Refresh()
{
OnPropertyChanged(nameof(RenderNodeOptIn));
OnPropertyChanged(nameof(NodeCodecsText));
OnPropertyChanged(nameof(NodeCodecsToolTip));
}
/// <summary>Restores the saved session and starts listening for LAN servers.</summary>
public async Task AttachAsync()
@@ -181,6 +205,7 @@ public sealed class ServerViewModel : SectionViewModel
if (Address.Length == 0 && Session.Discovered.Count > 0) Address = Session.Discovered[0].Address;
};
if (!Shell.Services.Environment.IsCapture) _session.StartDiscovery();
Shell.Settings.Encoders.CollectionChanged += OnEncodersChanged;
Sync.Attach();
await _session.RestoreAsync();
if (_session.Flow.Error is not ConnectError.None and var error && !_session.IsConnected) ErrorText = ServerSession.ErrorText(error);
@@ -189,10 +214,17 @@ public sealed class ServerViewModel : SectionViewModel
public override void Dispose()
{
if (_session is not null) _session.PropertyChanged -= OnSessionChanged;
Shell.Settings.Encoders.CollectionChanged -= OnEncodersChanged;
Sync.Dispose();
base.Dispose();
}
/// <summary>The encoders next to the render-node option are listed on the first visit.</summary>
protected override void OnActivated()
{
if (Shell.Settings.Encoders.Count == 0 && !Shell.Settings.IsDetecting) _ = Shell.Settings.DetectEncodersAsync();
}
private void SetSyncOption(bool value, bool current, Action<bool> store, [System.Runtime.CompilerServices.CallerMemberName] string? name = null)
{
if (value == current) return;
@@ -222,22 +254,13 @@ public sealed class ServerViewModel : SectionViewModel
private void ShowCertificate()
{
if (Fingerprint is not { } fingerprint) return;
var forget = Shell.Services.Dialogs.Confirm(new ConfirmRequest
{
Heading = Loc.L("Server.Certificate.Title"),
Message = Loc.L("Server.Certificate.Message"),
Detail = ServerSession.FormatFingerprint(fingerprint),
DetailToolTip = Loc.L("Tooltips.Server.Fingerprint"),
SafeText = Loc.L("Server.Certificate.Keep"),
SafeToolTip = Loc.L("Tooltips.Server.KeepTrust"),
ActionText = Loc.L("Server.Certificate.Forget"),
ActionToolTip = Loc.L("Tooltips.Server.ForgetTrust"),
IsDestructive = true,
});
if (!forget) return;
Session.Disconnect();
Session.Forget(fingerprint);
if (Fingerprint is { } fingerprint) Session.ConfirmForget(fingerprint, Shell.Services.Dialogs);
}
private void OnEncodersChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
OnPropertyChanged(nameof(NodeCodecsText));
OnPropertyChanged(nameof(NodeCodecsToolTip));
}
private void OnSessionChanged(object? sender, PropertyChangedEventArgs e)
+181 -72
View File
@@ -3,11 +3,58 @@
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:infra="clr-namespace:Titano.App.Infrastructure"
xmlns:shell="clr-namespace:Titano.App.Shell"
xmlns:st="clr-namespace:Titano.App.Settings">
<UserControl.Resources>
<!-- Every page is a size scope: its labels share one column as wide as the longest label (at least 180 px, DESIGN §3),
wrapping only past 280 px, so translations 40 % longer are never cut (DESIGN §2: MinWidth only). -->
<Style x:Key="Page" TargetType="StackPanel">
<Setter Property="Visibility" Value="Collapsed" />
<Setter Property="Grid.IsSharedSizeScope" Value="True" />
</Style>
<Style x:Key="Setting.Row" TargetType="HeaderedContentControl">
<Setter Property="Focusable" Value="False" />
<Setter Property="Margin" Value="0,0,0,14" />
<Setter Property="MinHeight" Value="32" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="HeaderedContentControl">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="180" SharedSizeGroup="SettingLabel" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding Header, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource Text.Label}" VerticalAlignment="Top"
TextTrimming="None" TextWrapping="Wrap" MaxWidth="280" Margin="0,7,14,0" />
<ContentPresenter Grid.Column="1" VerticalAlignment="Center" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<!-- A path in a row with buttons: up to 360 px, narrower before anything wraps or is cut; left to right in every language. -->
<Style x:Key="TextBox.Path" TargetType="TextBox" BasedOn="{StaticResource TextBox.Setting}">
<Setter Property="Width" Value="Auto" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<!-- Numbers stay right-aligned in both reading directions. -->
<Style x:Key="TextBox.SettingNumber" TargetType="TextBox" BasedOn="{StaticResource TextBox.Number}">
<Setter Property="FlowDirection" Value="LeftToRight" />
</Style>
<!-- Keyboard focus in the section list: a 2 px Accent ring inside the item (DESIGN §4), distinct from the selected fill. -->
<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>
<Style x:Key="ListBoxItem.SettingsSection" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItem.Section}">
<Setter Property="FocusVisualStyle" Value="{StaticResource Focus.Inset}" />
</Style>
<Style x:Key="Slider.Budget" TargetType="Slider" BasedOn="{StaticResource {x:Type Slider}}">
<Setter Property="ui:ControlState.Accent" Value="{DynamicResource Brush.Sun}" />
@@ -24,6 +71,13 @@
<Setter Property="ui:ControlState.CornerRadius" Value="12" />
<Setter Property="ui:ButtonIcon.Glyph" Value="{StaticResource Icon.Reset}" />
</Style>
<!-- "Auto · 8": a pill of text with the advisor's reason in its tooltip (DESIGN §4), not a button. -->
<Style x:Key="Text.AutoPill" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource Size.Chip}" />
<Setter Property="Foreground" Value="{DynamicResource Brush.Accent}" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Typography.NumeralAlignment" Value="Tabular" />
</Style>
</UserControl.Resources>
<Grid Margin="20,16,20,16">
@@ -33,15 +87,16 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<!-- Section list: search, sections, settings as JSON. -->
<DockPanel>
<TextBox DockPanel.Dock="Top" Margin="0,0,0,8" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
<!-- Section list: search, sections, settings as JSON (visual and Tab order). -->
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBox Margin="0,0,0,8" Text="{Binding SearchText, UpdateSourceTrigger=PropertyChanged}" ui:Field.Glyph="{StaticResource Icon.Search}"
ui:Field.Placeholder="{l:Loc Settings.Search}" ToolTip="{l:Loc Tooltips.Settings.Search}" AutomationProperties.Name="{l:Loc Settings.Search}" />
<StackPanel DockPanel.Dock="Bottom">
<Button Content="{l:Loc Settings.Export}" Command="{Binding ExportSettingsCommand}" ToolTip="{l:Loc Tooltips.Settings.Export}" HorizontalAlignment="Stretch" Margin="0,0,0,8" />
<Button Content="{l:Loc Settings.Import}" Command="{Binding ImportSettingsCommand}" ToolTip="{l:Loc Tooltips.Settings.Import}" HorizontalAlignment="Stretch" />
</StackPanel>
<ListBox ItemsSource="{Binding VisiblePages}" SelectedItem="{Binding SelectedPageItem}" ItemContainerStyle="{StaticResource ListBoxItem.Section}"
<ListBox Grid.Row="1" ItemsSource="{Binding VisiblePages}" SelectedItem="{Binding SelectedPageItem}" ItemContainerStyle="{StaticResource ListBoxItem.SettingsSection}"
ScrollViewer.VerticalScrollBarVisibility="Auto" AutomationProperties.Name="{l:Loc Shell.Nav.Settings}">
<ListBox.ItemTemplate>
<DataTemplate DataType="{x:Type st:SettingsPageItem}">
@@ -49,17 +104,22 @@
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</DockPanel>
<StackPanel Grid.Row="2" Margin="0,8,0,0">
<Button Content="{l:Loc Settings.Export}" Command="{Binding ExportSettingsCommand}" ToolTip="{l:Loc Tooltips.Settings.Export}" HorizontalAlignment="Stretch" Margin="0,0,0,8" />
<Button Content="{l:Loc Settings.Import}" Command="{Binding ImportSettingsCommand}" ToolTip="{l:Loc Tooltips.Settings.Import}" HorizontalAlignment="Stretch" />
</StackPanel>
</Grid>
<Border Grid.Column="2" Style="{StaticResource Border.Panel}" Padding="22,18">
<DockPanel>
<TextBlock DockPanel.Dock="Top" Text="{Binding PageTitle}" Style="{StaticResource Text.PageTitle}" Margin="0,0,0,18" />
<Border DockPanel.Dock="Bottom" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,0" Padding="0,12,0,0" Margin="0,12,0,0">
<Button Style="{StaticResource Button.Subtle}" HorizontalAlignment="Right" Content="{l:Loc Settings.ResetSection}" Command="{Binding ResetSectionCommand}"
ToolTip="{l:Loc Tooltips.Settings.ResetSection}" BorderBrush="{DynamicResource Brush.Stroke}" Foreground="{DynamicResource Brush.TextMuted}" />
</Border>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Text="{Binding PageTitle}" Style="{StaticResource Text.PageTitle}" Margin="0,0,0,18" />
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Focusable="False">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Focusable="False">
<Grid>
<!-- ================= General ================= -->
<StackPanel Style="{StaticResource Page}" Visibility="{Binding Page, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=General}">
@@ -82,27 +142,35 @@
<!-- ================= Archive ================= -->
<StackPanel Style="{StaticResource Page}" Visibility="{Binding Page, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=Archive}">
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Archive.Root}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Setting}" Text="{Binding ArchiveRoot.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" Text="{Binding ArchiveRoot.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding ArchiveRoot}" ToolTip="{Binding ArchiveRoot.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Archive.Root}" />
<Button Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.FolderOpen}" Command="{Binding BrowseArchiveCommand}"
<Button Grid.Column="1" Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.FolderOpen}" Command="{Binding BrowseArchiveCommand}"
ToolTip="{l:Loc Tooltips.Settings.BrowseArchive}" AutomationProperties.Name="{l:Loc Settings.Browse}" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding ArchiveFreeText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.ArchiveFree}" />
</WrapPanel>
<TextBlock Grid.Column="2" Style="{StaticResource Text.Hint}" Text="{Binding ArchiveFreeText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.ArchiveFree}" />
</Grid>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Archive.Folders}">
<TextBox Style="{StaticResource TextBox.SettingMono}" Text="{Binding FolderTemplate.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding FolderTemplate}" ToolTip="{Binding FolderTemplate.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Archive.Folders}" />
shell:EditBehavior.Field="{Binding FolderTemplate}" ToolTip="{Binding FolderTemplate.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Archive.Folders}"
FlowDirection="LeftToRight" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Archive.Files}">
<TextBox Style="{StaticResource TextBox.SettingMono}" Text="{Binding FileTemplate.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding FileTemplate}" ToolTip="{Binding FileTemplate.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Archive.Files}" />
shell:EditBehavior.Field="{Binding FileTemplate}" ToolTip="{Binding FileTemplate.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Archive.Files}"
FlowDirection="LeftToRight" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Archive.Preview}">
<ItemsControl ItemsSource="{Binding PreviewNames}" Focusable="False" Margin="0,7,0,0" ToolTip="{l:Loc Tooltips.Settings.Preview}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" FontFamily="{StaticResource Font.Mono}" FontSize="12" Foreground="{DynamicResource Brush.TextMuted}" LineHeight="20" TextTrimming="CharacterEllipsis" />
<TextBlock Text="{Binding}" FontFamily="{StaticResource Font.Mono}" FontSize="12" Foreground="{DynamicResource Brush.TextMuted}" LineHeight="20"
TextTrimming="CharacterEllipsis" FlowDirection="LeftToRight" HorizontalAlignment="Left" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
@@ -126,8 +194,10 @@
ToolTip="{l:Loc Tooltips.Settings.Memory}" AutomationProperties.Name="{l:Loc Settings.Rendering.Memory}" />
<TextBlock Text="{Binding MemoryText}" Margin="12,0,0,0" VerticalAlignment="Center" Typography.NumeralAlignment="Tabular" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding InstalledText}" Margin="12,0,0,0" />
<Button Style="{StaticResource Button.AutoPill}" Content="{Binding MemoryAutoText}" Margin="12,0,0,0" ToolTip="{l:Loc Tooltips.Settings.MemoryAuto}"
Visibility="{Binding IsMemoryAuto, Converter={StaticResource BoolToVisibility}}" />
<Border Style="{StaticResource Pill.Auto}" Margin="12,0,0,0" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Settings.MemoryAuto}"
Visibility="{Binding IsMemoryAuto, Converter={StaticResource BoolToVisibility}}">
<TextBlock Style="{StaticResource Text.AutoPill}" Text="{Binding MemoryAutoText}" />
</Border>
<Button Style="{StaticResource Button.Reset}" Margin="12,0,0,0" Command="{Binding ResetMemoryCommand}" ToolTip="{l:Loc Tooltips.Settings.MemoryReset}"
AutomationProperties.Name="{l:Loc Settings.BackToAuto}"
Visibility="{Binding IsMemoryAuto, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
@@ -135,11 +205,13 @@
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Rendering.Parallelism}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Number}" Text="{Binding Parallelism.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<TextBox Style="{StaticResource TextBox.SettingNumber}" Text="{Binding Parallelism.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding Parallelism}" ToolTip="{Binding Parallelism.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Rendering.Parallelism}" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding CoresText}" Margin="12,0,0,0" />
<Button Style="{StaticResource Button.AutoPill}" Content="{Binding ParallelismAutoText}" Margin="12,0,0,0" ToolTip="{l:Loc Tooltips.Settings.ParallelismAuto}"
Visibility="{Binding IsParallelismAuto, Converter={StaticResource BoolToVisibility}}" />
<Border Style="{StaticResource Pill.Auto}" Margin="12,0,0,0" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Settings.ParallelismAuto}"
Visibility="{Binding IsParallelismAuto, Converter={StaticResource BoolToVisibility}}">
<TextBlock Style="{StaticResource Text.AutoPill}" Text="{Binding ParallelismAutoText}" />
</Border>
<Button Style="{StaticResource Button.Reset}" Margin="12,0,0,0" Command="{Binding ResetParallelismCommand}" ToolTip="{l:Loc Tooltips.Settings.ParallelismReset}"
AutomationProperties.Name="{l:Loc Settings.BackToAuto}"
Visibility="{Binding IsParallelismAuto, Converter={x:Static ui:InverseBoolToVisibilityConverter.Instance}}" />
@@ -155,31 +227,40 @@
</WrapPanel>
</HeaderedContentControl>
<!-- Encoders on this PC -->
<DockPanel Margin="0,4,0,8" LastChildFill="False">
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Rendering.SelfTest}" Command="{Binding SelfTestCommand}"
ToolTip="{l:Loc Tooltips.Settings.SelfTest}" Margin="8,0,0,0" />
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Rendering.Redetect}" Command="{Binding RedetectCommand}"
ToolTip="{l:Loc Tooltips.Settings.Redetect}" />
<!-- Encoders on this PC (title, adapter, Re-detect, Run self-test: visual and Tab order). -->
<Grid Margin="0,4,0,8">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Text="{l:Loc Settings.Rendering.Encoders}" FontWeight="SemiBold" VerticalAlignment="Center" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding AdapterText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.Adapter}" />
</DockPanel>
<TextBlock Grid.Column="1" Style="{StaticResource Text.Hint}" Text="{Binding AdapterText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.Adapter}" />
<Button Grid.Column="2" Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Rendering.Redetect}" Command="{Binding RedetectCommand}"
ToolTip="{l:Loc Tooltips.Settings.Redetect}" Margin="8,0,0,0" />
<Button Grid.Column="3" Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Rendering.SelfTest}" Command="{Binding SelfTestCommand}"
ToolTip="{l:Loc Tooltips.Settings.SelfTest}" Margin="8,0,0,0" />
</Grid>
<!-- Settings.html encoder table: codec, encoder, 10-bit, max size, self-test (announced as it moves on), presets served. -->
<Border Style="{StaticResource Border.Card}">
<StackPanel>
<Border BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,0,0,1" Padding="14,8">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110" />
<ColumnDefinition Width="1.4*" MinWidth="160" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="96" />
<ColumnDefinition Width="1.2*" MinWidth="140" />
<ColumnDefinition Width="70" />
<ColumnDefinition Width="100" />
<ColumnDefinition Width="130" />
<ColumnDefinition Width="*" MinWidth="120" />
</Grid.ColumnDefinitions>
<TextBlock Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.Codec}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.Encoder}" Margin="10,0,0,0" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.TenBit}" Margin="10,0,0,0" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.Max}" Margin="10,0,0,0" />
<TextBlock Grid.Column="4" Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.SelfTest}" Margin="10,0,0,0" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.Header}" Text="{l:Loc Settings.Rendering.Column.UsedFor}" Margin="10,0,0,0" />
</Grid>
</Border>
<ItemsControl ItemsSource="{Binding Encoders}" Focusable="False">
@@ -188,18 +269,22 @@
<Border BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,0,0,1" Height="36" Padding="14,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="110" />
<ColumnDefinition Width="1.4*" MinWidth="160" />
<ColumnDefinition Width="90" />
<ColumnDefinition Width="120" />
<ColumnDefinition Width="150" />
<ColumnDefinition Width="96" />
<ColumnDefinition Width="1.2*" MinWidth="140" />
<ColumnDefinition Width="70" />
<ColumnDefinition Width="100" />
<ColumnDefinition Width="130" />
<ColumnDefinition Width="*" MinWidth="120" />
</Grid.ColumnDefinitions>
<TextBlock Style="{StaticResource Text.Cell}" Text="{Binding Codec}" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Cell}" Text="{Binding Name}" Margin="10,0,0,0" ToolTip="{Binding Row.Name}" />
<TextBlock x:Name="TenBit" Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding TenBitText}" Margin="10,0,0,0" Foreground="{DynamicResource Brush.TextFaint}" />
<TextBlock Grid.Column="3" Style="{StaticResource Text.Cell}" Text="{Binding MaxText}" Margin="10,0,0,0" />
<ui:StatusGlyph Grid.Column="4" Kind="{Binding ResultKind}" Text="{Binding ResultText}" ToolTip="{Binding ResultToolTip}" FontSize="13"
VerticalAlignment="Center" Margin="10,0,0,0" Visibility="{Binding HasResult, Converter={StaticResource BoolToVisibility}}" />
VerticalAlignment="Center" Margin="10,0,0,0" Visibility="{Binding HasResult, Converter={StaticResource BoolToVisibility}}"
AutomationProperties.LiveSetting="Polite" infra:LiveRegion.Text="{Binding ResultAnnouncement}" />
<TextBlock Grid.Column="5" Style="{StaticResource Text.Cell}" Text="{Binding UsedForText}" ToolTip="{Binding UsedForText}"
Foreground="{DynamicResource Brush.TextMuted}" Margin="10,0,0,0" />
</Grid>
</Border>
<DataTemplate.Triggers>
@@ -217,26 +302,33 @@
<!-- ================= Storage ================= -->
<StackPanel Style="{StaticResource Page}" Visibility="{Binding Page, Converter={x:Static shell:EqualsToVisibilityConverter.Instance}, ConverterParameter=Storage}">
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Storage.Folder}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Setting}" Text="{Binding CacheFolder.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<!-- Path, browse, usage, Clear on one line: the path gives way first (Settings.html). -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" Text="{Binding CacheFolder.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding CacheFolder}" ToolTip="{Binding CacheFolder.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Storage.Folder}" />
<Button Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.FolderOpen}" Command="{Binding BrowseCacheCommand}"
<Button Grid.Column="1" Style="{StaticResource Button.Icon}" Margin="10,0,0,0" ui:ButtonIcon.Glyph="{StaticResource Icon.FolderOpen}" Command="{Binding BrowseCacheCommand}"
ToolTip="{l:Loc Tooltips.Settings.BrowseCache}" AutomationProperties.Name="{l:Loc Settings.Browse}" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{Binding CacheUsageText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.CacheUsage}" />
<Button Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Storage.Clear}" Command="{Binding ClearCacheCommand}" ToolTip="{l:Loc Tooltips.Settings.ClearCacheAsk}"
Margin="10,0,0,0" />
</WrapPanel>
<TextBlock Grid.Column="2" Style="{StaticResource Text.Hint}" Text="{Binding CacheUsageText}" Margin="10,0,0,0" ToolTip="{l:Loc Tooltips.Settings.CacheUsage}" />
<Button Grid.Column="3" Style="{StaticResource Button.Compact}" Content="{l:Loc Settings.Storage.Clear}" Command="{Binding ClearCacheCommand}"
ToolTip="{l:Loc Tooltips.Settings.ClearCacheAsk}" Margin="10,0,0,0" />
</Grid>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Storage.Thumbnails}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Number}" Width="96" Text="{Binding ThumbnailMemory.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<TextBox Style="{StaticResource TextBox.SettingNumber}" Width="96" Text="{Binding ThumbnailMemory.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding ThumbnailMemory}" ToolTip="{Binding ThumbnailMemory.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Storage.Thumbnails}" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{l:Loc Settings.Storage.ThumbnailsUnit}" Margin="12,0,0,0" />
</WrapPanel>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Storage.Limit}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Number}" Text="{Binding CacheLimit.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
<TextBox Style="{StaticResource TextBox.SettingNumber}" Text="{Binding CacheLimit.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding CacheLimit}" ToolTip="{Binding CacheLimit.ToolTip}" AutomationProperties.Name="{l:Loc Settings.Storage.Limit}" />
<TextBlock Style="{StaticResource Text.Hint}" Text="{l:Loc Settings.Storage.LimitUnit}" Margin="12,0,0,0" />
</WrapPanel>
@@ -248,10 +340,10 @@
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Server.Default}">
<TextBox Style="{StaticResource TextBox.Setting}" Text="{Binding DefaultServer.Text, UpdateSourceTrigger=PropertyChanged, ValidatesOnNotifyDataErrors=True}"
shell:EditBehavior.Field="{Binding DefaultServer}" ToolTip="{Binding DefaultServer.ToolTip}" ui:Field.Placeholder="{l:Loc Server.AddressPlaceholder}"
AutomationProperties.Name="{l:Loc Settings.Server.Default}" />
AutomationProperties.Name="{l:Loc Settings.Server.Default}" FlowDirection="LeftToRight" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Server.RenderNode}">
<CheckBox Content="{l:Loc Server.RenderNode}" IsChecked="{Binding RenderNodeOptIn}" ToolTip="{l:Loc Tooltips.Server.RenderNode}" Margin="0,4,0,0" />
<CheckBox Content="{l:Loc Settings.Server.OfferPc}" IsChecked="{Binding RenderNodeOptIn}" ToolTip="{l:Loc Tooltips.Server.RenderNode}" Margin="0,4,0,0" />
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Server.Certificates}">
<Grid>
@@ -267,12 +359,12 @@
<ColumnDefinition Width="110" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Style="{StaticResource Text.Cell}" Text="{Binding Server}" />
<TextBlock Style="{StaticResource Text.Cell}" Text="{Binding Server}" ToolTip="{Binding Server}" FlowDirection="LeftToRight" HorizontalAlignment="Left" />
<TextBlock Grid.Column="1" Style="{StaticResource Text.Cell}" Text="{Binding Fingerprint}" FontFamily="{StaticResource Font.Mono}" FontSize="12"
ToolTip="{Binding FullFingerprint}" Margin="10,0,0,0" />
ToolTip="{Binding FullFingerprint}" Margin="10,0,0,0" FlowDirection="LeftToRight" HorizontalAlignment="Left" />
<TextBlock Grid.Column="2" Style="{StaticResource Text.Cell}" Text="{Binding TrustedText}" Foreground="{DynamicResource Brush.TextMuted}" Margin="10,0,0,0" />
<Button Grid.Column="3" Style="{StaticResource Button.Row}" Content="{l:Loc Server.Certificate.Forget}" Command="{Binding ForgetCommand}"
ToolTip="{l:Loc Tooltips.Server.ForgetTrust}" Margin="10,0,0,0" />
ToolTip="{l:Loc Tooltips.Server.ForgetTrust}" AutomationProperties.Name="{Binding ForgetName}" Margin="10,0,0,0" />
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -290,7 +382,8 @@
<WrapPanel>
<Button Content="{l:Loc About.Update.Check}" Command="{Binding Shell.About.CheckCommand}" ToolTip="{l:Loc Tooltips.About.Check}" />
<ui:StatusGlyph Kind="{Binding Shell.About.UpdateKind}" Text="{Binding Shell.About.UpdateText}" FontSize="13" VerticalAlignment="Center" Margin="12,0,0,0"
Visibility="{Binding Shell.About.HasUpdateText, Converter={StaticResource BoolToVisibility}}" />
Visibility="{Binding Shell.About.HasUpdateText, Converter={StaticResource BoolToVisibility}}"
AutomationProperties.LiveSetting="Polite" infra:LiveRegion.Text="{Binding Shell.About.UpdateText}" />
<Button Style="{StaticResource Button.Link}" Content="{l:Loc About.Update.Download}" Command="{Binding Shell.About.DownloadCommand}" ToolTip="{Binding Shell.About.DownloadToolTip}"
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="13"
Visibility="{Binding Shell.About.IsUpdateAvailable, Converter={StaticResource BoolToVisibility}}" />
@@ -309,19 +402,28 @@
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Advanced.Portable}">
<TextBlock Text="{Binding PortableText}" Margin="0,7,0,0" ToolTip="{l:Loc Tooltips.Settings.Portable}" />
</HeaderedContentControl>
<!-- Read-only folders: the full path in the tooltip; Open says what it does. -->
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Advanced.DataFolder}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Setting}" IsReadOnly="True" Text="{Binding DataFolder, Mode=OneWay}" ToolTip="{l:Loc Tooltips.Settings.DataFolder}"
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" IsReadOnly="True" Text="{Binding DataFolder, Mode=OneWay}" ToolTip="{Binding DataFolder}"
AutomationProperties.Name="{l:Loc Settings.Advanced.DataFolder}" />
<Button Content="{l:Loc Common.Open}" Command="{Binding OpenDataFolderCommand}" ToolTip="{l:Loc Tooltips.Settings.OpenDataFolder}" Margin="10,0,0,0" />
</WrapPanel>
<Button Grid.Column="1" Content="{l:Loc Common.Open}" Command="{Binding OpenDataFolderCommand}" ToolTip="{l:Loc Tooltips.Settings.OpenDataFolder}" Margin="10,0,0,0" />
</Grid>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Advanced.Logs}">
<WrapPanel>
<TextBox Style="{StaticResource TextBox.Setting}" IsReadOnly="True" Text="{Binding LogsFolder, Mode=OneWay}" ToolTip="{l:Loc Tooltips.Settings.LogsFolder}"
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" MinWidth="160" MaxWidth="360" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBox Style="{StaticResource TextBox.Path}" IsReadOnly="True" Text="{Binding LogsFolder, Mode=OneWay}" ToolTip="{Binding LogsFolder}"
AutomationProperties.Name="{l:Loc Settings.Advanced.Logs}" />
<Button Content="{l:Loc Common.Open}" Command="{Binding OpenLogsCommand}" ToolTip="{l:Loc Tooltips.Common.OpenLogs}" Margin="10,0,0,0" />
</WrapPanel>
<Button Grid.Column="1" Content="{l:Loc Common.Open}" Command="{Binding OpenLogsCommand}" ToolTip="{l:Loc Tooltips.Common.OpenLogs}" Margin="10,0,0,0" />
</Grid>
</HeaderedContentControl>
<HeaderedContentControl Style="{StaticResource Setting.Row}" Header="{l:Loc Settings.Advanced.Diagnostics}">
<Button HorizontalAlignment="Left" Content="{l:Loc Settings.Advanced.ExportBundle}" Command="{Binding ExportDiagnosticsCommand}" ToolTip="{l:Loc Tooltips.Settings.Diagnostics}"
@@ -334,7 +436,14 @@
</StackPanel>
</Grid>
</ScrollViewer>
</DockPanel>
<!-- Reset section: only on pages with settings to reset. -->
<Border Grid.Row="2" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="0,1,0,0" Padding="0,12,0,0" Margin="0,12,0,0"
Visibility="{Binding CanResetSection, Converter={StaticResource BoolToVisibility}}">
<Button Style="{StaticResource Button.Subtle}" HorizontalAlignment="Right" Content="{l:Loc Settings.ResetSection}" Command="{Binding ResetSectionCommand}"
ToolTip="{l:Loc Tooltips.Settings.ResetSection}" BorderBrush="{DynamicResource Brush.Stroke}" Foreground="{DynamicResource Brush.TextMuted}" />
</Border>
</Grid>
</Border>
</Grid>
</UserControl>
+33 -8
View File
@@ -144,7 +144,7 @@ public sealed class SettingsViewModel : SectionViewModel
OpenLogsCommand = new RelayCommand(() => ShellActions.Reveal(LogsFolder));
ExportDiagnosticsCommand = new AsyncRelayCommand(ExportDiagnosticsAsync);
BackupDatabaseCommand = new AsyncRelayCommand(BackupDatabaseAsync, () => Shell.Services.Database is not null);
ResetSectionCommand = new RelayCommand(ResetSection);
ResetSectionCommand = new RelayCommand(ResetSection, () => CanResetSection);
ExportSettingsCommand = new AsyncRelayCommand(ExportSettingsAsync);
ImportSettingsCommand = new AsyncRelayCommand(ImportSettingsAsync);
Loc.CultureChanged += OnCultureChanged;
@@ -168,6 +168,7 @@ public sealed class SettingsViewModel : SectionViewModel
if (!Set(ref _page, value)) return;
OnPropertyChanged(nameof(SelectedPageItem));
OnPropertyChanged(nameof(PageTitle));
OnPropertyChanged(nameof(CanResetSection));
if (value == SettingsPage.Rendering && Encoders.Count == 0 && !_isDetecting) _ = DetectEncodersAsync();
if (value == SettingsPage.Storage) _ = UpdateCacheUsageAsync();
}
@@ -480,10 +481,13 @@ public sealed class SettingsViewModel : SectionViewModel
// ---------------- Footer ----------------
public ICommand ResetSectionCommand { get; }
/// <summary>Advanced holds no setting with a default (paths and actions only): it has no Reset section.</summary>
public bool CanResetSection => _page != SettingsPage.Advanced;
public ICommand ExportSettingsCommand { get; }
public ICommand ImportSettingsCommand { get; }
/// <summary>Loads what needs the services (certificates, cache usage).</summary>
/// <summary>Loads what needs the services (certificates, cache usage) and follows the server session.</summary>
public void Attach()
{
try
@@ -495,16 +499,20 @@ public sealed class SettingsViewModel : SectionViewModel
Log.Warning("settings", "Cache folder not prepared", ex);
}
LoadCertificates();
Shell.Services.Server.PropertyChanged += (_, _) => LoadCertificates();
Shell.Services.Server.PropertyChanged += OnServerChanged;
}
public override void Dispose()
{
Loc.CultureChanged -= OnCultureChanged;
Shell.Services.Server.PropertyChanged -= OnServerChanged;
_selfTest?.Cancel();
base.Dispose();
}
/// <summary>Other screens change the archive and the server in use: Settings shows them when it opens.</summary>
protected override void OnActivated() => ReloadShared();
// ---------------- Implementation ----------------
private void Save() => Shell.Services.SaveSettings();
@@ -527,6 +535,24 @@ public sealed class SettingsViewModel : SectionViewModel
OnPropertyChanged(nameof(IsPreferHardware));
OnPropertyChanged(nameof(IsSoftwareOnly));
OnPropertyChanged(nameof(IsHardwareForPreviews));
Shell.Server.Refresh();
}
/// <summary>
/// Takes the archive and server values other screens set (opening an archive, connecting), unless the field holds an
/// edit not committed yet.
/// </summary>
private void ReloadShared()
{
if (!ArchiveRoot.IsDirty) ArchiveRoot.Load(_s.LastArchivePath ?? string.Empty);
if (!DefaultServer.IsDirty) DefaultServer.Load(ServerAddress.Display(_s.ServerUrl));
UpdateArchiveFree();
}
private void OnServerChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
{
LoadCertificates();
if (!DefaultServer.IsDirty) DefaultServer.Load(ServerAddress.Display(_s.ServerUrl));
}
private void UpdatePreview() => PreviewNames = NamingPreview.FirstNames(FolderTemplate.Text, FileTemplate.Text);
@@ -623,7 +649,7 @@ public sealed class SettingsViewModel : SectionViewModel
{
Heading = Loc.L("Settings.Storage.ClearTitle"),
Message = Loc.L("Settings.Storage.ClearMessage"),
Detail = folder,
Detail = Formatting.LeftToRight(folder),
DetailToolTip = Loc.L("Tooltips.Settings.CacheFolder"),
SafeText = Loc.L("Settings.Storage.Keep"),
SafeToolTip = Loc.L("Tooltips.Settings.KeepCache"),
@@ -715,11 +741,10 @@ public sealed class SettingsViewModel : SectionViewModel
case SettingsPage.Updates:
_s.CheckForUpdates = defaults.CheckForUpdates;
break;
case SettingsPage.Advanced:
break;
}
Save();
OnAllPropertiesChanged();
Shell.Server.Refresh();
}
private async Task ExportSettingsAsync()
@@ -783,10 +808,10 @@ public sealed class SettingsViewModel : SectionViewModel
Certificates.Clear();
foreach (var certificate in _s.TrustedCertificates.OrderByDescending(c => c.TrustedAt))
{
// The same question as on the Server screen; the session on that certificate is closed first.
Certificates.Add(new TrustedCertificateRow(certificate, new RelayCommand(() =>
{
Shell.Services.Server.Forget(certificate.Fingerprint);
LoadCertificates();
if (Shell.Services.Server.ConfirmForget(certificate.Fingerprint, Shell.Services.Dialogs)) LoadCertificates();
})));
}
OnPropertyChanged(nameof(HasCertificates));
+17 -10
View File
@@ -47,13 +47,15 @@
</Style>
</UserControl.Resources>
<!-- A modal dialog over the dimmed shell: Tab, Ctrl+Tab and the arrows stay inside it, and it opens with focus on the chosen card. -->
<Border Width="640" Background="{DynamicResource Brush.Surface}" BorderBrush="{DynamicResource Brush.Stroke}" BorderThickness="1"
CornerRadius="{StaticResource Radius.Dialog}" Padding="32,28" Effect="{StaticResource Shadow.Popup}">
CornerRadius="{StaticResource Radius.Dialog}" Padding="32,28" Effect="{StaticResource Shadow.Popup}"
KeyboardNavigation.TabNavigation="Cycle" KeyboardNavigation.ControlTabNavigation="Cycle" KeyboardNavigation.DirectionalNavigation="Contained">
<StackPanel>
<DockPanel LastChildFill="True">
<ComboBox DockPanel.Dock="Right" VerticalAlignment="Top" MinWidth="120" ItemsSource="{Binding Languages}" SelectedItem="{Binding SelectedLanguage}"
DisplayMemberPath="Name" ToolTip="{l:Loc Tooltips.Welcome.Language}" AutomationProperties.Name="{l:Loc Settings.General.Language}" />
<ui:BrandMarkIcon Width="56" Height="56" ShowPlate="True" />
<ui:BrandMarkIcon Width="56" Height="56" ShowPlate="True" FlowDirection="LeftToRight" />
<StackPanel Margin="16,0,16,0" VerticalAlignment="Center">
<TextBlock Text="{l:Loc Shell.Welcome.Title}" FontSize="20" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" />
<TextBlock Text="{l:Loc Shell.Welcome.Question}" Foreground="{DynamicResource Brush.TextMuted}" Margin="0,4,0,0" TextTrimming="CharacterEllipsis" />
@@ -62,7 +64,7 @@
<StackPanel Margin="0,20,0,0">
<!-- Create a local archive -->
<RadioButton Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsLocal}" ToolTip="{l:Loc Tooltips.Welcome.Local}"
<RadioButton x:Name="LocalChoice" Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsLocal}" ToolTip="{l:Loc Tooltips.Welcome.Local}"
AutomationProperties.Name="{l:Loc Shell.Welcome.Local}">
<DockPanel>
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Subtle}" Content="{l:Loc Shell.Welcome.Change}" Command="{Binding ChangeRootCommand}"
@@ -76,7 +78,7 @@
</RadioButton>
<!-- Adopt an existing folder -->
<RadioButton Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsAdopt}" ToolTip="{l:Loc Tooltips.Welcome.Adopt}"
<RadioButton x:Name="AdoptChoice" Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsAdopt}" ToolTip="{l:Loc Tooltips.Welcome.Adopt}"
AutomationProperties.Name="{l:Loc Shell.Welcome.Adopt}">
<DockPanel>
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Subtle}" Content="{l:Loc Shell.Welcome.Choose}" Command="{Binding ChooseAdoptCommand}"
@@ -90,7 +92,7 @@
</RadioButton>
<!-- Connect to a server -->
<RadioButton Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsServer}" ToolTip="{l:Loc Tooltips.Welcome.Server}"
<RadioButton x:Name="ServerChoice" Style="{StaticResource RadioButton.Choice}" GroupName="Welcome" IsChecked="{Binding IsServer}" ToolTip="{l:Loc Tooltips.Welcome.Server}"
AutomationProperties.Name="{l:Loc Shell.Welcome.Server}" Margin="0">
<DockPanel>
<ui:StatusGlyph DockPanel.Dock="Right" Kind="Online" Text="{l:Loc Shell.Welcome.Found}" VerticalAlignment="Center" ToolTip="{l:Loc Tooltips.Welcome.Found}"
@@ -104,12 +106,17 @@
</RadioButton>
</StackPanel>
<DockPanel Margin="0,20,0,0" LastChildFill="False">
<Button DockPanel.Dock="Right" Style="{StaticResource Button.Primary}" Height="36" Padding="22,0" Content="{l:Loc Shell.Welcome.Continue}"
<!-- Consent, then Continue (visual and Tab order); the consent has the same label as in Settings. -->
<Grid Margin="0,20,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<CheckBox Content="{l:Loc Settings.General.UsageCounts}" IsChecked="{Binding UsageCounts}" ToolTip="{l:Loc Tooltips.Settings.UsageCounts}" VerticalAlignment="Center"
HorizontalAlignment="Left" Foreground="{DynamicResource Brush.TextMuted}" />
<Button Grid.Column="1" Style="{StaticResource Button.Primary}" Height="36" Padding="22,0" Margin="12,0,0,0" Content="{l:Loc Shell.Welcome.Continue}"
Command="{Binding ContinueCommand}" ToolTip="{l:Loc Tooltips.Welcome.Continue}" IsDefault="True" />
<CheckBox Content="{l:Loc Shell.Welcome.Consent}" IsChecked="{Binding UsageCounts}" ToolTip="{l:Loc Tooltips.Settings.UsageCounts}" VerticalAlignment="Center"
Foreground="{DynamicResource Brush.TextMuted}" />
</DockPanel>
</Grid>
</StackPanel>
</Border>
</UserControl>
+18 -1
View File
@@ -1,8 +1,25 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Threading;
namespace Titano.App.Sections;
public partial class WelcomeView : UserControl
{
public WelcomeView() => InitializeComponent();
public WelcomeView()
{
InitializeComponent();
IsVisibleChanged += (_, e) =>
{
if (e.NewValue is true) Dispatcher.InvokeAsync(FocusChoice, DispatcherPriority.Input);
};
}
/// <summary>The dialog opens with keyboard focus on the chosen card, so the keyboard starts inside it.</summary>
private void FocusChoice()
{
var chosen = new[] { LocalChoice, AdoptChoice, ServerChoice }.FirstOrDefault(c => c.IsChecked == true) ?? LocalChoice;
Keyboard.Focus(chosen);
}
}
+5 -5
View File
@@ -100,13 +100,13 @@ public sealed class WelcomeViewModel : LocalizedViewModel
}
}
/// <summary>"D:\TitanoArchive · 1.8 TB free".</summary>
/// <summary>"D:\TitanoArchive · 1.8 TB free" (the path left to right in every language).</summary>
public string LocalDetail => ArchiveLocations.FreeSpace(_localRoot) is { } free
? Loc.L("Shell.Welcome.Local.Detail", _localRoot, Formatting.Bytes(free))
: _localRoot;
? Loc.L("Shell.Welcome.Local.Detail", Formatting.LeftToRight(_localRoot), Formatting.Bytes(free))
: Formatting.LeftToRight(_localRoot);
/// <summary>The chosen folder to adopt; null until picked.</summary>
public string? AdoptDetail => _adoptFolder;
public string? AdoptDetail => _adoptFolder is { } folder ? Formatting.LeftToRight(folder) : null;
public bool HasAdoptDetail => _adoptFolder is not null;
@@ -117,7 +117,7 @@ public sealed class WelcomeViewModel : LocalizedViewModel
/// <summary>"Studio NAS on this network · https://nas.local:8443".</summary>
public string? ServerDetail => FoundServer is { } s
? s.Name == s.Address ? s.Address : Loc.L("Shell.Welcome.Server.Found", s.Name, s.Address)
? s.Name == s.Address ? Formatting.LeftToRight(s.Address) : Loc.L("Shell.Welcome.Server.Found", s.Name, Formatting.LeftToRight(s.Address))
: null;
public bool HasServerDetail => ServerDetail is not null;
+30 -2
View File
@@ -77,6 +77,18 @@ public sealed class ServerSession : ObservableObject, ITrustStore, IDisposable
OnAllPropertiesChanged();
}
/// <summary>
/// Forgets a trusted certificate once the user confirmed it (Server screen and Settings › Server alike); the session
/// that relies on it is closed first. True when it was forgotten.
/// </summary>
public bool ConfirmForget(string fingerprint, IAppDialogs dialogs)
{
if (!dialogs.Confirm(ForgetRequest(fingerprint))) return false;
if (IsConnected && string.Equals(TrustOf(_flow.Info?.TlsFingerprint)?.Fingerprint, fingerprint, StringComparison.OrdinalIgnoreCase)) Disconnect();
Forget(fingerprint);
return true;
}
// ---------------- Session ----------------
/// <summary>Resumes the saved session at start; stays signed out quietly when it cannot be reused.</summary>
@@ -196,11 +208,27 @@ public sealed class ServerSession : ObservableObject, ITrustStore, IDisposable
ActionToolTip = Loc.L("Tooltips.Server.Trust"),
};
/// <summary>Splits the 32-byte SHA-256 fingerprint into two lines of 16 bytes.</summary>
/// <summary>The destructive question before a trusted certificate is forgotten, with its fingerprint.</summary>
public static ConfirmRequest ForgetRequest(string fingerprint) => new()
{
Heading = Loc.L("Server.Certificate.Title"),
Message = Loc.L("Server.Certificate.Message"),
Detail = FormatFingerprint(fingerprint),
DetailToolTip = Loc.L("Tooltips.Server.Fingerprint"),
SafeText = Loc.L("Server.Certificate.Keep"),
SafeToolTip = Loc.L("Tooltips.Server.KeepTrust"),
ActionText = Loc.L("Server.Certificate.Forget"),
ActionToolTip = Loc.L("Tooltips.Server.ForgetTrust"),
IsDestructive = true,
};
/// <summary>Splits the 32-byte SHA-256 fingerprint into two lines of 16 bytes, each kept left to right.</summary>
public static string FormatFingerprint(string fingerprint)
{
var bytes = fingerprint.Split(':');
return bytes.Length <= 16 ? fingerprint : string.Join(':', bytes.Take(16)) + "\n" + string.Join(':', bytes.Skip(16));
return bytes.Length <= 16
? Formatting.LeftToRight(fingerprint)
: Formatting.LeftToRight(string.Join(':', bytes.Take(16))) + "\n" + Formatting.LeftToRight(string.Join(':', bytes.Skip(16)));
}
/// <summary>"9A:3C:71:E0:…" for the status line.</summary>
+24 -2
View File
@@ -11,6 +11,7 @@ namespace Titano.App.Server;
public sealed class SyncRowAction(SyncAction action, ICommand command) : ObservableObject
{
private string _toolTip = string.Empty;
private string _sequence = string.Empty;
public SyncAction Action { get; } = action;
public string Text => Loc.L("Server.Sync.Action." + Action);
@@ -22,8 +23,25 @@ public sealed class SyncRowAction(SyncAction action, ICommand command) : Observa
set => Set(ref _toolTip, value);
}
/// <summary>The title of the row's sequence.</summary>
public string Sequence
{
get => _sequence;
set
{
if (Set(ref _sequence, value)) OnPropertyChanged(nameof(AccessibleName));
}
}
/// <summary>"Upload: Clouds over the Langhe": screen readers name the sequence each of the many identical buttons acts on.</summary>
public string AccessibleName => Loc.L("Server.Sync.ActionFor", Text, _sequence);
/// <summary>The label in the current language.</summary>
public void Relabel() => OnPropertyChanged(nameof(Text));
public void Relabel()
{
OnPropertyChanged(nameof(Text));
OnPropertyChanged(nameof(AccessibleName));
}
}
/// <summary>One row of the sync table (Server.html): sequence, this PC, server, state and the actions that apply.</summary>
@@ -93,7 +111,11 @@ public sealed class SyncRow : ObservableObject
var kept = _actions.ToDictionary(a => a.Action);
Actions = [.. wanted.Select(action => kept.GetValueOrDefault(action) ?? new SyncRowAction(action, new AsyncRelayCommand(() => _act(this, action))))];
}
foreach (var action in _actions) action.ToolTip = SyncText.ToolTip(_entry, action.Action);
foreach (var action in _actions)
{
action.ToolTip = SyncText.ToolTip(_entry, action.Action);
action.Sequence = Title;
}
}
private void RaiseTexts()
+38 -6
View File
@@ -53,6 +53,15 @@ public sealed class SyncFilterChip(SyncFilter filter, Action<SyncFilter> select)
}
}
/// <summary>Why the sync table shows no rows; each case has its one action (BRIEF §0.2 rule 6).</summary>
public enum SyncEmpty
{
None,
SignedOut,
Nothing,
NoMatch,
}
/// <summary>
/// The sync table of the Server screen (BRIEF §12.7, Server.html): every sequence of this PC and of the signed-in
/// server with what each side holds, where it stands and what can be done (upload, download originals, open with
@@ -87,6 +96,13 @@ public sealed class SyncTableViewModel : ObservableObject, IDisposable
{
if (Host.Server is { } server) ShellActions.OpenUrl(server + "/admin");
});
ClearFiltersCommand = new RelayCommand(() =>
{
_search = string.Empty;
OnPropertyChanged(nameof(SearchText));
Select(SyncFilter.All);
});
ImportCommand = new RelayCommand(() => _shell.Navigate(SectionKey.Import));
}
public ObservableCollection<SyncRow> Rows { get; } = [];
@@ -94,6 +110,12 @@ public sealed class SyncTableViewModel : ObservableObject, IDisposable
public ICommand UploadAllCommand => _uploadAll;
public ICommand OpenAdminCommand { get; }
/// <summary>"No sequence matches": back to every sequence.</summary>
public ICommand ClearFiltersCommand { get; }
/// <summary>"Nothing to compare yet": bring photos in.</summary>
public ICommand ImportCommand { get; }
public string SearchText
{
get => _search;
@@ -108,11 +130,19 @@ public sealed class SyncTableViewModel : ObservableObject, IDisposable
public bool HasRows => Rows.Count > 0;
public SyncEmpty Empty => HasRows ? SyncEmpty.None
: !IsActive ? SyncEmpty.SignedOut
: _entries.Count == 0 ? SyncEmpty.Nothing
: SyncEmpty.NoMatch;
/// <summary>"Not connected to a server", "Nothing to compare yet" or "No sequence matches"; null when rows show.</summary>
public string? EmptyText => HasRows ? null
: !IsActive ? Loc.L("Server.Empty")
: _entries.Count == 0 ? Loc.L("Server.Sync.Empty")
: Loc.L("Server.Sync.NoMatch");
public string? EmptyText => Empty switch
{
SyncEmpty.SignedOut => Loc.L("Server.Empty"),
SyncEmpty.Nothing => Loc.L("Server.Sync.Empty"),
SyncEmpty.NoMatch => Loc.L("Server.Sync.NoMatch"),
_ => null,
};
/// <summary>What "Upload all local" sends, or why it is disabled.</summary>
public string UploadAllToolTip =>
@@ -134,8 +164,9 @@ public sealed class SyncTableViewModel : ObservableObject, IDisposable
public string? ErrorToolTip => Host.Agent?.LastError is { } error ? Loc.L("Tooltips.Server.Sync.Retrying", error.Message) : null;
/// <summary>The server's web admin (it admits administrators only).</summary>
public bool CanOpenAdmin => IsActive;
/// <summary>The server's web admin admits administrators only: the link shows for accounts that manage the archive or users.</summary>
public bool CanOpenAdmin => _shell.Services.Server.User is { } user && IsActive
&& (user.Permissions & (long)(Permissions.ManageArchive | Permissions.ManageUsers)) != 0;
private SyncHost Host => _shell.Services.Sync;
@@ -249,6 +280,7 @@ public sealed class SyncTableViewModel : ObservableObject, IDisposable
while (Rows.Count > wanted.Count) Rows.RemoveAt(Rows.Count - 1);
}
OnPropertyChanged(nameof(HasRows));
OnPropertyChanged(nameof(Empty));
OnPropertyChanged(nameof(EmptyText));
}
+7 -2
View File
@@ -234,11 +234,16 @@ public static class SyncText
_ => Loc.L("Tooltips.Server.Sync." + action),
};
/// <summary>
/// The chips sort by where the originals are: a sequence being transferred still counts as only on this PC (no server
/// copy yet) or only on the server (no local originals yet), as the chip tooltips say.
/// </summary>
public static bool Matches(SyncEntry entry, SyncFilter filter, string search) =>
(filter switch
{
SyncFilter.LocalOnly => entry.Status == SyncStatus.LocalOnly,
SyncFilter.Remote => entry.Status is SyncStatus.RemoteOnly or SyncStatus.ProxiesOnly,
SyncFilter.LocalOnly => entry.Status == SyncStatus.LocalOnly || entry is { Status: SyncStatus.Transferring, Link: null },
SyncFilter.Remote => entry.Status is SyncStatus.RemoteOnly or SyncStatus.ProxiesOnly
|| entry is { Status: SyncStatus.Transferring, HasLocalOriginals: false, Link: not null },
SyncFilter.Conflicts => entry.Status == SyncStatus.Conflict,
_ => true,
}) && (search.Length == 0 || entry.Title.Contains(search, StringComparison.CurrentCultureIgnoreCase));
@@ -11,28 +11,6 @@ using Titano.Core.Windows.MediaFoundation;
namespace Titano.App.Settings;
/// <summary>Who provides an encoder row.</summary>
public enum EncoderSource
{
/// <summary>A Media Foundation MFT (hardware or Microsoft software).</summary>
MediaFoundation,
/// <summary>Titano's managed MJPEG/AVI writer.</summary>
BuiltInMjpeg,
/// <summary>Titano's managed GIF/APNG encoders.</summary>
BuiltInAnimation,
}
/// <summary>One row of Settings › Rendering › Encoders.</summary>
public sealed record EncoderRow(string Codec, string Name, string? Vendor, EncoderSource Source, bool Hardware, bool TenBit, int MaxWidth, int MaxHeight, VideoCodec? VideoCodec)
{
public bool CanSelfTest => Source != EncoderSource.BuiltInAnimation;
/// <summary>"NVIDIA · NVIDIA HEVC Encoder MFT" unless the name already carries the vendor.</summary>
public string DisplayName => Vendor is { } vendor && !Name.Contains(vendor, StringComparison.OrdinalIgnoreCase) ? vendor + " · " + Name : Name;
}
/// <summary>Outcome of encoding the synthetic test clip with one encoder.</summary>
public sealed record SelfTestResult(bool Passed, double FramesPerSecond, string? Error);
+53
View File
@@ -0,0 +1,53 @@
using Titano.Core.Export;
using Titano.Core.Localization;
using Titano.Core.Video;
namespace Titano.App.Settings;
/// <summary>Who provides an encoder row.</summary>
public enum EncoderSource
{
/// <summary>A Media Foundation MFT (hardware or Microsoft software).</summary>
MediaFoundation,
/// <summary>Titano's managed MJPEG/AVI writer.</summary>
BuiltInMjpeg,
/// <summary>Titano's managed GIF/APNG encoders.</summary>
BuiltInAnimation,
}
/// <summary>One row of Settings › Rendering › Encoders.</summary>
public sealed record EncoderRow(string Codec, string Name, string? Vendor, EncoderSource Source, bool Hardware, bool TenBit, int MaxWidth, int MaxHeight, VideoCodec? VideoCodec)
{
public bool CanSelfTest => Source != EncoderSource.BuiltInAnimation;
/// <summary>"NVIDIA · NVIDIA HEVC Encoder MFT" unless the name already carries the vendor.</summary>
public string DisplayName => Vendor is { } vendor && !Name.Contains(vendor, StringComparison.OrdinalIgnoreCase) ? vendor + " · " + Name : Name;
}
/// <summary>What the encoders of this PC are for: the built-in presets each one serves and what a render node offers.</summary>
public static class EncoderUse
{
/// <summary>Names of the built-in presets an encoder row can encode, in preset order.</summary>
public static IReadOnlyList<string> Presets(EncoderRow row) =>
[
.. ExportPresets.BuiltIn
.Where(p => row.Source == EncoderSource.BuiltInAnimation ? p.Codec is VideoCodec.Gif or VideoCodec.Apng : p.Codec == row.VideoCodec)
.Select(p => Loc.L(p.NameKey)),
];
/// <summary>"4K archive · 4K HEVC · …" for the Used for column, or "Custom only" when no preset uses the codec.</summary>
public static string Text(EncoderRow row) => Presets(row) is { Count: > 0 } names ? string.Join(" · ", names) : Loc.L("Settings.Rendering.CustomOnly");
/// <summary>
/// The Media Foundation encoders a render node on this PC offers the server: the software ones, and the hardware ones
/// when its renders may use them (<paramref name="allowsHardware"/>, as the node client decides).
/// </summary>
public static IReadOnlyList<EncoderRow> Node(IEnumerable<EncoderRow> rows, bool allowsHardware) =>
[.. rows.Where(r => r.Source == EncoderSource.MediaFoundation && (!r.Hardware || allowsHardware))];
/// <summary>"HEVC · H.264 · AV1": the codecs of <paramref name="encoders"/>, each once; null when there are none.</summary>
public static string? Codecs(IEnumerable<EncoderRow> encoders) =>
encoders.Select(e => e.Codec).Distinct(StringComparer.Ordinal).ToList() is { Count: > 0 } codecs ? string.Join(" · ", codecs) : null;
}
+12 -2
View File
@@ -64,8 +64,11 @@ public sealed class EncoderRowViewModel(EncoderRow row) : ObservableObject
public bool HasTenBit => Row.TenBit;
/// <summary>"8192×8192" or "no limit".</summary>
public string MaxText => Row.MaxWidth > 0 ? $"{Row.MaxWidth}×{Row.MaxHeight}" : Loc.L("Settings.Rendering.NoLimit");
/// <summary>"8192×8192" (width first in every language) or "no limit".</summary>
public string MaxText => Row.MaxWidth > 0 ? Formatting.LeftToRight($"{Row.MaxWidth}×{Row.MaxHeight}") : Loc.L("Settings.Rendering.NoLimit");
/// <summary>The built-in presets this encoder serves (Settings.html "Used for").</summary>
public string UsedForText => EncoderUse.Text(Row);
public bool IsTesting
{
@@ -97,6 +100,9 @@ public sealed class EncoderRowViewModel(EncoderRow row) : ObservableObject
public string ResultToolTip => _result is { Passed: false, Error: { } error } ? error : Loc.L("Tooltips.Settings.SelfTestResult");
/// <summary>What a screen reader announces when the self-test of this row moves on: "HEVC NVIDIA NVENC (hardware): 142 fps · ok".</summary>
public string ResultAnnouncement => Loc.L("Settings.Rendering.ResultFor", Codec, Name, ResultText);
internal void Refresh() => OnAllPropertiesChanged();
private void RaiseResult()
@@ -105,6 +111,7 @@ public sealed class EncoderRowViewModel(EncoderRow row) : ObservableObject
OnPropertyChanged(nameof(ResultKind));
OnPropertyChanged(nameof(ResultText));
OnPropertyChanged(nameof(ResultToolTip));
OnPropertyChanged(nameof(ResultAnnouncement));
}
}
@@ -117,4 +124,7 @@ public sealed class TrustedCertificateRow(TrustedCertificate certificate, IComma
public string FullFingerprint => Certificate.Fingerprint;
public string TrustedText => Formatting.Date(Certificate.TrustedAt);
public ICommand ForgetCommand { get; } = forget;
/// <summary>"Forget: https://nas.local:8443": the button names its server for screen readers.</summary>
public string ForgetName => Loc.L("Settings.Server.ForgetName", Server);
}