From 52b1219db6f7cbe4384421ea26943d35afeac59c Mon Sep 17 00:00:00 2001 From: Laserlicht <13953785+Laserlicht@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:53:24 +0200 Subject: [PATCH] code review --- client/adventureMap/CList.cpp | 2 +- client/gui/Shortcut.h | 2 +- client/gui/ShortcutHandler.cpp | 2 +- config/shortcutsConfig.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/adventureMap/CList.cpp b/client/adventureMap/CList.cpp index 17bacee15..b79de033b 100644 --- a/client/adventureMap/CList.cpp +++ b/client/adventureMap/CList.cpp @@ -315,7 +315,7 @@ void CHeroList::CHeroItem::keyPressed(EShortcut key) auto & heroes = LOCPLINT->localState->getWanderingHeroes(); - if(key == EShortcut::LIST_HERO_DELETE) + if(key == EShortcut::LIST_HERO_DISMISS) { LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[22], [=](){ LOCPLINT->cb->dismissHero(hero); }, nullptr); return; diff --git a/client/gui/Shortcut.h b/client/gui/Shortcut.h index 398224ef0..e4c52384d 100644 --- a/client/gui/Shortcut.h +++ b/client/gui/Shortcut.h @@ -297,7 +297,7 @@ enum class EShortcut LIST_HERO_DOWN, LIST_HERO_TOP, LIST_HERO_BOTTOM, - LIST_HERO_DELETE, + LIST_HERO_DISMISS, LIST_TOWN_UP, LIST_TOWN_DOWN, LIST_TOWN_TOP, diff --git a/client/gui/ShortcutHandler.cpp b/client/gui/ShortcutHandler.cpp index a1f27e571..fc986084b 100644 --- a/client/gui/ShortcutHandler.cpp +++ b/client/gui/ShortcutHandler.cpp @@ -279,7 +279,7 @@ EShortcut ShortcutHandler::findShortcut(const std::string & identifier ) const {"listHeroDown", EShortcut::LIST_HERO_DOWN }, {"listHeroTop", EShortcut::LIST_HERO_TOP }, {"listHeroBottom", EShortcut::LIST_HERO_BOTTOM }, - {"listHeroDelete", EShortcut::LIST_HERO_DELETE }, + {"listHeroDismiss", EShortcut::LIST_HERO_DISMISS }, {"listTownUp", EShortcut::LIST_TOWN_UP }, {"listTownDown", EShortcut::LIST_TOWN_DOWN }, {"listTownTop", EShortcut::LIST_TOWN_TOP }, diff --git a/config/shortcutsConfig.json b/config/shortcutsConfig.json index ad1b25a36..0193ebeb4 100644 --- a/config/shortcutsConfig.json +++ b/config/shortcutsConfig.json @@ -246,7 +246,7 @@ "listHeroDown": "Ctrl+PageDown", "listHeroTop": "Ctrl+Home", "listHeroBottom": "Ctrl+End", - "listHeroDelete": "Delete", + "listHeroDismiss": "Delete", "listTownUp": "Ctrl+PageUp", "listTownDown": "Ctrl+PageDown", "listTownTop": "Ctrl+Home",