parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add 'cancel' button when closing Pamhyr2 from x button

terraz_dev
Theophile Terraz 2025-02-14 14:48:40 +01:00
parent 6bcbd006f1
commit e3315c8f81
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/View/MainWindow.py
View File

@ -348,10 +348,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
def closeEvent(self, event): def closeEvent(self, event):
if not self._close_question: if not self._close_question:
if self._study is not None and not self._study.is_saved: if self._study is not None and not self._study.is_saved:
if self.dialog_close(cancel=False): if self.dialog_close():
# PAMHYR is close correctly (no crash) # PAMHYR is close correctly (no crash)
self.conf.set_close_correctly() self.conf.set_close_correctly()
super(ApplicationWindow, self).closeEvent(event) super(ApplicationWindow, self).closeEvent(event)
else:
event.ignore()
else: else:
super(ApplicationWindow, self).closeEvent(event) super(ApplicationWindow, self).closeEvent(event)
@ -531,7 +533,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
self.update() self.update()
def close_model(self): def close_model(self):
if not self.dialog_close(cancel=True): if not self.dialog_close():
return return
self._study = None self._study = None
@ -833,21 +835,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
return file return file
def dialog_close(self, cancel=True): def dialog_close(self):
dlg = QMessageBox(self) dlg = QMessageBox(self)
dlg.setWindowTitle(self._trad["mb_close_title"]) dlg.setWindowTitle(self._trad["mb_close_title"])
dlg.setText(self._trad["mb_close_msg"]) dlg.setText(self._trad["mb_close_msg"])
opt = QMessageBox.Save | QMessageBox.Close opt = QMessageBox.Save | QMessageBox.Close
if cancel: opt |= QMessageBox.Cancel
opt |= QMessageBox.Cancel
dlg.setStandardButtons(opt) dlg.setStandardButtons(opt)
dlg.setIcon(QMessageBox.Warning) dlg.setIcon(QMessageBox.Warning)
dlg.button(QMessageBox.Save).setText(self._trad["Save"]) dlg.button(QMessageBox.Save).setText(self._trad["Save"])
dlg.button(QMessageBox.Close).setText(self._trad["Close"]) dlg.button(QMessageBox.Close).setText(self._trad["Close"])
if cancel: dlg.button(QMessageBox.Cancel).setText(self._trad["Cancel"])
dlg.button(QMessageBox.Cancel).setText(self._trad["Cancel"])
res = dlg.exec() res = dlg.exec()