change the "accents" state to lower case

ubports · Apr 7, 2021 · b7896dc · b7896dc
1 parent bd1bc26
commit b7896dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/qml/KeyboardContainer.qml b/qml/KeyboardContainer.qml
@@ -76,9 +76,6 @@ Item {
         },
         State {
             name: "SYMBOLS"
-        },
-        State {
-            name: "ACCENTS"
         }
     ]
 
@@ -93,7 +90,6 @@ Item {
         property string characterKeypadSource: loadLayout(maliit_input_method.contentType,
                                                           maliit_input_method.activeLanguage)
         property string symbolKeypadSource: activeKeypad ? activeKeypad.symbols : ""
-        property string accentsKeypadSource: activeKeypad ? activeKeypad.accents : ""
 
         onCharacterKeypadSourceChanged: {
             panel.state = "CHARACTERS";
@@ -102,10 +98,10 @@ Item {
         function loadKeypad() {
             if (panel.state === "CHARACTERS" ) {
                 return characterKeypadSource;
-            } else if (panel.state === "ACCENTS") {
-                return accentsKeypadSource;
-            } else {
+            } else if (panel.state === "SYMBOLS") {
                 return symbolKeypadSource;
+            } else {
+                return "languages/Keyboard_"+panel.state+".qml";
             }
         }
 

diff --git a/qml/keys/SymojiKey.qml b/qml/keys/SymojiKey.qml
@@ -67,7 +67,7 @@ FlickActionKey {
 		panel.state = "EMOJI";
             }
         } else if (index == 2) {
-	    panel.state = (state == "marks") ? "CHARACTERS" : "ACCENTS";
+	    panel.state = (state == "marks") ? "CHARACTERS" : "accents";
             state = (state == "marks") ? "signs" : "marks";
         } else if (index == 3) {
             if(standard)
@@ -79,7 +79,7 @@ FlickActionKey {
                  canvas.languageMenuShown = true;
 	    }
         } else if (index == 4) {
-	    if(panel.state == "ACCENTS" && state =="signs") panel.state = "CHARACTERS";
+	    if(panel.state == "accents" && state =="signs") panel.state = "CHARACTERS";
             else state="marks";
         }
     }