--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesUpdateOptionsDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -9,21 +9,19 @@ from PyQt6.QtWidgets import QDialog -from .Ui_GitSubmodulesUpdateOptionsDialog import ( - Ui_GitSubmodulesUpdateOptionsDialog -) +from .Ui_GitSubmodulesUpdateOptionsDialog import Ui_GitSubmodulesUpdateOptionsDialog -class GitSubmodulesUpdateOptionsDialog(QDialog, - Ui_GitSubmodulesUpdateOptionsDialog): +class GitSubmodulesUpdateOptionsDialog(QDialog, Ui_GitSubmodulesUpdateOptionsDialog): """ Class implementing a dialog to enter options for a submodule update command. """ + def __init__(self, submodulePaths, parent=None): """ Constructor - + @param submodulePaths list of submodule paths @type list of str @param parent reference to the parent widget @@ -31,13 +29,13 @@ """ super().__init__(parent) self.setupUi(self) - + self.submodulesList.addItems(sorted(submodulePaths)) - + def getData(self): """ Public method to get the entered data. - + @return tuple containing the update procedure, a flag indicating an init, a flag indicating an update with remote, a flag indicating not to fetch the remote, a flag indicating an enforced operation @@ -47,17 +45,16 @@ submodulePaths = [] for itm in self.submodulesList.selectedItems(): submodulePaths.append(itm.text()) - + if self.checkoutButton.isChecked(): procedure = "--checkout" elif self.rebaseButton.isChecked(): procedure = "--rebase" else: procedure = "--merge" - - nofetch = (self.remoteCheckBox.isChecked() and - self.nofetchCheckBox.isChecked()) - + + nofetch = self.remoteCheckBox.isChecked() and self.nofetchCheckBox.isChecked() + return ( procedure, self.initCheckBox.isChecked(),