--- a/eric7/WebBrowser/UrlBar/UrlBar.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/WebBrowser/UrlBar/UrlBar.py Sat May 22 18:51:46 2021 +0200 @@ -16,8 +16,8 @@ except ImportError: QSslCertificate = None # __IGNORE_WARNING__ -from E5Gui.E5LineEdit import E5LineEdit, E5LineEditSide -from E5Gui.E5LineEditButton import E5LineEditButton +from E5Gui.EricLineEdit import EricLineEdit, EricLineEditSide +from E5Gui.EricLineEditButton import EricLineEditButton from WebBrowser.WebBrowserWindow import WebBrowserWindow @@ -31,7 +31,7 @@ import Utilities -class UrlBar(E5LineEdit): +class UrlBar(EricLineEdit): """ Class implementing a line edit for entering URLs. """ @@ -42,7 +42,7 @@ @param mainWindow reference to the main window (WebBrowserWindow) @param parent reference to the parent widget (WebBrowserView) """ - E5LineEdit.__init__(self, parent) + EricLineEdit.__init__(self, parent) self.setPlaceholderText(self.tr("Enter the URL here.")) self.setWhatsThis(self.tr("Enter the URL here.")) @@ -55,28 +55,28 @@ self.__bmActiveIcon.pixmap(16, 16, QIcon.Mode.Disabled)) self.__safeBrowsingLabel = SafeBrowsingLabel(self) - self.addWidget(self.__safeBrowsingLabel, E5LineEditSide.LEFT) + self.addWidget(self.__safeBrowsingLabel, EricLineEditSide.LEFT) self.__safeBrowsingLabel.setVisible(False) self.__favicon = FavIconLabel(self) - self.addWidget(self.__favicon, E5LineEditSide.LEFT) + self.addWidget(self.__favicon, EricLineEditSide.LEFT) self.__sslLabel = SslLabel(self) - self.addWidget(self.__sslLabel, E5LineEditSide.LEFT) + self.addWidget(self.__sslLabel, EricLineEditSide.LEFT) self.__sslLabel.setVisible(False) - self.__rssButton = E5LineEditButton(self) + self.__rssButton = EricLineEditButton(self) self.__rssButton.setIcon(UI.PixmapCache.getIcon("rss16")) - self.addWidget(self.__rssButton, E5LineEditSide.RIGHT) + self.addWidget(self.__rssButton, EricLineEditSide.RIGHT) self.__rssButton.setVisible(False) - self.__bookmarkButton = E5LineEditButton(self) - self.addWidget(self.__bookmarkButton, E5LineEditSide.RIGHT) + self.__bookmarkButton = EricLineEditButton(self) + self.addWidget(self.__bookmarkButton, EricLineEditSide.RIGHT) self.__bookmarkButton.setVisible(False) - self.__clearButton = E5LineEditButton(self) + self.__clearButton = EricLineEditButton(self) self.__clearButton.setIcon(UI.PixmapCache.getIcon("clearLeft")) - self.addWidget(self.__clearButton, E5LineEditSide.RIGHT) + self.addWidget(self.__clearButton, EricLineEditSide.RIGHT) self.__clearButton.setVisible(False) self.__safeBrowsingLabel.clicked.connect(self.__showThreatInfo) @@ -289,7 +289,7 @@ self.setPalette(p) - E5LineEdit.paintEvent(self, evt) + EricLineEdit.paintEvent(self, evt) def focusOutEvent(self, evt): """ @@ -299,7 +299,7 @@ """ if self.text() == "" and self.__browser is not None: self.__browserUrlChanged(self.__browser.url()) - E5LineEdit.focusOutEvent(self, evt) + EricLineEdit.focusOutEvent(self, evt) def mousePressEvent(self, evt): """ @@ -325,7 +325,7 @@ if evt.button() == Qt.MouseButton.LeftButton: self.selectAll() else: - E5LineEdit.mouseDoubleClickEvent(self, evt) + EricLineEdit.mouseDoubleClickEvent(self, evt) def keyPressEvent(self, evt): """ @@ -369,7 +369,7 @@ url.setHost(host) self.setText(url.toString()) - E5LineEdit.keyPressEvent(self, evt) + EricLineEdit.keyPressEvent(self, evt) def dragEnterEvent(self, evt): """ @@ -381,7 +381,7 @@ if mimeData.hasUrls() or mimeData.hasText(): evt.acceptProposedAction() - E5LineEdit.dragEnterEvent(self, evt) + EricLineEdit.dragEnterEvent(self, evt) def dropEvent(self, evt): """ @@ -399,7 +399,7 @@ QUrl.ParsingMode.TolerantMode) if url.isEmpty() or not url.isValid(): - E5LineEdit.dropEvent(self, evt) + EricLineEdit.dropEvent(self, evt) return self.setText(str(url.toEncoded(), encoding="utf-8"))