Mercurial Repositories > eric / changeset
changeset
Continued porting the web browser.
Mon, 28 Mar 2016 16:34:22 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 28 Mar 2016 16:34:22 +0200
- branch
- QtWebEngine
- changeset 4904
- ea8f13f76d26
- parent 4903
- 10910764454a
- child 4905
- 09f38f85a3af
Continued porting the web browser.
- completed the feature permissions stuff for Qt 5.6
--- a/WebBrowser/FeaturePermissions/FeaturePermissionBar.py Mon Mar 28 16:06:39 2016 +0200 +++ b/WebBrowser/FeaturePermissions/FeaturePermissionBar.py Mon Mar 28 16:34:22 2016 +0200 @@ -45,7 +45,7 @@ self.__manager = manager self.__permissionFeatureTexts = { - # TODO: Qt 5.6 + # TODO: Qt 5.7? ## QWebEnginePage.Notifications: ## self.tr("{0} wants to use desktop notifications."), QWebEnginePage.Geolocation: @@ -56,14 +56,17 @@ self.tr("{0} wants to use your camera."), QWebEnginePage.MediaAudioVideoCapture: self.tr("{0} wants to use your microphone and camera."), + QWebEnginePage.MouseLock: + self.tr("{0} wants to lock your mouse."), } self.__permissionFeatureIconNames = { - # TODO: Qt 5.6 + # TODO: Qt 5.7? ## QWebEnginePage.Notifications: "notification.png", QWebEnginePage.Geolocation: "geolocation.png", QWebEnginePage.MediaAudioCapture: "audiocapture.png", QWebEnginePage.MediaVideoCapture: "camera.png", QWebEnginePage.MediaAudioVideoCapture: "audio-video.png", + QWebEnginePage.MouseLock: "mouse.png", } self.setAutoFillBackground(True)
--- a/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Mon Mar 28 16:06:39 2016 +0200 +++ b/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Mon Mar 28 16:34:22 2016 +0200 @@ -33,7 +33,7 @@ super(FeaturePermissionManager, self).__init__(parent) self.__featurePermissions = { - # TODO: Qt 5.6 + # TODO: Qt 5.7? ## QWebEnginePage.Notifications: { ## QWebEnginePage.PermissionGrantedByUser: [], ## QWebEnginePage.PermissionDeniedByUser: [], @@ -54,9 +54,13 @@ QWebEnginePage.PermissionGrantedByUser: [], QWebEnginePage.PermissionDeniedByUser: [], }, + QWebEnginePage.MouseLock: { + QWebEnginePage.PermissionGrantedByUser: [], + QWebEnginePage.PermissionDeniedByUser: [], + }, } self.__featurePermissionsKeys = { - # TODO: Qt 5.6 + # TODO: Qt 5.7? ## (QWebEnginePage.Notifications, ## QWebEnginePage.PermissionGrantedByUser): ## "NotificationsGranted", @@ -87,6 +91,12 @@ (QWebEnginePage.MediaAudioVideoCapture, QWebEnginePage.PermissionDeniedByUser): "MediaAudioVideoCaptureDenied", + (QWebEnginePage.MouseLock, + QWebEnginePage.PermissionGrantedByUser): + "MouseLockGranted", + (QWebEnginePage.MouseLock, + QWebEnginePage.PermissionDeniedByUser): + "MouseLockDenied", } self.__loaded = False
--- 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():
