diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -20,116 +20,117 @@
class SvnCommitDialog(QWidget, Ui_SvnCommitDialog):
"""
Class implementing a dialog to enter the commit message.
-
+
@signal accepted() emitted, if the dialog was accepted
@signal rejected() emitted, if the dialog was rejected
"""
+
accepted = pyqtSignal()
rejected = pyqtSignal()
-
+
def __init__(self, vcs, parent=None):
"""
Constructor
-
+
@param vcs reference to the vcs object
@param parent parent widget (QWidget)
"""
super().__init__(parent, Qt.WindowType.Window)
self.setupUi(self)
-
+
self.__vcs = vcs
-
+
project = ericApp().getObject("Project")
pwl, pel = project.getProjectDictionaries()
language = project.getProjectSpellLanguage()
self.logEdit.setLanguageWithPWL(language, pwl or None, pel or None)
-
+
if pysvn.svn_version < (1, 5, 0) or pysvn.version < (1, 6, 0):
self.changeListsGroup.hide()
else:
self.changeLists.addItems(sorted(vcs.svnGetChangelists()))
-
+
def showEvent(self, evt):
"""
Protected method called when the dialog is about to be shown.
-
+
@param evt the event (QShowEvent)
"""
commitMessages = self.__vcs.vcsCommitMessages()
self.recentComboBox.clear()
self.recentComboBox.addItem("")
self.recentComboBox.addItems(commitMessages)
-
+
self.logEdit.setFocus(Qt.FocusReason.OtherFocusReason)
-
+
def logMessage(self):
"""
Public method to retrieve the log message.
-
+
This method has the side effect of saving the 20 most recent
commit messages for reuse.
-
+
@return the log message (string)
"""
msg = self.logEdit.toPlainText()
if msg:
self.__vcs.vcsAddCommitMessage(msg)
return msg
-
+
def hasChangelists(self):
"""
Public method to check, if the user entered some changelists.
-
+
@return flag indicating availability of changelists (boolean)
"""
return len(self.changeLists.selectedItems()) > 0
-
+
def changelistsData(self):
"""
Public method to retrieve the changelists data.
-
+
@return tuple containing the changelists (list of strings) and a flag
indicating to keep changelists (boolean)
"""
- slists = [line.text().strip()
- for line in self.changeLists.selectedItems()
- if line.text().strip() != ""]
-
+ slists = [
+ line.text().strip()
+ for line in self.changeLists.selectedItems()
+ if line.text().strip() != ""
+ ]
+
if len(slists) == 0:
return [], False
-
+
return slists, self.keepChangeListsCheckBox.isChecked()
-
+
def on_buttonBox_clicked(self, button):
"""
Private slot called by a button of the button box clicked.
-
+
@param button button that was clicked (QAbstractButton)
"""
- if button == self.buttonBox.button(
- QDialogButtonBox.StandardButton.Cancel
- ):
+ if button == self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel):
self.logEdit.clear()
-
+
def on_buttonBox_accepted(self):
"""
Private slot called by the buttonBox accepted signal.
"""
self.close()
self.accepted.emit()
-
+
def on_buttonBox_rejected(self):
"""
Private slot called by the buttonBox rejected signal.
"""
self.close()
self.rejected.emit()
-
+
@pyqtSlot(int)
def on_recentComboBox_activated(self, index):
"""
Private slot to select a commit message from recent ones.
-
+
@param index index of the selected entry
@type int
"""
