GUI: added interface for run/step with swallow exceptions

src/gui/Src/Gui/MainWindow.cpp

@@ -566,6 +566,7 @@ void MainWindow::refreshShortcuts()
 
     setGlobalShortcut(ui->actionRun, ConfigShortcut("DebugRun"));
     setGlobalShortcut(ui->actioneRun, ConfigShortcut("DebugeRun"));
+    setGlobalShortcut(ui->actionseRun, ConfigShortcut("DebugseRun"));
     setGlobalShortcut(ui->actionRunSelection, ConfigShortcut("DebugRunSelection"));
     setGlobalShortcut(ui->actionRunExpression, ConfigShortcut("DebugRunExpression"));
     setGlobalShortcut(ui->actionPause, ConfigShortcut("DebugPause"));
@@ -573,9 +574,11 @@ void MainWindow::refreshShortcuts()
     setGlobalShortcut(ui->actionClose, ConfigShortcut("DebugClose"));
     setGlobalShortcut(ui->actionStepInto, ConfigShortcut("DebugStepInto"));
     setGlobalShortcut(ui->actioneStepInto, ConfigShortcut("DebugeStepInto"));
+    setGlobalShortcut(ui->actionseStepInto, ConfigShortcut("DebugseStepInto"));
     setGlobalShortcut(ui->actionStepIntoSource, ConfigShortcut("DebugStepIntoSource"));
     setGlobalShortcut(ui->actionStepOver, ConfigShortcut("DebugStepOver"));
     setGlobalShortcut(ui->actioneStepOver, ConfigShortcut("DebugeStepOver"));
+    setGlobalShortcut(ui->actionseStepOver, ConfigShortcut("DebugseStepOver"));
     setGlobalShortcut(ui->actionStepOverSource, ConfigShortcut("DebugStepOverSource"));
     setGlobalShortcut(ui->actionRtr, ConfigShortcut("DebugRtr"));
     setGlobalShortcut(ui->actioneRtr, ConfigShortcut("DebugeRtr"));
@@ -1763,3 +1766,18 @@ void MainWindow::on_actionStepOverSource_triggered()
 {
     DbgCmdExec("TraceOverConditional src.line(cip) && !src.disp(cip)");
 }
+
+void MainWindow::on_actionseStepInto_triggered()
+{
+    DbgCmdExec("seStepInto");
+}
+
+void MainWindow::on_actionseStepOver_triggered()
+{
+    DbgCmdExec("seStepOver");
+}
+
+void MainWindow::on_actionseRun_triggered()
+{
+    DbgCmdExec("serun");
+}

src/gui/Src/Gui/MainWindow.h

@@ -248,6 +248,9 @@ private slots:
     void on_actionReloadStylesheet_triggered();
     void on_actionStepIntoSource_triggered();
     void on_actionStepOverSource_triggered();
+    void on_actionseStepInto_triggered();
+    void on_actionseStepOver_triggered();
+    void on_actionseRun_triggered();
 };
 
 #endif // MAINWINDOW_H

src/gui/Src/Gui/MainWindow.ui

@@ -96,6 +96,7 @@
     </widget>
     <addaction name="actionRun"/>
     <addaction name="actioneRun"/>
+    <addaction name="actionseRun"/>
     <addaction name="actionRunSelection"/>
     <addaction name="actionRunExpression"/>
     <addaction name="actionPause"/>
@@ -105,10 +106,12 @@
     <addaction name="separator"/>
     <addaction name="actionStepInto"/>
     <addaction name="actioneStepInto"/>
+    <addaction name="actionseStepInto"/>
     <addaction name="actionStepIntoSource"/>
     <addaction name="actionTicnd"/>
     <addaction name="actionStepOver"/>
     <addaction name="actioneStepOver"/>
+    <addaction name="actionseStepOver"/>
     <addaction name="actionStepOverSource"/>
     <addaction name="actionRtu"/>
     <addaction name="actionTocnd"/>
@@ -391,7 +394,7 @@
      <normaloff>:/icons/images/arrow-step-into.png</normaloff>:/icons/images/arrow-step-into.png</iconset>
    </property>
    <property name="text">
-    <string>Step into (skip exceptions)</string>
+    <string>Step into (pass exceptions)</string>
    </property>
   </action>
   <action name="actioneStepOver">
@@ -400,7 +403,7 @@
      <normaloff>:/icons/images/arrow-step-over.png</normaloff>:/icons/images/arrow-step-over.png</iconset>
    </property>
    <property name="text">
-    <string>Step over (skip exceptions)</string>
+    <string>Step over (pass exceptions)</string>
    </property>
   </action>
   <action name="actioneRun">
@@ -409,7 +412,7 @@
      <normaloff>:/icons/images/arrow-run.png</normaloff>:/icons/images/arrow-run.png</iconset>
    </property>
    <property name="text">
-    <string>Run (&amp;skip exceptions)</string>
+    <string>Run (pass exceptions)</string>
    </property>
   </action>
   <action name="actioneRtr">
@@ -418,7 +421,7 @@
      <normaloff>:/icons/images/arrow-step-rtr.png</normaloff>:/icons/images/arrow-step-rtr.png</iconset>
    </property>
    <property name="text">
-    <string>Execute till return (skip exceptions)</string>
+    <string>Execute till return (pass exceptions)</string>
    </property>
   </action>
   <action name="actionScript">
@@ -964,6 +967,33 @@
     <string>&amp;Graph</string>
    </property>
   </action>
+  <action name="actionseStepInto">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/arrow-step-into.png</normaloff>:/icons/images/arrow-step-into.png</iconset>
+   </property>
+   <property name="text">
+    <string>Step into (swallow exception)</string>
+   </property>
+  </action>
+  <action name="actionseStepOver">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/arrow-step-over.png</normaloff>:/icons/images/arrow-step-over.png</iconset>
+   </property>
+   <property name="text">
+    <string>Step over (swallow exception)</string>
+   </property>
+  </action>
+  <action name="actionseRun">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/arrow-run.png</normaloff>:/icons/images/arrow-run.png</iconset>
+   </property>
+   <property name="text">
+    <string>Run (swallow exception)</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

src/gui/Src/Utils/Configuration.cpp

@@ -291,28 +291,31 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
     defaultShortcuts.insert("ViewGraph", Shortcut(tr("View -> Graph"), "Alt+G", true));
 
     defaultShortcuts.insert("DebugRun", Shortcut(tr("Debug -> Run"), "F9", true));
-    defaultShortcuts.insert("DebugeRun", Shortcut(tr("Debug -> Run (skip exceptions)"), "Shift+F9", true));
+    defaultShortcuts.insert("DebugeRun", Shortcut(tr("Debug -> Run (pass exceptions)"), "Shift+F9", true));
+    defaultShortcuts.insert("DebugseRun", Shortcut(tr("Debug -> Run (swallow exception)"), "Ctrl+Alt+Shift+F9", true));
     defaultShortcuts.insert("DebugRunSelection", Shortcut(tr("Debug -> Run until selection"), "F4", true));
     defaultShortcuts.insert("DebugRunExpression", Shortcut(tr("Debug -> Run until expression"), "Shift+F4", true));
     defaultShortcuts.insert("DebugPause", Shortcut(tr("Debug -> Pause"), "F12", true));
     defaultShortcuts.insert("DebugRestart", Shortcut(tr("Debug -> Restart"), "Ctrl+F2", true));
     defaultShortcuts.insert("DebugClose", Shortcut(tr("Debug -> Close"), "Alt+F2", true));
     defaultShortcuts.insert("DebugStepInto", Shortcut(tr("Debug -> Step into"), "F7", true));
-    defaultShortcuts.insert("DebugeStepInto", Shortcut(tr("Debug -> Step into (skip execptions)"), "Shift+F7", true));
+    defaultShortcuts.insert("DebugeStepInto", Shortcut(tr("Debug -> Step into (pass execptions)"), "Shift+F7", true));
+    defaultShortcuts.insert("DebugseStepInto", Shortcut(tr("Debug -> Step into (swallow exception)"), "Ctrl+Alt+Shift+F7", true));
     defaultShortcuts.insert("DebugStepIntoSource", Shortcut(tr("Debug -> Step into (source)"), "F11", true));
     defaultShortcuts.insert("DebugStepOver", Shortcut(tr("Debug -> Step over"), "F8", true));
-    defaultShortcuts.insert("DebugeStepOver", Shortcut(tr("Debug -> Step over (skip execptions)"), "Shift+F8", true));
+    defaultShortcuts.insert("DebugeStepOver", Shortcut(tr("Debug -> Step over (pass execptions)"), "Shift+F8", true));
+    defaultShortcuts.insert("DebugseStepOver", Shortcut(tr("Debug -> Step over (swallow exception)"), "Ctrl+Alt+Shift+F8", true));
     defaultShortcuts.insert("DebugStepOverSource", Shortcut(tr("Debug -> Step over (source)"), "F10", true));
     defaultShortcuts.insert("DebugRtr", Shortcut(tr("Debug -> Execute till return"), "Ctrl+F9", true));
-    defaultShortcuts.insert("DebugeRtr", Shortcut(tr("Debug -> Execute till return (skip exceptions)"), "Ctrl+Shift+F9", true));
+    defaultShortcuts.insert("DebugeRtr", Shortcut(tr("Debug -> Execute till return (pass exceptions)"), "Ctrl+Shift+F9", true));
     defaultShortcuts.insert("DebugRtu", Shortcut(tr("Debug -> Run to user code"), "Alt+F9", true));
     defaultShortcuts.insert("DebugSkipNextInstruction", Shortcut(tr("Debug -> Skip next instruction"), "Ctrl+F8", true));
     defaultShortcuts.insert("DebugCommand", Shortcut(tr("Debug -> Command"), "Ctrl+Return", true));
-    defaultShortcuts.insert("DebugTraceIntoConditional", Shortcut(tr("Debug -> Trace Into Conditional"), ""));
-    defaultShortcuts.insert("DebugTraceOverConditional", Shortcut(tr("Debug -> Trace Over Conditional"), ""));
-    defaultShortcuts.insert("DebugEnableTraceRecordBit", Shortcut(tr("Debug -> Trace Record -> Bit"), ""));
-    defaultShortcuts.insert("DebugTraceRecordNone", Shortcut(tr("Debug -> Trace Record -> None"), ""));
-    defaultShortcuts.insert("DebugInstrUndo", Shortcut(tr("Debug -> Undo instruction"), "Alt+U"));
+    defaultShortcuts.insert("DebugTraceIntoConditional", Shortcut(tr("Debug -> Trace Into Conditional"), "", true));
+    defaultShortcuts.insert("DebugTraceOverConditional", Shortcut(tr("Debug -> Trace Over Conditional"), "", true));
+    defaultShortcuts.insert("DebugEnableTraceRecordBit", Shortcut(tr("Debug -> Trace Record -> Bit"), "", true));
+    defaultShortcuts.insert("DebugTraceRecordNone", Shortcut(tr("Debug -> Trace Record -> None"), "", true));
+    defaultShortcuts.insert("DebugInstrUndo", Shortcut(tr("Debug -> Undo instruction"), "Alt+U", true));
 
     defaultShortcuts.insert("PluginsScylla", Shortcut(tr("Plugins -> Scylla"), "Ctrl+I", true));
 

src/gui/Translations

@@ -1 +1 @@
-Subproject commit 9739ea332a67adbde874602ec8c9709a7bce003e
+Subproject commit 7de45d0dcdfc2773b75afbacab3e43b2bf40e685