eric: comparison eric6/WebBrowser/WebBrowserTabWidget.py

-:ebab8ba287e6
+:6b42677d7043
 from __future__ import unicode_literals
 import os
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QDir, QFile, \
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QFile, QFileDevice
-QFileDevice, QTemporaryFile
 from PyQt5.QtGui import QIcon, QPixmap, QPainter
 from PyQt5.QtWidgets import QWidget, QHBoxLayout, QMenu, QToolButton, \
 QDialog, QApplication
 from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
 from E5Gui.E5Application import e5App
 from .WebBrowserView import WebBrowserView
 from .WebBrowserPage import WebBrowserPage
 from .Tools import WebBrowserTools
-from .Tools import FilePrinter
 from . import WebInspector
 import UI.PixmapCache
 import Utilities
 import Preferences
 import Globals
-from Globals import qVersionTuple
 from eric6config import getConfig
+def isCupsAvailable():
+"""
+Static method to test the availability of CUPS.
+@return flag indicating the availability of CUPS
+@rtype bool
+"""
+if Globals.isMacPlatform():
+# OS X/MacOS always have CUPS
+return True
+elif Globals.isLinuxPlatform():
+testPrinter = QPrinter()
+return testPrinter.supportsMultipleCopies()
+else:
+return False
 class WebBrowserTabWidget(E5TabWidget):
 """
 Class implementing the central widget showing the web pages.
 self.__newTabButton.clicked.connect(self.__newBrowser)
 self.__initTabContextMenu()
 self.__historyCompleter = None
-self.__pdfPrinter = None
 def __initTabContextMenu(self):
 """
 Private method to create the tab context menu.
 """
 UI.PixmapCache.getIcon("tabCloseOther.png"),
 self.tr("Close Others"), self.__tabContextMenuCloseOthers)
 self.__tabContextMenu.addAction(
 self.tr('Close All'), self.closeAllBrowsers)
 self.__tabContextMenu.addSeparator()
-if qVersionTuple() >= (5, 8, 0) or (
+self.__tabContextMenu.addAction(
-not Globals.isWindowsPlatform() and qVersionTuple() < (5, 7, 0)):
+UI.PixmapCache.getIcon("printPreview.png"),
-self.__tabContextMenu.addAction(
+self.tr('Print Preview'), self.__tabContextMenuPrintPreview)
-UI.PixmapCache.getIcon("printPreview.png"),
+self.__tabContextMenu.addAction(
-self.tr('Print Preview'), self.__tabContextMenuPrintPreview)
+UI.PixmapCache.getIcon("print.png"),
-if qVersionTuple() >= (5, 8, 0) or (
+self.tr('Print'), self.__tabContextMenuPrint)
-not Globals.isWindowsPlatform() or qVersionTuple() >= (5, 7, 0)):
+self.__tabContextMenu.addAction(
-self.__tabContextMenu.addAction(
+UI.PixmapCache.getIcon("printPdf.png"),
-UI.PixmapCache.getIcon("print.png"),
+self.tr('Print as PDF'), self.__tabContextMenuPrintPdf)
-self.tr('Print'), self.__tabContextMenuPrint)
-if Globals.isLinuxPlatform() or qVersionTuple() >= (5, 7, 0):
-self.__tabContextMenu.addAction(
-UI.PixmapCache.getIcon("printPdf.png"),
-self.tr('Print as PDF'), self.__tabContextMenuPrintPdf)
 self.__tabContextMenu.addSeparator()
 if hasattr(WebBrowserPage, "isAudioMuted"):
 self.__audioAct = self.__tabContextMenu.addAction(
 "", self.__tabContextMenuAudioMute)
 self.__tabContextMenu.addSeparator()
 printDialog = QPrintDialog(printer, self)
 printDialog.setOptions(QAbstractPrintDialog.PrintToFile |
 QAbstractPrintDialog.PrintShowPageSize)
 if not Globals.isWindowsPlatform():
-if FilePrinter.isCupsAvailable():
+if isCupsAvailable():
 printDialog.setOption(QAbstractPrintDialog.PrintCollateCopies)
 printDialog.setOption(QAbstractPrintDialog.PrintPageRange)
 if printDialog.exec_() == QDialog.Accepted:
-if hasattr(browser.page(), "print"):
+browser.page().execPrintPage(printer, 10 * 1000)
-# Qt >= 5.8.0
-browser.page().execPrintPage(printer, 10 * 1000)
-elif hasattr(browser.page(), "printToPdf"):
-# Qt >= 5.7.0
-if printer.outputFormat() == QPrinter.PdfFormat:
-# print to PDF file selected
-browser.page().printToPdf(
-lambda pdf: self.__pdfGeneratedForSave(
-printer.outputFileName(), pdf),
-printer.pageLayout())
-else:
-# print to printer
-self.__pdfPrinter = printer
-browser.page().printToPdf(
-self.__pdfGeneratedForPrinting,
-printer.pageLayout())
-else:
-browser.render(printer)
 @pyqtSlot()
 def printBrowserPdf(self, browser=None):
 """
 Public slot called to print the displayed page to PDF.
 """</b>.</p><p><b>Error:</b> {1}</p>""").format(
 filePath, pdfFile.errorString()),
 E5MessageBox.StandardButtons(
 E5MessageBox.Ok))
-def __pdfGeneratedForPrinting(self, pdfData):
-"""
-Private slot to print the generated PDF data.
-@param pdfData generated PDF document
-@type QByteArray
-"""
-if self.__pdfPrinter is None or pdfData.isEmpty():
-return
-tempFile = QTemporaryFile(QDir.tempPath() + "/ericBrowserXXXXXX.pdf")
-tempFile.setAutoRemove(False)
-if tempFile.open():
-bytesWritten = tempFile.write(pdfData)
-tempFile.close()
-if bytesWritten == pdfData.size():
-if Globals.isWindowsPlatform():
-printerName = self.__pdfPrinter.printerName()
-import ctypes
-ctypes.windll.shell32.ShellExecuteW(
-None, "printto", tempFile.fileName(),
-'"{0}"'.format(printerName), None, 0)
-else:
-FilePrinter.printFile(
-self.__pdfPrinter, tempFile.fileName(),
-FilePrinter.FilePrinter.SystemDeletesFiles,
-FilePrinter.FilePrinter.SystemSelectsPages)
-else:
-tempFile.remove()
-self.__pdfPrinter = None
 @pyqtSlot()
 def printPreviewBrowser(self, browser=None):
 """
 Public slot called to show a print preview of the displayed file.
 printer.setPrinterName(printerName)
 printer.setResolution(Preferences.getPrinter("Resolution"))
 preview = QPrintPreviewDialog(printer, self)
 preview.resize(800, 750)
-if qVersionTuple() >= (5, 8, 0):
+preview.paintRequested.connect(
-preview.paintRequested.connect(
+lambda p: self.__printPreviewRequested(p, browser))
-lambda p: self.__printPreviewRequested(p, browser))
-else:
-preview.paintRequested.connect(lambda p: browser.render(p))
 preview.exec_()
 def __printPreviewRequested(self, printer, browser):
 """
 Private slot to generate the print preview.

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/WebBrowserTabWidget.py

eric6/WebBrowser/WebBrowserTabWidget.py