Mercurial Repositories > eric / file diff

diff -r 6baca884c73a -r 6b8128e0c9d1 eric6/UI/UserInterface.py
--- a/eric6/UI/UserInterface.py	Tue Apr 27 17:42:00 2021 +0200
+++ b/eric6/UI/UserInterface.py	Wed Apr 28 19:42:28 2021 +0200
@@ -60,7 +60,7 @@
     E5NetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
-    from E5Network.E5SslErrorHandler import E5SslErrorHandler
+    from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
@@ -1028,19 +1028,19 @@
         
         @param debugServer reference to the debug server object
         """
-        from E5Gui.E5SideBar import E5SideBar
+        from E5Gui.E5SideBar import E5SideBar, E5SideBarSide
         
         logging.debug("Creating Sidebars Layout...")
         
         delay = Preferences.getUI("SidebarDelay")
         # Create the left sidebar
-        self.leftSidebar = E5SideBar(E5SideBar.West, delay)
+        self.leftSidebar = E5SideBar(E5SideBarSide.WEST, delay)
         
         # Create the bottom sidebar
-        self.bottomSidebar = E5SideBar(E5SideBar.South, delay)
+        self.bottomSidebar = E5SideBar(E5SideBarSide.SOUTH, delay)
         
         # Create the right sidebar
-        self.rightSidebar = E5SideBar(E5SideBar.East, delay)
+        self.rightSidebar = E5SideBar(E5SideBarSide.EAST, delay)
         
         ####################################################
         ## Populate the left side bar
@@ -7287,7 +7287,7 @@
         @param errors list of SSL errors (list of QSslError)
         """
         ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
-        if ignored == E5SslErrorHandler.NotIgnored:
+        if ignored == E5SslErrorState.NOT_IGNORED:
             self.__downloadCancelled = True
     
     #######################################