Fix issue #98

OpenBangla · May 31, 2019 · 1d4df2c · 1d4df2c
1 parent f50a581
commit 1d4df2c
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/data/Avro_Easy.json b/data/Avro_Easy.json
@@ -62,10 +62,10 @@
     "Key_B_Normal": "ব",
     "Key_B_Shift": "ভ",
     "Key_B_ShiftAltGr": "",
-    "Key_BackBracket_AltGr": "",
-    "Key_BackBracket_Normal": "ৱ",
-    "Key_BackBracket_Shift": "ৰ",
-    "Key_BackBracket_ShiftAltGr": "",
+    "Key_BackSlash_AltGr": "",
+    "Key_BackSlash_Normal": "ৱ",
+    "Key_BackSlash_Shift": "ৰ",
+    "Key_BackSlash_ShiftAltGr": "",
     "Key_BackQuote_AltGr": "",
     "Key_BackQuote_Normal": "‌",
     "Key_BackQuote_Shift": "‍",

diff --git a/data/Bornona.json b/data/Bornona.json
@@ -62,10 +62,10 @@
     "Key_B_Normal": "ব",
     "Key_B_Shift": "য়",
     "Key_B_ShiftAltGr": "",
-    "Key_BackBracket_AltGr": "",
-    "Key_BackBracket_Normal": "ৱ",
-    "Key_BackBracket_Shift": "ৰ",
-    "Key_BackBracket_ShiftAltGr": "",
+    "Key_BackSlash_AltGr": "",
+    "Key_BackSlash_Normal": "ৱ",
+    "Key_BackSlash_Shift": "ৰ",
+    "Key_BackSlash_ShiftAltGr": "",
     "Key_BackQuote_AltGr": "",
     "Key_BackQuote_Normal": "‌",
     "Key_BackQuote_Shift": "~",

diff --git a/data/Munir_Optima_uni_.json b/data/Munir_Optima_uni_.json
@@ -62,10 +62,10 @@
     "Key_B_Normal": "প",
     "Key_B_Shift": "ফ",
     "Key_B_ShiftAltGr": "",
-    "Key_BackBracket_AltGr": "",
-    "Key_BackBracket_Normal": "‌",
-    "Key_BackBracket_Shift": "@",
-    "Key_BackBracket_ShiftAltGr": "",
+    "Key_BackSlash_AltGr": "",
+    "Key_BackSlash_Normal": "‌",
+    "Key_BackSlash_Shift": "@",
+    "Key_BackSlash_ShiftAltGr": "",
     "Key_BackQuote_AltGr": "ৰ",
     "Key_BackQuote_Normal": "৳",
     "Key_BackQuote_Shift": "‍",

diff --git a/data/National_Jatiya.json b/data/National_Jatiya.json
@@ -62,10 +62,10 @@
     "Key_B_Normal": "ন",
     "Key_B_Shift": "ণ",
     "Key_B_ShiftAltGr": "",
-    "Key_BackBracket_AltGr": "",
-    "Key_BackBracket_Normal": "\\",
-    "Key_BackBracket_Shift": "|",
-    "Key_BackBracket_ShiftAltGr": "",
+    "Key_BackSlash_AltGr": "",
+    "Key_BackSlash_Normal": "\\",
+    "Key_BackSlash_Shift": "|",
+    "Key_BackSlash_ShiftAltGr": "",
     "Key_BackQuote_AltGr": "‌",
     "Key_BackQuote_Normal": "‌",
     "Key_BackQuote_Shift": "‍",

diff --git a/data/Probhat.json b/data/Probhat.json
@@ -62,10 +62,10 @@
     "Key_B_Normal": "ব",
     "Key_B_Shift": "ভ",
     "Key_B_ShiftAltGr": "",
-    "Key_BackBracket_AltGr": "",
-    "Key_BackBracket_Normal": "‌",
-    "Key_BackBracket_Shift": "॥",
-    "Key_BackBracket_ShiftAltGr": "",
+    "Key_BackSlash_AltGr": "",
+    "Key_BackSlash_Normal": "‌",
+    "Key_BackSlash_Shift": "॥",
+    "Key_BackSlash_ShiftAltGr": "",
     "Key_BackQuote_AltGr": "",
     "Key_BackQuote_Normal": "‍",
     "Key_BackQuote_Shift": "~",

diff --git a/src/engine/libengine/FixedLayoutParser.cpp b/src/engine/libengine/FixedLayoutParser.cpp
@@ -159,9 +159,9 @@ QString FixedLayoutParser::getCharForKey(int keyNum, bool shift, bool altgr, boo
   case VC_BRACE_RIGHT:key = "CloseBracket";
     emulateShift = true;
     break;
-  case VC_BACK_SLASH:key = "BlackSlash";
+  case VC_BACK_SLASH:key = "BackSlash";
     break;
-  case VC_BAR:key = "BlackSlash";
+  case VC_BAR:key = "BackSlash";
     emulateShift = true;
     break;
   case VC_SEMICOLON:key = "Semicolon";

diff --git a/src/frontend/LayoutConverter.cpp b/src/frontend/LayoutConverter.cpp
@@ -96,7 +96,7 @@ ConversionResult LayoutConverter::convertAvroLayout(QString path) {
         if (key.contains("OEM4"))
           key.replace("OEM4", "OpenBracket");
         if (key.contains("OEM5"))
-          key.replace("OEM5", "BackBracket");
+          key.replace("OEM5", "BackSlash");
         if (key.contains("OEM6"))
           key.replace("OEM6", "CloseBracket");
         if (key.contains("OEM7"))