Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- changeset 5993
- 4b2b9be7de14
- parent 5920
- e47dd106c3d6
- child 6026
- 4773c9469880
equal
deleted
inserted
replaced
| 5992:d184ca2d3a95 | 5993:4b2b9be7de14 |
|---|---|
| 814 if not self.__initShortcutsOnly: | 814 if not self.__initShortcutsOnly: |
| 815 self.exportBookmarksAct.triggered.connect( | 815 self.exportBookmarksAct.triggered.connect( |
| 816 bookmarksManager.exportBookmarks) | 816 bookmarksManager.exportBookmarks) |
| 817 self.__actions.append(self.exportBookmarksAct) | 817 self.__actions.append(self.exportBookmarksAct) |
| 818 | 818 |
| 819 # TODO: re-check this once printing on Windows is reliable | 819 if qVersionTuple() >= (5, 8, 0) or ( |
| 820 ## if qVersionTuple() >= (5, 8, 0) or ( | 820 not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)): |
| 821 ## not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)): | |
| 822 if not Globals.isWindowsPlatform() and qVersionTuple() >= (5, 7, 0): | |
| 823 self.printAct = E5Action( | 821 self.printAct = E5Action( |
| 824 self.tr('Print'), | 822 self.tr('Print'), |
| 825 UI.PixmapCache.getIcon("print.png"), | 823 UI.PixmapCache.getIcon("print.png"), |
| 826 self.tr('&Print'), | 824 self.tr('&Print'), |
| 827 QKeySequence(self.tr("Ctrl+P", "File|Print")), | 825 QKeySequence(self.tr("Ctrl+P", "File|Print")), |
| 854 self.__tabWidget.printBrowserPdf) | 852 self.__tabWidget.printBrowserPdf) |
| 855 self.__actions.append(self.printPdfAct) | 853 self.__actions.append(self.printPdfAct) |
| 856 else: | 854 else: |
| 857 self.printPdfAct = None | 855 self.printPdfAct = None |
| 858 | 856 |
| 859 # TODO: re-check this once printing on Windows is reliable | 857 if qVersionTuple() >= (5, 8, 0) or ( |
| 860 ## if qVersionTuple() >= (5, 8, 0) or ( | 858 not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)): |
| 861 ## not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)): | |
| 862 if not Globals.isWindowsPlatform() and ( | |
| 863 qVersionTuple() < (5, 7, 0) or qVersionTuple() >= (5, 8, 0)): | |
| 864 self.printPreviewAct = E5Action( | 859 self.printPreviewAct = E5Action( |
| 865 self.tr('Print Preview'), | 860 self.tr('Print Preview'), |
| 866 UI.PixmapCache.getIcon("printPreview.png"), | 861 UI.PixmapCache.getIcon("printPreview.png"), |
| 867 self.tr('Print Preview'), | 862 self.tr('Print Preview'), |
| 868 0, 0, self, 'webbrowser_file_print_preview') | 863 0, 0, self, 'webbrowser_file_print_preview') |
