diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py --- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -26,78 +26,70 @@ Class implementing the Options Dialog for a new project from the repository. """ + def __init__(self, vcs, parent=None): """ Constructor - + @param vcs reference to the version control object @param parent parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) - + self.vcsProjectDirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) - + self.__vcs = vcs - - vcsUrlHistory = self.__vcs.getPlugin().getPreferences( - "RepositoryUrlHistory") + + vcsUrlHistory = self.__vcs.getPlugin().getPreferences("RepositoryUrlHistory") self.vcsUrlPicker.setMode(EricPathPickerModes.DIRECTORY_MODE) self.vcsUrlPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop) self.vcsUrlPicker.setSizeAdjustPolicy( - QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon) + QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon + ) self.vcsUrlPicker.setPathsList(vcsUrlHistory) - self.vcsUrlClearHistoryButton.setIcon( - UI.PixmapCache.getIcon("editDelete")) + self.vcsUrlClearHistoryButton.setIcon(UI.PixmapCache.getIcon("editDelete")) self.vcsUrlPicker.setText("") - - ipath = ( - Preferences.getMultiProject("Workspace") or - Utilities.getHomeDir() - ) + + ipath = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir() self.__initPaths = [ Utilities.fromNativeSeparators(ipath), Utilities.fromNativeSeparators(ipath) + "/", ] self.vcsProjectDirPicker.setText(self.__initPaths[0]) - - self.lfNoteLabel.setVisible( - self.__vcs.isExtensionActive("largefiles")) - self.largeCheckBox.setVisible( - self.__vcs.isExtensionActive("largefiles")) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(False) - + + self.lfNoteLabel.setVisible(self.__vcs.isExtensionActive("largefiles")) + self.largeCheckBox.setVisible(self.__vcs.isExtensionActive("largefiles")) + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + @pyqtSlot(str) def on_vcsProjectDirPicker_textChanged(self, txt): """ Private slot to handle a change of the project directory. - + @param txt name of the project directory (string) """ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled( - bool(txt) and - Utilities.fromNativeSeparators(txt) not in self.__initPaths) - + bool(txt) and Utilities.fromNativeSeparators(txt) not in self.__initPaths + ) + @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) """ url = QUrl.fromUserInput(txt) enable = url.isValid() and url.scheme() in ConfigHgSchemes - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enable) - - self.vcsUrlPicker.setPickerEnabled(url.scheme() == "file" or - len(txt) == 0) - + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enable) + + self.vcsUrlPicker.setPickerEnabled(url.scheme() == "file" or len(txt) == 0) + @pyqtSlot() def on_vcsUrlClearHistoryButton_clicked(self): """ @@ -106,19 +98,19 @@ currentVcsUrl = self.vcsUrlPicker.text() self.vcsUrlPicker.clear() self.vcsUrlPicker.setText(currentVcsUrl) - + self.__saveHistory() - + def getData(self): """ Public slot to retrieve the data entered into the dialog and to save the history of entered repository URLs. - + @return a tuple of a string (project directory) and a dictionary containing the data entered. """ self.__saveHistory() - + url = QUrl.fromUserInput(self.vcsUrlPicker.text().replace("\\", "/")) vcsdatadict = { "url": url.toString(QUrl.UrlFormattingOption.None_), @@ -126,7 +118,7 @@ "largefiles": self.largeCheckBox.isChecked(), } return (self.vcsProjectDirPicker.text(), vcsdatadict) - + def __saveHistory(self): """ Private method to save the repository URL history. @@ -135,11 +127,10 @@ vcsUrlHistory = self.vcsUrlPicker.getPathItems() if url not in vcsUrlHistory: vcsUrlHistory.insert(0, url) - + # max. list sizes is hard coded to 20 entries newVcsUrlHistory = [url for url in vcsUrlHistory if url] if len(newVcsUrlHistory) > 20: newVcsUrlHistory = newVcsUrlHistory[:20] - - self.__vcs.getPlugin().setPreferences( - "RepositoryUrlHistory", newVcsUrlHistory) + + self.__vcs.getPlugin().setPreferences("RepositoryUrlHistory", newVcsUrlHistory)