From 00a7b82347289cc5b2b36f32b33097d8ab315ab1 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Martineau Date: Sat, 10 Oct 2026 23:17:18 -0400 Subject: [PATCH] =?UTF-8?q?The=20conversations'=20F2=20chip=20reads=20URL?= =?UTF-8?q?=E2=86=92QR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It names what the key does with the selection: its link, shown as a code. Co-Authored-By: Claude Opus 5.5 (1M context) --- CLAUDE.md | 2 +- meshterm/ui/chat.py | 12 +++++++----- tests/test_chat.py | 2 +- tests/test_rooms.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 28a2127..34c6d71 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -776,7 +776,7 @@ branch on the platform per frame, and never `from meshterm.platforms import PLAT it is undiscoverable on the device. One exception, by JP's choice (2026-10-10): the chat's day jump (`^PgUp/^PgDn`) has no chip; `Day ↑`/`Day ↓` were taken off F1/F2. - **The three conversations share one lane** (channel, DM, room; JP, 2026-10-10): what - they share sits on F1–F3 plain, in the hint's order — `Paths` (^P), `QR` (^U), `Map` + they share sits on F1–F3 plain, in the hint's order — `Paths` (^P), `URL→QR` (^U), `Map` (^L, empty without a locator) — and each screen's own verbs ride the Shift bank: ^R on Shift+F1 (`Retry` in a DM and a room, `Resend` in a channel), the room's `Log in` (^O) on Shift+F2. F4/F5 stay the pager, with `Latest`/`Oldest` behind Shift. A verb new to diff --git a/meshterm/ui/chat.py b/meshterm/ui/chat.py index e32c3bf..de96503 100644 --- a/meshterm/ui/chat.py +++ b/meshterm/ui/chat.py @@ -132,7 +132,7 @@ class ChatScreen(Screen): """The PicoCalc lane of a conversation: the same lane in a channel, a DM, and a room. The plain bank of F1 to F3 has the verbs that all three screens share, in the order - of the hint: ``Paths`` (^P), ``QR`` (^U), and ``Map`` (^L). The Shift bank of F1 to + of the hint: ``Paths`` (^P), ``URL→QR`` (^U), and ``Map`` (^L). The Shift bank of F1 to F3 has the verbs of one screen only. ``Retry`` (^R) is on the Shift half of F1 in a DM and in a room, and ``Resend`` (the same ^R, unscoped) is there in a channel. A room adds ``Log in`` (^O) on the Shift half of F2 (refer to @@ -140,9 +140,11 @@ class ChatScreen(Screen): the three screens, and the user finds a verb in the same place (JP, 2026-10-10). The three shared verbs act *on* the selected message. ``Paths`` is lit while a - message is selected. ``QR`` shows the codes of the links of the selection on a - share screen, larger than the codes under it in the transcript, and is lit while the - selection has a URL (refer to :meth:`_picked_urls`). ``Map`` is lit while the author + message is selected. ``URL→QR`` shows the codes of the links of the selection on a + share screen, one code at a time with its full URL, and is lit while the selection + has a URL (refer to :meth:`_picked_urls`). On the Cardputer it is the only way to a + code. On the PicoCalc, the transcript already draws each code under its message in + the same size, so there the chip only shows one code alone. ``Map`` is lit while the author of the selection has a location (refer to :meth:`_locate_target`), and its slot is empty when the screen has no locator. @@ -185,7 +187,7 @@ class ChatScreen(Screen): enabled=self._selected is not None and self._paths is not None, opp_enabled=self._retry_target() is not None, ) - lane[1] = FPair("QR", "url_code", enabled=bool(self._picked_urls())) + lane[1] = FPair("URL→QR", "url_code", enabled=bool(self._picked_urls())) if self._locator is not None: lane[2] = FPair("Map", "locate", enabled=self._locate_target() is not None) lane[3] = FPair("Page ↓", "pagedown", "Latest", "ctrl_end", enabled=live, opp_enabled=live) diff --git a/tests/test_chat.py b/tests/test_chat.py index 76b62b9..bf97ac0 100644 --- a/tests/test_chat.py +++ b/tests/test_chat.py @@ -2419,7 +2419,7 @@ def test_channel_and_dm_lanes_share_f1_to_f3_and_keep_their_own_verbs_behind_shi ) for screen in (direct, channel): lane = screen.picocalc_lyra_lane - assert [pair.label for pair in lane[:3]] == ["Paths", "QR", "Map"] + assert [pair.label for pair in lane[:3]] == ["Paths", "URL→QR", "Map"] assert [pair.action for pair in lane[:3]] == ["paths", "url_code", "locate"] assert direct.picocalc_lyra_lane[0].opp_label == "Retry" assert channel.picocalc_lyra_lane[0].opp_label == "Resend" diff --git a/tests/test_rooms.py b/tests/test_rooms.py index bf07495..d3c68a2 100644 --- a/tests/test_rooms.py +++ b/tests/test_rooms.py @@ -897,7 +897,7 @@ def test_the_handheld_lane_puts_log_in_behind_f2() -> None: assert fkeys.PICOCALC_LYRA_DECK.action_for(lane, 7) == "login" assert lane[0].opp_label == "Retry" # The plain bank of F1 to F3 is the one of each conversation (refer to test_chat). - assert [pair.label for pair in lane[:2]] == ["Paths", "QR"] + assert [pair.label for pair in lane[:2]] == ["Paths", "URL→QR"] async def test_l_opens_the_map_on_the_author_of_a_post() -> None: