Mercurial Repositories > eric / file comparison
comparison: eric5.py
eric5.py
- branch
- 5_0_x
- changeset 700
- f61fa26998d0
- parent 567
- 5dcea6a6c0d0
- child 769
- a7cac3e1f1e3
equal
deleted
inserted
replaced
| 698:7435c1a668f9 | 700:f61fa26998d0 |
|---|---|
| 192 elif not Preferences.getUI("ShowSplash"): | 192 elif not Preferences.getUI("ShowSplash"): |
| 193 splash = NoneSplashScreen() | 193 splash = NoneSplashScreen() |
| 194 else: | 194 else: |
| 195 splash = SplashScreen() | 195 splash = SplashScreen() |
| 196 | 196 |
| 197 # modify the executable search path for the PyQt4 installer | |
| 198 try: | |
| 199 from PyQt4 import pyqtconfig | |
| 200 pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"] | |
| 201 if os.path.exists(os.path.join(pyqtDataDir, "bin")): | |
| 202 path = os.path.join(pyqtDataDir, "bin") + os.pathsep + os.environ["PATH"] | |
| 203 os.environ["PATH"] = path | |
| 204 except (AttributeError, ImportError): | |
| 205 pass | |
| 206 | |
| 197 pluginFile = None | 207 pluginFile = None |
| 198 noopen = False | 208 noopen = False |
| 199 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: | 209 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: |
| 200 del sys.argv[sys.argv.index("--noopen")] | 210 del sys.argv[sys.argv.index("--noopen")] |
| 201 noopen = True | 211 noopen = True |
