Mercurial Repositories > eric / file comparison
comparison: src/eric7/eric7_ide.py
src/eric7/eric7_ide.py
- branch
- eric7
- changeset 10789
- d3fa6a6b919e
- parent 10760
- f702f6781b05
- child 10926
- 9ef616cd220d
equal
deleted
inserted
replaced
| 10788:c14f37a9aa74 | 10789:d3fa6a6b919e |
|---|---|
| 381 splash = NoneSplashScreen() | 381 splash = NoneSplashScreen() |
| 382 else: | 382 else: |
| 383 splash = SplashScreen() | 383 splash = SplashScreen() |
| 384 QCoreApplication.processEvents() | 384 QCoreApplication.processEvents() |
| 385 | 385 |
| 386 # modify the executable search path for the PyQt5 installer | 386 # modify the executable search path for the PyQt6 installer |
| 387 if OSUtilities.isWindowsPlatform(): | 387 if OSUtilities.isWindowsPlatform(): |
| 388 pyqtDataDir = QtUtilities.getPyQt6ModulesDirectory() | 388 pyqtDataDir = QtUtilities.getPyQt6ModulesDirectory() |
| 389 if os.path.exists(os.path.join(pyqtDataDir, "bin")): | 389 if os.path.exists(os.path.join(pyqtDataDir, "bin")): |
| 390 path = os.path.join(pyqtDataDir, "bin") | 390 path = os.path.join(pyqtDataDir, "bin") |
| 391 else: | 391 else: |
| 404 from eric7.EricNetwork.EricSslUtilities import initSSL # __IGNORE_WARNING_I101__ | 404 from eric7.EricNetwork.EricSslUtilities import initSSL # __IGNORE_WARNING_I101__ |
| 405 | 405 |
| 406 initSSL() | 406 initSSL() |
| 407 | 407 |
| 408 splash.showMessage(QCoreApplication.translate("eric7_ide", "Starting...")) | 408 splash.showMessage(QCoreApplication.translate("eric7_ide", "Starting...")) |
| 409 logging.getLogger(__name__).debug( | 409 logging.getLogger(__name__).debug("Starting...") |
| 410 QCoreApplication.translate("eric7_ide", "Starting...") | |
| 411 ) | |
| 412 | 410 |
| 413 # We can only import these after creating the EricApplication because they | 411 # We can only import these after creating the EricApplication because they |
| 414 # make Qt calls that need the EricApplication to exist. | 412 # make Qt calls that need the EricApplication to exist. |
| 415 from eric7.UI.UserInterface import UserInterface # __IGNORE_WARNING_I101__ | 413 from eric7.UI.UserInterface import UserInterface # __IGNORE_WARNING_I101__ |
| 416 | 414 |
| 417 splash.showMessage( | 415 splash.showMessage( |
| 418 QCoreApplication.translate("eric7_ide", "Generating Main Window...") | 416 QCoreApplication.translate("eric7_ide", "Generating Main Window...") |
| 419 ) | 417 ) |
| 420 logging.getLogger(__name__).debug( | 418 logging.getLogger(__name__).debug("Generating Main Window...") |
| 421 QCoreApplication.translate("eric7_ide", "Generating Main Window...") | |
| 422 ) | |
| 423 mainWindow = UserInterface( | 419 mainWindow = UserInterface( |
| 424 app, | 420 app, |
| 425 loc, | 421 loc, |
| 426 splash, | 422 splash, |
| 427 ( | 423 ( |
