Mercurial Repositories > eric / changeset

--- a/WebBrowser/WebBrowserTabWidget.py	Mon Feb 20 19:32:48 2017 +0100
+++ b/WebBrowser/WebBrowserTabWidget.py	Tue Feb 21 19:29:29 2017 +0100
@@ -184,16 +184,22 @@
         self.__tabContextMenu.addAction(
             self.tr('Close All'), self.closeAllBrowsers)
         self.__tabContextMenu.addSeparator()
-        if qVersion() >= "5.8.0" or (
-                not Globals.isWindowsPlatform() and qVersion() < "5.7.0"):
+        # TODO: re-check this once printing on Windows is reliable
+##        if qVersion() >= "5.8.0" or (
+##                not Globals.isWindowsPlatform() and qVersion() < "5.7.0"):
+        if not Globals.isWindowsPlatform() and (
+                qVersion() < "5.7.0" or qVersion() >= "5.8.0"):
             self.__tabContextMenu.addAction(
                 UI.PixmapCache.getIcon("printPreview.png"),
                 self.tr('Print Preview'), self.__tabContextMenuPrintPreview)
-        if qVersion() >= "5.8.0" or (
-                not Globals.isWindowsPlatform() or qVersion() >= "5.7.0"):
+        # TODO: re-check this once printing on Windows is reliable
+##        if qVersion() >= "5.8.0" or (
+##                not Globals.isWindowsPlatform() or qVersion() >= "5.7.0"):
+        if not Globals.isWindowsPlatform() and qVersion() >= "5.7.0":
             self.__tabContextMenu.addAction(
                 UI.PixmapCache.getIcon("print.png"),
                 self.tr('Print'), self.__tabContextMenuPrint)
+        # TODO: check this on macOS
         if Globals.isLinuxPlatform() or qVersion() >= "5.7.0":
             self.__tabContextMenu.addAction(
                 UI.PixmapCache.getIcon("printPdf.png"),

--- a/WebBrowser/WebBrowserWindow.py	Mon Feb 20 19:32:48 2017 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Tue Feb 21 19:29:29 2017 +0100
@@ -714,8 +714,10 @@
                 bookmarksManager.exportBookmarks)
         self.__actions.append(self.exportBookmarksAct)
         
-        if qVersion() >= "5.8.0" or (
-                not Globals.isWindowsPlatform() or qVersion() >= "5.7.0"):
+        # TODO: re-check this once printing on Windows is reliable
+##        if qVersion() >= "5.8.0" or (
+##                not Globals.isWindowsPlatform() or qVersion() >= "5.7.0"):
+        if not Globals.isWindowsPlatform() and qVersion() >= "5.7.0":
             self.printAct = E5Action(
                 self.tr('Print'),
                 UI.PixmapCache.getIcon("print.png"),
@@ -733,6 +735,7 @@
         else:
             self.printAct = None
         
+        # TODO: check this on macOS
         if Globals.isLinuxPlatform() or qVersion() >= "5.7.0":
             self.printPdfAct = E5Action(
                 self.tr('Print as PDF'),
@@ -752,8 +755,11 @@
         else:
             self.printPdfAct = None
         
-        if qVersion() >= "5.8.0" or (
-                not Globals.isWindowsPlatform() and qVersion() < "5.7.0"):
+        # TODO: re-check this once printing on Windows is reliable
+##        if qVersion() >= "5.8.0" or (
+##                not Globals.isWindowsPlatform() and qVersion() < "5.7.0"):
+        if not Globals.isWindowsPlatform() and (
+                qVersion() < "5.7.0" or qVersion() >= "5.8.0"):
             self.printPreviewAct = E5Action(
                 self.tr('Print Preview'),
                 UI.PixmapCache.getIcon("printPreview.png"),