honor confirm close settings when quitting (napari#4700)

* honor confirm close settings on quit * update string * Update napari/settings/_application.py Co-authored-by: Grzegorz Bokota <[email protected]> * Update napari/settings/_application.py Co-authored-by: Grzegorz Bokota <[email protected]> Co-authored-by: Grzegorz Bokota <[email protected]>
Nadalyn-CZI · Jun 16, 2022 · 640484c · 640484c
1 parent 6a6776a
commit 640484c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/napari/_qt/menus/file_menu.py b/napari/_qt/menus/file_menu.py
@@ -135,6 +135,9 @@ def __init__(self, window: 'Window'):
         self.update()
 
     def _close_app(self):
+        if not get_settings().application.confirm_close_window:
+            self._win._qt_window.close(quit_app=True)
+            return
         message = QMessageBox(
             QMessageBox.Icon.Warning,
             trans._("Close application?"),

diff --git a/napari/settings/_application.py b/napari/settings/_application.py
@@ -7,7 +7,6 @@
 from ..utils._base import _DEFAULT_LOCALE
 from ..utils.events.custom_types import conint
 from ..utils.events.evented_model import EventedModel
-from ..utils.interactions import Shortcut
 from ..utils.notifications import NotificationSeverity
 from ..utils.translations import trans
 from ._constants import LoopMode
@@ -158,10 +157,9 @@ class ApplicationSettings(EventedModel):
     )
     confirm_close_window: bool = Field(
         default=True,
-        title=trans._("Confirm window closing"),
+        title=trans._("Confirm window or application closing"),
         description=trans._(
-            "Ask for confirmation before closing window with {shortcut}",
-            shortcut=Shortcut("Control-W").platform,
+            "Ask for confirmation before closing a napari window or application (all napari windows).",
         ),
     )