src/eric7/WebBrowser/WebBrowserView.py

branch
eric7
changeset 9624
b47dfa7a137d
parent 9576
be9f8e7e42e0
child 9643
10839ab864e0
--- a/src/eric7/WebBrowser/WebBrowserView.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserView.py	Sun Dec 18 19:33:46 2022 +0100
@@ -40,11 +40,11 @@
 from PyQt6.QtWebEngineWidgets import QWebEngineView
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QStyle
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import qVersionTuple
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, QtUtilities
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 from eric7.WebBrowser.ZoomManager import ZoomManager
 
@@ -268,9 +268,10 @@
             if not os.path.exists(name.toString()):
                 name.setScheme(Preferences.getWebBrowser("DefaultScheme"))
             else:
-                if Utilities.isWindowsPlatform():
+                if OSUtilities.isWindowsPlatform():
                     name.setUrl(
-                        "file:///" + Utilities.fromNativeSeparators(name.toString())
+                        "file:///"
+                        + FileSystemUtilities.fromNativeSeparators(name.toString())
                     )
                 else:
                     name.setUrl("file://" + name.toString())
@@ -1967,7 +1968,7 @@
             defaultFileName = os.path.join(documentLocation, self.url().fileName())
         else:
             defaultFileName = os.path.join(documentLocation, self.page().title())
-            if Utilities.isWindowsPlatform():
+            if OSUtilities.isWindowsPlatform():
                 defaultFileName += ".mht"
             else:
                 defaultFileName += ".mhtml"
@@ -1994,7 +1995,7 @@
             extension = os.path.splitext(fileName)[1]
             if not extension:
                 # add the platform specific default extension
-                if Utilities.isWindowsPlatform():
+                if OSUtilities.isWindowsPlatform():
                     extensionsIndex = 1
                 else:
                     extensionsIndex = 0
@@ -2375,7 +2376,7 @@
     ## Methods below implement slots for Qt 6.4+
     ###########################################################################
 
-    if qVersionTuple() >= (6, 4, 0):
+    if QtUtilities.qVersionTuple() >= (6, 4, 0):
 
         @pyqtSlot("QWebEngineFileSystemAccessRequest")
         def __fileSystemAccessRequested(self, accessRequest):

eric ide

mercurial