Mercurial Repositories > eric / file diff

--- a/eric6.py	Sat Dec 10 17:16:38 2016 +0100
+++ b/eric6.py	Sun Dec 11 16:25:42 2016 +0100
@@ -16,8 +16,8 @@
 import sys
 
 # generate list of arguments to be remembered for a restart
-restartArgsList = ["--nosplash", "--plugin", "--debug", "--config", "--pyqt4"
-                   "--settings"]
+restartArgsList = ["--nosplash", "--no-splash", "--plugin", "--debug",
+                   "--config", "--pyqt4", "--settings"]
 restartArgs = [arg for arg in sys.argv[1:]
                if arg.split("=", 1)[0] in restartArgsList]
 
@@ -113,10 +113,19 @@
     client = E5SingleApplicationClient()
     res = client.connect()
     if res > 0:
+        # deprecated option
         if "--nosplash" in sys.argv and sys.argv.index("--nosplash") < ddindex:
             del sys.argv[sys.argv.index("--nosplash")]
+        if "--no-splash" in sys.argv and \
+                sys.argv.index("--no-splash") < ddindex:
+            del sys.argv[sys.argv.index("--no-splash")]
+        # deprecated option
         if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex:
             del sys.argv[sys.argv.index("--noopen")]
+        if "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
+            del sys.argv[sys.argv.index("--no-open")]
+        if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex:
+            del sys.argv[sys.argv.index("--no-crash")]
         if "--debug" in sys.argv and sys.argv.index("--debug") < ddindex:
             del sys.argv[sys.argv.index("--debug")]
         for arg in sys.argv:
@@ -234,9 +243,10 @@
         ("--config=configDir",
          "use the given directory as the one containing the config files"),
         ("--debug", "activate debugging output to the console"),
-        ("--nosplash", "don't show the splash screen"),
-        ("--noopen",
+        ("--no-splash", "don't show the splash screen"),
+        ("--no-open",
          "don't open anything at startup except that given in command"),
+        ("--no-crash", "don't check for a crsh session file on startup"),
         ("--plugin=plugin-file",
          "load the given plugin file (plugin development)"),
         ("--pyqt4",
@@ -280,8 +290,12 @@
     # generate and show a splash window, if not suppressed
     from UI.SplashScreen import SplashScreen, NoneSplashScreen
     if "--nosplash" in sys.argv and sys.argv.index("--nosplash") < ddindex:
+        # support for deprecated option
         del sys.argv[sys.argv.index("--nosplash")]
         splash = NoneSplashScreen()
+    elif "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex:
+        del sys.argv[sys.argv.index("--no-splash")]
+        splash = NoneSplashScreen()
     elif not Preferences.getUI("ShowSplash"):
         splash = NoneSplashScreen()
     else:
@@ -301,9 +315,17 @@
     
     pluginFile = None
     noopen = False
+    nocrash = False
     if "--noopen" in sys.argv and sys.argv.index("--noopen") < ddindex:
+        # support for deprecated option
         del sys.argv[sys.argv.index("--noopen")]
         noopen = True
+    elif "--no-open" in sys.argv and sys.argv.index("--no-open") < ddindex:
+        del sys.argv[sys.argv.index("--no-open")]
+        noopen = True
+    if "--no-crash" in sys.argv and sys.argv.index("--no-crash") < ddindex:
+        del sys.argv[sys.argv.index("--no-crash")]
+        nocrash = True
     for arg in sys.argv:
         if arg.startswith("--plugin=") and sys.argv.index(arg) < ddindex:
             import Utilities
@@ -338,7 +360,7 @@
 
     splash.showMessage(
         QCoreApplication.translate("eric6", "Generating Main Window..."))
-    mainWindow = UserInterface(app, loc, splash, pluginFile, noopen,
+    mainWindow = UserInterface(app, loc, splash, pluginFile, noopen, nocrash,
                                restartArgs)
     app.lastWindowClosed.connect(app.quit)
     mainWindow.show()