From 63d46d02910207c21359548f839d75daa2181412 Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 6 Apr 2022 11:46:14 +0200 Subject: [PATCH] aligned hotkey display format with doc --- src/common/KeyMap.cxx | 6 +++--- src/gui/Widget.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/KeyMap.cxx b/src/common/KeyMap.cxx index ea4f5927f..cf7f7cc5e 100644 --- a/src/common/KeyMap.cxx +++ b/src/common/KeyMap.cxx @@ -162,17 +162,17 @@ string KeyMap::getDesc(const Mapping& mapping) const else if(mapping.mod & KBDM_LCTRL) buf << "Left Ctrl"; else if(mapping.mod & KBDM_RCTRL) buf << "Right Ctrl"; - if((mapping.mod & (MOD2)) && buf.tellp()) buf << "+"; + if((mapping.mod & (MOD2)) && buf.tellp()) buf << "-"; if((mapping.mod & MOD2) == MOD2) buf << mod2; else if(mapping.mod & LMOD2) buf << "Left " << mod2; else if(mapping.mod & RMOD2) buf << "Right " << mod2; - if((mapping.mod & (MOD3)) && buf.tellp()) buf << "+"; + if((mapping.mod & (MOD3)) && buf.tellp()) buf << "-"; if((mapping.mod & MOD3) == MOD3) buf << mod3; else if(mapping.mod & LMOD3) buf << "Left " << mod3; else if(mapping.mod & RMOD3) buf << "Right " << mod3; - if((mapping.mod & (KBDM_SHIFT)) && buf.tellp()) buf << "+"; + if((mapping.mod & (KBDM_SHIFT)) && buf.tellp()) buf << "-"; if((mapping.mod & KBDM_SHIFT) == KBDM_SHIFT) buf << "Shift"; else if(mapping.mod & KBDM_LSHIFT) buf << "Left Shift"; else if(mapping.mod & KBDM_RSHIFT) buf << "Right Shift"; diff --git a/src/gui/Widget.cxx b/src/gui/Widget.cxx index c6ee68604..e42db913a 100644 --- a/src/gui/Widget.cxx +++ b/src/gui/Widget.cxx @@ -314,8 +314,8 @@ string Widget::getToolTip(const Common::Point& pos) const if(hotkey2 != EmptyString) { - // Merge hotkeys if they only differ by "+Shift" - const string mod = "+Shift"; + // Merge hotkeys if they only differ by "-Shift" + const string mod = "-Shift"; const size_t p = BSPF::findIgnoreCase(hotkey, mod); if(p != string::npos)