Mercurial Repositories > eric / file diff

--- a/Helpviewer/FeaturePermissions/FeaturePermissionBar.py	Thu Aug 06 19:01:39 2015 +0200
+++ b/Helpviewer/FeaturePermissions/FeaturePermissionBar.py	Fri Aug 07 19:40:15 2015 +0200
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QLabel, QHBoxLayout, QPushButton, QCheckBox
+from PyQt5.QtWidgets import QLabel, QHBoxLayout, QPushButton
 from PyQt5.QtWebKitWidgets import QWebPage
 
 from E5Gui.E5AnimatedWidget import E5AnimatedWidget
@@ -39,8 +39,6 @@
         """
         super(FeaturePermissionBar, self).__init__(parent=view)
         
-        self.__messageLabel = QLabel(self)
-        
         self.__frame = frame
         self.__feature = feature
         self.__view = view
@@ -51,15 +49,22 @@
             QWebPage.Geolocation:
                 self.tr("{0} wants to use your position.")
         }
+        self.__permissionFeatureIconNames = {
+            QWebPage.Notifications: "notification.png",
+            QWebPage.Geolocation: "geolocation.png",
+        }
         
         self.setAutoFillBackground(True)
         self.__layout = QHBoxLayout()
         self.setLayout(self.__layout)
-        self.__layout.setContentsMargins(self.DefaultHeight, 0, 0, 0)
+        self.__layout.setContentsMargins(9, 0, 0, 0)
+        self.__iconLabel = QLabel(self)
+        self.__layout.addWidget(self.__iconLabel)
+        self.__messageLabel = QLabel(self)
         self.__layout.addWidget(self.__messageLabel)
         self.__layout.addStretch()
-        self.__rememberCheckBox = QCheckBox(self.tr("Remember"), self)
-        self.__layout.addWidget(self.__rememberCheckBox)
+        self.__rememberButton = QPushButton(self.tr("Remember"), self)
+        self.__rememberButton.setCheckable(True)
         self.__allowButton = QPushButton(self.tr("Allow"), self)
         self.__denyButton = QPushButton(self.tr("Deny"), self)
         self.__discardButton = QPushButton(UI.PixmapCache.getIcon("close.png"),
@@ -67,11 +72,18 @@
         self.__allowButton.clicked.connect(self.__permissionGranted)
         self.__denyButton.clicked.connect(self.__permissionDenied)
         self.__discardButton.clicked.connect(self.__permissionUnknown)
+        self.__layout.addWidget(self.__rememberButton)
         self.__layout.addWidget(self.__allowButton)
         self.__layout.addWidget(self.__denyButton)
         self.__layout.addWidget(self.__discardButton)
         
         try:
+            self.__iconLabel.setPixmap(UI.PixmapCache.getPixmap(
+                self.__permissionFeatureIconNames[self.__feature]))
+        except KeyError:
+            pass
+        
+        try:
             self.__messageLabel.setText(
                 self.__permissionFeatureTexts[self.__feature].format(
                     self.__frame.securityOrigin().host()))
@@ -104,7 +116,7 @@
         page.setFeaturePermission(self.__frame, self.__feature,
                                   QWebPage.PermissionDeniedByUser)
         
-        if self.__rememberCheckBox.isChecked():
+        if self.__rememberButton.isChecked():
             Helpviewer.HelpWindow.HelpWindow.featurePermissionManager()\
                 .rememberFeaturePermission(page.url().host(), self.__feature,
                                            QWebPage.PermissionDeniedByUser)
@@ -122,7 +134,7 @@
         page.setFeaturePermission(self.__frame, self.__feature,
                                   QWebPage.PermissionGrantedByUser)
         
-        if self.__rememberCheckBox.isChecked():
+        if self.__rememberButton.isChecked():
             Helpviewer.HelpWindow.HelpWindow.featurePermissionManager()\
                 .rememberFeaturePermission(page.url().host(), self.__feature,
                                            QWebPage.PermissionGrantedByUser)