From b0edc68c3d5691ce17a79bb6b9ef9f797ab50848 Mon Sep 17 00:00:00 2001 From: RedDevilus Date: Tue, 20 Apr 2021 17:15:19 +0200 Subject: [PATCH] Debugger-GUI: Resize help + add 2 hotkeys A bit easier and nicer to look at but still needs some work. --- bin/docs/debugger.txt | 97 ++++++++++++++---------- pcsx2/gui/Debugger/DisassemblyDialog.cpp | 8 +- 2 files changed, 60 insertions(+), 45 deletions(-) diff --git a/bin/docs/debugger.txt b/bin/docs/debugger.txt index 0f11f8b05b..d98d1dbf60 100644 --- a/bin/docs/debugger.txt +++ b/bin/docs/debugger.txt @@ -1,43 +1,58 @@ -disassembly view: - - ctrl+g goto - ctrl+e edit breakpoint - ctrl+d enable/disable breakpoint - ctrl+b add breakpoint - right follow branch/position memory view to accessed address - left go back one branch level/goto pc - up move cursor up one line - down move cursor down one line - page up move visible area up one page - page down move visible area down one page - f10 step over - f11 step into - tab toggle display symbols - left click select line/toggle breakpoint if line is already highlighted - right click open context menu - -memory view: - - ctrl+g goto - ctrl+b add breakpoint - left move cursor back one byte/nibble - right move cursor ahead one byte/nibble - up move cursor up one line - down move cursor down one line - page up move cursor up one page - page down move cursor down one page - 0-9,A-F overwrite hex nibble - any overwrite ansi byte - left click select byte/nibble - right click open context menu - ctrl+wheel zoom memory view - esc return to previous goto address - ctrl+v paste a hex string into memory -breakpoint list: +†---------------------† - up select previous item - down select next item - delete remove selected breakpoint - return edit selected breakpoint - space toggle enable state of selected breakpoint +Disassembly view: + +†---------------------† + + Ctrl + G Goto + Ctrl + E Edit Breakpoint + Ctrl + D Enable/disable breakpoint + Ctrl + B Add breakpoint + Left Go back one branch level/goto pc + Right Follow branch/position memory view to accessed address + Up Move cursor up one line + Down Move cursor down one line + Page Up Move visible area up one page + Page Down Move visible area down one page + F10 Step over + F11 Step into + Tab Toggle display symbols + Left Click Select line/toggle breakpoint if line is already highlighted + Right Click Open context menu + +†---------------------† + +Memory View: + +†---------------------† + + Ctrl + G Goto + Ctrl + B Add breakpoint + Left Move cursor back one byte/nibble + Right Move cursor ahead one byte/nibble + Up Move cursor up one line + Down Move cursor down one line + Page Up Move cursor up one page + Page Down Move cursor down one page + 0-9,A-F Overwrite hex nibble + Any Overwrite ansi byte + Left Click Select byte/nibble + Right Click Open context menu + Ctrl+Wheel Zoom memory view + Esc Return to previous goto address + Ctrl+V Paste a hex string into memory + +†---------------------† + +Breakpoint List: + +†---------------------† + + Up Select previous item + Down Select next item + Delete Remove selected breakpoint + Return Edit selected breakpoint + Space Toggle enable state of selected breakpoint + +†---------------------† \ No newline at end of file diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp index 5f06b2ab24..16c693158f 100644 --- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp +++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp @@ -1,5 +1,5 @@ /* PCSX2 - PS2 Emulator for PCs - * Copyright (C) 2002-2014 PCSX2 Dev Team + * Copyright (C) 2002-2021 PCSX2 Dev Team * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- @@ -72,7 +72,7 @@ DebuggerHelpDialog::DebuggerHelpDialog(wxWindow* parent) } wxTextCtrl* textControl = new wxTextCtrl(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); - textControl->SetMinSize(wxSize(400,300)); + textControl->SetMinSize(wxSize(650,610)); sizer->Add(textControl, 1, wxEXPAND); SetSizerAndFit(sizer); @@ -248,12 +248,12 @@ DisassemblyDialog::DisassemblyDialog(wxWindow* parent): breakRunButton->Enable(false); topRowSizer->Add(breakRunButton); - stepIntoButton = new wxButton( panel, wxID_ANY, L"Step Into"); + stepIntoButton = new wxButton( panel, wxID_ANY, L"Step Into" + wxString(" (F11)")); stepIntoButton->Enable(false); Bind(wxEVT_BUTTON, &DisassemblyDialog::onStepIntoClicked, this, stepIntoButton->GetId()); topRowSizer->Add(stepIntoButton); - stepOverButton = new wxButton( panel, wxID_ANY, L"Step Over"); + stepOverButton = new wxButton( panel, wxID_ANY, L"Step Over" + wxString(" (F10)")); stepOverButton->Enable(false); Bind(wxEVT_BUTTON, &DisassemblyDialog::onStepOverClicked, this, stepOverButton->GetId()); topRowSizer->Add(stepOverButton);