diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Preferences/ConfigurationPages/CooperationPage.py --- a/src/eric7/Preferences/ConfigurationPages/CooperationPage.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/CooperationPage.py Wed Jul 13 14:55:47 2022 +0200 @@ -20,6 +20,7 @@ """ Class implementing the Cooperation configuration page. """ + def __init__(self): """ Constructor @@ -27,74 +28,68 @@ super().__init__() self.setupUi(self) self.setObjectName("CooperationPage") - + self.__bannedUserValidator = QRegularExpressionValidator( QRegularExpression( r"[a-zA-Z0-9.-]+@" r"(?:(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})\.){3}" - r"(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})"), - self.bannedUserEdit) + r"(?:2(?:[0-4][0-9]|5[0-5])|[01]?[0-9]{1,2})" + ), + self.bannedUserEdit, + ) self.bannedUserEdit.setValidator(self.__bannedUserValidator) - + # set initial values - self.autostartCheckBox.setChecked( - Preferences.getCooperation("AutoStartServer")) - self.otherPortsCheckBox.setChecked( - Preferences.getCooperation("TryOtherPorts")) - self.serverPortSpin.setValue( - Preferences.getCooperation("ServerPort")) - self.portToTrySpin.setValue( - Preferences.getCooperation("MaxPortsToTry")) + self.autostartCheckBox.setChecked(Preferences.getCooperation("AutoStartServer")) + self.otherPortsCheckBox.setChecked(Preferences.getCooperation("TryOtherPorts")) + self.serverPortSpin.setValue(Preferences.getCooperation("ServerPort")) + self.portToTrySpin.setValue(Preferences.getCooperation("MaxPortsToTry")) self.autoAcceptCheckBox.setChecked( - Preferences.getCooperation("AutoAcceptConnections")) - - self.bannedUsersList.addItems(sorted( - Preferences.getCooperation("BannedUsers"))) - + Preferences.getCooperation("AutoAcceptConnections") + ) + + self.bannedUsersList.addItems(sorted(Preferences.getCooperation("BannedUsers"))) + def save(self): """ Public slot to save the Cooperation configuration. """ Preferences.setCooperation( - "AutoStartServer", - self.autostartCheckBox.isChecked()) - Preferences.setCooperation( - "TryOtherPorts", - self.otherPortsCheckBox.isChecked()) + "AutoStartServer", self.autostartCheckBox.isChecked() + ) + Preferences.setCooperation("TryOtherPorts", self.otherPortsCheckBox.isChecked()) Preferences.setCooperation( - "AutoAcceptConnections", - self.autoAcceptCheckBox.isChecked()) - Preferences.setCooperation( - "ServerPort", - self.serverPortSpin.value()) - Preferences.setCooperation( - "MaxPortsToTry", - self.portToTrySpin.value()) - + "AutoAcceptConnections", self.autoAcceptCheckBox.isChecked() + ) + Preferences.setCooperation("ServerPort", self.serverPortSpin.value()) + Preferences.setCooperation("MaxPortsToTry", self.portToTrySpin.value()) + bannedUsers = [] for row in range(self.bannedUsersList.count()): bannedUsers.append(self.bannedUsersList.item(row).text()) Preferences.setCooperation("BannedUsers", bannedUsers) - + @pyqtSlot() def on_bannedUsersList_itemSelectionChanged(self): """ Private slot to react on changes of selected banned users. """ self.deleteBannedUsersButton.setEnabled( - len(self.bannedUsersList.selectedItems()) > 0) - + len(self.bannedUsersList.selectedItems()) > 0 + ) + @pyqtSlot(str) def on_bannedUserEdit_textChanged(self, txt): """ Private slot to handle the user entering a banned user. - + @param txt text entered by the user (string) """ self.addBannedUserButton.setEnabled( - self.__bannedUserValidator.validate(txt, len(txt))[0] == - QValidator.State.Acceptable) - + self.__bannedUserValidator.validate(txt, len(txt))[0] + == QValidator.State.Acceptable + ) + @pyqtSlot() def on_deleteBannedUsersButton_clicked(self): """ @@ -105,7 +100,7 @@ row = self.bannedUsersList.row(itm) itm = self.bannedUsersList.takeItem(row) del itm - + @pyqtSlot() def on_addBannedUserButton_clicked(self): """ @@ -113,12 +108,12 @@ """ self.bannedUsersList.addItem(self.bannedUserEdit.text()) self.bannedUserEdit.clear() - + def create(dlg): """ Module function to create the configuration page. - + @param dlg reference to the configuration dialog @return reference to the instantiated page (ConfigurationPageBase) """