diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/WebBrowser/UrlBar/UrlBar.py --- a/src/eric7/WebBrowser/UrlBar/UrlBar.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/WebBrowser/UrlBar/UrlBar.py Tue Oct 18 16:06:21 2022 +0200 @@ -17,18 +17,17 @@ except ImportError: QSslCertificate = None # __IGNORE_WARNING__ -from EricWidgets.EricLineEdit import EricClearableLineEdit, EricLineEditSide +from eric7.EricWidgets.EricLineEdit import EricClearableLineEdit, EricLineEditSide -from WebBrowser.WebBrowserWindow import WebBrowserWindow +from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow -from WebBrowser.SafeBrowsing.SafeBrowsingLabel import SafeBrowsingLabel +from eric7.WebBrowser.SafeBrowsing.SafeBrowsingLabel import SafeBrowsingLabel from .FavIconLabel import FavIconLabel from .SslLabel import SslLabel -import UI.PixmapCache -import Preferences -import Utilities +from eric7.EricGui import EricPixmapCache +from eric7 import Preferences, Utilities class UrlBar(EricClearableLineEdit): @@ -53,7 +52,7 @@ self.__browser = None self.__privateMode = WebBrowserWindow.isPrivate() - self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16") + self.__bmActiveIcon = EricPixmapCache.getIcon("bookmark16") self.__bmInactiveIcon = QIcon( self.__bmActiveIcon.pixmap(16, 16, QIcon.Mode.Disabled) ) @@ -70,7 +69,7 @@ self.__sslLabel.setVisible(False) self.__rssAction = self.addAction( - UI.PixmapCache.getIcon("rss16"), QLineEdit.ActionPosition.TrailingPosition + EricPixmapCache.getIcon("rss16"), QLineEdit.ActionPosition.TrailingPosition ) self.__rssAction.setVisible(False) @@ -144,7 +143,7 @@ if manager.bookmarkForUrl(self.__browser.url()) is not None: self.__bookmarkAction.setIcon(self.__bmActiveIcon) bookmarks = manager.bookmarksForUrl(self.__browser.url()) - from WebBrowser.Bookmarks.BookmarkNode import BookmarkNode + from eric7.WebBrowser.Bookmarks.BookmarkNode import BookmarkNode for bookmark in bookmarks: manager.setTimestamp( @@ -411,7 +410,7 @@ """ Private slot to handle clicking the RSS icon. """ - from WebBrowser.Feeds.FeedsDialog import FeedsDialog + from eric7.WebBrowser.Feeds.FeedsDialog import FeedsDialog feeds = self.__browser.getRSS() dlg = FeedsDialog(feeds, self.__browser) @@ -427,7 +426,7 @@ """ threatInfo = self.__safeBrowsingLabel.getThreatInfo() if threatInfo: - from WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import ( + from eric7.WebBrowser.SafeBrowsing.SafeBrowsingInfoWidget import ( SafeBrowsingInfoWidget, )