Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Navigation/NavigationBar.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/WebBrowser/Navigation/NavigationBar.py	Tue Oct 18 16:06:21 2022 +0200
@@ -19,13 +19,13 @@
     QMenu,
 )
 
-from EricWidgets.EricToolButton import EricToolButton
+from eric7.EricWidgets.EricToolButton import EricToolButton
 
-from WebBrowser.WebBrowserWindow import WebBrowserWindow
-from WebBrowser.Download.DownloadManagerButton import DownloadManagerButton
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+from eric7.WebBrowser.Download.DownloadManagerButton import DownloadManagerButton
 
-import UI.PixmapCache
-import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7 import Preferences
 
 from .ReloadStopButton import ReloadStopButton
 
@@ -67,7 +67,7 @@
         self.__backButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.__backButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.__backButton.setAutoRaise(True)
-        self.__backButton.setIcon(UI.PixmapCache.getIcon("back"))
+        self.__backButton.setIcon(EricPixmapCache.getIcon("back"))
         self.__backButton.setEnabled(False)
 
         self.__forwardButton = EricToolButton(self)
@@ -76,7 +76,7 @@
         self.__forwardButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.__forwardButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.__forwardButton.setAutoRaise(True)
-        self.__forwardButton.setIcon(UI.PixmapCache.getIcon("forward"))
+        self.__forwardButton.setIcon(EricPixmapCache.getIcon("forward"))
         self.__forwardButton.setEnabled(False)
 
         self.__backNextLayout = QHBoxLayout()
@@ -93,11 +93,11 @@
         self.__homeButton.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)
         self.__homeButton.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         self.__homeButton.setAutoRaise(True)
-        self.__homeButton.setIcon(UI.PixmapCache.getIcon("home"))
+        self.__homeButton.setIcon(EricPixmapCache.getIcon("home"))
 
         self.__exitFullScreenButton = EricToolButton(self)
         self.__exitFullScreenButton.setObjectName("navigation_exitfullscreen_button")
-        self.__exitFullScreenButton.setIcon(UI.PixmapCache.getIcon("windowRestore"))
+        self.__exitFullScreenButton.setIcon(EricPixmapCache.getIcon("windowRestore"))
         self.__exitFullScreenButton.setToolTip(self.tr("Exit Fullscreen"))
         self.__exitFullScreenButton.setToolButtonStyle(
             Qt.ToolButtonStyle.ToolButtonIconOnly
@@ -111,7 +111,7 @@
 
         self.__superMenuButton = EricToolButton(self)
         self.__superMenuButton.setObjectName("navigation_supermenu_button")
-        self.__superMenuButton.setIcon(UI.PixmapCache.getIcon("superMenu"))
+        self.__superMenuButton.setIcon(EricPixmapCache.getIcon("superMenu"))
         self.__superMenuButton.setToolTip(self.tr("Main Menu"))
         self.__superMenuButton.setPopupMode(
             QToolButton.ToolButtonPopupMode.InstantPopup
@@ -125,7 +125,7 @@
         urlBar = self.__mw.tabWidget().stackedUrlBar()
         self.__navigationSplitter.addWidget(urlBar)
 
-        from WebBrowser.WebBrowserWebSearchWidget import WebBrowserWebSearchWidget
+        from eric7.WebBrowser.WebBrowserWebSearchWidget import WebBrowserWebSearchWidget
 
         self.__searchEdit = WebBrowserWebSearchWidget(self.__mw, self)
         sizePolicy = QSizePolicy(