diff -r 27f636beebad -r 2c730d5fd177 eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Tue Mar 02 17:17:09 2021 +0100
@@ -54,12 +54,14 @@
self.__lastColumn = self.statusList.columnCount()
self.refreshButton = self.buttonBox.addButton(
- self.tr("Refresh"), QDialogButtonBox.ActionRole)
+ self.tr("Refresh"), QDialogButtonBox.ButtonRole.ActionRole)
self.refreshButton.setToolTip(
self.tr("Press to refresh the status display"))
self.refreshButton.setEnabled(False)
- 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.diff = None
self.vcs = vcs
@@ -72,7 +74,7 @@
self.statusList.headerItem().setText(self.__lastColumn, "")
self.statusList.header().setSortIndicator(self.__pathColumn,
- Qt.AscendingOrder)
+ Qt.SortOrder.AscendingOrder)
if self.vcs.version < (1, 5, 0):
self.statusList.header().hideSection(self.__changelistColumn)
@@ -121,7 +123,8 @@
for act in self.menuactions:
act.setEnabled(False)
- self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.statusList.setContextMenuPolicy(
+ Qt.ContextMenuPolicy.CustomContextMenu)
self.statusList.customContextMenuRequested.connect(
self.__showContextMenu)
@@ -219,7 +222,8 @@
"""
Private method to resize the list columns.
"""
- self.statusList.header().resizeSections(QHeaderView.ResizeToContents)
+ self.statusList.header().resizeSections(
+ QHeaderView.ResizeMode.ResizeToContents)
self.statusList.header().setStretchLastSection(True)
def __generateItem(self, status, propStatus, locked, history, switched,
@@ -269,38 +273,40 @@
statusText = self.status[status]
itm = QTreeWidgetItem(self.statusList)
- itm.setData(0, Qt.DisplayRole, "")
- itm.setData(1, Qt.DisplayRole, self.currentChangelist)
- itm.setData(2, Qt.DisplayRole, statusText)
- itm.setData(3, Qt.DisplayRole, self.propStatus[propStatus])
- itm.setData(4, Qt.DisplayRole, self.locked[locked])
- itm.setData(5, Qt.DisplayRole, self.history[history])
- itm.setData(6, Qt.DisplayRole, self.switched[switched])
- itm.setData(7, Qt.DisplayRole, self.lockinfo[lockinfo])
- itm.setData(8, Qt.DisplayRole, self.uptodate[uptodate])
- itm.setData(9, Qt.DisplayRole, rev)
- itm.setData(10, Qt.DisplayRole, chg)
- itm.setData(11, Qt.DisplayRole, author)
- itm.setData(12, Qt.DisplayRole, path)
+ itm.setData(0, Qt.ItemDataRole.DisplayRole, "")
+ itm.setData(1, Qt.ItemDataRole.DisplayRole, self.currentChangelist)
+ itm.setData(2, Qt.ItemDataRole.DisplayRole, statusText)
+ itm.setData(3, Qt.ItemDataRole.DisplayRole,
+ self.propStatus[propStatus])
+ itm.setData(4, Qt.ItemDataRole.DisplayRole, self.locked[locked])
+ itm.setData(5, Qt.ItemDataRole.DisplayRole, self.history[history])
+ itm.setData(6, Qt.ItemDataRole.DisplayRole, self.switched[switched])
+ itm.setData(7, Qt.ItemDataRole.DisplayRole, self.lockinfo[lockinfo])
+ itm.setData(8, Qt.ItemDataRole.DisplayRole, self.uptodate[uptodate])
+ itm.setData(9, Qt.ItemDataRole.DisplayRole, rev)
+ itm.setData(10, Qt.ItemDataRole.DisplayRole, chg)
+ itm.setData(11, Qt.ItemDataRole.DisplayRole, author)
+ itm.setData(12, Qt.ItemDataRole.DisplayRole, path)
- itm.setTextAlignment(1, Qt.AlignLeft)
- itm.setTextAlignment(2, Qt.AlignHCenter)
- itm.setTextAlignment(3, Qt.AlignHCenter)
- itm.setTextAlignment(4, Qt.AlignHCenter)
- itm.setTextAlignment(5, Qt.AlignHCenter)
- itm.setTextAlignment(6, Qt.AlignHCenter)
- itm.setTextAlignment(7, Qt.AlignHCenter)
- itm.setTextAlignment(8, Qt.AlignHCenter)
- itm.setTextAlignment(9, Qt.AlignRight)
- itm.setTextAlignment(10, Qt.AlignRight)
- itm.setTextAlignment(11, Qt.AlignLeft)
- itm.setTextAlignment(12, Qt.AlignLeft)
+ itm.setTextAlignment(1, Qt.AlignmentFlag.AlignLeft)
+ itm.setTextAlignment(2, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(3, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(4, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(5, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(6, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(7, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(8, Qt.AlignmentFlag.AlignHCenter)
+ itm.setTextAlignment(9, Qt.AlignmentFlag.AlignRight)
+ itm.setTextAlignment(10, Qt.AlignmentFlag.AlignRight)
+ itm.setTextAlignment(11, Qt.AlignmentFlag.AlignLeft)
+ itm.setTextAlignment(12, Qt.AlignmentFlag.AlignLeft)
if status in "ADM" or propStatus in "M":
- itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
- itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked)
+ itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ itm.setCheckState(self.__toBeCommittedColumn,
+ Qt.CheckState.Checked)
else:
- itm.setFlags(itm.flags() & ~Qt.ItemIsUserCheckable)
+ itm.setFlags(itm.flags() & ~Qt.ItemFlag.ItemIsUserCheckable)
self.hidePropertyStatusColumn = (
self.hidePropertyStatusColumn and
@@ -326,7 +332,7 @@
"""
if (
self.process is not None and
- self.process.state() != QProcess.NotRunning
+ self.process.state() != QProcess.ProcessState.NotRunning
):
self.process.terminate()
QTimer.singleShot(2000, self.process.kill)
@@ -412,9 +418,12 @@
'Ensure, that it is in the search path.'
).format('svn'))
else:
- self.buttonBox.button(QDialogButtonBox.Close).setEnabled(False)
- self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(True)
- self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setEnabled(False)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
+ self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Cancel).setDefault(True)
self.inputGroup.setEnabled(True)
self.inputGroup.show()
@@ -427,17 +436,21 @@
"""
if (
self.process is not None and
- self.process.state() != QProcess.NotRunning
+ self.process.state() != QProcess.ProcessState.NotRunning
):
self.process.terminate()
QTimer.singleShot(2000, self.process.kill)
self.process.waitForFinished(3000)
- 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.Close).setFocus(
- Qt.OtherFocusReason)
+ 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.buttonBox.button(
+ QDialogButtonBox.StandardButton.Close).setFocus(
+ Qt.FocusReason.OtherFocusReason)
self.inputGroup.setEnabled(False)
self.inputGroup.hide()
@@ -477,9 +490,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()
elif button == self.refreshButton:
self.on_refreshButton_clicked()
@@ -501,7 +518,7 @@
the contents pane.
"""
if self.process is not None:
- self.process.setReadChannel(QProcess.StandardOutput)
+ self.process.setReadChannel(QProcess.ProcessChannel.StandardOutput)
while self.process.canReadLine():
s = str(self.process.readLine(),
@@ -556,9 +573,9 @@
@param isOn flag indicating the status of the check box (boolean)
"""
if isOn:
- self.input.setEchoMode(QLineEdit.Password)
+ self.input.setEchoMode(QLineEdit.EchoMode.Password)
else:
- self.input.setEchoMode(QLineEdit.Normal)
+ self.input.setEchoMode(QLineEdit.EchoMode.Normal)
@pyqtSlot()
def on_sendButton_clicked(self):
@@ -980,7 +997,10 @@
commitableItems = []
for index in range(self.statusList.topLevelItemCount()):
itm = self.statusList.topLevelItem(index)
- if itm.checkState(self.__toBeCommittedColumn) == Qt.Checked:
+ if (
+ itm.checkState(self.__toBeCommittedColumn) ==
+ Qt.CheckState.Checked
+ ):
commitableItems.append(itm)
return commitableItems
@@ -1071,8 +1091,10 @@
"""
for index in range(self.statusList.topLevelItemCount()):
itm = self.statusList.topLevelItem(index)
- if itm.flags() & Qt.ItemIsUserCheckable:
+ if itm.flags() & Qt.ItemFlag.ItemIsUserCheckable:
if selected:
- itm.setCheckState(self.__toBeCommittedColumn, Qt.Checked)
+ itm.setCheckState(self.__toBeCommittedColumn,
+ Qt.CheckState.Checked)
else:
- itm.setCheckState(self.__toBeCommittedColumn, Qt.Unchecked)
+ itm.setCheckState(self.__toBeCommittedColumn,
+ Qt.CheckState.Unchecked)
