commit 7623eb3c83d91405471177d750ab0ae8fd05a0d6 Author: Tomas Korbar Date: Mon Oct 1 16:27:36 2018 +0200 Fix typos in QMessageBox constructors diff --git a/ui5/devmgr5.py b/ui5/devmgr5.py index 35bdcb7..267cfba 100644 --- a/ui5/devmgr5.py +++ b/ui5/devmgr5.py @@ -139,8 +139,7 @@ class PluginInstall(QObject): install_plugin = QMessageBox.warning(self.parent, self.parent.windowTitle(), self.__tr("The HPLIP plugin is already installed.

Do you want to continue and re-install it?"), - QMessageBox.Yes, - QMessageBox.No, + QMessageBox.Yes | QMessageBox.No, QMessageBox.NoButton) == QMessageBox.Yes if install_plugin: @@ -149,8 +148,7 @@ class PluginInstall(QObject): QMessageBox.critical(self.parent, self.parent.windowTitle(), self.__tr("Unable to find an appropriate su/sudo utility to run hp-plugin.

Install kdesu, gnomesu, or gksu.

"), - QMessageBox.Ok, - QMessageBox.NoButton, + QMessageBox.Ok | QMessageBox.NoButton, QMessageBox.NoButton) diff --git a/ui5/nodevicesdialog.py b/ui5/nodevicesdialog.py index 6083f6d..ca86bfc 100644 --- a/ui5/nodevicesdialog.py +++ b/ui5/nodevicesdialog.py @@ -64,8 +64,7 @@ class NoDevicesDialog(QDialog, Ui_NoDevicesDialog_base): QMessageBox.critical(self, self.windowTitle(), self.__tr("An error occurred.

Please re-start the Device Manager and try again."), - QMessageBox.Ok, - QMessageBox.NoButton, + QMessageBox.Ok | QMessageBox.NoButton, QMessageBox.NoButton) diff --git a/ui5/setupdialog.py b/ui5/setupdialog.py index fbfe5ac..05e2b1d 100644 --- a/ui5/setupdialog.py +++ b/ui5/setupdialog.py @@ -1108,8 +1108,7 @@ class SetupDialog(QDialog, Ui_Dialog): if QMessageBox.critical(self, self.windowTitle(), error_text, - QMessageBox.Retry | QMessageBox.Default, - QMessageBox.Cancel | QMessageBox.Escape, + QMessageBox.Retry | QMessageBox.Default | QMessageBox.Cancel | QMessageBox.Escape, QMessageBox.NoButton) == QMessageBox.Cancel: break @@ -1138,8 +1137,7 @@ class SetupDialog(QDialog, Ui_Dialog): if QMessageBox.critical(self, self.windowTitle(), error_text, - QMessageBox.Retry | QMessageBox.Default, - QMessageBox.Cancel | QMessageBox.Escape, + QMessageBox.Retry | QMessageBox.Default | QMessageBox.Cancel | QMessageBox.Escape, QMessageBox.NoButton) == QMessageBox.Cancel: break