Move SFTP and S3 into the tab strip, and the host list into a card grid

Four asks in one pass over the desktop head, and two of them are furniture moving rather than anything new. THE STRIP IS THE WINDOW'S NOW, not the terminal's. Vaults, SFTP and S3 sit at its head and cannot be closed, and open terminals follow them. SFTP and S3 left the nav rail to get there, which is the one semantic change: they are the two destinations you stay in while something runs, and a rail entry is for somewhere you go and come back from. So the rail belongs to the Vaults tab and collapses with it, which also means SFTP, S3 and a terminal each get the full 1016 rather than the 826 a page gets. The tab is expressed as "a page, and not one of the two the strip took" rather than as a fourth ShellSurface. Both are still ShellScreen members and have to be — that is what they are on the phone, where they are two rows in a hub — so a surface each would have been a second way to say a thing Screen already says. IsTransfersShowing and IsBucketsShowing light the other two tabs unchanged. What is new is one field: the page Vaults comes back to, because it is the one tab with sub-navigation and therefore the one that can return to the wrong place. That is not the hidden field ShellSurface argues against — that one would be a second copy of "which page"; this is a tab remembering its own. THE HOSTS SCREEN IS A GRID, and the 268-pixel sidebar is gone. That column was choosing among forty machines and editing one of them at two-thirds width, and it was narrow so the editor beneath it could be a column at all. Cards took the first job at full width; a 304-pixel drawer took the second and collapses when nothing is selected. Pressing a group card narrows the grid; SHOW ALL is the way back. The group editor moved into the drawer as well, which finally makes IsEditingGroup mean the same thing on both heads — it was the phone's alone, because the desktop's editor was a bar that was always on screen. AreHostsExpanded and ToggleHosts went with the control that used them. They folded the whole list away under one heading, an affordance that existed because the column was narrow. Folding a single group is a different thing and is still here. THE TYPE SCALE IS A POINT LARGER and the text ramp is white. The base size was never stated anywhere — a bare TextBlock took TextElement's default of 12 — so raising the scale meant naming it, on Window and on UserControl. The second selector is not redundancy: the layout harness hosts a UserControl in a window it builds itself, and without it the suite would measure every screen a point smaller than it ships, silently. A selector on TextBlock would have been the obvious way and is wrong, because a style setter beats an inherited value and would collapse every deliberate step back to one number. #E3E7F4 is a blue-tinted white on blue-black surfaces, which costs contrast twice — once for being darker than white and once for sharing a hue with what it is drawn on. Pure white is 18.3:1 against the canvas where that was 15.5:1. Every step below moved with the top, so the intervals the design chose are kept and TextDim clears 9:1 against 6.4:1. The palette is shared, so the phone has both changes too. TWO DEFECTS THE HARNESS STRUCTURALLY CANNOT SEE, found by rendering the screen rather than by measuring it, and both now covered. The tile was 232 and was first written as 248, from arithmetic that left out the scrolling stack's own margins. Every layout test passed — the harness asks whether a control is inside the window, never how many fit on a line — so the grid quietly became one column wide at exactly the minimum this application guarantees, which is the shape cards exist to avoid. TheHostsGridKeepsTwoColumnsAtTheMinimumWithTheDrawerOpen counts columns instead, and fails at 248. And a card's text ran past its own border, because a horizontal StackPanel measures children with infinite width: a TextBlock inside one never learns it is short of room, so TextTrimming never fires. Both card rows are grids with a star column that gives way and an Auto column that does not — a hostname with its tail cut is still the machine you were looking for, where a badge or the word naming an auth method is not. The keychain header changed shape for the same class of reason. It was Auto,Auto,*,Auto with the buttons last, so the slack column was the only thing absorbing a change of width and five buttons fell off the right edge the moment the type grew. That is how GENERATE lost the word KEY once already. The summary sits in the star column and trims now, so the buttons always get their width. HostSidebarTests became HostGridTests and moved to the grid with the gestures it drives. docs/design-import-gaps.md gains a v3 section naming the five toolbar controls in the design with nothing behind them — a view-mode switch, a tag filter, a calendar, a share control and Serial — and manual-checks.md and the README follow the controls that moved.
2026-08-03 15:08:48 +02:00
parent 416f233657
commit 208443b932
38 changed files with 2252 additions and 1432 deletions
@@ -18,10 +18,20 @@
    each carries a count, which is the one genuinely new fact: how many hosts, how many keys, how many pins
    is a question you would otherwise have to open the screen to answer.

-    A count is drawn only where one is real. SFTP, Logs and Preferences have none — a transfer queue's depth
-    is not "how many files this screen holds", a log has no total until it is read, and preferences are not
-    counted — so those three show nothing rather than a zero. The design draws a number on every row; a zero
-    beside Logs would be a fact this application never computed.
+    A count is drawn only where one is real. Logs and Preferences have none — a log has no total until it is
+    read, and preferences are not counted — so those two show nothing rather than a zero. The design draws a
+    number on every row; a zero beside Logs would be a fact this application never computed.
+
+    ── SFTP AND S3 ARE NOT HERE, and that is the tab strip's doing. ──────────────────────────────────────
+    Both were rail entries until the strip grew fixed tabs for them. They are the two destinations that are
+    not about the keychain — they are a place you leave the keychain to work in, and you stay there while a
+    transfer runs — which is exactly what a tab is for and what a rail entry is not. The rail is drawn only
+    under the Vaults tab now, so an entry here for either of them would be a route out of the tab it lives
+    in. See MainWindowViewModel.IsVaultsTab.
+
+    What this costs is that the S3 count has nowhere to go: the strip's tabs are one word each, and the rail
+    was where "how many buckets" was printed. It is on the S3 screen itself, which is where somebody
+    counting buckets is going anyway.

    One of the destinations — TEAM — reaches a screen that says it is not built. It is in the list anyway
    rather than dropped, and the reasoning is in ShellScreen: the milestones are public, the screen behind it
@@ -61,32 +71,6 @@
          </Grid>
        </Button>

-        <Button Classes="flat nav" Classes.active="{Binding IsTransfersShowing}"
-                Command="{Binding ShowFilesCommand}"
-                CommandParameter="{x:Static vm:RemoteKind.Host}"
-                ToolTip.Tip="Move files to and from a host over SFTP">
-          <Grid ColumnDefinitions="Auto,*,Auto">
-            <TextBlock Grid.Column="0" Classes="navicon" Text="⇅" />
-            <TextBlock Grid.Column="1" Classes="navlabel" Text="SFTP" />
-          </Grid>
-        </Button>
-
-        <!--
-          Buckets are their own destination now, as they are on the phone, rather than a toggle inside the
-          files screen. Same screen behind both — an object store and an SFTP host are both an
-          IRemoteFileStore — and the entry chosen is what decides which picker is offered. See ShowFiles.
-        -->
-        <Button Classes="flat nav" Classes.active="{Binding IsBucketsShowing}"
-                Command="{Binding ShowFilesCommand}"
-                CommandParameter="{x:Static vm:RemoteKind.Bucket}"
-                ToolTip.Tip="Objects in an S3-compatible bucket from your keychain">
-          <Grid ColumnDefinitions="Auto,*,Auto">
-            <TextBlock Grid.Column="0" Classes="navicon" Text="◳" />
-            <TextBlock Grid.Column="1" Classes="navlabel" Text="S3" />
-            <TextBlock Grid.Column="2" Classes="navcount" Text="{Binding Vault.ObjectStores.Count}" />
-          </Grid>
-        </Button>
-
        <!--
          TotalItemCount is keys plus passwords and deliberately excludes buckets, which used to disagree
          with the list under it. It no longer does: buckets have their own entry above, so this number and