Sun, 16 May 2021 20:07:24 +0200
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
# -*- coding: utf-8 -*- # Copyright (c) 2012 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing the AdBlock icon for the main window status bar. """ from PyQt6.QtCore import Qt from PyQt6.QtGui import QAction from PyQt6.QtWidgets import QMenu from E5Gui.E5ClickableLabel import E5ClickableLabel import UI.PixmapCache class AdBlockIcon(E5ClickableLabel): """ Class implementing the AdBlock icon for the main window status bar. """ def __init__(self, parent): """ Constructor @param parent reference to the parent widget @type WebBrowserWindow """ super().__init__(parent) self.__mw = parent self.__menuAction = None self.__enabled = False self.setMaximumHeight(16) self.setCursor(Qt.CursorShape.PointingHandCursor) self.setToolTip(self.tr( "AdBlock lets you block unwanted content on web pages.")) self.clicked.connect(self.__showMenu) def setEnabled(self, enabled): """ Public slot to set the enabled state. @param enabled enabled state @type bool """ self.__enabled = enabled if enabled: self.currentChanged() else: self.setPixmap( UI.PixmapCache.getPixmap("adBlockPlusDisabled16")) def __createMenu(self, menu): """ Private slot to create the context menu. @param menu parent menu @type QMenu """ menu.clear() manager = self.__mw.adBlockManager() if manager.isEnabled(): act = menu.addAction( UI.PixmapCache.getIcon("adBlockPlusDisabled"), self.tr("Disable AdBlock")) act.triggered.connect(lambda: self.__enableAdBlock(False)) else: act = menu.addAction( UI.PixmapCache.getIcon("adBlockPlus"), self.tr("Enable AdBlock")) act.triggered.connect(lambda: self.__enableAdBlock(True)) menu.addSeparator() if manager.isEnabled() and self.__mw.currentBrowser().url().host(): if self.__isCurrentHostExcepted(): act = menu.addAction( UI.PixmapCache.getIcon("adBlockPlus"), self.tr("Remove AdBlock Exception")) act.triggered.connect(lambda: self.__setException(False)) else: act = menu.addAction( UI.PixmapCache.getIcon("adBlockPlusGreen"), self.tr("Add AdBlock Exception")) act.triggered.connect(lambda: self.__setException(True)) menu.addAction( UI.PixmapCache.getIcon("adBlockPlusGreen"), self.tr("AdBlock Exceptions..."), manager.showExceptionsDialog) menu.addSeparator() menu.addAction( UI.PixmapCache.getIcon("adBlockPlus"), self.tr("AdBlock Configuration..."), manager.showDialog) # TODO: change this to return a QMenu def menuAction(self): """ Public method to get a reference to the menu action. @return reference to the menu action @rtype QAction """ if not self.__menuAction: self.__menuAction = QAction(self.tr("AdBlock"), self) # TODO: replace this obsolete function self.__menuAction.setMenu(QMenu()) self.__menuAction.menu().aboutToShow.connect( lambda: self.__createMenu(self.__menuAction.menu())) if self.__enabled: self.__menuAction.setIcon( UI.PixmapCache.getIcon("adBlockPlus")) else: self.__menuAction.setIcon( UI.PixmapCache.getIcon("adBlockPlusDisabled")) return self.__menuAction def __showMenu(self, pos): """ Private slot to show the context menu. @param pos position the context menu should be shown @type QPoint """ menu = QMenu() self.__createMenu(menu) menu.exec(pos) def __enableAdBlock(self, enable): """ Private slot to enable or disable AdBlock. @param enable flag indicating the desired enable state @type bool """ self.__mw.adBlockManager().setEnabled(enable) def __isCurrentHostExcepted(self): """ Private method to check, if the host of the current browser is excepted. @return flag indicating an exception @rtype bool """ browser = self.__mw.currentBrowser() if browser is None: return False urlHost = browser.page().url().host() return ( urlHost and self.__mw.adBlockManager().isHostExcepted(urlHost) ) def currentChanged(self): """ Public slot to handle a change of the current browser tab. """ if self.__enabled: if self.__isCurrentHostExcepted(): self.setPixmap( UI.PixmapCache.getPixmap("adBlockPlusGreen16")) else: self.setPixmap(UI.PixmapCache.getPixmap("adBlockPlus16")) def __setException(self, enable): """ Private slot to add or remove the current host from the list of exceptions. @param enable flag indicating to set or remove an exception @type bool """ urlHost = self.__mw.currentBrowser().url().host() if enable: self.__mw.adBlockManager().addException(urlHost) else: self.__mw.adBlockManager().removeException(urlHost) self.currentChanged() def sourceChanged(self, browser, url): """ Public slot to handle URL changes. @param browser reference to the browser @type WebBrowserView @param url new URL @type QUrl """ if browser == self.__mw.currentBrowser(): self.currentChanged()