Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- branch
- QtWebEngine
- changeset 4758
- c973eef8fef1
- parent 4754
- 1ff6d0ecb2fd
- child 4759
- a60eb8619906
equal
deleted
inserted
replaced
| 4754:1ff6d0ecb2fd | 4758:c973eef8fef1 |
|---|---|
| 87 _bookmarksManager = None | 87 _bookmarksManager = None |
| 88 _historyManager = None | 88 _historyManager = None |
| 89 _passwordManager = None | 89 _passwordManager = None |
| 90 ## _adblockManager = None | 90 ## _adblockManager = None |
| 91 ## _downloadManager = None | 91 ## _downloadManager = None |
| 92 ## _feedsManager = None | 92 _feedsManager = None |
| 93 ## _userAgentsManager = None | 93 ## _userAgentsManager = None |
| 94 ## _syncManager = None | 94 ## _syncManager = None |
| 95 ## _speedDial = None | 95 ## _speedDial = None |
| 96 _personalInformationManager = None | 96 _personalInformationManager = None |
| 97 ## _greaseMonkeyManager = None | 97 ## _greaseMonkeyManager = None |
| 241 s = QSize(800, 800) | 241 s = QSize(800, 800) |
| 242 self.resize(s) | 242 self.resize(s) |
| 243 else: | 243 else: |
| 244 self.restoreGeometry(g) | 244 self.restoreGeometry(g) |
| 245 | 245 |
| 246 WebBrowserWindow.BrowserWindows.append(self) | |
| 247 | |
| 246 self.__setIconDatabasePath() | 248 self.__setIconDatabasePath() |
| 247 self.__initWebEngineSettings() | 249 self.__initWebEngineSettings() |
| 248 | 250 |
| 249 self.passwordManager() | 251 self.passwordManager() |
| 250 | 252 |
| 259 ## syncMgr.syncMessage.connect(self.statusBar().showMessage) | 261 ## syncMgr.syncMessage.connect(self.statusBar().showMessage) |
| 260 ## syncMgr.syncError.connect(self.statusBar().showMessage) | 262 ## syncMgr.syncError.connect(self.statusBar().showMessage) |
| 261 ## | 263 ## |
| 262 self.__tabWidget.newBrowser(home) | 264 self.__tabWidget.newBrowser(home) |
| 263 self.__tabWidget.currentBrowser().setFocus() | 265 self.__tabWidget.currentBrowser().setFocus() |
| 264 | |
| 265 WebBrowserWindow.BrowserWindows.append(self) | |
| 266 | 266 |
| 267 # TODO: AdBlock | 267 # TODO: AdBlock |
| 268 ## self.__adBlockIcon = AdBlockIcon(self) | 268 ## self.__adBlockIcon = AdBlockIcon(self) |
| 269 ## self.statusBar().addPermanentWidget(self.__adBlockIcon) | 269 ## self.statusBar().addPermanentWidget(self.__adBlockIcon) |
| 270 ## self.__adBlockIcon.setEnabled( | 270 ## self.__adBlockIcon.setEnabled( |
| 1637 ## if not self.__initShortcutsOnly: | 1637 ## if not self.__initShortcutsOnly: |
| 1638 ## self.showDownloadManagerAct.triggered.connect( | 1638 ## self.showDownloadManagerAct.triggered.connect( |
| 1639 ## self.__showDownloadsWindow) | 1639 ## self.__showDownloadsWindow) |
| 1640 ## self.__actions.append(self.showDownloadManagerAct) | 1640 ## self.__actions.append(self.showDownloadManagerAct) |
| 1641 | 1641 |
| 1642 # TODO: RSS Feeds Manager | 1642 self.feedsManagerAct = E5Action( |
| 1643 ## self.feedsManagerAct = E5Action( | 1643 self.tr('RSS Feeds Dialog'), |
| 1644 ## self.tr('RSS Feeds Dialog'), | 1644 UI.PixmapCache.getIcon("rss22.png"), |
| 1645 ## UI.PixmapCache.getIcon("rss22.png"), | 1645 self.tr('&RSS Feeds Dialog...'), |
| 1646 ## self.tr('&RSS Feeds Dialog...'), | 1646 QKeySequence(self.tr("Ctrl+Shift+F", "Help|RSS Feeds Dialog")), |
| 1647 ## QKeySequence(self.tr("Ctrl+Shift+F", "Help|RSS Feeds Dialog")), | 1647 0, self, 'webbrowser_rss_feeds') |
| 1648 ## 0, self, 'webbrowser_rss_feeds') | 1648 self.feedsManagerAct.setStatusTip(self.tr( |
| 1649 ## self.feedsManagerAct.setStatusTip(self.tr( | 1649 'Open a dialog showing the configured RSS feeds.')) |
| 1650 ## 'Open a dialog showing the configured RSS feeds.')) | 1650 self.feedsManagerAct.setWhatsThis(self.tr( |
| 1651 ## self.feedsManagerAct.setWhatsThis(self.tr( | 1651 """<b>RSS Feeds Dialog...</b>""" |
| 1652 ## """<b>RSS Feeds Dialog...</b>""" | 1652 """<p>Open a dialog to show the configured RSS feeds.""" |
| 1653 ## """<p>Open a dialog to show the configured RSS feeds.""" | 1653 """ It can be used to mange the feeds and to show their""" |
| 1654 ## """ It can be used to mange the feeds and to show their""" | 1654 """ contents.</p>""" |
| 1655 ## """ contents.</p>""" | 1655 )) |
| 1656 ## )) | 1656 if not self.__initShortcutsOnly: |
| 1657 ## if not self.__initShortcutsOnly: | 1657 self.feedsManagerAct.triggered.connect(self.__showFeedsManager) |
| 1658 ## self.feedsManagerAct.triggered.connect(self.__showFeedsManager) | 1658 self.__actions.append(self.feedsManagerAct) |
| 1659 ## self.__actions.append(self.feedsManagerAct) | |
| 1660 | 1659 |
| 1661 # TODO: Site Info | 1660 # TODO: Site Info |
| 1662 ## self.siteInfoAct = E5Action( | 1661 ## self.siteInfoAct = E5Action( |
| 1663 ## self.tr('Siteinfo Dialog'), | 1662 ## self.tr('Siteinfo Dialog'), |
| 1664 ## UI.PixmapCache.getIcon("helpAbout.png"), | 1663 ## UI.PixmapCache.getIcon("helpAbout.png"), |
| 1882 menu.addAction(self.clearPrivateDataAct) | 1881 menu.addAction(self.clearPrivateDataAct) |
| 1883 menu.addAction(self.clearIconsAct) | 1882 menu.addAction(self.clearIconsAct) |
| 1884 | 1883 |
| 1885 menu = mb.addMenu(self.tr("&Tools")) | 1884 menu = mb.addMenu(self.tr("&Tools")) |
| 1886 menu.setTearOffEnabled(True) | 1885 menu.setTearOffEnabled(True) |
| 1887 ## menu.addAction(self.feedsManagerAct) | 1886 menu.addAction(self.feedsManagerAct) |
| 1888 ## menu.addAction(self.siteInfoAct) | 1887 ## menu.addAction(self.siteInfoAct) |
| 1889 ## menu.addSeparator() | 1888 ## menu.addSeparator() |
| 1890 ## menu.addAction(self.synchronizationAct) | 1889 ## menu.addAction(self.synchronizationAct) |
| 1891 ## menu.addSeparator() | 1890 ## menu.addSeparator() |
| 1892 ## menu.addAction(self.toolsMonitorAct) | 1891 ## menu.addAction(self.toolsMonitorAct) |
| 1993 settingstb.addAction(self.featurePermissionAct) | 1992 settingstb.addAction(self.featurePermissionAct) |
| 1994 | 1993 |
| 1995 toolstb = self.addToolBar(self.tr("Tools")) | 1994 toolstb = self.addToolBar(self.tr("Tools")) |
| 1996 toolstb.setObjectName("ToolsToolBar") | 1995 toolstb.setObjectName("ToolsToolBar") |
| 1997 toolstb.setIconSize(UI.Config.ToolBarIconSize) | 1996 toolstb.setIconSize(UI.Config.ToolBarIconSize) |
| 1998 ## toolstb.addAction(self.feedsManagerAct) | 1997 toolstb.addAction(self.feedsManagerAct) |
| 1999 ## toolstb.addAction(self.siteInfoAct) | 1998 ## toolstb.addAction(self.siteInfoAct) |
| 2000 ## toolstb.addSeparator() | 1999 ## toolstb.addSeparator() |
| 2001 ## toolstb.addAction(self.synchronizationAct) | 2000 ## toolstb.addAction(self.synchronizationAct) |
| 2002 | 2001 |
| 2003 helptb = self.addToolBar(self.tr("Help")) | 2002 helptb = self.addToolBar(self.tr("Help")) |
| 2787 Preferences.getUI("StyleSheet")) | 2786 Preferences.getUI("StyleSheet")) |
| 2788 | 2787 |
| 2789 self.__initWebEngineSettings() | 2788 self.__initWebEngineSettings() |
| 2790 | 2789 |
| 2791 # TODO: NetworkManager | 2790 # TODO: NetworkManager |
| 2792 ## self.networkAccessManager().preferencesChanged() | 2791 ## self.networkManager().preferencesChanged() |
| 2793 ## | 2792 ## |
| 2794 self.historyManager().preferencesChanged() | 2793 self.historyManager().preferencesChanged() |
| 2795 | 2794 |
| 2796 self.__tabWidget.preferencesChanged() | 2795 self.__tabWidget.preferencesChanged() |
| 2797 | 2796 |
| 2906 ## | 2905 ## |
| 2907 ## @return reference to the cookie jar (CookieJar) | 2906 ## @return reference to the cookie jar (CookieJar) |
| 2908 ## """ | 2907 ## """ |
| 2909 ## from .CookieJar.CookieJar import CookieJar | 2908 ## from .CookieJar.CookieJar import CookieJar |
| 2910 ## cls._cookieJar = CookieJar() | 2909 ## cls._cookieJar = CookieJar() |
| 2911 ## return cls.networkAccessManager().cookieJar() | 2910 ## return cls.networkManager().cookieJar() |
| 2912 ## | 2911 ## |
| 2913 def __clearIconsDatabase(self): | 2912 def __clearIconsDatabase(self): |
| 2914 """ | 2913 """ |
| 2915 Private slot to clear the icons databse. | 2914 Private slot to clear the icons databse. |
| 2916 """ | 2915 """ |
| 3299 if favicons: | 3298 if favicons: |
| 3300 self.__clearIconsDatabase() | 3299 self.__clearIconsDatabase() |
| 3301 # TODO: Cache Cleaning | 3300 # TODO: Cache Cleaning |
| 3302 ## if cache: | 3301 ## if cache: |
| 3303 ## try: | 3302 ## try: |
| 3304 ## self.networkAccessManager().cache().clear() | 3303 ## self.networkManager().cache().clear() |
| 3305 ## except AttributeError: | 3304 ## except AttributeError: |
| 3306 ## pass | 3305 ## pass |
| 3307 # TODO: Cookies | 3306 # TODO: Cookies |
| 3308 ## if cookies: | 3307 ## if cookies: |
| 3309 ## self.cookieJar().clear() | 3308 ## self.cookieJar().clear() |
| 3401 ## def __showNetworkMonitor(self): | 3400 ## def __showNetworkMonitor(self): |
| 3402 ## """ | 3401 ## """ |
| 3403 ## Private slot to show the network monitor dialog. | 3402 ## Private slot to show the network monitor dialog. |
| 3404 ## """ | 3403 ## """ |
| 3405 ## from E5Network.E5NetworkMonitor import E5NetworkMonitor | 3404 ## from E5Network.E5NetworkMonitor import E5NetworkMonitor |
| 3406 ## monitor = E5NetworkMonitor.instance(self.networkAccessManager()) | 3405 ## monitor = E5NetworkMonitor.instance(self.networkManager()) |
| 3407 ## monitor.show() | 3406 ## monitor.show() |
| 3408 ## | 3407 ## |
| 3409 ## def __showDownloadsWindow(self): | 3408 ## def __showDownloadsWindow(self): |
| 3410 ## """ | 3409 ## """ |
| 3411 ## Private slot to show the downloads dialog. | 3410 ## Private slot to show the downloads dialog. |
| 3766 elif evt.button() == Qt.XButton2: | 3765 elif evt.button() == Qt.XButton2: |
| 3767 self.currentBrowser().triggerPageAction(QWebEnginePage.Forward) | 3766 self.currentBrowser().triggerPageAction(QWebEnginePage.Forward) |
| 3768 else: | 3767 else: |
| 3769 super(WebBrowserWindow, self).mousePressEvent(evt) | 3768 super(WebBrowserWindow, self).mousePressEvent(evt) |
| 3770 | 3769 |
| 3771 # TODO: RSS | 3770 @classmethod |
| 3772 ## @classmethod | 3771 def feedsManager(cls): |
| 3773 ## def feedsManager(cls): | 3772 """ |
| 3774 ## """ | 3773 Class method to get a reference to the RSS feeds manager. |
| 3775 ## Class method to get a reference to the RSS feeds manager. | 3774 |
| 3776 ## | 3775 @return reference to the RSS feeds manager (FeedsManager) |
| 3777 ## @return reference to the RSS feeds manager (FeedsManager) | 3776 """ |
| 3778 ## """ | 3777 if cls._feedsManager is None: |
| 3779 ## if cls._feedsManager is None: | 3778 from .Feeds.FeedsManager import FeedsManager |
| 3780 ## from .Feeds.FeedsManager import FeedsManager | 3779 cls._feedsManager = FeedsManager() |
| 3781 ## cls._feedsManager = FeedsManager() | 3780 |
| 3782 ## | 3781 return cls._feedsManager |
| 3783 ## return cls._feedsManager | 3782 |
| 3784 ## | 3783 def __showFeedsManager(self): |
| 3785 ## def __showFeedsManager(self): | 3784 """ |
| 3786 ## """ | 3785 Private slot to show the feeds manager dialog. |
| 3787 ## Private slot to show the feeds manager dialog. | 3786 """ |
| 3788 ## """ | 3787 feedsManager = self.feedsManager() |
| 3789 ## feedsManager = self.feedsManager() | 3788 feedsManager.openUrl.connect(self.openUrl) |
| 3790 ## feedsManager.openUrl.connect(self.openUrl) | 3789 feedsManager.newUrl.connect(self.openUrlNewTab) |
| 3791 ## feedsManager.newUrl.connect(self.openUrlNewTab) | 3790 feedsManager.rejected.connect(self.__feedsManagerClosed) |
| 3792 ## feedsManager.rejected.connect(self.__feedsManagerClosed) | 3791 feedsManager.show() |
| 3793 ## feedsManager.show() | 3792 |
| 3794 ## | 3793 def __feedsManagerClosed(self): |
| 3795 ## def __feedsManagerClosed(self): | 3794 """ |
| 3796 ## """ | 3795 Private slot to handle closing the feeds manager dialog. |
| 3797 ## Private slot to handle closing the feeds manager dialog. | 3796 """ |
| 3798 ## """ | 3797 feedsManager = self.sender() |
| 3799 ## feedsManager = self.sender() | 3798 feedsManager.openUrl.disconnect(self.openUrl) |
| 3800 ## feedsManager.openUrl.disconnect(self.openUrl) | 3799 feedsManager.newUrl.disconnect(self.openUrlNewTab) |
| 3801 ## feedsManager.newUrl.disconnect(self.openUrlNewTab) | 3800 feedsManager.rejected.disconnect(self.__feedsManagerClosed) |
| 3802 ## feedsManager.rejected.disconnect(self.__feedsManagerClosed) | 3801 |
| 3803 ## | |
| 3804 # TODO: Site Info | 3802 # TODO: Site Info |
| 3805 ## def __showSiteinfoDialog(self): | 3803 ## def __showSiteinfoDialog(self): |
| 3806 ## """ | 3804 ## """ |
| 3807 ## Private slot to show the site info dialog. | 3805 ## Private slot to show the site info dialog. |
| 3808 ## """ | 3806 ## """ |
