Merge origin/main: reconcile ConfigWindow consolidation with Debug window + protocol updates

origin/main (23 commits) added a Debug window/log system on top of the old
separate Devices/Channels/Plot windows, plus protocol fixes (cml, mark10,
modbus_rtu, scpi) and device/profile changes. Local main (3 commits)
replaced the separate windows with a unified ConfigWindow + dock panel.

Kept local's ConfigWindow/dock architecture and ported the Debug window
onto it: new toolbar button + _open_debug(), gated by developer_mode same
as origin's version. Deduped the two independent "developer mode" toggles
that had collided in SettingsWindow (origin's General-tab checkbox gating
Debug window + device sim-mode visibility, local's Advanced-tab checkbox
setting verbose logging) into one General-tab checkbox that does both.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

1 files changed, 11 insertions, 16 deletions

diff --git a/ui/windows/devices_window.py b/ui/windows/devices_window.py
index ac9d13c..eec65c8 100644
--- a/ui/windows/devices_window.py
+++ b/ui/windows/devices_window.py
@@ -124,12 +124,11 @@ class ChannelsTab(QWidget):
 
     # Col indices
     _C_DEVICE  = 0
-    _C_CH_ID   = 1
-    _C_ENABLED = 2
-    _C_NAME    = 3
-    _C_UNIT    = 4
-    _C_MIN     = 5
-    _C_MAX     = 6
+    _C_ENABLED = 1
+    _C_NAME    = 2
+    _C_UNIT    = 3
+    _C_MIN     = 4
+    _C_MAX     = 5
 
     def __init__(self, registry: DeviceRegistry):
         super().__init__()
@@ -142,14 +141,13 @@ class ChannelsTab(QWidget):
 
         self._table = QTableWidget()
         self._table.setObjectName("channelTable")
-        self._table.setColumnCount(7)
+        self._table.setColumnCount(6)
         self._table.setHorizontalHeaderLabels(
-            ["Device", "Signal ID", "On", "Name", "Unit", "Min", "Max"]
+            ["Device", "On", "Name", "Unit", "Min", "Max"]
         )
         hdr = self._table.horizontalHeader()
         hdr.setSectionResizeMode(self._C_NAME,    QHeaderView.ResizeMode.Stretch)
         hdr.setSectionResizeMode(self._C_DEVICE,  QHeaderView.ResizeMode.ResizeToContents)
-        hdr.setSectionResizeMode(self._C_CH_ID,   QHeaderView.ResizeMode.ResizeToContents)
         hdr.setSectionResizeMode(self._C_ENABLED, QHeaderView.ResizeMode.ResizeToContents)
         self._table.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
         self._table.setAlternatingRowColors(True)
@@ -165,16 +163,13 @@ class ChannelsTab(QWidget):
             for ch in dev.info.channels:
                 self._table.insertRow(row)
 
-                dev_item = QTableWidgetItem(f"{dev.info.icon} {dev.info.device_id}")
+                # Device + signal ID folded into one non-editable column —
+                # the separate "Signal ID" column was removed as redundant.
+                dev_item = QTableWidgetItem(f"{dev.info.icon} {dev.info.device_id} / {ch.channel_id}")
                 dev_item.setFlags(dev_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
                 dev_item.setForeground(QColor("#64748b"))
                 self._table.setItem(row, self._C_DEVICE, dev_item)
 
-                ch_item = QTableWidgetItem(ch.channel_id)
-                ch_item.setFlags(ch_item.flags() & ~Qt.ItemFlag.ItemIsEditable)
-                ch_item.setForeground(QColor(ch.color))
-                self._table.setItem(row, self._C_CH_ID, ch_item)
-
                 # Enabled checkbox — centred in cell
                 chk_container = QWidget()
                 chk_lay = QHBoxLayout(chk_container)
@@ -349,7 +344,7 @@ class DevicesWindow(QWidget):
         dev = self.registry.get_instance(device_id)
         if dev:
             DeviceConfigDialog(dev, self).exec()
-            self._ch_tab.refresh()
+            self.refresh()  # rebuilds device rows (picks up a renamed display name) + Signals tab
             self.device_reconfigured.emit(device_id)
 
     def _on_remove(self, device_id: str):