--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -26,59 +26,61 @@ Class implementing a dialog to enter options used to start a project in the repository. """ + def __init__(self, vcs, project, parent=None): """ Constructor - + @param vcs reference to the version control object @param project reference to the project object @param parent parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) - + self.vcsUrlPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) - + self.project = project - + self.protocolCombo.addItems(ConfigSvnProtocols) - + hd = Utilities.toNativeSeparators(QDir.homePath()) - hd = os.path.join(hd, 'subversionroot') + hd = os.path.join(hd, "subversionroot") self.vcsUrlPicker.setText(hd) - + self.vcs = vcs - + self.localPath = hd self.networkPath = "localhost/" self.localProtocol = True - + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + @pyqtSlot() def on_vcsUrlPicker_pickerButtonClicked(self): """ Private slot to display a repository browser dialog. """ from .SvnRepoBrowserDialog import SvnRepoBrowserDialog + dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) - dlg.start( - self.protocolCombo.currentText() + self.vcsUrlPicker.text()) + dlg.start(self.protocolCombo.currentText() + self.vcsUrlPicker.text()) if dlg.exec() == QDialog.DialogCode.Accepted: url = dlg.getSelectedUrl() if url: protocol = url.split("://")[0] path = url.split("://")[1] self.protocolCombo.setCurrentIndex( - self.protocolCombo.findText(protocol + "://")) + self.protocolCombo.findText(protocol + "://") + ) self.vcsUrlPicker.setText(path) - + @pyqtSlot(int) def on_protocolCombo_activated(self, index): """ Private slot to switch the status of the directory selection button. - + @param index index of the selected entry @type int """ @@ -94,28 +96,27 @@ self.vcsUrlPicker.setText(self.networkPath) self.vcsUrlLabel.setText(self.tr("&URL:")) self.localProtocol = False - + @pyqtSlot(str) def on_vcsUrlPicker_textChanged(self, txt): """ Private slot to handle changes of the URL. - + @param txt current text of the line edit (string) """ enable = "://" not in txt - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enable) - + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enable) + def getData(self): """ Public slot to retrieve the data entered into the dialog. - + @return a dictionary containing the data entered """ scheme = self.protocolCombo.currentText() url = self.vcsUrlPicker.text() vcsdatadict = { - "url": '{0}{1}'.format(scheme, url), + "url": "{0}{1}".format(scheme, url), "message": self.vcsLogEdit.text(), "standardLayout": self.layoutCheckBox.isChecked(), }