diff --git a/src/DodoSSH.Client.App/App.axaml b/src/DodoSSH.Client.App/App.axaml
index e4089f3..f906eb0 100644
--- a/src/DodoSSH.Client.App/App.axaml
+++ b/src/DodoSSH.Client.App/App.axaml
@@ -305,6 +305,22 @@
@@ -77,209 +96,227 @@
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
+
+
+
- It shares a word with the tab strip's first tab, which is a different level of the window: that
- tab is "this application rather than SFTP or S3", and this is one of the nine screens under it.
- -->
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DodoSSH.Client.App/Views/NavRail.axaml.cs b/src/DodoSSH.Client.App/Views/NavRail.axaml.cs
index 607203f..38747f7 100644
--- a/src/DodoSSH.Client.App/Views/NavRail.axaml.cs
+++ b/src/DodoSSH.Client.App/Views/NavRail.axaml.cs
@@ -1,9 +1,85 @@
using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
+using DodoSSH.Client.Shell.ViewModels;
namespace DodoSSH.Client.App.Views;
-/// The five destinations down the left edge of the unlocked window.
+/// The window's destinations, down the left edge — the switcher, the six rail rows and the user chip.
internal sealed partial class NavRail : UserControl
{
public NavRail() => InitializeComponent();
+
+ /// Opens the user popover.
+ ///
+ /// A handler rather than relying on the click that opening a Flyout answers to on its own: a
+ /// named method is a thing a test can call directly, where an implicit open is not.
+ ///
+ private void OnUserChipPressed(object? sender, RoutedEventArgs e)
+ {
+ if (sender is Control chip)
+ {
+ FlyoutBase.ShowAttachedFlyout(chip);
+ }
+ }
+
+ /// Hides the popover, whatever handler is about to navigate.
+ private void ClosePopover()
+ {
+ if (this.FindControl("UserChip") is { } chip)
+ {
+ FlyoutBase.GetAttachedFlyout(chip)?.Hide();
+ }
+ }
+
+ /// Leaves for the vaults screen with the new-vault form open, shutting the popover behind it.
+ ///
+ /// The popover is closed first: the command navigates, and a popup left open would be hanging over a
+ /// screen it has nothing to do with. A Flyout does not close on its own when something inside it
+ /// is pressed — which is what the vault switches above it want, and not what this wants.
+ ///
+ private void OnPopoverNewVaultPressed(object? sender, RoutedEventArgs e)
+ {
+ ClosePopover();
+
+ if (DataContext is MainWindowViewModel shell)
+ {
+ shell.ShowNewVaultCommand.Execute(null);
+ }
+ }
+
+ /// Settings and Preferences both land here — see the remark in the markup.
+ private void OnPopoverPreferencesPressed(object? sender, RoutedEventArgs e)
+ {
+ ClosePopover();
+
+ if (DataContext is MainWindowViewModel shell)
+ {
+ shell.ShowScreenCommand.Execute(ShellScreen.Preferences);
+ }
+ }
+
+ private void OnPopoverVaultsPressed(object? sender, RoutedEventArgs e)
+ {
+ ClosePopover();
+
+ if (DataContext is MainWindowViewModel shell)
+ {
+ shell.ShowScreenCommand.Execute(ShellScreen.Vaults);
+ }
+ }
+
+ ///
+ /// Starts a sign-out, through Preferences so the confirmation card has somewhere to be seen — see
+ ///
+ private void OnPopoverLogoutPressed(object? sender, RoutedEventArgs e)
+ {
+ ClosePopover();
+
+ if (DataContext is MainWindowViewModel shell)
+ {
+ shell.SignOutFromPopoverCommand.Execute(null);
+ }
+ }
}
diff --git a/src/DodoSSH.Client.App/Views/SessionHeader.axaml b/src/DodoSSH.Client.App/Views/SessionHeader.axaml
new file mode 100644
index 0000000..d9bd990
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionHeader.axaml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DodoSSH.Client.App/Views/SessionHeader.axaml.cs b/src/DodoSSH.Client.App/Views/SessionHeader.axaml.cs
new file mode 100644
index 0000000..ee4dd87
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionHeader.axaml.cs
@@ -0,0 +1,58 @@
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+
+namespace DodoSSH.Client.App.Views;
+
+///
+/// The v5b session shell's host header: the address, and a ghost button that crosses to the other surface.
+/// See the remark at the top of SessionHeader.axaml.
+///
+internal sealed partial class SessionHeader : UserControl
+{
+ /// What the cross-surface ghost button says — "Open SFTP" or "Open terminal".
+ internal static readonly StyledProperty OpenLabelProperty =
+ AvaloniaProperty.Register(nameof(OpenLabel));
+
+ /// What the cross-surface ghost button runs.
+ ///
+ /// The terminal usage binds SelectFilesHostCommand with the selected tab as its parameter; the
+ /// SFTP usage binds OpenTerminalForFilesHostCommand , which needs none — see the remark on both in
+ /// MainWindowViewModel for why the two directions are not symmetrical.
+ ///
+ internal static readonly StyledProperty OpenCommandProperty =
+ AvaloniaProperty.Register(nameof(OpenCommand));
+
+ internal static readonly StyledProperty OpenCommandParameterProperty =
+ AvaloniaProperty.Register(nameof(OpenCommandParameter));
+
+ /// What the header says instead of an address, while no session/host context is active.
+ internal static readonly StyledProperty EmptyTextProperty =
+ AvaloniaProperty.Register(nameof(EmptyText));
+
+ public SessionHeader() => InitializeComponent();
+
+ internal string? OpenLabel
+ {
+ get => GetValue(OpenLabelProperty);
+ set => SetValue(OpenLabelProperty, value);
+ }
+
+ internal ICommand? OpenCommand
+ {
+ get => GetValue(OpenCommandProperty);
+ set => SetValue(OpenCommandProperty, value);
+ }
+
+ internal object? OpenCommandParameter
+ {
+ get => GetValue(OpenCommandParameterProperty);
+ set => SetValue(OpenCommandParameterProperty, value);
+ }
+
+ internal string? EmptyText
+ {
+ get => GetValue(EmptyTextProperty);
+ set => SetValue(EmptyTextProperty, value);
+ }
+}
diff --git a/src/DodoSSH.Client.App/Views/SessionSidebar.axaml b/src/DodoSSH.Client.App/Views/SessionSidebar.axaml
new file mode 100644
index 0000000..ce2850f
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionSidebar.axaml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DodoSSH.Client.App/Views/SessionSidebar.axaml.cs b/src/DodoSSH.Client.App/Views/SessionSidebar.axaml.cs
new file mode 100644
index 0000000..44dd362
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionSidebar.axaml.cs
@@ -0,0 +1,29 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace DodoSSH.Client.App.Views;
+
+///
+/// The v5b session sidebar: QUICK ACCESS on both surfaces, SNIPS on the terminal's own. See the remark at
+/// the top of SessionSidebar.axaml.
+///
+internal sealed partial class SessionSidebar : UserControl
+{
+ /// Whether the SNIPS section draws below QUICK ACCESS.
+ ///
+ /// Set from the usage site rather than inferred from a surface flag on the shell, for the same reason
+ /// MainWindow.axaml , not one this control can read off its
+ /// own DataContext .
+ ///
+ internal static readonly StyledProperty ShowsSnipsProperty =
+ AvaloniaProperty.Register(nameof(ShowsSnips));
+
+ public SessionSidebar() => InitializeComponent();
+
+ internal bool ShowsSnips
+ {
+ get => GetValue(ShowsSnipsProperty);
+ set => SetValue(ShowsSnipsProperty, value);
+ }
+}
diff --git a/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml b/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml
new file mode 100644
index 0000000..3a967cc
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml.cs b/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml.cs
new file mode 100644
index 0000000..d37bb0e
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionStatusBar.axaml.cs
@@ -0,0 +1,30 @@
+using Avalonia;
+using Avalonia.Controls;
+
+namespace DodoSSH.Client.App.Views;
+
+///
+/// The v5b session shell's status bar: CONNECTED and its dot, the elapsed timer, and — only where it is true
+/// — UTF-8. See the remark at the top of SessionStatusBar.axaml.
+///
+internal sealed partial class SessionStatusBar : UserControl
+{
+ ///
+ /// Whether "UTF-8" is drawn on the right.
+ ///
+ ///
+ /// Set true only by the terminal surface's own usage in MainWindow.axaml . It is a fact about this
+ /// client's renderer and its write path — see the remark on SessionStatusBar.axaml — and has
+ /// nothing to do with an SFTP session, which moves bytes rather than decoded text.
+ ///
+ internal static readonly StyledProperty ShowsEncodingProperty =
+ AvaloniaProperty.Register(nameof(ShowsEncoding));
+
+ public SessionStatusBar() => InitializeComponent();
+
+ internal bool ShowsEncoding
+ {
+ get => GetValue(ShowsEncodingProperty);
+ set => SetValue(ShowsEncodingProperty, value);
+ }
+}
diff --git a/src/DodoSSH.Client.App/Views/SessionTabRow.axaml b/src/DodoSSH.Client.App/Views/SessionTabRow.axaml
new file mode 100644
index 0000000..27268e1
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionTabRow.axaml
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DodoSSH.Client.App/Views/SessionTabRow.axaml.cs b/src/DodoSSH.Client.App/Views/SessionTabRow.axaml.cs
new file mode 100644
index 0000000..1d653e0
--- /dev/null
+++ b/src/DodoSSH.Client.App/Views/SessionTabRow.axaml.cs
@@ -0,0 +1,63 @@
+using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using DodoSSH.Client.Shell.ViewModels;
+
+namespace DodoSSH.Client.App.Views;
+
+///
+/// The v5b in-screen tab row: one pill per open terminal, and the "+" that opens another — parameterised by
+///
+internal sealed partial class SessionTabRow : UserControl
+{
+ /// What a left click on a tab runs, with the tab itself as the command parameter.
+ ///
+ /// A plain SelectTabCommand and the SFTP surface wants SelectFilesHostCommand , and only the caller
+ /// in MainWindow.axaml knows which screen this instance is on.
+ ///
+ internal static readonly StyledProperty TabCommandProperty =
+ AvaloniaProperty.Register(nameof(TabCommand));
+
+ public SessionTabRow() => InitializeComponent();
+
+ internal ICommand? TabCommand
+ {
+ get => GetValue(TabCommandProperty);
+ set => SetValue(TabCommandProperty, value);
+ }
+
+ ///
+ /// Closes a tab on a middle click. See the identical remark on the strip this control replaced,
+ /// TerminalTabs.axaml.cs , for why this is PointerUpdateKind rather than
+ /// IsMiddleButtonPressed , why it fires on press rather than release, and why it is wired on the
+ /// tab's own template root rather than on the row.
+ ///
+ ///
+ /// Not parameterised like CloseTabCommand , read
+ /// directly off this control's own
+ private void OnTabPointerPressed(object? sender, PointerPressedEventArgs e)
+ {
+ if (sender is not Visual { DataContext: TerminalTabViewModel tab }
+ || DataContext is not MainWindowViewModel shell)
+ {
+ return;
+ }
+
+ if (e.GetCurrentPoint((Visual)sender).Properties.PointerUpdateKind
+ is not PointerUpdateKind.MiddleButtonPressed)
+ {
+ return;
+ }
+
+ e.Handled = true;
+
+ shell.CloseTabCommand.Execute(tab);
+ }
+}
diff --git a/src/DodoSSH.Client.App/Views/TerminalTabs.axaml b/src/DodoSSH.Client.App/Views/TerminalTabs.axaml
deleted file mode 100644
index e23bcf1..0000000
--- a/src/DodoSSH.Client.App/Views/TerminalTabs.axaml
+++ /dev/null
@@ -1,314 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DodoSSH.Client.App/Views/TerminalTabs.axaml.cs b/src/DodoSSH.Client.App/Views/TerminalTabs.axaml.cs
deleted file mode 100644
index 633fa9c..0000000
--- a/src/DodoSSH.Client.App/Views/TerminalTabs.axaml.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using DodoSSH.Client.Shell.ViewModels;
-
-namespace DodoSSH.Client.App.Views;
-
-/// The tab strip, above every screen.
-internal sealed partial class TerminalTabs : UserControl
-{
- public TerminalTabs() => InitializeComponent();
-
- ///
- /// Closes a tab on a middle click.
- ///
- ///
- ///
- /// Wired on the tab's own template root, which is the whole answer to "and not on the strip itself".
- /// A middle press on the background, on the sentence, or on the button that opens a connection reaches
- /// no handler at all, because there is none there to reach. Nothing has to test what was clicked.
- ///
- ///
- /// PointerUpdateKind , not IsMiddleButtonPressed .state : it is equally true for a left press made while the middle button happens to be held,
- /// and for every press during a middle drag. The question here is which button caused this press, and
- /// that is the one thing only PointerUpdateKind answers.
- ///
- ///
- /// On press rather than on release, which is what every browser and every terminal does. Matching a
- /// release to its press would need capture tracking, to buy the ability to change your mind about a
- /// middle click — a gesture nobody makes by accident and nobody aborts.
- ///
- ///
- private void OnTabPointerPressed(object? sender, PointerPressedEventArgs e)
- {
- if (sender is not Visual { DataContext: TerminalTabViewModel tab }
- || DataContext is not MainWindowViewModel shell)
- {
- return;
- }
-
- if (e.GetCurrentPoint((Visual)sender).Properties.PointerUpdateKind
- is not PointerUpdateKind.MiddleButtonPressed)
- {
- return;
- }
-
- // Handled, so the strip's ScrollViewer does not also take this as the start of a pan.
- e.Handled = true;
-
- // Fire-and-forget, as the host sidebar's double-tap connect is: CloseTabCommand is asynchronous —
- // it waits for the workspace to tear the session down — and an event handler has nowhere to await
- // it. Its failures are the workspace's to report, not this strip's.
- shell.CloseTabCommand.Execute(tab);
- }
-
- ///
- /// Opens the vault menu, on the Vaults tab.
- ///
- ///
- ///
- /// The tab is selected before the menu opens, and that order is the whole reason this is a handler
- /// rather than Button.Flyout . Selecting it puts the shell on a page, which collapses the
- /// renderer — so the popup never has to drop over the WebView's native child window, and the question
- /// this strip's comment refuses to answer without a screenshot does not come up. See the comment on the
- /// caret in the markup, and docs/platform-flags.md for what treating such a question as settled
- /// has already cost this project.
- ///
- ///
- /// It is also what a user expects. The caret belongs to the Vaults tab, so pressing it arriving at
- /// Vaults is the same gesture as pressing the tab, with a menu on the end.
- ///
- ///
- private void OnVaultMenuPressed(object? sender, RoutedEventArgs e)
- {
- if (DataContext is not MainWindowViewModel shell || sender is not Control caret)
- {
- return;
- }
-
- shell.ShowVaultsCommand.Execute(null);
-
- FlyoutBase.ShowAttachedFlyout(caret);
- }
-
- /// Leaves for the teams screen with the new-vault form open, shutting the menu behind it.
- ///
- /// The menu is closed first, because the command navigates and a flyout left open would be hanging over
- /// a screen it has nothing to do with. A Flyout does not close when something inside it is
- /// pressed — which is what the switches above it want, and not what this wants.
- ///
- private void OnNewVaultPressed(object? sender, RoutedEventArgs e)
- {
- if (DataContext is not MainWindowViewModel shell)
- {
- return;
- }
-
- if (this.FindControl("VaultMenu") is { } caret)
- {
- FlyoutBase.GetAttachedFlyout(caret)?.Hide();
- }
-
- shell.ShowNewVaultCommand.Execute(null);
- }
-}
diff --git a/src/DodoSSH.Client.App/Views/TitleBar.axaml b/src/DodoSSH.Client.App/Views/TitleBar.axaml
index e6a3081..ed5c3b5 100644
--- a/src/DodoSSH.Client.App/Views/TitleBar.axaml
+++ b/src/DodoSSH.Client.App/Views/TitleBar.axaml
@@ -9,86 +9,83 @@
The window asks Windows for no chrome at all, so everything a titlebar does has to be here: dragging,
the double-click to maximise, and three buttons. That is a real cost, and the reason it is worth paying
- is that a 38-pixel grey system bar above a near-black application is the one part of the window that
+ is that a 53-pixel grey system bar above a near-black application is the one part of the window that
would look borrowed.
It sits above the terminal rather than over it, which matters more than it looks: the terminal is a
native child window that composites above anything Avalonia draws in the same rectangle, so a titlebar
overlapping it would be painted underneath and its close button would not be clickable.
+
+ ── v5b ──────────────────────────────────────────────────────────────────────────────────────────────
+ Redrawn against TitleBar.dc.html rather than the v3 mock this replaced, and three things left with the
+ redraw. The vault chip and the account name are gone from here — both now live on the rail's user chip,
+ which is where the design's own "who is signed in" lives too, one destination lower than the window's
+ own name. 44 pixels became 53, which is the design's own height and not a number this file chose; see
+ LayoutHarness.TitleBarHeight and the matching 9-pixel rise in MainWindow.axaml 's own
+ MinHeight , which is what keeps every screen the exact height it was designed against despite the
+ bar above it growing.
+
+ The design's kbd chip reads ⌘K; this one reads CTRL K, because a Windows build is not where the ⌘ key
+ lives — the same substitution the search box's own tooltip already made before this pass touched it.
+ SYNCED stays, on the right, past the window buttons' own left edge: a documented deviation from a design
+ whose titlebar has no home for it at all — see design-notes/v5b-fidelity-notes.md.
-->
-
-
+
-
+
-
+
-
-
-
-
-
-
-
+
-
-
+
@@ -112,20 +109,28 @@
-
-
-
diff --git a/src/DodoSSH.Client.App/Views/TransfersScreen.axaml b/src/DodoSSH.Client.App/Views/TransfersScreen.axaml
index 08b531f..0fde69f 100644
--- a/src/DodoSSH.Client.App/Views/TransfersScreen.axaml
+++ b/src/DodoSSH.Client.App/Views/TransfersScreen.axaml
@@ -35,40 +35,71 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -99,14 +164,34 @@
-->
-
+
+
-
+
+
+
@@ -116,14 +201,20 @@
-
-
+
+
+
@@ -150,25 +241,37 @@
-
-
+
-
+
-
-
+
@@ -219,26 +322,41 @@
-
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -246,27 +364,22 @@
-
-
-
-
+
-
+
+
@@ -324,37 +443,48 @@
Making a directory sits here, beside the path it would be made in, rather than with the queue's
controls. It exists because the queue refuses to overwrite: without somewhere else to put a file,
"that name is already taken" is a dead end.
+
+ v5b narrows the box from 140 to 90: at the session shell's own 204-pixel width once QUICK ACCESS
+ is showing, 140 plus MKDIR plus the spacing between them ran past the pane's own edge. Still wide
+ enough for a real directory name to be typed and read back, which is what this box is for; a
+ name that outgrows it scrolls inside the box the way every TextBox already does.
-->
-
-
-
+
-
-
-
+
@@ -392,10 +522,11 @@
HorizontalAlignment="Center" VerticalAlignment="Center">
-
-
-
+
+
+
+
+
+
+
+
-
+
+
- It is here rather than beside DISCONNECT because this row spans the window and that one spans
- half of it: what the screen has to say about a session is a sentence, and a sentence needs the
- width. Only while something is open — the other half of the time it is inside the invitation
- in the remote pane, next to the button that provoked it, which is where a refusal has to be.
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+