Mercurial Repositories > eric / file comparison
comparison: src/eric7/WebBrowser/WebBrowserWindow.py
src/eric7/WebBrowser/WebBrowserWindow.py
- branch
- eric7
- changeset 9971
- 773ad1f1ed22
- parent 9695
- ad962e9b904d
- child 10069
- 435cc5875135
equal
deleted
inserted
replaced
| 9970:c3686b43f76b | 9971:773ad1f1ed22 |
|---|---|
| 3628 True, | 3628 True, |
| 3629 fromEric=False, | 3629 fromEric=False, |
| 3630 displayMode=ConfigurationMode.WEBBROWSERMODE, | 3630 displayMode=ConfigurationMode.WEBBROWSERMODE, |
| 3631 ) | 3631 ) |
| 3632 dlg.preferencesChanged.connect(self.preferencesChanged) | 3632 dlg.preferencesChanged.connect(self.preferencesChanged) |
| 3633 dlg.masterPasswordChanged.connect( | 3633 dlg.mainPasswordChanged.connect( |
| 3634 lambda old, new: self.masterPasswordChanged(old, new, local=True) | 3634 lambda old, new: self.mainPasswordChanged(old, new, local=True) |
| 3635 ) | 3635 ) |
| 3636 dlg.show() | 3636 dlg.show() |
| 3637 if self.__lastConfigurationPageName: | 3637 if self.__lastConfigurationPageName: |
| 3638 dlg.showConfigurationPageByName(self.__lastConfigurationPageName) | 3638 dlg.showConfigurationPageByName(self.__lastConfigurationPageName) |
| 3639 else: | 3639 else: |
| 3700 self.__javaScriptIcon.preferencesChanged() | 3700 self.__javaScriptIcon.preferencesChanged() |
| 3701 | 3701 |
| 3702 if not WebBrowserWindow.isPrivate(): | 3702 if not WebBrowserWindow.isPrivate(): |
| 3703 self.sessionManager().preferencesChanged() | 3703 self.sessionManager().preferencesChanged() |
| 3704 | 3704 |
| 3705 def masterPasswordChanged(self, oldPassword, newPassword, local=False): | 3705 def mainPasswordChanged(self, oldPassword, newPassword, local=False): |
| 3706 """ | 3706 """ |
| 3707 Public slot to handle the change of the master password. | 3707 Public slot to handle the change of the main password. |
| 3708 | 3708 |
| 3709 @param oldPassword current master password | 3709 @param oldPassword current main password |
| 3710 @type str | 3710 @type str |
| 3711 @param newPassword new master password | 3711 @param newPassword new main password |
| 3712 @type str | 3712 @type str |
| 3713 @param local flag indicating being called from the local configuration | 3713 @param local flag indicating being called from the local configuration |
| 3714 dialog | 3714 dialog |
| 3715 @type bool | 3715 @type bool |
| 3716 """ | 3716 """ |
| 3717 self.passwordManager().masterPasswordChanged(oldPassword, newPassword) | 3717 self.passwordManager().mainPasswordChanged(oldPassword, newPassword) |
| 3718 if local: | 3718 if local: |
| 3719 # we were called from our local configuration dialog | 3719 # we were called from our local configuration dialog |
| 3720 Preferences.convertPasswords(oldPassword, newPassword) | 3720 Preferences.convertPasswords(oldPassword, newPassword) |
| 3721 Utilities.crypto.changeRememberedMaster(newPassword) | 3721 Utilities.crypto.changeRememberedMain(newPassword) |
| 3722 | 3722 |
| 3723 @pyqtSlot() | 3723 @pyqtSlot() |
| 3724 def __showAcceptedLanguages(self): | 3724 def __showAcceptedLanguages(self): |
| 3725 """ | 3725 """ |
| 3726 Private slot to configure the accepted languages for web pages. | 3726 Private slot to configure the accepted languages for web pages. |
