Merge pull request #738 from wheremyfoodat/forgotten-hotkeys

Annotate hotkeys in assembly window

Author: nicolasnoble

src/gui/gui.cc

@@ -802,7 +802,7 @@ void PCSX::GUI::endFrame() {
                 if (ImGui::MenuItem(_("Soft Reset"), "F8")) {
                     g_system->softReset();
                 }
-                if (ImGui::MenuItem(_("Hard Reset"), "shift-F8")) {
+                if (ImGui::MenuItem(_("Hard Reset"), "Shift+F8")) {
                     g_system->hardReset();
                 }
                 ImGui::EndMenu();

src/gui/widgets/assembly.cc

@@ -408,13 +408,13 @@ void PCSX::Widgets::Assembly::draw(GUI* gui, psxRegisters* registers, Memory* me
             ImGui::EndMenu();
         }
         if (ImGui::BeginMenu(_("Debug"))) {
-            if (ImGui::MenuItem(_("Pause"), nullptr, nullptr, g_system->running())) g_system->pause();
-            if (ImGui::MenuItem(_("Resume"), nullptr, nullptr, !g_system->running())) g_system->resume();
+            if (ImGui::MenuItem(_("Pause"), "F6", nullptr, g_system->running())) g_system->pause();
+            if (ImGui::MenuItem(_("Resume"), "F5", nullptr, !g_system->running())) g_system->resume();
             ImGui::Separator();
-            if (ImGui::MenuItem(_("Step In"), nullptr, nullptr, !g_system->running())) g_emulator->m_debug->stepIn();
-            if (ImGui::MenuItem(_("Step Over"), nullptr, nullptr, !g_system->running()))
+            if (ImGui::MenuItem(_("Step In"), "F11", nullptr, !g_system->running())) g_emulator->m_debug->stepIn();
+            if (ImGui::MenuItem(_("Step Over"), "F10", nullptr, !g_system->running()))
                 g_emulator->m_debug->stepOver();
-            if (ImGui::MenuItem(_("Step Out"), nullptr, nullptr, !g_system->running())) g_emulator->m_debug->stepOut();
+            if (ImGui::MenuItem(_("Step Out"), "Shift+F11", nullptr, !g_system->running())) g_emulator->m_debug->stepOut();
             ImGui::EndMenu();
         }
         if (ImGui::BeginMenu(_("Options"))) {