diff --git a/src/web/public/app.js b/src/web/public/app.js index 390f64b4..f7669682 100644 --- a/src/web/public/app.js +++ b/src/web/public/app.js @@ -1417,12 +1417,17 @@ class CodemanApp { this._tabLayoutDragKeydown(e); return; } + // So does the Tiles count menu: it closes alone and gives the keyboard + // back to the Tiles button (tile-grid.js). + if (this._tileCountMenu) { + this.closeTileCountMenu({ refocus: true }); + return; + } this.closeAllPanels(); this.closeHelp(); if (this.attachmentHistoryDrawerOpen) this.closeAttachmentHistory(); this.closeSessionManager(); this.closeCommandPalette?.(); - this.closeTilePicker?.(); this.closeShortcutOverlay?.(); // Overlay layouts only: below 1024px the sidebar is a modal off-canvas // drawer over the terminal, so Escape must close it. The docked desktop diff --git a/src/web/public/constants.js b/src/web/public/constants.js index b170c453..773c0127 100644 --- a/src/web/public/constants.js +++ b/src/web/public/constants.js @@ -1793,8 +1793,8 @@ function dragTrackFractions(fr, index, deltaPx, totalPx, minPx) { } /** - * The sessions the Tiles picker offers (and the Tiles button opens, case c of - * tileGridOpenSet), in tab order: live ones only, never a session popped out to + * The sessions the Tiles button can open (case c of tileGridOpenSet, and the + * ones a count fills a grid with), in tab order: live ones only, never a session popped out to * its own window (that window owns its PTY size). A session with no PTY * attached IS offered: its tile shows the Attach overlay. * @@ -1820,8 +1820,8 @@ function buildTilePickerSessions(sessions, sessionOrder, detachedIds) { * a. the grid this tab last had (`stored`, already sanitized: live, not * detached, at most the cap), if any of its sessions survive; * b. else an open split's two sessions, Pane A focused; - * c. else the open sessions in tab order, the picker's list (no detached - * ones), up to `limit`, the active session always among them and focused + * c. else the open sessions in tab order (buildTilePickerSessions: no + * detached ones), up to `limit`, the active session always among them and focused * (when it sits past the limit, the first `limit - 1` others come with it). * Null when there is nothing to open. * diff --git a/src/web/public/i18n.js b/src/web/public/i18n.js index e0cb2f48..ff3ad3f0 100644 --- a/src/web/public/i18n.js +++ b/src/web/public/i18n.js @@ -103,10 +103,10 @@ Tiles: '平铺', Split: '分屏', 'Tiled sessions': '平铺的会话', - 'Tiles: show several sessions side by side (right-click to choose which)': - '平铺:并排显示多个会话(右键单击可选择会话)', - 'Tiles: back to a single session (right-click to choose which sessions)': - '平铺:返回单个会话(右键单击可选择会话)', + 'Tiles: show several sessions side by side (right-click for how many)': + '平铺:并排显示多个会话(右键单击可选择窗格数量)', + 'Tiles: back to a single session (right-click for how many tiles)': '平铺:返回单个会话(右键单击可选择窗格数量)', + 'How many tiles': '窗格数量', 'Split: unavailable while tiles are open': '分屏:平铺打开时不可用', 'Toggle Tile Grid': '切换平铺网格', 'Focus Tile Left': '聚焦左侧窗格', @@ -125,7 +125,7 @@ 'Zoom Focused Tile': '放大聚焦的窗格', 'Remove Focused Tile': '移除聚焦的窗格', 'Add the Session to the Tile Grid': '将该会话加入平铺网格', - 'Choose Which Sessions to Tile': '选择要平铺的会话', + 'Choose How Many Tiles (2, 4 or 6)': '选择窗格数量(2、4 或 6)', 'a tab': '标签页', 'the Tiles button': '平铺按钮', Click: '单击', @@ -133,8 +133,6 @@ Arrows: '方向键', 'not bound': '未绑定', 'Open group as tiles': '以平铺方式打开分组', - 'Show sessions as tiles': '以平铺方式显示会话', - 'Open tiles': '打开平铺', 'No sessions to show as tiles': '没有可平铺显示的会话', 'This group has no session to show as tiles': '此分组没有可平铺显示的会话', 'Zoom this tile': '放大此窗格', @@ -1058,7 +1056,7 @@ (_m, group) => `删除分组“${group}”?其中的标签将移到未分组。`, ], // Tile grid: counts, exit codes and durations pass through. - [/^Up to (\d+) tiles$/, (_m, n) => `最多 ${n} 个窗格`], + [/^(\d+) tiles$/, (_m, n) => `${n} 个窗格`], [/^This window fits (\d+) tiles?$/, (_m, n) => `此窗口可容纳 ${n} 个窗格`], [/^The grid holds at most (\d+) tiles$/, (_m, n) => `平铺网格最多容纳 ${n} 个窗格`], [ diff --git a/src/web/public/index.html b/src/web/public/index.html index 3fbe4530..d868c437 100644 --- a/src/web/public/index.html +++ b/src/web/public/index.html @@ -192,7 +192,7 @@ - +
—