Mercurial Repositories > eric / file comparison
comparison: eric6/UI/UserInterface.py
eric6/UI/UserInterface.py
- branch
- without_py2_and_pyqt4
- changeset 7196
- ab0a91b82b37
- parent 7192
- a22eee00b052
- child 7198
- 684261ef2165
equal
deleted
inserted
replaced
| 7192:a22eee00b052 | 7196:ab0a91b82b37 |
|---|---|
| 2033 """ with a word selected, this word is search in the Qt help""" | 2033 """ with a word selected, this word is search in the Qt help""" |
| 2034 """ collection.</p>""" | 2034 """ collection.</p>""" |
| 2035 )) | 2035 )) |
| 2036 self.helpviewerAct.triggered.connect(self.__helpViewer) | 2036 self.helpviewerAct.triggered.connect(self.__helpViewer) |
| 2037 self.actions.append(self.helpviewerAct) | 2037 self.actions.append(self.helpviewerAct) |
| 2038 ## else: | |
| 2039 ## self.helpviewerAct = None | |
| 2040 | 2038 |
| 2041 self.__initQtDocActions() | 2039 self.__initQtDocActions() |
| 2042 self.__initPythonDocActions() | 2040 self.__initPythonDocActions() |
| 2043 self.__initEricDocAction() | 2041 self.__initEricDocAction() |
| 2044 self.__initPySideDocActions() | 2042 self.__initPySideDocActions() |
| 3678 versionText += \ | 3676 versionText += \ |
| 3679 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\ | 3677 """<tr><td><b>WebEngine</b></td><td>{0}</td></tr>"""\ |
| 3680 .format(chromeVersion) | 3678 .format(chromeVersion) |
| 3681 except ImportError: | 3679 except ImportError: |
| 3682 pass | 3680 pass |
| 3683 try: | |
| 3684 from PyQt5.QtWebKit import qWebKitVersion | |
| 3685 versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ | |
| 3686 .format(qWebKitVersion()) | |
| 3687 except ImportError: | |
| 3688 pass | |
| 3689 versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ | 3681 versionText += """<tr><td><b>{0}</b></td><td>{1}</td></tr>"""\ |
| 3690 .format(Program, Version) | 3682 .format(Program, Version) |
| 3691 versionText += self.tr("""</table>""") | 3683 versionText += self.tr("""</table>""") |
| 3692 | 3684 |
| 3693 E5MessageBox.about(self, Program, versionText) | 3685 E5MessageBox.about(self, Program, versionText) |
| 5977 if self.__webBrowserProcess is None: | 5969 if self.__webBrowserProcess is None: |
| 5978 webBrowsers = [ | 5970 webBrowsers = [ |
| 5979 os.path.join( | 5971 os.path.join( |
| 5980 os.path.dirname(__file__), "..", "eric6_browser.py"), | 5972 os.path.dirname(__file__), "..", "eric6_browser.py"), |
| 5981 # QtWebEngine based web browser | 5973 # QtWebEngine based web browser |
| 5982 os.path.join( | |
| 5983 os.path.dirname(__file__), "..", "eric6_webbrowser.py"), | |
| 5984 # QtWebKit based web browser | |
| 5985 ] | 5974 ] |
| 5986 process = QProcess() | 5975 process = QProcess() |
| 5987 for browser in webBrowsers: | 5976 for browser in webBrowsers: |
| 5988 args = [ | 5977 args = [ |
| 5989 browser, | 5978 browser, |
| 6239 self.masterPasswordChanged.emit(oldPassword, newPassword) | 6228 self.masterPasswordChanged.emit(oldPassword, newPassword) |
| 6240 Preferences.convertPasswords(oldPassword, newPassword) | 6229 Preferences.convertPasswords(oldPassword, newPassword) |
| 6241 variant = Globals.getWebBrowserSupport() | 6230 variant = Globals.getWebBrowserSupport() |
| 6242 if variant == "QtWebEngine": | 6231 if variant == "QtWebEngine": |
| 6243 from WebBrowser.Passwords.PasswordManager import \ | 6232 from WebBrowser.Passwords.PasswordManager import \ |
| 6244 PasswordManager | |
| 6245 pwManager = PasswordManager() | |
| 6246 pwManager.masterPasswordChanged(oldPassword, newPassword) | |
| 6247 elif variant == "QtWebKit": | |
| 6248 from Helpviewer.Passwords.PasswordManager import \ | |
| 6249 PasswordManager | 6233 PasswordManager |
| 6250 pwManager = PasswordManager() | 6234 pwManager = PasswordManager() |
| 6251 pwManager.masterPasswordChanged(oldPassword, newPassword) | 6235 pwManager.masterPasswordChanged(oldPassword, newPassword) |
| 6252 Utilities.crypto.changeRememberedMaster(newPassword) | 6236 Utilities.crypto.changeRememberedMaster(newPassword) |
| 6253 | 6237 |
