Merge branch 'main' into dev

2021-03-13 17:00:07 +01:00
parent 2f790140e0 47ece1f285
commit de57d0b027
16 changed files with 248 additions and 162 deletions
@@ -42,7 +42,6 @@ def testGuiProjTree_TreeItems(qtbot, caplog, monkeypatch, nwGUI, nwMinimal):
    monkeypatch.setattr(QMessageBox, "warning", lambda *args: QMessageBox.Yes)
    monkeypatch.setattr(QMessageBox, "information", lambda *args: QMessageBox.Yes)
    monkeypatch.setattr(GuiMain, "editItem", lambda *args: None)
-    monkeypatch.setattr(GuiProjectTree, "hasFocus", lambda *args: True)

    nwGUI.theProject.projTree.setSeed(42)
    nwTree = nwGUI.treeView