Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added more reasonable behavior to "should I force shutdown or wait" message

Browse Source 
Now there's an option of "don't ask again" and there should not be
a useless close button.

fixes QubesOS/qubes-issues#6123
This commit is contained in:
Marta Marczykowska-Górecka 2020-10-26 16:25:47 +01:00
parent 954f2dc7f7
commit 1cfd5b8704
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesmanager/qube_manager.py
View File

@ -533,7 +533,14 @@ class VmShutdownMonitor(QObject):
self.tr("Wait another {0} seconds...").format( self.tr("Wait another {0} seconds...").format(
self.shutdown_time / 1000), self.shutdown_time / 1000),
QMessageBox.NoRole) QMessageBox.NoRole)
ignore_button = msgbox.addButton(self.tr("Don't ask again"),
QMessageBox.RejectRole)
msgbox.setDefaultButton(wait_button) msgbox.setDefaultButton(wait_button)
msgbox.setEscapeButton(ignore_button)
msgbox.setWindowFlags(
msgbox.windowFlags() | Qt.CustomizeWindowHint)
msgbox.setWindowFlags(
msgbox.windowFlags() & ~Qt.WindowCloseButtonHint)
msgbox.exec_() msgbox.exec_()
msgbox.deleteLater() msgbox.deleteLater()
@ -545,6 +552,8 @@ class VmShutdownMonitor(QObject):
# shutting it down # shutting it down
pass pass
self.restart_vm_if_needed() self.restart_vm_if_needed()
elif msgbox.clickedButton() is ignore_button:
return
else: else:
self.shutdown_started = datetime.now() self.shutdown_started = datetime.now()
self.check_again_later() self.check_again_later()