Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/WebBrowserWindow.py
eric7/WebBrowser/WebBrowserWindow.py
- branch
- eric7
- changeset 8314
- e3642a6a1e71
- parent 8312
- 800c432b34c8
- child 8318
- 962bce857696
equal
deleted
inserted
replaced
| 8313:dac33c7fce07 | 8314:e3642a6a1e71 |
|---|---|
| 54 | 54 |
| 55 from .ZoomManager import ZoomManager | 55 from .ZoomManager import ZoomManager |
| 56 | 56 |
| 57 from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer | 57 from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer |
| 58 | 58 |
| 59 from eric6config import getConfig | 59 from eric7config import getConfig |
| 60 | 60 |
| 61 | 61 |
| 62 class WebBrowserWindow(E5MainWindow): | 62 class WebBrowserWindow(E5MainWindow): |
| 63 """ | 63 """ |
| 64 Class implementing the web browser main window. | 64 Class implementing the web browser main window. |
| 2456 elif isinstance(link, QUrl): | 2456 elif isinstance(link, QUrl): |
| 2457 linkName = link.toString() | 2457 linkName = link.toString() |
| 2458 else: | 2458 else: |
| 2459 linkName = link | 2459 linkName = link |
| 2460 | 2460 |
| 2461 applPath = os.path.join(getConfig("ericDir"), "eric6_browser.py") | 2461 applPath = os.path.join(getConfig("ericDir"), "eric7_browser.py") |
| 2462 args = [] | 2462 args = [] |
| 2463 args.append(applPath) | 2463 args.append(applPath) |
| 2464 args.append("--config={0}".format(Utilities.getConfigDir())) | 2464 args.append("--config={0}".format(Utilities.getConfigDir())) |
| 2465 if self.__settingsDir: | 2465 if self.__settingsDir: |
| 2466 args.append("--settings={0}".format(self.__settingsDir)) | 2466 args.append("--settings={0}".format(self.__settingsDir)) |
| 3311 @rtype str | 3311 @rtype str |
| 3312 """ | 3312 """ |
| 3313 qthelpDir = os.path.join(Utilities.getConfigDir(), "qthelp") | 3313 qthelpDir = os.path.join(Utilities.getConfigDir(), "qthelp") |
| 3314 if not os.path.exists(qthelpDir): | 3314 if not os.path.exists(qthelpDir): |
| 3315 os.makedirs(qthelpDir) | 3315 os.makedirs(qthelpDir) |
| 3316 return os.path.join(qthelpDir, "eric6help.qhc") | 3316 return os.path.join(qthelpDir, "eric7help.qhc") |
| 3317 | 3317 |
| 3318 @classmethod | 3318 @classmethod |
| 3319 def networkManager(cls): | 3319 def networkManager(cls): |
| 3320 """ | 3320 """ |
| 3321 Class method to get a reference to the network manager object. | 3321 Class method to get a reference to the network manager object. |
