Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Sync/SyncCheckPage.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/WebBrowser/Sync/SyncCheckPage.py	Tue Oct 18 16:06:21 2022 +0200
@@ -14,8 +14,8 @@
 
 from .Ui_SyncCheckPage import Ui_SyncCheckPage
 
-import Preferences
-import UI.PixmapCache
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 
 
 class SyncCheckPage(QWizardPage, Ui_SyncCheckPage):
@@ -40,7 +40,7 @@
 
         forceUpload = self.field("ReencryptData")
 
-        from WebBrowser.WebBrowserWindow import WebBrowserWindow
+        from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
         syncMgr = WebBrowserWindow.syncManager()
         syncMgr.syncError.connect(self.__syncError)
@@ -66,42 +66,42 @@
         self.speedDialMsgLabel.setText("")
 
         if not syncMgr.syncEnabled():
-            self.bookmarkLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
-            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
-            self.passwordsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
-            self.userAgentsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
-            self.speedDialLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.bookmarkLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
+            self.historyLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
+            self.passwordsLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
+            self.userAgentsLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
+            self.speedDialLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
             return
 
         # bookmarks
         if Preferences.getWebBrowser("SyncBookmarks"):
             self.__makeAnimatedLabel("loadingAnimation", self.bookmarkLabel)
         else:
-            self.bookmarkLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.bookmarkLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
 
         # history
         if Preferences.getWebBrowser("SyncHistory"):
             self.__makeAnimatedLabel("loadingAnimation", self.historyLabel)
         else:
-            self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.historyLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
 
         # Passwords
         if Preferences.getWebBrowser("SyncPasswords"):
             self.__makeAnimatedLabel("loadingAnimation", self.passwordsLabel)
         else:
-            self.passwordsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.passwordsLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
 
         # user agent settings
         if Preferences.getWebBrowser("SyncUserAgents"):
             self.__makeAnimatedLabel("loadingAnimation", self.userAgentsLabel)
         else:
-            self.userAgentsLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.userAgentsLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
 
         # speed dial settings
         if Preferences.getWebBrowser("SyncSpeedDial"):
             self.__makeAnimatedLabel("loadingAnimation", self.speedDialLabel)
         else:
-            self.speedDialLabel.setPixmap(UI.PixmapCache.getPixmap("syncNo"))
+            self.speedDialLabel.setPixmap(EricPixmapCache.getPixmap("syncNo"))
 
         QTimer.singleShot(0, lambda: syncMgr.loadSettings(forceUpload=forceUpload))
 
@@ -148,31 +148,35 @@
         """
         if type_ == "bookmarks":
             if status:
-                self.bookmarkLabel.setPixmap(UI.PixmapCache.getPixmap("syncCompleted"))
+                self.bookmarkLabel.setPixmap(EricPixmapCache.getPixmap("syncCompleted"))
             else:
-                self.bookmarkLabel.setPixmap(UI.PixmapCache.getPixmap("syncFailed"))
+                self.bookmarkLabel.setPixmap(EricPixmapCache.getPixmap("syncFailed"))
         elif type_ == "history":
             if status:
-                self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncCompleted"))
+                self.historyLabel.setPixmap(EricPixmapCache.getPixmap("syncCompleted"))
             else:
-                self.historyLabel.setPixmap(UI.PixmapCache.getPixmap("syncFailed"))
+                self.historyLabel.setPixmap(EricPixmapCache.getPixmap("syncFailed"))
         elif type_ == "passwords":
             if status:
-                self.passwordsLabel.setPixmap(UI.PixmapCache.getPixmap("syncCompleted"))
+                self.passwordsLabel.setPixmap(
+                    EricPixmapCache.getPixmap("syncCompleted")
+                )
             else:
-                self.passwordsLabel.setPixmap(UI.PixmapCache.getPixmap("syncFailed"))
+                self.passwordsLabel.setPixmap(EricPixmapCache.getPixmap("syncFailed"))
         elif type_ == "useragents":
             if status:
                 self.userAgentsLabel.setPixmap(
-                    UI.PixmapCache.getPixmap("syncCompleted")
+                    EricPixmapCache.getPixmap("syncCompleted")
                 )
             else:
-                self.userAgentsLabel.setPixmap(UI.PixmapCache.getPixmap("syncFailed"))
+                self.userAgentsLabel.setPixmap(EricPixmapCache.getPixmap("syncFailed"))
         elif type_ == "speeddial":
             if status:
-                self.speedDialLabel.setPixmap(UI.PixmapCache.getPixmap("syncCompleted"))
+                self.speedDialLabel.setPixmap(
+                    EricPixmapCache.getPixmap("syncCompleted")
+                )
             else:
-                self.speedDialLabel.setPixmap(UI.PixmapCache.getPixmap("syncFailed"))
+                self.speedDialLabel.setPixmap(EricPixmapCache.getPixmap("syncFailed"))
 
     def __syncError(self, message):
         """