diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py --- a/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -26,59 +26,59 @@ """ Class implementing a dialog for importing bookmarks from other sources. """ + SourcesListIdRole = Qt.ItemDataRole.UserRole - + def __init__(self, parent=None): """ Constructor - + @param parent reference to the parent widget (QWidget) """ super().__init__(parent) self.setupUi(self) - + self.filePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) - + self.sourcesList.setIconSize(QSize(48, 48)) for icon, displayText, idText in BookmarksImporters.getImporters(): itm = QListWidgetItem(icon, displayText, self.sourcesList) itm.setData(self.SourcesListIdRole, idText) - + self.__currentPage = 0 self.__selectedSource = "" self.__topLevelBookmarkNode = None self.__sourceFile = "" self.__sourceDir = "" - + self.pagesWidget.setCurrentIndex(self.__currentPage) self.__enableNextButton() - + def __enableNextButton(self): """ Private slot to set the enabled state of the next button. """ if self.__currentPage == 0: - self.nextButton.setEnabled( - len(self.sourcesList.selectedItems()) == 1) + self.nextButton.setEnabled(len(self.sourcesList.selectedItems()) == 1) elif self.__currentPage == 1: self.nextButton.setEnabled(self.filePicker.text() != "") - + @pyqtSlot() def on_sourcesList_itemSelectionChanged(self): """ Private slot to handle changes of the selection of the import source. """ self.__enableNextButton() - + @pyqtSlot(str) def on_filePicker_textChanged(self, txt): """ Private slot handling changes of the file to import bookmarks form. - + @param txt text of the line edit (string) """ self.__enableNextButton() - + @pyqtSlot() def on_nextButton_clicked(self): """ @@ -86,68 +86,72 @@ """ if self.sourcesList.currentItem() is None: return - + if self.__currentPage == 0: self.__selectedSource = self.sourcesList.currentItem().data( - self.SourcesListIdRole) - (pixmap, sourceName, self.__sourceFile, info, prompt, - self.__sourceDir) = BookmarksImporters.getImporterInfo( - self.__selectedSource) - + self.SourcesListIdRole + ) + ( + pixmap, + sourceName, + self.__sourceFile, + info, + prompt, + self.__sourceDir, + ) = BookmarksImporters.getImporterInfo(self.__selectedSource) + self.iconLabel.setPixmap(pixmap) self.importingFromLabel.setText( - self.tr("<b>Importing from {0}</b>").format(sourceName)) + self.tr("<b>Importing from {0}</b>").format(sourceName) + ) self.fileLabel1.setText(info) self.fileLabel2.setText(prompt) - self.standardDirLabel.setText( - "<i>{0}</i>".format(self.__sourceDir)) - + self.standardDirLabel.setText("<i>{0}</i>".format(self.__sourceDir)) + self.nextButton.setText(self.tr("Finish")) - + self.__currentPage += 1 self.pagesWidget.setCurrentIndex(self.__currentPage) self.__enableNextButton() - + if self.__selectedSource == "ie": self.filePicker.setMode(EricPathPickerModes.DIRECTORY_MODE) else: self.filePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) if Globals.isMacPlatform(): - fileFilter = "*{0}".format( - os.path.splitext(self.__sourceFile)[1]) + fileFilter = "*{0}".format(os.path.splitext(self.__sourceFile)[1]) else: fileFilter = self.__sourceFile self.filePicker.setFilters(fileFilter) self.filePicker.setDefaultDirectory(self.__sourceDir) - + elif self.__currentPage == 1: if self.filePicker.text() == "": return - + importer = BookmarksImporters.getImporter(self.__selectedSource) importer.setPath(self.filePicker.text()) if importer.open(): self.__topLevelBookmarkNode = importer.importedBookmarks() if importer.error(): EricMessageBox.critical( - self, - self.tr("Error importing bookmarks"), - importer.errorString()) + self, self.tr("Error importing bookmarks"), importer.errorString() + ) return - + self.accept() - + @pyqtSlot() def on_cancelButton_clicked(self): """ Private slot documentation goes here. """ self.reject() - + def getImportedBookmarks(self): """ Public method to get the imported bookmarks. - + @return top level bookmark (BookmarkNode) """ return self.__topLevelBookmarkNode