Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserWindow.py	Sun Sep 01 19:58:00 2019 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Mon Sep 02 18:50:38 2019 +0200
@@ -830,60 +830,49 @@
             bookmarksManager.exportBookmarks)
         self.__actions.append(self.exportBookmarksAct)
         
-        if qVersionTuple() >= (5, 8, 0) or (
-           not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)):
-            self.printAct = E5Action(
-                self.tr('Print'),
-                UI.PixmapCache.getIcon("print.png"),
-                self.tr('&Print'),
-                QKeySequence(self.tr("Ctrl+P", "File|Print")),
-                0, self, 'webbrowser_file_print')
-            self.printAct.setStatusTip(self.tr('Print the displayed help'))
-            self.printAct.setWhatsThis(self.tr(
-                """<b>Print</b>"""
-                """<p>Print the displayed help text.</p>"""
-            ))
-            self.printAct.triggered.connect(self.__tabWidget.printBrowser)
-            self.__actions.append(self.printAct)
-        else:
-            self.printAct = None
-        
-        if Globals.isLinuxPlatform() or qVersionTuple() >= (5, 7, 0):
-            self.printPdfAct = E5Action(
-                self.tr('Print as PDF'),
-                UI.PixmapCache.getIcon("printPdf.png"),
-                self.tr('Print as PDF'),
-                0, 0, self, 'webbrowser_file_print_pdf')
-            self.printPdfAct.setStatusTip(self.tr(
-                'Print the displayed help as PDF'))
-            self.printPdfAct.setWhatsThis(self.tr(
-                """<b>Print as PDF</b>"""
-                """<p>Print the displayed help text as a PDF file.</p>"""
-            ))
-            self.printPdfAct.triggered.connect(
-                self.__tabWidget.printBrowserPdf)
-            self.__actions.append(self.printPdfAct)
-        else:
-            self.printPdfAct = None
-        
-        if qVersionTuple() >= (5, 8, 0) or (
-           not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)):
-            self.printPreviewAct = E5Action(
-                self.tr('Print Preview'),
-                UI.PixmapCache.getIcon("printPreview.png"),
-                self.tr('Print Preview'),
-                0, 0, self, 'webbrowser_file_print_preview')
-            self.printPreviewAct.setStatusTip(self.tr(
-                'Print preview of the displayed help'))
-            self.printPreviewAct.setWhatsThis(self.tr(
-                """<b>Print Preview</b>"""
-                """<p>Print preview of the displayed help text.</p>"""
-            ))
-            self.printPreviewAct.triggered.connect(
-                self.__tabWidget.printPreviewBrowser)
-            self.__actions.append(self.printPreviewAct)
-        else:
-            self.printPreviewAct = None
+        self.printAct = E5Action(
+            self.tr('Print'),
+            UI.PixmapCache.getIcon("print.png"),
+            self.tr('&Print'),
+            QKeySequence(self.tr("Ctrl+P", "File|Print")),
+            0, self, 'webbrowser_file_print')
+        self.printAct.setStatusTip(self.tr('Print the displayed help'))
+        self.printAct.setWhatsThis(self.tr(
+            """<b>Print</b>"""
+            """<p>Print the displayed help text.</p>"""
+        ))
+        self.printAct.triggered.connect(self.__tabWidget.printBrowser)
+        self.__actions.append(self.printAct)
+        
+        self.printPdfAct = E5Action(
+            self.tr('Print as PDF'),
+            UI.PixmapCache.getIcon("printPdf.png"),
+            self.tr('Print as PDF'),
+            0, 0, self, 'webbrowser_file_print_pdf')
+        self.printPdfAct.setStatusTip(self.tr(
+            'Print the displayed help as PDF'))
+        self.printPdfAct.setWhatsThis(self.tr(
+            """<b>Print as PDF</b>"""
+            """<p>Print the displayed help text as a PDF file.</p>"""
+        ))
+        self.printPdfAct.triggered.connect(
+            self.__tabWidget.printBrowserPdf)
+        self.__actions.append(self.printPdfAct)
+        
+        self.printPreviewAct = E5Action(
+            self.tr('Print Preview'),
+            UI.PixmapCache.getIcon("printPreview.png"),
+            self.tr('Print Preview'),
+            0, 0, self, 'webbrowser_file_print_preview')
+        self.printPreviewAct.setStatusTip(self.tr(
+            'Print preview of the displayed help'))
+        self.printPreviewAct.setWhatsThis(self.tr(
+            """<b>Print Preview</b>"""
+            """<p>Print preview of the displayed help text.</p>"""
+        ))
+        self.printPreviewAct.triggered.connect(
+            self.__tabWidget.printPreviewBrowser)
+        self.__actions.append(self.printPreviewAct)
         
         self.sendPageLinkAct = E5Action(
             self.tr('Send Page Link'),