|
 |
faa6c09 |
From 95a73bbc9bd65602a0f9411469ab511bc80a01d0 Mon Sep 17 00:00:00 2001
|
|
|
faa6c09 |
From: Till Kamppeter <till.kamppeter@gmail.com>
|
|
|
faa6c09 |
Date: Wed, 3 Oct 2018 15:13:00 +0200
|
|
|
faa6c09 |
Subject: Call QMessageBox constructors of PyQT5 with the correct parameters
|
|
|
faa6c09 |
|
|
|
faa6c09 |
The whole Python source code of HPLIP contains 40 incorrect calls of
|
|
|
faa6c09 |
the QMessageBox constructurs, mostly the list of buttons was given as
|
|
|
faa6c09 |
separate arguments instead of a bitwise OR of each button's
|
|
|
faa6c09 |
representation value. If the flow of the code hits one of these
|
|
|
faa6c09 |
calls (usually when some error or warnings message should be
|
|
|
faa6c09 |
displayed or an "Are you sure?" question asked) the GUI app crashes.
|
|
|
faa6c09 |
See https://pythonspot.com/pyqt5-messagebox/ for QMessageBox
|
|
|
faa6c09 |
documentation.
|
|
|
faa6c09 |
This patch corrects all these calls.
|
|
|
faa6c09 |
|
|
|
faa6c09 |
Bug-Debian: https://bugs.debian.org/912768
|
|
|
faa6c09 |
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1745383
|
|
|
faa6c09 |
---
|
|
|
faa6c09 |
ui/devmgr4.py | 16 ++++++++--------
|
|
|
faa6c09 |
ui/faxaddrbookform.py | 6 +++---
|
|
|
faa6c09 |
ui/faxsendjobform.py | 6 +++---
|
|
|
faa6c09 |
ui/firmwaredialog.py | 2 +-
|
|
|
faa6c09 |
ui/makecopiesform.py | 4 ++--
|
|
|
faa6c09 |
ui/nodevicesform.py | 2 +-
|
|
|
faa6c09 |
ui/pluginform2.py | 4 ++--
|
|
|
faa6c09 |
ui/printerform.py | 2 +-
|
|
|
faa6c09 |
ui/settingsdialog.py | 4 ++--
|
|
|
faa6c09 |
ui/setupform.py | 10 +++++-----
|
|
|
faa6c09 |
ui/unloadform.py | 2 +-
|
|
|
faa6c09 |
ui/upgradeform.py | 4 ++--
|
|
|
faa6c09 |
ui5/devmgr5.py | 6 ++----
|
|
|
faa6c09 |
ui5/fabwindow.py | 2 +-
|
|
|
faa6c09 |
ui5/nodevicesdialog.py | 3 +--
|
|
|
faa6c09 |
ui5/plugindialog.py | 2 +-
|
|
|
faa6c09 |
ui5/queuesconf.py | 2 +-
|
|
|
faa6c09 |
ui5/setupdialog.py | 6 +++---
|
|
|
faa6c09 |
18 files changed, 40 insertions(+), 43 deletions(-)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/devmgr4.py b/ui/devmgr4.py
|
|
|
faa6c09 |
index cc2552f91..a868ccac0 100644
|
|
|
faa6c09 |
--- a/ui/devmgr4.py
|
|
|
faa6c09 |
+++ b/ui/devmgr4.py
|
|
|
faa6c09 |
@@ -1422,7 +1422,7 @@ class DevMgr4(DevMgr4_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("Unable to find an appropriate su/sudo utility to run hp-plugin.Install kdesu, gnomesu, or gksu. "),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
else:
|
|
|
faa6c09 |
@@ -2854,7 +2854,7 @@ class DevMgr4(DevMgr4_base):
|
|
|
faa6c09 |
x = QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("Annoying Confirmation: Are you sure you want to remove this device?"),
|
|
|
faa6c09 |
- QMessageBox.Yes,
|
|
|
faa6c09 |
+ QMessageBox.Yes |\
|
|
|
faa6c09 |
QMessageBox.No | QMessageBox.Default,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
if x == QMessageBox.Yes:
|
|
|
faa6c09 |
@@ -2949,7 +2949,7 @@ class DevMgr4(DevMgr4_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -2958,7 +2958,7 @@ class DevMgr4(DevMgr4_base):
|
|
|
faa6c09 |
QMessageBox.warning(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
msg,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -3115,7 +3115,7 @@ class ScrollTestpageView(ScrollView):
|
|
|
faa6c09 |
QMessageBox.information(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("A test page should be printing on your printer. If the page fails to print, please visit http://hplip.sourceforge.net for troubleshooting and support."),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -3130,7 +3130,7 @@ class ScrollTestpageView(ScrollView):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -3272,7 +3272,7 @@ class ScrollColorCalView(ScrollView):
|
|
|
faa6c09 |
QMessageBox.information(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("A test page should be printing on your printer. If the page fails to print, please visit http://hplip.sourceforge.net for troubleshooting and support."),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -3287,7 +3287,7 @@ class ScrollColorCalView(ScrollView):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/faxaddrbookform.py b/ui/faxaddrbookform.py
|
|
|
faa6c09 |
index 109462207..b23364410 100644
|
|
|
faa6c09 |
--- a/ui/faxaddrbookform.py
|
|
|
faa6c09 |
+++ b/ui/faxaddrbookform.py
|
|
|
faa6c09 |
@@ -228,7 +228,7 @@ class FaxAddrBookGroupsForm(FaxAddrBookGroupsForm_base):
|
|
|
faa6c09 |
x = QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("Annoying Confirmation: Are you sure you want to delete this group?"),
|
|
|
faa6c09 |
- QMessageBox.Yes,
|
|
|
faa6c09 |
+ QMessageBox.Yes |\
|
|
|
faa6c09 |
QMessageBox.No | QMessageBox.Default,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
if x == QMessageBox.Yes:
|
|
|
faa6c09 |
@@ -421,7 +421,7 @@ class FaxAddrBookForm(FaxAddrBookForm_base):
|
|
|
faa6c09 |
if QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("Annoying Confirmation: Are you sure you want to delete this address book entry?"),
|
|
|
faa6c09 |
- QMessageBox.Yes,
|
|
|
faa6c09 |
+ QMessageBox.Yes |\
|
|
|
faa6c09 |
QMessageBox.No | QMessageBox.Default,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Yes:
|
|
|
faa6c09 |
db.delete(self.current.entry['name'])
|
|
|
faa6c09 |
@@ -451,7 +451,7 @@ class FaxAddrBookForm(FaxAddrBookForm_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
QString(error_text),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/faxsendjobform.py b/ui/faxsendjobform.py
|
|
|
faa6c09 |
index 106215c5e..69f424c42 100644
|
|
|
faa6c09 |
--- a/ui/faxsendjobform.py
|
|
|
faa6c09 |
+++ b/ui/faxsendjobform.py
|
|
|
faa6c09 |
@@ -210,7 +210,7 @@ class FaxSendJobForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.information(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("Fax send completed successfully."),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -219,7 +219,7 @@ class FaxSendJobForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -228,7 +228,7 @@ class FaxSendJobForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.warning(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/firmwaredialog.py b/ui/firmwaredialog.py
|
|
|
faa6c09 |
index 16b313374..0bcee1164 100644
|
|
|
faa6c09 |
--- a/ui/firmwaredialog.py
|
|
|
faa6c09 |
+++ b/ui/firmwaredialog.py
|
|
|
faa6c09 |
@@ -109,7 +109,7 @@ class FirmwareDialog(QDialog, FirmwareDialog_Base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/makecopiesform.py b/ui/makecopiesform.py
|
|
|
faa6c09 |
index 27f144b36..0fbb573e3 100644
|
|
|
faa6c09 |
--- a/ui/makecopiesform.py
|
|
|
faa6c09 |
+++ b/ui/makecopiesform.py
|
|
|
faa6c09 |
@@ -156,7 +156,7 @@ class MakeCopiesForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -164,7 +164,7 @@ class MakeCopiesForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.warning(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
msg,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/nodevicesform.py b/ui/nodevicesform.py
|
|
|
faa6c09 |
index 01f6ae53b..57a696375 100644
|
|
|
faa6c09 |
--- a/ui/nodevicesform.py
|
|
|
faa6c09 |
+++ b/ui/nodevicesform.py
|
|
|
faa6c09 |
@@ -67,7 +67,7 @@ class NoDevicesForm(NoDevicesForm_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
self.__tr("An error occurred.Please re-start the Device Manager and try again."),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/pluginform2.py b/ui/pluginform2.py
|
|
|
faa6c09 |
index 64e64aa77..76cb0238b 100644
|
|
|
faa6c09 |
--- a/ui/pluginform2.py
|
|
|
faa6c09 |
+++ b/ui/pluginform2.py
|
|
|
faa6c09 |
@@ -173,7 +173,7 @@ class PluginForm2(PluginForm2_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -181,7 +181,7 @@ class PluginForm2(PluginForm2_base):
|
|
|
faa6c09 |
QMessageBox.information(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/printerform.py b/ui/printerform.py
|
|
|
faa6c09 |
index 0c6c4f39e..7c10ab07b 100644
|
|
|
faa6c09 |
--- a/ui/printerform.py
|
|
|
faa6c09 |
+++ b/ui/printerform.py
|
|
|
faa6c09 |
@@ -154,7 +154,7 @@ class PrinterForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/settingsdialog.py b/ui/settingsdialog.py
|
|
|
faa6c09 |
index 92da22546..24f02fd84 100644
|
|
|
faa6c09 |
--- a/ui/settingsdialog.py
|
|
|
faa6c09 |
+++ b/ui/settingsdialog.py
|
|
|
faa6c09 |
@@ -146,7 +146,7 @@ class SettingsDialog(SettingsDialog_base):
|
|
|
faa6c09 |
## QMessageBox.warning(self,
|
|
|
faa6c09 |
## self.caption(),
|
|
|
faa6c09 |
## self.__tr("One or more email addresses are missing.Please enter this information and try again."),
|
|
|
faa6c09 |
-## QMessageBox.Ok,
|
|
|
faa6c09 |
+## QMessageBox.Ok |\
|
|
|
faa6c09 |
## QMessageBox.NoButton,
|
|
|
faa6c09 |
## QMessageBox.NoButton)
|
|
|
faa6c09 |
## return
|
|
|
faa6c09 |
@@ -163,7 +163,7 @@ class SettingsDialog(SettingsDialog_base):
|
|
|
faa6c09 |
## QMessageBox.information(self,
|
|
|
faa6c09 |
## self.caption(),
|
|
|
faa6c09 |
## self.__tr("Please check your email for a test message. If the message doesn't arrive, please check your settings and try again."),
|
|
|
faa6c09 |
-## QMessageBox.Ok,
|
|
|
faa6c09 |
+## QMessageBox.Ok |\
|
|
|
faa6c09 |
## QMessageBox.NoButton,
|
|
|
faa6c09 |
## QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/setupform.py b/ui/setupform.py
|
|
|
faa6c09 |
index 307917b02..78863fdd8 100644
|
|
|
faa6c09 |
--- a/ui/setupform.py
|
|
|
faa6c09 |
+++ b/ui/setupform.py
|
|
|
faa6c09 |
@@ -602,7 +602,7 @@ class SetupForm(SetupForm_base):
|
|
|
faa6c09 |
if ( QMessageBox.warning(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
warn_text,
|
|
|
faa6c09 |
- QMessageBox.Yes,
|
|
|
faa6c09 |
+ QMessageBox.Yes |\
|
|
|
faa6c09 |
QMessageBox.No,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Yes ):
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -804,7 +804,7 @@ class SetupForm(SetupForm_base):
|
|
|
faa6c09 |
if QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Retry | QMessageBox.Default,
|
|
|
faa6c09 |
+ QMessageBox.Retry | QMessageBox.Default |\
|
|
|
faa6c09 |
QMessageBox.Cancel | QMessageBox.Escape,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Cancel:
|
|
|
faa6c09 |
break
|
|
|
faa6c09 |
@@ -832,7 +832,7 @@ class SetupForm(SetupForm_base):
|
|
|
faa6c09 |
if QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Retry | QMessageBox.Default,
|
|
|
faa6c09 |
+ QMessageBox.Retry | QMessageBox.Default |\
|
|
|
faa6c09 |
QMessageBox.Cancel | QMessageBox.Escape,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Cancel:
|
|
|
faa6c09 |
break
|
|
|
faa6c09 |
@@ -1003,7 +1003,7 @@ class SetupForm(SetupForm_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -1011,7 +1011,7 @@ class SetupForm(SetupForm_base):
|
|
|
faa6c09 |
QMessageBox.warning(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/unloadform.py b/ui/unloadform.py
|
|
|
faa6c09 |
index 8397a689c..ae363e01e 100644
|
|
|
faa6c09 |
--- a/ui/unloadform.py
|
|
|
faa6c09 |
+++ b/ui/unloadform.py
|
|
|
faa6c09 |
@@ -135,7 +135,7 @@ class UnloadForm(QMainWindow):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui/upgradeform.py b/ui/upgradeform.py
|
|
|
faa6c09 |
index 6b9acf5cc..d0b418419 100644
|
|
|
faa6c09 |
--- a/ui/upgradeform.py
|
|
|
faa6c09 |
+++ b/ui/upgradeform.py
|
|
|
faa6c09 |
@@ -118,7 +118,7 @@ class UpgradeForm(UpgradeForm_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
@@ -126,7 +126,7 @@ class UpgradeForm(UpgradeForm_base):
|
|
|
faa6c09 |
QMessageBox.information(self,
|
|
|
faa6c09 |
self.caption(),
|
|
|
faa6c09 |
text,
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
+ QMessageBox.Ok |\
|
|
|
faa6c09 |
QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py
|
|
|
faa6c09 |
index 495883f72..0ca016820 100644
|
|
|
faa6c09 |
--- a/ui5/devmgr5.py
|
|
|
faa6c09 |
+++ b/ui5/devmgr5.py
|
|
|
faa6c09 |
@@ -139,8 +139,7 @@ class PluginInstall(QObject):
|
|
|
faa6c09 |
install_plugin = QMessageBox.warning(self.parent,
|
|
|
faa6c09 |
self.parent.windowTitle(),
|
|
|
faa6c09 |
self.__tr("The HPLIP plugin is already installed.Do you want to continue and re-install it?"),
|
|
|
faa6c09 |
- QMessageBox.Yes,
|
|
|
faa6c09 |
- QMessageBox.No,
|
|
|
faa6c09 |
+ QMessageBox.Yes | QMessageBox.No,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Yes
|
|
|
faa6c09 |
|
|
|
faa6c09 |
if install_plugin:
|
|
|
faa6c09 |
@@ -149,8 +148,7 @@ class PluginInstall(QObject):
|
|
|
faa6c09 |
QMessageBox.critical(self.parent,
|
|
|
faa6c09 |
self.parent.windowTitle(),
|
|
|
faa6c09 |
self.__tr("Unable to find an appropriate su/sudo utility to run hp-plugin.Install kdesu, gnomesu, or gksu. "),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
- QMessageBox.NoButton,
|
|
|
faa6c09 |
+ QMessageBox.Ok | QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui5/fabwindow.py b/ui5/fabwindow.py
|
|
|
faa6c09 |
index 488b6bbd5..0b95c94f1 100644
|
|
|
faa6c09 |
--- a/ui5/fabwindow.py
|
|
|
faa6c09 |
+++ b/ui5/fabwindow.py
|
|
|
faa6c09 |
@@ -344,7 +344,7 @@ class FABWindow(QMainWindow, Ui_MainWindow):
|
|
|
faa6c09 |
new_name = to_unicode(self.NameLineEdit.text())
|
|
|
faa6c09 |
if new_name != self.name:
|
|
|
faa6c09 |
if QMessageBox.question(self, self.__tr("Rename?"), "Rename '%s' to '%s'?"%(self.name,new_name), \
|
|
|
faa6c09 |
- QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
|
|
|
faa6c09 |
+ QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
|
|
|
faa6c09 |
|
|
|
faa6c09 |
self.db.rename(self.name, new_name)
|
|
|
faa6c09 |
log.debug("Rename %s to %s" % (self.name, new_name))
|
|
|
faa6c09 |
diff --git a/ui5/nodevicesdialog.py b/ui5/nodevicesdialog.py
|
|
|
faa6c09 |
index 6083f6d4b..ca86bfcda 100644
|
|
|
faa6c09 |
--- a/ui5/nodevicesdialog.py
|
|
|
faa6c09 |
+++ b/ui5/nodevicesdialog.py
|
|
|
faa6c09 |
@@ -64,8 +64,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base):
|
|
|
faa6c09 |
QMessageBox.critical(self,
|
|
|
faa6c09 |
self.windowTitle(),
|
|
|
faa6c09 |
self.__tr("An error occurred.Please re-start the Device Manager and try again."),
|
|
|
faa6c09 |
- QMessageBox.Ok,
|
|
|
faa6c09 |
- QMessageBox.NoButton,
|
|
|
faa6c09 |
+ QMessageBox.Ok | QMessageBox.NoButton,
|
|
|
faa6c09 |
QMessageBox.NoButton)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui5/plugindialog.py b/ui5/plugindialog.py
|
|
|
faa6c09 |
index e3007f911..1c6b33868 100644
|
|
|
faa6c09 |
--- a/ui5/plugindialog.py
|
|
|
faa6c09 |
+++ b/ui5/plugindialog.py
|
|
|
faa6c09 |
@@ -252,7 +252,7 @@ class PluginDialog(QDialog, Ui_Dialog):
|
|
|
faa6c09 |
|
|
|
faa6c09 |
if QMessageBox.question(self, " ",
|
|
|
faa6c09 |
self.__tr("%sWithout this, it is not possible to authenticate and validate the plug-in prior to installation. Do you still want to install the plug-in?" %error_str),
|
|
|
faa6c09 |
- QMessageBox.Yes | QMessageBox.No) != QMessageBox.Yes:
|
|
|
faa6c09 |
+ QMessageBox.Yes | QMessageBox.No, QMessageBox.No) != QMessageBox.Yes:
|
|
|
faa6c09 |
|
|
|
faa6c09 |
self.pluginObj.deleteInstallationFiles(download_plugin_file)
|
|
|
faa6c09 |
self.close()
|
|
|
faa6c09 |
diff --git a/ui5/queuesconf.py b/ui5/queuesconf.py
|
|
|
faa6c09 |
index cf2206490..e3c2a0278 100644
|
|
|
faa6c09 |
--- a/ui5/queuesconf.py
|
|
|
faa6c09 |
+++ b/ui5/queuesconf.py
|
|
|
faa6c09 |
@@ -245,7 +245,7 @@ class QueuesDiagnose(QDialog, Ui_Dialog):
|
|
|
faa6c09 |
|
|
|
faa6c09 |
if QMessageBox.question(self, " ",
|
|
|
faa6c09 |
self.__tr("%sWithout this, it is not possible to authenticate and validate this tool prior to installation. Do you still want to run Smart Install disabler?" %error_str),
|
|
|
faa6c09 |
- QMessageBox.Yes | QMessageBox.No) == QMessageBox.Yes:
|
|
|
faa6c09 |
+ QMessageBox.Yes | QMessageBox.No, QMessageBox.No) == QMessageBox.Yes:
|
|
|
faa6c09 |
# Disabling without verification.
|
|
|
faa6c09 |
sts, out = utils.run("sh %s"%smart_install_run)
|
|
|
faa6c09 |
|
|
|
faa6c09 |
diff --git a/ui5/setupdialog.py b/ui5/setupdialog.py
|
|
|
faa6c09 |
index fbfe5ac9b..120ee1587 100644
|
|
|
faa6c09 |
--- a/ui5/setupdialog.py
|
|
|
faa6c09 |
+++ b/ui5/setupdialog.py
|
|
|
faa6c09 |
@@ -873,7 +873,7 @@ class SetupDialog(QDialog, Ui_Dialog):
|
|
|
faa6c09 |
self.windowTitle(),
|
|
|
faa6c09 |
warn_text,
|
|
|
faa6c09 |
QMessageBox.Yes|\
|
|
|
faa6c09 |
- QMessageBox.No|\
|
|
|
faa6c09 |
+ QMessageBox.No,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Yes ):
|
|
|
faa6c09 |
i = 2
|
|
|
faa6c09 |
while True:
|
|
|
faa6c09 |
@@ -1108,7 +1108,7 @@ class SetupDialog(QDialog, Ui_Dialog):
|
|
|
faa6c09 |
if QMessageBox.critical(self,
|
|
|
faa6c09 |
self.windowTitle(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Retry | QMessageBox.Default,
|
|
|
faa6c09 |
+ QMessageBox.Retry | QMessageBox.Default |\
|
|
|
faa6c09 |
QMessageBox.Cancel | QMessageBox.Escape,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Cancel:
|
|
|
faa6c09 |
break
|
|
|
faa6c09 |
@@ -1138,7 +1138,7 @@ class SetupDialog(QDialog, Ui_Dialog):
|
|
|
faa6c09 |
if QMessageBox.critical(self,
|
|
|
faa6c09 |
self.windowTitle(),
|
|
|
faa6c09 |
error_text,
|
|
|
faa6c09 |
- QMessageBox.Retry | QMessageBox.Default,
|
|
|
faa6c09 |
+ QMessageBox.Retry | QMessageBox.Default |\
|
|
|
faa6c09 |
QMessageBox.Cancel | QMessageBox.Escape,
|
|
|
faa6c09 |
QMessageBox.NoButton) == QMessageBox.Cancel:
|
|
|
faa6c09 |
break
|