From 7e73a21f5c48dada7a5fd19eb8f3747e261c3a56 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 2 Feb 2020 22:38:42 -0500 Subject: [PATCH] Add "Add Item" and F1 menu key accelerator on Linux Patch from @x-qq Closes #195 --- src/game/boe.menu.cpp | 10 +++++++++- src/pcedit/pc.menu.cpp | 11 ++++++++++- src/scenedit/scen.menu.cpp | 10 +++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/game/boe.menu.cpp b/src/game/boe.menu.cpp index 8fc70da6..08a8f8d2 100644 --- a/src/game/boe.menu.cpp +++ b/src/game/boe.menu.cpp @@ -78,7 +78,7 @@ void OpenBoEMenu::add_persistent_menu_items(tgui::MenuBar::Ptr& menubar) const { { { "Library", "Tip of the Day" }, eMenu::LIBRARY_TIPS }, { { "Library", "Show Introductory Dialog" }, eMenu::LIBRARY_INTRO }, - { { "Help", "Index" }, eMenu::HELP_TOC }, + { { "Help", "Index F1" }, eMenu::HELP_TOC }, { { "Help", "About Blades of Exile" }, eMenu::ABOUT }, { { "Help", "Outdoor Commands" }, eMenu::HELP_OUT }, { { "Help", "Town Commands" }, eMenu::HELP_TOWN }, @@ -118,6 +118,14 @@ bool OpenBoEMenu::handle_keypressed_event(const sf::Event& event) const { event_was_consumed = this->handle_ctrl_keypress(event); } } + + switch(event.key.code) { + case sf::Keyboard::F1: + handle_menu_choice(eMenu::HELP_TOC); + event_was_consumed = true; + break; + default: break; + } return event_was_consumed; } diff --git a/src/pcedit/pc.menu.cpp b/src/pcedit/pc.menu.cpp index 57296631..720e0658 100644 --- a/src/pcedit/pc.menu.cpp +++ b/src/pcedit/pc.menu.cpp @@ -51,6 +51,7 @@ void OpenBoEPCEditMenu::add_persistent_menu_items(tgui::MenuBar::Ptr& menubar) c { { "Party", "Removed Bad Conditions" }, eMenu::CURE_CONDITIONS }, { { "Party", "Edit Mage Spells" }, eMenu::EDIT_MAGE }, { { "Party", "Edit Priest Spells" }, eMenu::EDIT_PRIEST }, + { { "Party", "Add Item" }, eMenu::EDIT_ITEM }, { { "Party", "Edit Traits" }, eMenu::EDIT_TRAITS }, { { "Party", "Edit Skills" }, eMenu::EDIT_SKILLS }, { { "Party", "Edit XP" }, eMenu::EDIT_XP }, @@ -66,7 +67,7 @@ void OpenBoEPCEditMenu::add_persistent_menu_items(tgui::MenuBar::Ptr& menubar) c { { "Scenario", "Set Stuff Done Flag" }, eMenu::SET_SDF }, { { "Help", "About Blades of Exile Editor" }, eMenu::ABOUT }, - { { "Help", "Blades of Exile Editor Help" }, eMenu::HELP_TOC }, + { { "Help", "Blades of Exile Editor Help F1" }, eMenu::HELP_TOC }, }; // Note that signal connection ids are discarded. @@ -101,6 +102,14 @@ bool OpenBoEPCEditMenu::handle_keypressed_event(const sf::Event& event) const { } } + switch(event.key.code) { + case sf::Keyboard::F1: + handle_menu_choice(eMenu::HELP_TOC); + event_was_consumed = true; + break; + default: break; + } + return event_was_consumed; } diff --git a/src/scenedit/scen.menu.cpp b/src/scenedit/scen.menu.cpp index 2b5eff6d..2f0a6e6f 100644 --- a/src/scenedit/scen.menu.cpp +++ b/src/scenedit/scen.menu.cpp @@ -116,7 +116,7 @@ void OpenBoESceneditMenu::add_persistent_menu_items(tgui::MenuBar::Ptr& menubar) { { "Outdoors", "Edit Area Descriptions" }, eMenu::OUT_AREAS }, { { "Outdoors", "Set Starting Location" }, eMenu::OUT_START }, - { { "Help", "Index" }, eMenu::HELP_TOC }, + { { "Help", "Index F1" }, eMenu::HELP_TOC }, { { "Help", "About Blades Scenario Editor" }, eMenu::ABOUT }, { { "Help", "Getting Started" }, eMenu::HELP_START }, { { "Help", "Testing Your Scenario" }, eMenu::HELP_TEST }, @@ -154,6 +154,14 @@ bool OpenBoESceneditMenu::handle_keypressed_event(const sf::Event& event) const } } + switch(event.key.code) { + case sf::Keyboard::F1: + handle_menu_choice(eMenu::HELP_TOC); + event_was_consumed = true; + break; + default: break; + } + return event_was_consumed; }