--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sat Mar 06 10:00:52 2021 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Mar 28 15:00:11 2021 +0200 @@ -33,7 +33,7 @@ @param parent parent widget (QWidget) """ super(SvnCommitDialog, self).__init__( - parent, Qt.WindowFlags(Qt.Window)) + parent, Qt.WindowFlags(Qt.WindowType.Window)) self.setupUi(self) if vcs.version < (1, 5, 0): @@ -53,7 +53,7 @@ self.recentComboBox.addItem("") self.recentComboBox.addItems(self.recentCommitMessages) - self.logEdit.setFocus(Qt.OtherFocusReason) + self.logEdit.setFocus(Qt.FocusReason.OtherFocusReason) def logMessage(self): """ @@ -103,7 +103,9 @@ @param button button that was clicked (QAbstractButton) """ - if button == self.buttonBox.button(QDialogButtonBox.Cancel): + if button == self.buttonBox.button( + QDialogButtonBox.StandardButton.Cancel + ): self.logEdit.clear() def on_buttonBox_accepted(self): @@ -120,12 +122,14 @@ self.close() self.rejected.emit() - @pyqtSlot(str) - def on_recentComboBox_activated(self, txt): + @pyqtSlot(int) + def on_recentComboBox_activated(self, index): """ Private slot to select a commit message from recent ones. - @param txt text of the combo (string) + @param index index of the selected entry + @type int """ + txt = self.recentComboBox.itemText(index) if txt: self.logEdit.setPlainText(txt)