56 lines
2.8 KiB
Text
56 lines
2.8 KiB
Text
|
From 95a73bbc9bd65602a0f9411469ab511bc80a01d0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Till Kamppeter <till.kamppeter@gmail.com>
|
||
|
|
Date: Wed, 3 Oct 2018 15:13:00 +0200
|
||
|
|
Subject: Call QMessageBox constructors of PyQT5 with the correct parameters
|
||
|
|
Bug-Debian: https://bugs.debian.org/912768
|
||
|
|
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1745383
|
||
|
|
|
||
|
|
Index: ui/setupform.py
|
||
|
|
--- ui/setupform.py.orig
|
||
|
|
+++ ui/setupform.py
|
||
|
|
@@ -602,7 +602,7 @@ class SetupForm(SetupForm_base):
|
||
|
|
if ( QMessageBox.warning(self,
|
||
|
|
self.caption(),
|
||
|
|
warn_text,
|
||
|
|
- QMessageBox.Yes,
|
||
|
|
+ QMessageBox.Yes |\
|
||
|
|
QMessageBox.No,
|
||
|
|
QMessageBox.NoButton) == QMessageBox.Yes ):
|
||
|
|
|
||
|
|
@@ -804,7 +804,7 @@ class SetupForm(SetupForm_base):
|
||
|
|
if QMessageBox.critical(self,
|
||
|
|
self.caption(),
|
||
|
|
error_text,
|
||
|
|
- QMessageBox.Retry | QMessageBox.Default,
|
||
|
|
+ QMessageBox.Retry | QMessageBox.Default |\
|
||
|
|
QMessageBox.Cancel | QMessageBox.Escape,
|
||
|
|
QMessageBox.NoButton) == QMessageBox.Cancel:
|
||
|
|
break
|
||
|
|
@@ -832,7 +832,7 @@ class SetupForm(SetupForm_base):
|
||
|
|
if QMessageBox.critical(self,
|
||
|
|
self.caption(),
|
||
|
|
error_text,
|
||
|
|
- QMessageBox.Retry | QMessageBox.Default,
|
||
|
|
+ QMessageBox.Retry | QMessageBox.Default |\
|
||
|
|
QMessageBox.Cancel | QMessageBox.Escape,
|
||
|
|
QMessageBox.NoButton) == QMessageBox.Cancel:
|
||
|
|
break
|
||
|
|
@@ -1003,7 +1003,7 @@ class SetupForm(SetupForm_base):
|
||
|
|
QMessageBox.critical(self,
|
||
|
|
self.caption(),
|
||
|
|
error_text,
|
||
|
|
- QMessageBox.Ok,
|
||
|
|
+ QMessageBox.Ok |\
|
||
|
|
QMessageBox.NoButton,
|
||
|
|
QMessageBox.NoButton)
|
||
|
|
|
||
|
|
@@ -1011,7 +1011,7 @@ class SetupForm(SetupForm_base):
|
||
|
|
QMessageBox.warning(self,
|
||
|
|
self.caption(),
|
||
|
|
error_text,
|
||
|
|
- QMessageBox.Ok,
|
||
|
|
+ QMessageBox.Ok |\
|
||
|
|
QMessageBox.NoButton,
|
||
|
|
QMessageBox.NoButton)
|
||
|
|
|