Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/WebBrowserTabWidget.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserTabWidget.py	Sun Dec 18 19:33:46 2022 +0100
@@ -19,12 +19,13 @@
 )
 from PyQt6.QtWidgets import QDialog, QHBoxLayout, QMenu, QToolButton, QWidget
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricTabWidget import EricTabWidget
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
 from . import WebInspector
@@ -43,10 +44,10 @@
     @return flag indicating the availability of CUPS
     @rtype bool
     """
-    if Globals.isMacPlatform():
+    if OSUtilities.isMacPlatform():
         # OS X/MacOS always have CUPS
         return True
-    elif Globals.isLinuxPlatform():
+    elif OSUtilities.isLinuxPlatform():
         testPrinter = QPrinter()
         return testPrinter.supportsMultipleCopies()
     else:
@@ -679,7 +680,7 @@
             QAbstractPrintDialog.PrintDialogOption.PrintToFile
             | QAbstractPrintDialog.PrintDialogOption.PrintShowPageSize
         )
-        if not Globals.isWindowsPlatform():
+        if not OSUtilities.isWindowsPlatform():
             if isCupsAvailable():
                 printDialog.setOption(
                     QAbstractPrintDialog.PrintDialogOption.PrintCollateCopies
@@ -729,7 +730,7 @@
                         lambda pdf: self.__pdfGeneratedForSave(filePath, pdf),
                         pageLayout,
                     )
-        elif Globals.isLinuxPlatform():
+        elif OSUtilities.isLinuxPlatform():
             printer = QPrinter(mode=QPrinter.PrinterMode.HighResolution)
             if Preferences.getPrinter("ColorMode"):
                 printer.setColorMode(QPrinter.ColorMode.Color)
@@ -1057,7 +1058,7 @@
         @return guessed URL (QUrl)
         """
         manager = self.__mainWindow.openSearchManager()
-        path = Utilities.fromNativeSeparators(path)
+        path = FileSystemUtilities.fromNativeSeparators(path)
         url = manager.convertKeywordSearchToUrl(path)
         if url.isValid():
             return url