fix: resolve menu-bar shortcut collision, checkmark desync, brittle test

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-13 11:33:05 +02:00
parent 0ccc29709e
commit b4cfa7561a
2 changed files with 6 additions and 11 deletions
+5 -4
View File
@@ -4501,7 +4501,6 @@ class MainWindow(QMainWindow):
# ── Menu bar ───────────────────────────────────────────── # ── Menu bar ─────────────────────────────────────────────
def _build_menubar(self) -> None: def _build_menubar(self) -> None:
from PyQt6.QtGui import QAction
mb = self.menuBar() mb = self.menuBar()
# File # File
@@ -4514,7 +4513,6 @@ class MainWindow(QMainWindow):
# Edit # Edit
m_edit = mb.addMenu("&Edit") m_edit = mb.addMenu("&Edit")
self._act_undo = m_edit.addAction("Undo scan edit", self._scan_panel.undo) self._act_undo = m_edit.addAction("Undo scan edit", self._scan_panel.undo)
self._act_undo.setShortcut("Ctrl+Z")
m_edit.addSeparator() m_edit.addSeparator()
m_subs = m_edit.addMenu("Subprofiles") m_subs = m_edit.addMenu("Subprofiles")
m_subs.addAction("Add…", self._new_subprofile) m_subs.addAction("Add…", self._new_subprofile)
@@ -4545,14 +4543,17 @@ class MainWindow(QMainWindow):
self._act_show_hidden.toggled.connect(self._btn_show_hidden.setChecked) self._act_show_hidden.toggled.connect(self._btn_show_hidden.setChecked)
self._btn_show_hidden.toggled.connect(self._act_show_hidden.setChecked) self._btn_show_hidden.toggled.connect(self._act_show_hidden.setChecked)
self._act_review.setChecked(self._btn_scan_mode.isChecked())
self._act_hide_exported.setChecked(self._chk_hide_exported.isChecked())
self._act_show_hidden.setChecked(self._btn_show_hidden.isChecked())
# Help # Help
m_help = mb.addMenu("&Help") m_help = mb.addMenu("&Help")
m_help.addAction("Keyboard shortcuts", self._show_shortcuts).setShortcut("F1") m_help.addAction("Keyboard shortcuts", self._show_shortcuts)
m_help.addAction("What's new", self._show_changelog) m_help.addAction("What's new", self._show_changelog)
m_help.addAction("About", self._show_about) # tiny method, Task 1.3 m_help.addAction("About", self._show_about) # tiny method, Task 1.3
# Profile selector + ? help button live in the top-right corner. # Profile selector + ? help button live in the top-right corner.
from PyQt6.QtWidgets import QWidget, QHBoxLayout, QLabel
corner = QWidget() corner = QWidget()
ch = QHBoxLayout(corner) ch = QHBoxLayout(corner)
ch.setContentsMargins(0, 0, 6, 0) ch.setContentsMargins(0, 0, 6, 0)
+1 -7
View File
@@ -1,4 +1,3 @@
import os
import pytest import pytest
# A real platform is needed because MpvWidget creates a GL context. # A real platform is needed because MpvWidget creates a GL context.
@@ -26,10 +25,5 @@ def win(app):
w.deleteLater() w.deleteLater()
def _descendant_object_names(widget):
"""All objectNames in a widget's child tree (for containment asserts)."""
return {c.objectName() for c in widget.findChildren(object) if c.objectName()}
def test_window_constructs(win): def test_window_constructs(win):
assert win.windowTitle() == "8-cut" assert win.windowTitle().startswith("8-cut")