Skip to content

iris-gui: o2 support in the summary, disk check and new machine dialog - #794

Merged
techomancer merged 3 commits into
techomancer:mainfrom
steigr:feature/fix-304-gui-o2-b44d86
Nov 20, 2026
Merged

techomancer merged 3 commits into
techomancer:mainfrom
steigr:feature/fix-304-gui-o2-b44d86

Conversation

@steigr

@steigr steigr commented Nov 20, 2026

Copy link
Copy Markdown
Contributor

Closes #304.

Most of #304 was already fixed: the O2's own o2.prom, o2.disks and similar keys are now folded into the shared keys when a config loads. As a result, the summary and the Start disk check already read the O2's settings. This PR fixes what was still Indy-shaped in the GUI.

Summary and Start check

  • The stopped-machine summary lists every drive the machine has: SCSI targets in (controller, id) order, then the NVMe card, then Fibre Channel disks.
    • A target on a second bus is named controller:id (for example the O2's external 1:3), not by its [scsi.N] key.
    • The IP35 bricks' unused [scsi] map is left out.
  • The missing-disk prompt names targets the same way.
  • The summary shows the machine folder. Paths inside it are shown relative to it and cut to the panel's width, with the full path in the tooltip.
  • A drive with no image reads "no image chosen", or "tray empty" for a CD-ROM.
  • The Network row and the status footer show when networking is off ("No network", no light) and name a stream network. A build without PCAP no longer records off or stream as NAT.

New machine dialog and settings

  • New machines are named after the chosen model until you type a name.
  • The motherboard EEPROM file is offered only on the Indigo2, in both the New machine dialog and the settings editor.

Buttons

  • Coloured buttons get white text. In the light theme the dark grey text was hard to read on green, red and blue.

The summary and disk-check logic now lives in a new iris-gui/src/summary.rs, which works from the config alone so it can be tested without a window. Docs: iris-gui-README.md, CHANGELOG.md, and a clanker note.

Testing

  • cargo test -p iris-gui passes. New tests cover an O2 by placement, the deprecated [o2] disks spelling, empty and scratch targets, the IP35, the Indy, the network modes, relative paths and default names.
  • I checked the summary, the New machine dialog, the button contrast and the footer by hand in the GUI.
  • I did not boot an O2 guest.

🤖 Generated with Claude Code

steigr and others added 3 commits November 20, 2026 10:26
The stopped-machine summary now lists the NVMe card and Fibre Channel
disks, names SCSI targets on a second bus as controller:id, leaves out
the IP35 bricks' unused [scsi] map and shows an unplugged or stream
Ethernet. The missing-disk prompt names targets the same way. Both are
worked out in the new summary module from the config alone.

The rest of issue 304 was already fixed upstream: the O2's own o2.prom,
o2.disks and similar keys are folded into the shared keys on load, so
the summary and the disk check read the O2's settings, and the Advanced
tab edits [o2]. Tests cover a config in that old spelling.

Refs techomancer#304

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…nly on the Indigo2

A drive with no image reads "no image chosen" (a CD-ROM "tray empty")
in the summary instead of ending in a comma. The New machine dialog
names the machine after the chosen model until a name is typed, and
it and the settings editor offer the motherboard EEPROM file only on
the Indigo2: the Indy keeps its PROM environment in the NVRAM.

Refs techomancer#304

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The summary shows the machine folder and gives paths inside it
relative to it, cut to the panel's width with the full path in the
tooltip; long absolute paths ran off the window. Coloured buttons get
white text, which the light theme's dark grey made hard to read on
green, red and blue. The status footer shows "No network" with no
light on a machine with networking off and names a running stream
network; a build without PCAP no longer records off or stream as NAT.

Refs techomancer#304

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@techomancer
techomancer merged commit 9937090 into techomancer:main Nov 20, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

iris-gui: O2 support

2 participants