diff -r e01ae92db699 -r 31965986ecd1 eric6/WebBrowser/WebBrowserTabWidget.py
--- a/eric6/WebBrowser/WebBrowserTabWidget.py Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserTabWidget.py Sun Mar 28 15:00:11 2021 +0200
@@ -91,7 +91,7 @@
self.setUsesScrollButtons(True)
self.setDocumentMode(True)
- self.setElideMode(Qt.ElideNone)
+ self.setElideMode(Qt.TextElideMode.ElideNone)
from .ClosedTabsManager import ClosedTabsManager
self.__closedTabsManager = ClosedTabsManager(self)
@@ -104,7 +104,7 @@
self.__tabContextMenuIndex = -1
self.currentChanged[int].connect(self.__currentChanged)
- self.setTabContextMenuPolicy(Qt.CustomContextMenu)
+ self.setTabContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customTabContextMenuRequested.connect(self.__showContextMenu)
self.__rightCornerWidget = QWidget(self)
@@ -121,7 +121,8 @@
UI.PixmapCache.getIcon("1downarrow"))
self.__navigationButton.setToolTip(
self.tr("Show a navigation menu"))
- self.__navigationButton.setPopupMode(QToolButton.InstantPopup)
+ self.__navigationButton.setPopupMode(
+ QToolButton.ToolButtonPopupMode.InstantPopup)
self.__navigationButton.setMenu(self.__navigationMenu)
self.__navigationButton.setEnabled(False)
self.__rightCornerWidgetLayout.addWidget(self.__navigationButton)
@@ -134,7 +135,8 @@
self.__closedTabsButton.setIcon(UI.PixmapCache.getIcon("trash"))
self.__closedTabsButton.setToolTip(
self.tr("Show a navigation menu for closed tabs"))
- self.__closedTabsButton.setPopupMode(QToolButton.InstantPopup)
+ self.__closedTabsButton.setPopupMode(
+ QToolButton.ToolButtonPopupMode.InstantPopup)
self.__closedTabsButton.setMenu(self.__closedTabsMenu)
self.__closedTabsButton.setEnabled(False)
self.__rightCornerWidgetLayout.addWidget(self.__closedTabsButton)
@@ -142,13 +144,14 @@
self.setTabsClosable(True)
self.tabCloseRequested.connect(self.closeBrowserAt)
- self.setCornerWidget(self.__rightCornerWidget, Qt.TopRightCorner)
+ self.setCornerWidget(
+ self.__rightCornerWidget, Qt.Corner.TopRightCorner)
self.__newTabButton = QToolButton(self)
self.__newTabButton.setIcon(UI.PixmapCache.getIcon("plus"))
self.__newTabButton.setToolTip(
self.tr("Open a new web browser tab"))
- self.setCornerWidget(self.__newTabButton, Qt.TopLeftCorner)
+ self.setCornerWidget(self.__newTabButton, Qt.Corner.TopLeftCorner)
self.__newTabButton.clicked.connect(self.__newBrowser)
self.__initTabContextMenu()
@@ -350,7 +353,7 @@
if page.isAudioMuted() or (
not page.isAudioMuted() and recentlyAudible):
pix = QPixmap(32, 32)
- pix.fill(Qt.transparent)
+ pix.fill(Qt.GlobalColor.transparent)
painter = QPainter(pix)
icon.paint(painter, 0, 0, 22, 22)
if page.isAudioMuted():
@@ -476,7 +479,10 @@
if linkName:
browser.setSource(QUrl(linkName))
if not browser.documentTitle():
- self.setTabText(index, self.__elide(linkName, Qt.ElideMiddle))
+ self.setTabText(
+ index,
+ self.__elide(linkName, Qt.TextElideMode.ElideMiddle)
+ )
self.setTabToolTip(index, linkName)
else:
self.setTabText(
@@ -644,21 +650,21 @@
if browser is None:
browser = self.currentBrowser()
- printer = QPrinter(mode=QPrinter.HighResolution)
+ printer = QPrinter(mode=QPrinter.PrinterMode.HighResolution)
if Preferences.getPrinter("ColorMode"):
- printer.setColorMode(QPrinter.Color)
+ printer.setColorMode(QPrinter.ColorMode.Color)
else:
- printer.setColorMode(QPrinter.GrayScale)
+ printer.setColorMode(QPrinter.ColorMode.GrayScale)
if Preferences.getPrinter("FirstPageFirst"):
- printer.setPageOrder(QPrinter.FirstPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
- printer.setPageOrder(QPrinter.LastPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
printer.setPageMargins(
Preferences.getPrinter("LeftMargin") * 10,
Preferences.getPrinter("TopMargin") * 10,
Preferences.getPrinter("RightMargin") * 10,
Preferences.getPrinter("BottomMargin") * 10,
- QPrinter.Millimeter
+ QPrinter.Unit.Millimeter
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
@@ -668,13 +674,17 @@
printer.setDocName(documentName)
printDialog = QPrintDialog(printer, self)
- printDialog.setOptions(QAbstractPrintDialog.PrintToFile |
- QAbstractPrintDialog.PrintShowPageSize)
+ printDialog.setOptions(
+ QAbstractPrintDialog.PrintDialogOption.PrintToFile |
+ QAbstractPrintDialog.PrintDialogOption.PrintShowPageSize
+ )
if not Globals.isWindowsPlatform():
if isCupsAvailable():
- printDialog.setOption(QAbstractPrintDialog.PrintCollateCopies)
- printDialog.setOption(QAbstractPrintDialog.PrintPageRange)
- if printDialog.exec() == QDialog.Accepted:
+ printDialog.setOption(
+ QAbstractPrintDialog.PrintDialogOption.PrintCollateCopies)
+ printDialog.setOption(
+ QAbstractPrintDialog.PrintDialogOption.PrintPageRange)
+ if printDialog.exec() == QDialog.DialogCode.Accepted:
browser.page().execPrintPage(printer, 10 * 1000)
@pyqtSlot()
@@ -696,7 +706,7 @@
if not name:
name = "printout.pdf"
dlg = PrintToPdfDialog(name, self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
filePath, pageLayout = dlg.getData()
if filePath:
if os.path.exists(filePath):
@@ -716,21 +726,21 @@
lambda pdf: self.__pdfGeneratedForSave(filePath, pdf),
pageLayout)
elif Globals.isLinuxPlatform():
- printer = QPrinter(mode=QPrinter.HighResolution)
+ printer = QPrinter(mode=QPrinter.PrinterMode.HighResolution)
if Preferences.getPrinter("ColorMode"):
- printer.setColorMode(QPrinter.Color)
+ printer.setColorMode(QPrinter.ColorMode.Color)
else:
- printer.setColorMode(QPrinter.GrayScale)
+ printer.setColorMode(QPrinter.ColorMode.GrayScale)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
printer.setPrinterName(printerName)
- printer.setOutputFormat(QPrinter.PdfFormat)
+ printer.setOutputFormat(QPrinter.OutputFormat.PdfFormat)
if name:
printer.setOutputFileName(name)
printer.setResolution(Preferences.getPrinter("Resolution"))
printDialog = QPrintDialog(printer, self)
- if printDialog.exec() == QDialog.Accepted:
+ if printDialog.exec() == QDialog.DialogCode.Accepted:
browser.render(printer)
def __pdfGeneratedForSave(self, filePath, pdfData):
@@ -749,7 +759,7 @@
if pdfFile.open(QFile.WriteOnly):
pdfFile.write(pdfData)
pdfFile.close()
- if pdfFile.error() != QFileDevice.NoError:
+ if pdfFile.error() != QFileDevice.FileError.NoError:
E5MessageBox.critical(
self,
self.tr("Print to PDF"),
@@ -771,21 +781,21 @@
if browser is None:
browser = self.currentBrowser()
- printer = QPrinter(mode=QPrinter.HighResolution)
+ printer = QPrinter(mode=QPrinter.PrinterMode.HighResolution)
if Preferences.getPrinter("ColorMode"):
- printer.setColorMode(QPrinter.Color)
+ printer.setColorMode(QPrinter.ColorMode.Color)
else:
- printer.setColorMode(QPrinter.GrayScale)
+ printer.setColorMode(QPrinter.ColorMode.GrayScale)
if Preferences.getPrinter("FirstPageFirst"):
- printer.setPageOrder(QPrinter.FirstPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.FirstPageFirst)
else:
- printer.setPageOrder(QPrinter.LastPageFirst)
+ printer.setPageOrder(QPrinter.PageOrder.LastPageFirst)
printer.setPageMargins(
Preferences.getPrinter("LeftMargin") * 10,
Preferences.getPrinter("TopMargin") * 10,
Preferences.getPrinter("RightMargin") * 10,
Preferences.getPrinter("BottomMargin") * 10,
- QPrinter.Millimeter
+ QPrinter.Unit.Millimeter
)
printerName = Preferences.getPrinter("PrinterName")
if printerName:
@@ -842,7 +852,7 @@
self.titleChanged.emit(browser, title)
- def __elide(self, txt, mode=Qt.ElideRight, length=40):
+ def __elide(self, txt, mode=Qt.TextElideMode.ElideRight, length=40):
"""
Private method to elide some text.
@@ -851,13 +861,13 @@
@param length amount of characters to be used (integer)
@return the elided text (string)
"""
- if mode == Qt.ElideNone or len(txt) < length:
+ if mode == Qt.TextElideMode.ElideNone or len(txt) < length:
return txt
- elif mode == Qt.ElideLeft:
+ elif mode == Qt.TextElideMode.ElideLeft:
return "...{0}".format(txt[-length:])
- elif mode == Qt.ElideMiddle:
+ elif mode == Qt.TextElideMode.ElideMiddle:
return "{0}...{1}".format(txt[:length // 2], txt[-(length // 2):])
- elif mode == Qt.ElideRight:
+ elif mode == Qt.TextElideMode.ElideRight:
return "{0}...".format(txt[:length])
else:
# just in case
@@ -1023,7 +1033,7 @@
@type UrlBar
"""
url = self.__guessUrlFromPath(edit.text())
- if e5App().keyboardModifiers() == Qt.AltModifier:
+ if e5App().keyboardModifiers() == Qt.KeyboardModifier.AltModifier:
self.newBrowser(url)
else:
self.currentBrowser().setSource(url)
@@ -1072,7 +1082,8 @@
return url
urlString = Preferences.getWebBrowser("DefaultScheme") + path.strip()
- url = QUrl.fromEncoded(urlString.encode("utf-8"), QUrl.TolerantMode)
+ url = QUrl.fromEncoded(urlString.encode("utf-8"),
+ QUrl.ParsingMode.TolerantMode)
return url
@@ -1143,7 +1154,8 @@
self.__closedTabsMenu.clear()
index = 0
for tab in self.__closedTabsManager.allClosedTabs():
- title = fm.elidedText(tab.title, Qt.ElideRight, maxWidth)
+ title = fm.elidedText(tab.title, Qt.TextElideMode.ElideRight,
+ maxWidth)
act = self.__closedTabsMenu.addAction(
self.__mainWindow.icon(tab.url), title)
act.setData(index)
