Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app_model/_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,12 @@ def _register_action_obj(self, action: Action) -> DisposeCallable:
"""
# register commands
disposers = [self.commands.register_action(action)]
# register menus
if dm := self.menus.append_action_menus(action):
disposers.append(dm)
# register keybindings
if dk := self.keybindings.register_action_keybindings(action):
disposers.append(dk)
# register menus
if dm := self.menus.append_action_menus(action):
disposers.append(dm)

# remember the action object as a whole.
# note that commands.register_action will have raised an exception
Expand Down
23 changes: 22 additions & 1 deletion tests/test_qt/test_qmainwindow.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
from __future__ import annotations

from typing import TYPE_CHECKING

from qtpy.QtCore import Qt
from qtpy.QtWidgets import QAction, QApplication

from app_model.backends.qt import QModelMainWindow, QModelToolBar
from app_model.types._action import Action

if TYPE_CHECKING:
from pytestqt.qtbot import QtBot

from ..conftest import FullApp # noqa: TID252


def test_qmodel_main_window(qtbot, full_app: "FullApp") -> None:
def test_qmodel_main_window(
qtbot: QtBot, qapp: QApplication, full_app: FullApp
) -> None:
win = QModelMainWindow(full_app)
qtbot.addWidget(win)

Expand All @@ -27,3 +35,16 @@ def test_qmodel_main_window(qtbot, full_app: "FullApp") -> None:
)
assert isinstance(tb, QModelToolBar)
win.addModelToolBar(full_app.Menus.EDIT, area=Qt.ToolBarArea.RightToolBarArea)

full_app.register_action(
Action(
id="late-action",
title="Late Action",
keybindings=[{"primary": "Shift+L"}],
menus=[{"id": full_app.Menus.FILE}],
callback=lambda: None,
)
)

action = qapp.findChild(QAction, "late-action")
assert action.shortcut().toString() == "Shift+L"
Loading