From a9098184068c2e7ab64e7ace745626bfe11eaeb1 Mon Sep 17 00:00:00 2001 From: Arcitec <14483309-Arcitec@users.noreply.gitlab.com> Date: Fri, 18 Aug 2023 18:19:15 +0200 Subject: [PATCH] Accurate character labels in Nordic KBD layout * The previous layout was not the real Nordic layout. Every character has now been fixed to use the correct, technical terms and accurate key legends. It now correctly represents the Nordic ISO layout standard. --- .../SteelSeriesApexRegions.h | 10 +++---- RGBController/RGBControllerKeyNames.cpp | 18 ++++++------- RGBController/RGBControllerKeyNames.h | 10 +++---- qt/DeviceView.cpp | 26 +++++++++---------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Controllers/SteelSeriesController/SteelSeriesApexRegions.h b/Controllers/SteelSeriesController/SteelSeriesApexRegions.h index 336851cc..1d820d46 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexRegions.h +++ b/Controllers/SteelSeriesController/SteelSeriesApexRegions.h @@ -288,13 +288,13 @@ static const std::map apex_uk_keyname_lookup = static const std::map apex_nor_keyname_lookup = { {36, KEY_EN_ISO_ENTER}, - {41, KEY_NORD_PLUS}, - {42, KEY_NORD_BACKSLASH}, + {41, KEY_NORD_PLUS_QUESTION}, + {42, KEY_NORD_ACUTE_GRAVE}, {43, KEY_NORD_AAL}, - {44, KEY_NORD_CHEVRON}, + {44, KEY_NORD_DOTS_CARET}, {45, KEY_NORD_QUOTE}, - {46, KEY_NORD_OE}, - {47, KEY_NORD_AE}, + {46, KEY_NORD_A_OE}, + {47, KEY_NORD_O_AE}, {48, KEY_NORD_HALF}, {51, KEY_NORD_HYPHEN}, {78, KEY_NORD_ANGLE_BRACKET}, diff --git a/RGBController/RGBControllerKeyNames.cpp b/RGBController/RGBControllerKeyNames.cpp index 43f92178..7803f6d4 100644 --- a/RGBController/RGBControllerKeyNames.cpp +++ b/RGBController/RGBControllerKeyNames.cpp @@ -155,16 +155,16 @@ const char* KEY_JP_COLON = "Key: :"; const char* KEY_KR_HAN = "Key: 한/영"; const char* KEY_KR_HANJA = "Key: 한자"; -const char* KEY_NORD_OE = "Key: Ø/Ä"; -const char* KEY_NORD_AE = "Key: Æ/Ö"; const char* KEY_NORD_AAL = "Key: Å"; -const char* KEY_NORD_HALF = "Key: ½/§"; -const char* KEY_NORD_HYPHEN = "Key: -/_"; -const char* KEY_NORD_PLUS = "Key: +/?"; -const char* KEY_NORD_BACKSLASH = "Key: \\/`/´"; -const char* KEY_NORD_CHEVRON = "Key: ^/~"; -const char* KEY_NORD_QUOTE = "Key: '/*"; -const char* KEY_NORD_ANGLE_BRACKET = "Key: "; +const char* KEY_NORD_A_OE = "Key: Ä Ø"; +const char* KEY_NORD_O_AE = "Key: Ö Æ"; +const char* KEY_NORD_HALF = "Key: § ½"; +const char* KEY_NORD_HYPHEN = "Key: - _"; +const char* KEY_NORD_PLUS_QUESTION = "Key: + ?"; +const char* KEY_NORD_ACUTE_GRAVE = "Key: ´ `"; +const char* KEY_NORD_DOTS_CARET = "Key: ¨ ^"; +const char* KEY_NORD_QUOTE = "Key: ' *"; +const char* KEY_NORD_ANGLE_BRACKET = "Key: < >"; const char* KEY_DE_ESZETT = "Key: ß"; const char* KEY_DE_DIAERESIS_A = "Key: Ä"; diff --git a/RGBController/RGBControllerKeyNames.h b/RGBController/RGBControllerKeyNames.h index 7cceba7d..7fae1023 100644 --- a/RGBController/RGBControllerKeyNames.h +++ b/RGBController/RGBControllerKeyNames.h @@ -155,14 +155,14 @@ extern const char* KEY_JP_COLON; extern const char* KEY_KR_HAN; extern const char* KEY_KR_HANJA; -extern const char* KEY_NORD_OE; -extern const char* KEY_NORD_AE; extern const char* KEY_NORD_AAL; +extern const char* KEY_NORD_A_OE; +extern const char* KEY_NORD_O_AE; extern const char* KEY_NORD_HALF; extern const char* KEY_NORD_HYPHEN; -extern const char* KEY_NORD_PLUS; -extern const char* KEY_NORD_BACKSLASH; -extern const char* KEY_NORD_CHEVRON; +extern const char* KEY_NORD_PLUS_QUESTION; +extern const char* KEY_NORD_ACUTE_GRAVE; +extern const char* KEY_NORD_DOTS_CARET; extern const char* KEY_NORD_QUOTE; extern const char* KEY_NORD_ANGLE_BRACKET; diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp index a00cc2df..bb9ea106 100644 --- a/qt/DeviceView.cpp +++ b/qt/DeviceView.cpp @@ -191,19 +191,19 @@ static const std::map led_label_lookup = "\xEC\x98\x81", }}, // 한/영 { KEY_KR_HANJA, { "Haja" , "\xED\x95\x9C\xEC" "\x9E\x90", }}, // 한자 - { KEY_NORD_OE, { "oe" , "\xC3\x98\x2F\xC3" - "\x84" }}, // Ø/Ä - { KEY_NORD_AE, { "ae" , "\xC3\x86\x2F\xC3" - "\x96" }}, // Æ/Ö - { KEY_NORD_AAL, { "Aal" , "\xC3\x85", }}, // Å - { KEY_NORD_HALF, { "1/2" , "\xC2\xBD\x2F\xC2" - "\xA7" }}, // ½/§ - { KEY_NORD_HYPHEN, { "-/_" , "-/_" }}, - { KEY_NORD_PLUS, { "+/?" , "+/?", }}, - { KEY_NORD_BACKSLASH, { "\\" , "\\", }}, - { KEY_NORD_CHEVRON, { "^/~" , "^/~", }}, - { KEY_NORD_QUOTE, { "'/*" , "'/*", }}, - { KEY_NORD_ANGLE_BRACKET, { "" , "" }}, + { KEY_NORD_AAL, { "Å" , "\xC3\x85", }}, // Å + { KEY_NORD_A_OE, { "Ä Ø" , "\xC3\x84\x20\xC3" + "\x98" }}, // Ä Ø + { KEY_NORD_O_AE, { "Ö Æ" , "\xC3\x96\x20\xC3" + "\x86" }}, // Ö Æ + { KEY_NORD_HALF, { "§ ½" , "\xC2\xA7\x20\xC2" + "\xBD" }}, // § ½ + { KEY_NORD_HYPHEN, { "- _" , "- _" }}, + { KEY_NORD_PLUS_QUESTION, { "+ ?" , "+ ?", }}, + { KEY_NORD_ACUTE_GRAVE, { "´ `" , "\xC2\xB4\x20\x60", }}, // ´ ` + { KEY_NORD_DOTS_CARET, { "¨ ^" , "\xC2\xA8\x20\x5E", }}, // ¨ ^ + { KEY_NORD_QUOTE, { "' *" , "' *", }}, + { KEY_NORD_ANGLE_BRACKET, { "< >" , "< >" }}, { KEY_DE_ESZETT, { "ß" , "\xc3\x9F", }}, { KEY_DE_DIAERESIS_A, { "Ä" , "\xC3\x84", }}, { KEY_DE_DIAERESIS_O, { "Ö" , "\xC3\x96", }},