diff -r e01ae92db699 -r 31965986ecd1 eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sun Mar 28 15:00:11 2021 +0200
@@ -38,10 +38,12 @@
super(SvnDialog, self).__init__(parent)
self.setupUi(self)
SvnDialogMixin.__init__(self, log)
- self.setWindowFlags(Qt.Window)
+ self.setWindowFlags(Qt.WindowType.Window)
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setDefault(True)
self.outputGroup.setTitle(text)
self.errorGroup.hide()
@@ -128,9 +130,12 @@
Public slot called when the process finished or the user pressed the
button.
"""
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setDefault(True)
self._cancel()
@@ -143,9 +148,13 @@
@param button button that was clicked (QAbstractButton)
"""
- if button == self.buttonBox.button(QDialogButtonBox.Close):
+ if button == self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close
+ ):
self.close()
- elif button == self.buttonBox.button(QDialogButtonBox.Cancel):
+ elif button == self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel
+ ):
self.finish()
def hasAddOrDelete(self):
