diff -r 10910764454a -r ea8f13f76d26 WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py --- a/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py Mon Mar 28 16:06:39 2016 +0200 +++ b/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py Mon Mar 28 16:34:22 2016 +0200 @@ -37,20 +37,21 @@ self.setupUi(self) # add the various lists - self.notifList = QTreeWidget() - self.notifList.setAlternatingRowColors(True) - self.notifList.setSelectionMode(QAbstractItemView.ExtendedSelection) - self.notifList.setRootIsDecorated(False) - self.notifList.setItemsExpandable(False) - self.notifList.setAllColumnsShowFocus(True) - self.notifList.setObjectName("notifList") - self.notifList.setSortingEnabled(True) - self.notifList.headerItem().setText(0, self.tr("Host")) - self.notifList.headerItem().setText(1, self.tr("Permission")) - self.tabWidget.addTab( - self.notifList, - UI.PixmapCache.getIcon("notification.png"), - self.tr("Notifications")) + # TODO: Qt 5.7? +## self.notifList = QTreeWidget() +## self.notifList.setAlternatingRowColors(True) +## self.notifList.setSelectionMode(QAbstractItemView.ExtendedSelection) +## self.notifList.setRootIsDecorated(False) +## self.notifList.setItemsExpandable(False) +## self.notifList.setAllColumnsShowFocus(True) +## self.notifList.setObjectName("notifList") +## self.notifList.setSortingEnabled(True) +## self.notifList.headerItem().setText(0, self.tr("Host")) +## self.notifList.headerItem().setText(1, self.tr("Permission")) +## self.tabWidget.addTab( +## self.notifList, +## UI.PixmapCache.getIcon("notification.png"), +## self.tr("Notifications")) self.geoList = QTreeWidget() self.geoList.setAlternatingRowColors(True) @@ -112,12 +113,30 @@ UI.PixmapCache.getIcon("audio-video.png"), self.tr("Microphone && Camera")) - self.setTabOrder(self.tabWidget, self.notifList) - self.setTabOrder(self.notifList, self.geoList) + self.mouseLockList = QTreeWidget() + self.mouseLockList.setAlternatingRowColors(True) + self.mouseLockList.setSelectionMode(QAbstractItemView.ExtendedSelection) + self.mouseLockList.setRootIsDecorated(False) + self.mouseLockList.setItemsExpandable(False) + self.mouseLockList.setAllColumnsShowFocus(True) + self.mouseLockList.setObjectName("mouseLockList") + self.mouseLockList.setSortingEnabled(True) + self.mouseLockList.headerItem().setText(0, self.tr("Host")) + self.mouseLockList.headerItem().setText(1, self.tr("Permission")) + self.tabWidget.addTab( + self.mouseLockList, + UI.PixmapCache.getIcon("mouse.png"), + self.tr("Mouse Lock")) + + # TODO: Qt 5.7? +## self.setTabOrder(self.tabWidget, self.notifList) +## self.setTabOrder(self.notifList, self.geoList) + self.setTabOrder(self.tabWidget, self.geoList) self.setTabOrder(self.geoList, self.micList) self.setTabOrder(self.micList, self.camList) self.setTabOrder(self.camList, self.micCamList) - self.setTabOrder(self.micCamList, self.removeButton) + self.setTabOrder(self.micCamList, self.mouseLockList) + self.setTabOrder(self.mouseLockList, self.removeButton) self.setTabOrder(self.removeButton, self.removeAllButton) self.__permissionStrings = { @@ -126,12 +145,13 @@ } self.__permissionsLists = { - # TODO: Qt 5.6 + # TODO: Qt 5.7? ## QWebEnginePage.Notifications: self.notifList, QWebEnginePage.Geolocation: self.geoList, QWebEnginePage.MediaAudioCapture: self.micList, QWebEnginePage.MediaVideoCapture: self.camList, QWebEnginePage.MediaAudioVideoCapture: self.micCamList, + QWebEnginePage.MouseLock: self.mouseLockList, } for feature, permissionsList in self.__permissionsLists.items():