Allow to disable ask on exit (#2213)
This commit is contained in:
@@ -135,6 +135,7 @@ class Config:
|
||||
self.emphLabels = True # Add emphasis to H1 and H2 item labels
|
||||
self.backupOnClose = False # Flag for running automatic backups
|
||||
self.askBeforeBackup = True # Flag for asking before running automatic backup
|
||||
self.askBeforeExit = True # Flag for asking before exiting the app
|
||||
|
||||
# Text Editor Settings
|
||||
self.textFont = QFont() # Editor font
|
||||
@@ -628,6 +629,7 @@ class Config:
|
||||
self._backupPath = conf.rdPath(sec, "backuppath", self._backupPath)
|
||||
self.backupOnClose = conf.rdBool(sec, "backuponclose", self.backupOnClose)
|
||||
self.askBeforeBackup = conf.rdBool(sec, "askbeforebackup", self.askBeforeBackup)
|
||||
self.askBeforeExit = conf.rdBool(sec, "askbeforeexit", self.askBeforeExit)
|
||||
|
||||
# Editor
|
||||
sec = "Editor"
|
||||
@@ -739,6 +741,7 @@ class Config:
|
||||
"backuppath": str(self._backupPath),
|
||||
"backuponclose": str(self.backupOnClose),
|
||||
"askbeforebackup": str(self.askBeforeBackup),
|
||||
"askbeforeexit": str(self.askBeforeExit),
|
||||
}
|
||||
|
||||
conf["Editor"] = {
|
||||
|
||||
@@ -271,10 +271,10 @@ class GuiPreferences(NDialog):
|
||||
self.tr("Include project notes in status bar word count"), self.incNotesWCount
|
||||
)
|
||||
|
||||
# Auto Save
|
||||
# Behaviour
|
||||
# =========
|
||||
|
||||
title = self.tr("Auto Save")
|
||||
title = self.tr("Behaviour")
|
||||
section += 1
|
||||
self.sidebar.addButton(title, section)
|
||||
self.mainForm.addGroupLabel(title, section)
|
||||
@@ -301,6 +301,14 @@ class GuiPreferences(NDialog):
|
||||
self.tr("How often the project is automatically saved."), unit=self.tr("seconds")
|
||||
)
|
||||
|
||||
# Ask before exiting novelWriter
|
||||
self.askBeforeExit = NSwitch(self)
|
||||
self.askBeforeExit.setChecked(CONFIG.askBeforeExit)
|
||||
self.mainForm.addRow(
|
||||
self.tr("Ask before exiting novelWriter"), self.askBeforeExit,
|
||||
self.tr("Only applies when a project is open.")
|
||||
)
|
||||
|
||||
# Project Backup
|
||||
# ==============
|
||||
|
||||
@@ -927,9 +935,10 @@ class GuiPreferences(NDialog):
|
||||
CONFIG.incNotesWCount = self.incNotesWCount.isChecked()
|
||||
CONFIG.setTextFont(self._textFont)
|
||||
|
||||
# Auto Save
|
||||
CONFIG.autoSaveDoc = self.autoSaveDoc.value()
|
||||
CONFIG.autoSaveProj = self.autoSaveProj.value()
|
||||
# Behaviour
|
||||
CONFIG.autoSaveDoc = self.autoSaveDoc.value()
|
||||
CONFIG.autoSaveProj = self.autoSaveProj.value()
|
||||
CONFIG.askBeforeExit = self.askBeforeExit.isChecked()
|
||||
|
||||
# Project Backup
|
||||
CONFIG.setBackupPath(self.backupPath)
|
||||
|
||||
@@ -852,7 +852,7 @@ class GuiMain(QMainWindow):
|
||||
|
||||
def closeMain(self) -> bool:
|
||||
"""Save everything, and close novelWriter."""
|
||||
if SHARED.hasProject and not SHARED.question("%s<br>%s" % (
|
||||
if SHARED.hasProject and CONFIG.askBeforeExit and not SHARED.question("%s<br>%s" % (
|
||||
self.tr("Do you want to exit novelWriter?"),
|
||||
self.tr("Changes are saved automatically.")
|
||||
)):
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Meta]
|
||||
timestamp = 2025-01-26 18:17:44
|
||||
timestamp = 2025-01-29 11:56:34
|
||||
|
||||
[Main]
|
||||
font =
|
||||
@@ -26,6 +26,7 @@ emphlabels = True
|
||||
backuppath =
|
||||
backuponclose = False
|
||||
askbeforebackup = True
|
||||
askbeforeexit = True
|
||||
|
||||
[Editor]
|
||||
textfont =
|
||||
|
||||
@@ -182,12 +182,14 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths):
|
||||
assert CONFIG.showFullPath is True
|
||||
assert CONFIG.incNotesWCount is True
|
||||
|
||||
# Auto Save
|
||||
# Behaviour
|
||||
prefs.autoSaveDoc.stepUp()
|
||||
prefs.autoSaveProj.stepUp()
|
||||
prefs.askBeforeExit.setChecked(False)
|
||||
|
||||
assert CONFIG.autoSaveDoc == 30
|
||||
assert CONFIG.autoSaveProj == 60
|
||||
assert CONFIG.askBeforeExit is True
|
||||
|
||||
# Project Backup
|
||||
with monkeypatch.context() as mp:
|
||||
@@ -333,9 +335,10 @@ def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths):
|
||||
assert CONFIG.showFullPath is False
|
||||
assert CONFIG.incNotesWCount is False
|
||||
|
||||
# Auto Save
|
||||
# Behaviour
|
||||
assert CONFIG.autoSaveDoc == 31
|
||||
assert CONFIG.autoSaveProj == 61
|
||||
assert CONFIG.askBeforeExit is False
|
||||
|
||||
# Project Backup
|
||||
assert CONFIG._backupPath == tstPaths.testDir
|
||||
|
||||
Reference in New Issue
Block a user