Mercurial Repositories > eric / changeset

--- a/eric6/Debugger/DebugUI.py	Wed Jan 06 13:58:40 2021 +0100
+++ b/eric6/Debugger/DebugUI.py	Wed Jan 06 14:06:40 2021 +0100
@@ -1115,54 +1115,31 @@
         if not quiet:
             if not program:
                 program = self.ui.currentProg
-            if (
-                not Preferences.getDebugger("SuppressClientExit") or
-                status != 0
-            ):
-                # TODO: test if this is still needed
-                if message:
-                    info = self.tr("<p>Message: {0}</p>").format(
-                        Utilities.html_uencode(message))
-                else:
-                    info = ""
-                if program is None:
-                    E5MessageBox.information(
-                        self.ui, Program,
-                        self.tr('<p>The program has terminated with an exit'
-                                ' status of {0}.</p>{1}').format(status, info)
-                    )
-                else:
-                    E5MessageBox.information(
-                        self.ui, Program,
-                        self.tr('<p><b>{0}</b> has terminated with an exit'
-                                ' status of {1}.</p>{2}').format(
-                            os.path.abspath(program), status, info)
-                    )
+            
+            if message:
+                info = self.tr("Message: {0}").format(
+                    Utilities.html_uencode(message))
+            else:
+                info = ""
+            if program is None:
+                msg = self.tr(
+                    '<p>The program has terminated with an exit status of'
+                    ' {0}.</p><p>{1}</p>').format(status, info)
             else:
-                if message:
-                    info = self.tr("Message: {0}").format(
-                        Utilities.html_uencode(message))
-                else:
-                    info = ""
-                if program is None:
-                    msg = self.tr(
-                        'The program has terminated with an exit status of'
-                        ' {0}.\n{1}').format(status, info)
-                else:
-                    msg = self.tr(
-                        '"{0}" has terminated with an exit status of'
-                        ' {1}.\n{2}').format(
-                        os.path.basename(program), status, info)
-                if status != 0:
-                    timeout = 0
-                    kind = NotificationTypes.Warning
-                else:
-                    timeout = None
-                    kind = NotificationTypes.Information
-                self.ui.showNotification(
-                    UI.PixmapCache.getPixmap("debug48"),
-                    self.tr("Program terminated"), msg, kind=kind,
-                    timeout=timeout)
+                msg = self.tr(
+                    '<p><b>{0}</b> has terminated with an exit status of'
+                    ' {1}.</p><p>{2}</p>').format(
+                    os.path.basename(program), status, info)
+            if status != 0:
+                timeout = 0
+                kind = NotificationTypes.Warning
+            else:
+                timeout = None
+                kind = NotificationTypes.Information
+            self.ui.showNotification(
+                UI.PixmapCache.getPixmap("debug48"),
+                self.tr("Program terminated"), msg, kind=kind,
+                timeout=timeout)
     
     def __lastClientExited(self):
         """

--- a/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Wed Jan 06 13:58:40 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Wed Jan 06 14:06:40 2021 +0100
@@ -142,8 +142,6 @@
             Preferences.getDebugger("ThreeStateBreakPoints"))
         self.recentFilesSpinBox.setValue(
             Preferences.getDebugger("RecentNumber"))
-        self.dontShowClientExitCheckBox.setChecked(
-            Preferences.getDebugger("SuppressClientExit"))
         self.exceptionBreakCheckBox.setChecked(
             Preferences.getDebugger("BreakAlways"))
         self.exceptionShellCheckBox.setChecked(
@@ -240,9 +238,6 @@
             "RecentNumber",
             self.recentFilesSpinBox.value())
         Preferences.setDebugger(
-            "SuppressClientExit",
-            self.dontShowClientExitCheckBox.isChecked())
-        Preferences.setDebugger(
             "BreakAlways",
             self.exceptionBreakCheckBox.isChecked())
         Preferences.setDebugger(

--- a/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Wed Jan 06 13:58:40 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.ui	Wed Jan 06 14:06:40 2021 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>550</width>
-    <height>1650</height>
+    <height>1655</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -478,16 +478,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="dontShowClientExitCheckBox">
-        <property name="toolTip">
-         <string>Select to suppress the client exit dialog for a clean exit</string>
-        </property>
-        <property name="text">
-         <string>Don't show client exit dialog for a clean exit</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -822,7 +812,6 @@
   <tabstop>debugEnvironEdit</tabstop>
   <tabstop>debugAutoSaveScriptsCheckBox</tabstop>
   <tabstop>automaticResetCheckBox</tabstop>
-  <tabstop>dontShowClientExitCheckBox</tabstop>
   <tabstop>multiprocessCheckBox</tabstop>
   <tabstop>debugThreeStateBreakPoint</tabstop>
   <tabstop>recentFilesSpinBox</tabstop>

--- a/eric6/Preferences/__init__.py	Wed Jan 06 13:58:40 2021 +0100
+++ b/eric6/Preferences/__init__.py	Wed Jan 06 14:06:40 2021 +0100
@@ -78,7 +78,6 @@
         "RecentNumber": 9,
         # max. number of file names to be remembered for the add breakpoint
         # dialog
-        "SuppressClientExit": False,
         "BreakAlways": False,
         "ShowExceptionInShell": True,
         "Python3VirtualEnv": "",
@@ -1728,9 +1727,8 @@
                "RubyRedirect",
                "ConsoleDbgEnabled", "PathTranslation",
                "Autosave", "ThreeStateBreakPoints",
-               "SuppressClientExit", "BreakAlways",
-               "AutoViewSourceCode", "ShowExceptionInShell",
-               "MultiProcessEnabled",
+               "BreakAlways", "AutoViewSourceCode",
+               "ShowExceptionInShell", "MultiProcessEnabled",
                ]:
         return toBool(prefClass.settings.value(
             "Debugger/" + key, prefClass.debuggerDefaults[key]))