1
0
Fork 0

GUI: added "skip next instruction" menu item/hotkey + fixed some small bugs with the hotkey descriptions

This commit is contained in:
Mr. eXoDia 2014-12-14 03:18:07 +01:00
parent 3b755c9279
commit c3bb3581fd
6 changed files with 30 additions and 7 deletions

View File

@ -146,6 +146,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
connect(ui->actioneStepInto, SIGNAL(triggered()), this, SLOT(execeStepInto()));
connect(ui->actioneRun, SIGNAL(triggered()), this, SLOT(execeRun()));
connect(ui->actioneRtr, SIGNAL(triggered()), this, SLOT(execeRtr()));
connect(ui->actionSkipNextInstruction, SIGNAL(triggered()), this, SLOT(execSkip()));
connect(ui->actionScript, SIGNAL(triggered()), this, SLOT(displayScriptWidget()));
connect(ui->actionRunSelection, SIGNAL(triggered()), this, SLOT(runSelection()));
connect(ui->actionCpu, SIGNAL(triggered()), this, SLOT(displayCpuWidget()));
@ -281,6 +282,7 @@ void MainWindow::refreshShortcuts()
ui->actionRtr->setShortcut(ConfigShortcut("DebugRtr"));
ui->actioneRtr->setShortcut(ConfigShortcut("DebugeRtr"));
ui->actionCommand->setShortcut(ConfigShortcut("DebugCommand"));
ui->actionSkipNextInstruction->setShortcut(ConfigShortcut("DebugSkipNextInstruction"));
ui->actionScylla->setShortcut(ConfigShortcut("PluginsScylla"));
@ -621,6 +623,11 @@ void MainWindow::execeRtr()
DbgCmdExec("ertr");
}
void MainWindow::execSkip()
{
DbgCmdExec("skip");
}
void MainWindow::displayCpuWidget()
{
mCpuWidget->show();

View File

@ -59,6 +59,7 @@ public slots:
void execeStepInto();
void execeRun();
void execeRtr();
void execSkip();
void displayCpuWidget();
void displaySymbolWidget();
void displayReferencesWidget();

View File

@ -80,6 +80,7 @@
<addaction name="actioneStepOver"/>
<addaction name="actionRtr"/>
<addaction name="actioneRtr"/>
<addaction name="actionSkipNextInstruction"/>
<addaction name="separator"/>
<addaction name="actionCommand"/>
</widget>
@ -88,10 +89,10 @@
<string>&amp;Help</string>
</property>
<addaction name="actionCalculator"/>
<addaction name="actionCheckUpdates"/>
<addaction name="actionDonate"/>
<addaction name="separator"/>
<addaction name="actionAbout"/>
<addaction name="actionCheckUpdates"/>
<addaction name="actionDonate"/>
<addaction name="separator"/>
<addaction name="actionAbout"/>
</widget>
<widget class="QMenu" name="menuPlugins">
<property name="title">
@ -604,6 +605,18 @@
<string>Change Command &amp;Line</string>
</property>
</action>
<action name="actionSkipNextInstruction">
<property name="icon">
<iconset resource="../../resource.qrc">
<normaloff>:/icons/images/arrow-skip.png</normaloff>:/icons/images/arrow-skip.png</iconset>
</property>
<property name="text">
<string>Skip next instruction</string>
</property>
<property name="toolTip">
<string>Skip next instruction</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>

View File

@ -202,14 +202,15 @@ Configuration::Configuration() : QObject()
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("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 (skip exceptions)"), "Ctrl+Shift+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("PluginsScylla", Shortcut(tr("Plugins -> Scylla"), "Ctrl+I", true));
defaultShortcuts.insert("OptionsPreferences", Shortcut(tr("Options -> Preferences"), "", true));
defaultShortcuts.insert("OptionsAppearance", Shortcut(tr("Options -> Preferences"), "", true));
defaultShortcuts.insert("OptionsShortcuts", Shortcut(tr("Options -> Preferences"), "", true));
defaultShortcuts.insert("OptionsAppearance", Shortcut(tr("Options -> Appearance"), "", true));
defaultShortcuts.insert("OptionsShortcuts", Shortcut(tr("Options -> Shortcuts"), "", true));
defaultShortcuts.insert("HelpAbout", Shortcut(tr("Help -> About"), "", true));
defaultShortcuts.insert("HelpDonate", Shortcut(tr("Help -> Donate"), "", true));

Binary file not shown.

After

Width:  |  Height:  |  Size: 611 B

View File

@ -47,5 +47,6 @@
<file>images/detach.png</file>
<file>images/trace.png</file>
<file>images/changeargs.png</file>
<file>images/arrow-skip.png</file>
</qresource>
</RCC>