Mercurial Repositories > eric / file diff

diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/StatusBar/JavaScriptIcon.py
--- a/eric6/WebBrowser/StatusBar/JavaScriptIcon.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/StatusBar/JavaScriptIcon.py	Tue Mar 02 17:17:09 2021 +0100
@@ -68,7 +68,7 @@
         menu.addAction(self.tr("Current Page Settings")).setFont(boldFont)
         
         if self._testCurrentPageWebAttribute(
-                QWebEngineSettings.JavascriptEnabled):
+                QWebEngineSettings.WebAttribute.JavascriptEnabled):
             act = menu.addAction(self.tr("Disable JavaScript (temporarily)"),
                                  self.__toggleJavaScript)
         else:
@@ -93,11 +93,11 @@
         Private slot to update the icon.
         """
         if self._testCurrentPageWebAttribute(
-                QWebEngineSettings.JavascriptEnabled):
+                QWebEngineSettings.WebAttribute.JavascriptEnabled):
             self.setGraphicsEffect(None)
         else:
             effect = QGraphicsColorizeEffect(self)
-            effect.setColor(Qt.gray)
+            effect.setColor(Qt.GlobalColor.gray)
             self.setGraphicsEffect(effect)
     
     @pyqtSlot()
@@ -110,9 +110,9 @@
             return
         
         current = self._testCurrentPageWebAttribute(
-            QWebEngineSettings.JavascriptEnabled)
-        self._setCurrentPageWebAttribute(QWebEngineSettings.JavascriptEnabled,
-                                         not current)
+            QWebEngineSettings.WebAttribute.JavascriptEnabled)
+        self._setCurrentPageWebAttribute(
+            QWebEngineSettings.WebAttribute.JavascriptEnabled, not current)
         
         self.__settings[page] = not current
         page.navigationRequestAccepted.connect(
@@ -132,7 +132,7 @@
         """
         from .JavaScriptSettingsDialog import JavaScriptSettingsDialog
         dlg = JavaScriptSettingsDialog(self._window)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             self._window.preferencesChanged()
             QTimer.singleShot(500, self.__updateIcon)
     
@@ -156,5 +156,5 @@
         else:
             enable = self.__settings[page]
         if isMainFrame:
-            page.settings().setAttribute(QWebEngineSettings.JavascriptEnabled,
-                                         enable)
+            page.settings().setAttribute(
+                QWebEngineSettings.WebAttribute.JavascriptEnabled, enable)