eric: comparison eric6/WebBrowser/UrlBar/UrlBar.py

-:27f636beebad
+:2c730d5fd177
 self.__browser = None
 self.__privateMode = WebBrowserWindow.isPrivate()
 self.__bmActiveIcon = UI.PixmapCache.getIcon("bookmark16")
 self.__bmInactiveIcon = QIcon(
-self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled))
+self.__bmActiveIcon.pixmap(16, 16, QIcon.Mode.Disabled))
 self.__safeBrowsingLabel = SafeBrowsingLabel(self)
 self.addWidget(self.__safeBrowsingLabel, E5LineEdit.LeftSide)
 self.__safeBrowsingLabel.setVisible(False)
 from .BookmarkActionSelectionDialog import (
 BookmarkActionSelectionDialog
 )
 url = self.__browser.url()
 dlg = BookmarkActionSelectionDialog(url)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 action = dlg.getAction()
 if action == BookmarkActionSelectionDialog.AddBookmark:
 self.__browser.addBookmark()
 elif action == BookmarkActionSelectionDialog.EditBookmark:
 bookmark = (
 """
 Protected method handling a paint event.
 @param evt reference to the paint event (QPaintEvent)
 """
-foregroundColor = QApplication.palette().color(QPalette.Text)
+foregroundColor = QApplication.palette().color(QPalette.ColorRole.Text)
 if self.__privateMode:
 backgroundColor = Preferences.getWebBrowser("PrivateModeUrlColor")
 else:
-backgroundColor = QApplication.palette().color(QPalette.Base)
+backgroundColor = QApplication.palette().color(
+QPalette.ColorRole.Base)
 if self.__browser is not None:
 p = self.palette()
 progress = self.__browser.progress()
 else:
 backgroundColor = Preferences.getWebBrowser(
 "SecureUrlColor")
 if progress == 0 or progress == 100:
-p.setBrush(QPalette.Base, backgroundColor)
+p.setBrush(QPalette.ColorRole.Base, backgroundColor)
-p.setBrush(QPalette.Text, foregroundColor)
+p.setBrush(QPalette.ColorRole.Text, foregroundColor)
 else:
-highlight = QApplication.palette().color(QPalette.Highlight)
+highlight = QApplication.palette().color(
+QPalette.ColorRole.Highlight)
 r = (highlight.red() + 2 * backgroundColor.red()) // 3
 g = (highlight.green() + 2 * backgroundColor.green()) // 3
 b = (highlight.blue() + 2 * backgroundColor.blue()) // 3
 loadingColor = QColor(r, g, b)
 gradient = QLinearGradient(
 QPointF(0, 0), QPointF(self.width(), 0))
 gradient.setColorAt(0, loadingColor)
 gradient.setColorAt(progress / 100.0 - 0.000001, loadingColor)
 gradient.setColorAt(progress / 100.0, backgroundColor)
-p.setBrush(QPalette.Base, gradient)
+p.setBrush(QPalette.ColorRole.Base, gradient)
 self.setPalette(p)
 E5LineEdit.paintEvent(self, evt)
 """
 Protected method called by a mouse press event.
 @param evt reference to the mouse event (QMouseEvent)
 """
-if evt.button() == Qt.XButton1:
+if evt.button() == Qt.MouseButton.XButton1:
 self.__mw.currentBrowser().triggerPageAction(
-QWebEnginePage.Back)
+QWebEnginePage.WebAction.Back)
-elif evt.button() == Qt.XButton2:
+elif evt.button() == Qt.MouseButton.XButton2:
 self.__mw.currentBrowser().triggerPageAction(
-QWebEnginePage.Forward)
+QWebEnginePage.WebAction.Forward)
 else:
 super(UrlBar, self).mousePressEvent(evt)
 def mouseDoubleClickEvent(self, evt):
 """
 Protected method to handle mouse double click events.
 @param evt reference to the mouse event (QMouseEvent)
 """
-if evt.button() == Qt.LeftButton:
+if evt.button() == Qt.MouseButton.LeftButton:
 self.selectAll()
 else:
 E5LineEdit.mouseDoubleClickEvent(self, evt)
 def keyPressEvent(self, evt):
 """
 Protected method to handle key presses.
 @param evt reference to the key press event (QKeyEvent)
 """
-if evt.key() == Qt.Key_Escape:
+if evt.key() == Qt.Key.Key_Escape:
 if self.__browser is not None:
 self.setText(
 str(self.__browser.url().toEncoded(), encoding="utf-8"))
 self.selectAll()
 completer = self.completer()
 completer.popup().hide()
 return
 currentText = self.text().strip()
 if (
-evt.key() in [Qt.Key_Enter, Qt.Key_Return] and
+evt.key() in [Qt.Key.Key_Enter, Qt.Key.Key_Return] and
 not currentText.lower().startswith(("http://", "https://"))
 ):
 append = ""
-if evt.modifiers() == Qt.KeyboardModifiers(Qt.ControlModifier):
+if evt.modifiers() == Qt.KeyboardModifiers(
+Qt.KeyboardModifier.ControlModifier
+):
 append = ".com"
+elif (
+evt.modifiers() == Qt.KeyboardModifiers(
+Qt.KeyboardModifier.ControlModifier |
+Qt.KeyboardModifier.ShiftModifier
+)
+):
+append = ".org"
 elif evt.modifiers() == Qt.KeyboardModifiers(
-Qt.ControlModifier | Qt.ShiftModifier):
+Qt.KeyboardModifier.ShiftModifier
-append = ".org"
+):
-elif evt.modifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier):
 append = ".net"
 if append != "":
 url = QUrl("http://www." + currentText)
 host = url.host()
 url = QUrl()
 if mimeData.hasUrls():
 url = mimeData.urls()[0]
 elif mimeData.hasText():
 url = QUrl.fromEncoded(mimeData.text().encode("utf-8"),
-QUrl.TolerantMode)
+QUrl.ParsingMode.TolerantMode)
 if url.isEmpty() or not url.isValid():
 E5LineEdit.dropEvent(self, evt)
 return
 sslConfiguration = self.__browser.page().getSslConfiguration()
 if sslConfiguration is not None and QSslCertificate is not None:
 sslCertificate = self.__browser.page().getSslCertificate()
 if sslCertificate is not None:
 org = Utilities.decodeString(", ".join(
-sslCertificate.subjectInfo(QSslCertificate.Organization)))
+sslCertificate.subjectInfo(
+QSslCertificate.SubjectInfo.Organization)))
 if org == "":
 cn = Utilities.decodeString(", ".join(
 sslCertificate.subjectInfo(
-QSslCertificate.CommonName)))
+QSslCertificate.SubjectInfo.CommonName)))
 if cn != "":
 org = cn.split(".", 1)[1]
 if org == "":
 org = self.tr("Unknown")
 self.__sslLabel.setText(" {0} ".format(org))

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/UrlBar/UrlBar.py

eric6/WebBrowser/UrlBar/UrlBar.py