From f8c1ee90ce4f645c8dc9a8b276dadfbbaa4542ff Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Mon, 10 Jun 2024 01:02:48 +0200 Subject: [PATCH] Reimplement the reject slot for the parent dialog class --- novelwriter/extensions/modified.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/novelwriter/extensions/modified.py b/novelwriter/extensions/modified.py index 12048497..f07e2553 100644 --- a/novelwriter/extensions/modified.py +++ b/novelwriter/extensions/modified.py @@ -30,8 +30,8 @@ from __future__ import annotations from enum import Enum from typing import TYPE_CHECKING -from PyQt5.QtCore import QSize, Qt -from PyQt5.QtGui import QKeyEvent, QKeySequence, QWheelEvent +from PyQt5.QtCore import QSize, Qt, pyqtSlot +from PyQt5.QtGui import QWheelEvent from PyQt5.QtWidgets import ( QApplication, QComboBox, QDialog, QDoubleSpinBox, QSpinBox, QToolButton, QWidget @@ -54,11 +54,11 @@ class NDialog(QDialog): self.setParent(None) # type: ignore return - def keyPressEvent(self, event: QKeyEvent) -> None: - """Overload keyPressEvent and forward escape to close.""" - if event.matches(QKeySequence.StandardKey.Cancel): - self.close() - event.ignore() + @pyqtSlot() + def reject(self) -> None: + """Overload the reject slot and also call close.""" + super().reject() + self.close() return