Mercurial Repositories > eric / changeset
changeset
Activated printing on Windows for the web browser NG.
Sat, 25 Nov 2017 13:49:54 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 25 Nov 2017 13:49:54 +0100
- changeset 5993
- 4b2b9be7de14
- parent 5992
- d184ca2d3a95
- child 5994
- cf0b37d2a28d
- child 5995
- c49a16f3384c
Activated printing on Windows for the web browser NG.
| WebBrowser/WebBrowserTabWidget.py | file | annotate | diff | comparison | revisions | |
| WebBrowser/WebBrowserWindow.py | file | annotate | diff | comparison | revisions |
--- a/WebBrowser/WebBrowserTabWidget.py Thu Nov 23 17:50:51 2017 +0100 +++ b/WebBrowser/WebBrowserTabWidget.py Sat Nov 25 13:49:54 2017 +0100 @@ -185,18 +185,13 @@ self.__tabContextMenu.addAction( self.tr('Close All'), self.closeAllBrowsers) self.__tabContextMenu.addSeparator() - # TODO: re-check this once printing on Windows is reliable -## if qVersionTuple() >= (5, 8, 0) or ( -## not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)): - if not Globals.isWindowsPlatform() and ( - qVersionTuple() < (5, 7, 0) or qVersionTuple() >= (5, 8, 0)): + if qVersionTuple() >= (5, 8, 0) or ( + not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)): self.__tabContextMenu.addAction( UI.PixmapCache.getIcon("printPreview.png"), self.tr('Print Preview'), self.__tabContextMenuPrintPreview) - # TODO: re-check this once printing on Windows is reliable -## if qVersionTuple() >= (5, 8, 0) or ( -## not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)): - if not Globals.isWindowsPlatform() and qVersionTuple() >= (5, 7, 0): + if qVersionTuple() >= (5, 8, 0) or ( + not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)): self.__tabContextMenu.addAction( UI.PixmapCache.getIcon("print.png"), self.tr('Print'), self.__tabContextMenuPrint)
--- a/WebBrowser/WebBrowserWindow.py Thu Nov 23 17:50:51 2017 +0100 +++ b/WebBrowser/WebBrowserWindow.py Sat Nov 25 13:49:54 2017 +0100 @@ -816,10 +816,8 @@ bookmarksManager.exportBookmarks) self.__actions.append(self.exportBookmarksAct) - # TODO: re-check this once printing on Windows is reliable -## if qVersionTuple() >= (5, 8, 0) or ( -## not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)): - if not Globals.isWindowsPlatform() and qVersionTuple() >= (5, 7, 0): + 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"), @@ -856,11 +854,8 @@ else: self.printPdfAct = None - # TODO: re-check this once printing on Windows is reliable -## if qVersionTuple() >= (5, 8, 0) or ( -## not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)): - if not Globals.isWindowsPlatform() and ( - qVersionTuple() < (5, 7, 0) or qVersionTuple() >= (5, 8, 0)): + 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"),
