Mercurial Repositories > eric / file comparison
comparison: eric6.py
eric6.py
- branch
- maintenance
- changeset 6602
- 331ac8f99cf8
- parent 6581
- 8eb6220f2bb7
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6570:06e7d2941ead | 6602:331ac8f99cf8 |
|---|---|
| 12 """ | 12 """ |
| 13 | 13 |
| 14 from __future__ import unicode_literals | 14 from __future__ import unicode_literals |
| 15 | 15 |
| 16 import sys | 16 import sys |
| 17 import os | |
| 18 | |
| 19 originalPathString = os.getenv("PATH") | |
| 17 | 20 |
| 18 # generate list of arguments to be remembered for a restart | 21 # generate list of arguments to be remembered for a restart |
| 19 restartArgsList = ["--no-splash", "--plugin", "--debug", "--config", | 22 restartArgsList = ["--no-splash", "--plugin", "--debug", "--config", |
| 20 "--pyqt4", "--settings", "--disable-crash", | 23 "--pyqt4", "--settings", "--disable-crash", |
| 21 "--disable-plugin"] | 24 "--disable-plugin"] |
| 39 import sip | 42 import sip |
| 40 sip.setdestroyonexit(False) | 43 sip.setdestroyonexit(False) |
| 41 except AttributeError: | 44 except AttributeError: |
| 42 pass | 45 pass |
| 43 | 46 |
| 44 import os | |
| 45 import traceback | 47 import traceback |
| 46 import time | 48 import time |
| 47 import logging | 49 import logging |
| 48 | 50 |
| 49 try: | 51 try: |
| 394 from UI.UserInterface import UserInterface | 396 from UI.UserInterface import UserInterface |
| 395 | 397 |
| 396 splash.showMessage( | 398 splash.showMessage( |
| 397 QCoreApplication.translate("eric6", "Generating Main Window...")) | 399 QCoreApplication.translate("eric6", "Generating Main Window...")) |
| 398 mainWindow = UserInterface(app, loc, splash, pluginFile, disabledPlugins, | 400 mainWindow = UserInterface(app, loc, splash, pluginFile, disabledPlugins, |
| 399 noopen, nocrash, disablecrash, restartArgs) | 401 noopen, nocrash, disablecrash, restartArgs, |
| 402 originalPathString) | |
| 400 app.lastWindowClosed.connect(app.quit) | 403 app.lastWindowClosed.connect(app.quit) |
| 401 mainWindow.show() | 404 mainWindow.show() |
| 402 | 405 |
| 403 QTimer.singleShot(0, uiStartUp) | 406 QTimer.singleShot(0, uiStartUp) |
| 404 | 407 |
