Mercurial Repositories > eric / file comparison
comparison: WebBrowser/WebBrowserWindow.py
WebBrowser/WebBrowserWindow.py
- changeset 5777
- 2c4441d65ee3
- parent 5768
- 6f4d7d02cb1e
- child 5779
- b53fabc86f3c
equal
deleted
inserted
replaced
| 5775:3a8bedba97ab | 5777:2c4441d65ee3 |
|---|---|
| 105 _featurePermissionManager = None | 105 _featurePermissionManager = None |
| 106 _flashCookieManager = None | 106 _flashCookieManager = None |
| 107 _imageSearchEngine = None | 107 _imageSearchEngine = None |
| 108 _autoScroller = None | 108 _autoScroller = None |
| 109 _tabManager = None | 109 _tabManager = None |
| 110 _sessionManager = None | |
| 110 | 111 |
| 111 def __init__(self, home, path, parent, name, fromEric=False, | 112 def __init__(self, home, path, parent, name, fromEric=False, |
| 112 initShortcutsOnly=False, searchWord=None, | 113 initShortcutsOnly=False, searchWord=None, |
| 113 private=False, qthelp=False, settingsDir=""): | 114 private=False, qthelp=False, settingsDir=""): |
| 114 """ | 115 """ |
| 424 | 425 |
| 425 self.__hideNavigationTimer = QTimer(self) | 426 self.__hideNavigationTimer = QTimer(self) |
| 426 self.__hideNavigationTimer.setInterval(1000) | 427 self.__hideNavigationTimer.setInterval(1000) |
| 427 self.__hideNavigationTimer.setSingleShot(True) | 428 self.__hideNavigationTimer.setSingleShot(True) |
| 428 self.__hideNavigationTimer.timeout.connect(self.__hideNavigation) | 429 self.__hideNavigationTimer.timeout.connect(self.__hideNavigation) |
| 430 | |
| 431 self.sessionManager() | |
| 429 | 432 |
| 430 QTimer.singleShot(0, syncMgr.loadSettings) | 433 QTimer.singleShot(0, syncMgr.loadSettings) |
| 431 | 434 |
| 432 def __del__(self): | 435 def __del__(self): |
| 433 """ | 436 """ |
| 3081 self.virustotalScanCurrentAct.setEnabled(True) | 3084 self.virustotalScanCurrentAct.setEnabled(True) |
| 3082 self.virustotalIpReportAct.setEnabled(True) | 3085 self.virustotalIpReportAct.setEnabled(True) |
| 3083 self.virustotalDomainReportAct.setEnabled(True) | 3086 self.virustotalDomainReportAct.setEnabled(True) |
| 3084 | 3087 |
| 3085 self.__javaScriptIcon.preferencesChanged() | 3088 self.__javaScriptIcon.preferencesChanged() |
| 3089 | |
| 3090 self.sessionManager().preferencesChanged() | |
| 3086 | 3091 |
| 3087 def masterPasswordChanged(self, oldPassword, newPassword): | 3092 def masterPasswordChanged(self, oldPassword, newPassword): |
| 3088 """ | 3093 """ |
| 3089 Public slot to handle the change of the master password. | 3094 Public slot to handle the change of the master password. |
| 3090 | 3095 |
| 4646 script.setRunsOnSubFrames(True) | 4651 script.setRunsOnSubFrames(True) |
| 4647 script.setSourceCode(Scripts.setupWebChannel()) | 4652 script.setSourceCode(Scripts.setupWebChannel()) |
| 4648 cls._webProfile.scripts().insert(script) | 4653 cls._webProfile.scripts().insert(script) |
| 4649 | 4654 |
| 4650 return cls._webProfile | 4655 return cls._webProfile |
| 4656 | |
| 4657 #################################################### | |
| 4658 ## Methods below implement session related functions | |
| 4659 #################################################### | |
| 4660 | |
| 4661 @classmethod | |
| 4662 def sessionManager(cls): | |
| 4663 """ | |
| 4664 Class method to get a reference to the session manager. | |
| 4665 | |
| 4666 @return reference to the session manager | |
| 4667 @rtype SessionManager | |
| 4668 """ | |
| 4669 if cls._sessionManager is None and not cls._isPrivate: | |
| 4670 from .Session.SessionManager import SessionManager | |
| 4671 cls._sessionManager = SessionManager() | |
| 4672 | |
| 4673 return cls._sessionManager |
