Mercurial Repositories > eric / file comparison
comparison: eric5.py
eric5.py
- branch
- 5_5_x
- changeset 3813
- 31b15072115d
- parent 3710
- 0060733678b0
equal
deleted
inserted
replaced
| 3810:ca370b397c9e | 3813:31b15072115d |
|---|---|
| 231 if not Globals.checkBlacklistedVersions(): | 231 if not Globals.checkBlacklistedVersions(): |
| 232 sys.exit(100) | 232 sys.exit(100) |
| 233 | 233 |
| 234 app = E5Application(sys.argv) | 234 app = E5Application(sys.argv) |
| 235 | 235 |
| 236 import Utilities | |
| 237 from Toolbox import Startup | 236 from Toolbox import Startup |
| 238 | |
| 239 ddindex = Startup.handleArgs(sys.argv, appinfo) | 237 ddindex = Startup.handleArgs(sys.argv, appinfo) |
| 240 | 238 |
| 241 logging.debug("Importing Preferences") | 239 logging.debug("Importing Preferences") |
| 242 import Preferences | 240 import Preferences |
| 243 | 241 |
| 257 splash = NoneSplashScreen() | 255 splash = NoneSplashScreen() |
| 258 elif not Preferences.getUI("ShowSplash"): | 256 elif not Preferences.getUI("ShowSplash"): |
| 259 splash = NoneSplashScreen() | 257 splash = NoneSplashScreen() |
| 260 else: | 258 else: |
| 261 splash = SplashScreen() | 259 splash = SplashScreen() |
| 260 QApplication.processEvents() | |
| 262 | 261 |
| 263 # modify the executable search path for the PyQt4 installer | 262 # modify the executable search path for the PyQt4 installer |
| 264 if Globals.isWindowsPlatform(): | 263 if Globals.isWindowsPlatform(): |
| 265 pyqtDataDir = Globals.getPyQt4ModulesDirectory() | 264 pyqtDataDir = Globals.getPyQt4ModulesDirectory() |
| 266 if os.path.exists(os.path.join(pyqtDataDir, "bin")): | 265 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
| 275 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: | 274 if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex: |
| 276 del sys.argv[sys.argv.index("--noopen")] | 275 del sys.argv[sys.argv.index("--noopen")] |
| 277 noopen = True | 276 noopen = True |
| 278 for arg in sys.argv: | 277 for arg in sys.argv: |
| 279 if arg.startswith("--plugin=") and sys.argv.index(arg) < ddindex: | 278 if arg.startswith("--plugin=") and sys.argv.index(arg) < ddindex: |
| 279 import Utilities | |
| 280 # extract the plugin development option | 280 # extract the plugin development option |
| 281 pluginFile = arg.replace("--plugin=", "").replace('"', "") | 281 pluginFile = arg.replace("--plugin=", "").replace('"', "") |
| 282 sys.argv.remove(arg) | 282 sys.argv.remove(arg) |
| 283 pluginFile = os.path.expanduser(pluginFile) | 283 pluginFile = os.path.expanduser(pluginFile) |
| 284 pluginFile = Utilities.normabspath(pluginFile) | 284 pluginFile = Utilities.normabspath(pluginFile) |
