separate the layoutbar from the symbolshiftkey

ubports · May 1, 2020 · f022da5 · f022da5
1 parent 45f1b71
commit f022da5
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 40 deletions.
diff --git a/plugins/en@flick/qml/Keyboard_en@flick.qml b/plugins/en@flick/qml/Keyboard_en@flick.qml
@@ -124,9 +124,8 @@ KeyPad {
 	 anchors.bottom:parent.bottom
 	 spacing: 0
 
-	    SymbolShiftKey {
-	        id: symShiftKey;
-	        label: Languages.languageIdToName(maliit_input_method.activeLanguage);
+	    LayoutBar {
+	        id: layoutBar;
 		leaves: ["abc", "àþç", "", "😃", ""];
 	        width: parent.width;
 	        height:layout.height-layout.height*0.5;

diff --git a/plugins/en@flick/qml/Keyboard_en@flick_email.qml b/plugins/en@flick/qml/Keyboard_en@flick_email.qml
@@ -125,9 +125,8 @@ KeyPad {
 	 anchors.bottom:parent.bottom
 	 spacing: 0
 
-	    SymbolShiftKey {
-	        id: symShiftKey;
-	        label: Languages.languageIdToName(maliit_input_method.activeLanguage);
+	    LayoutBar {
+	        id: layoutBar;
 		leaves: ["abc", "àþç", "", "😃", ""];
 	        width: parent.width;
 	        height:layout.height-layout.height*0.5;

diff --git a/plugins/en@flick/qml/Keyboard_en@flick_url.qml b/plugins/en@flick/qml/Keyboard_en@flick_url.qml
@@ -125,9 +125,8 @@ KeyPad {
 	 anchors.bottom:parent.bottom
 	 spacing: 0
 
-	    SymbolShiftKey {
-	        id: symShiftKey;
-	        label: Languages.languageIdToName(maliit_input_method.activeLanguage);
+	    LayoutBar {
+	        id: layoutBar;
 		leaves: ["abc", "àþç", "", "😃", ""];
 	        width: parent.width;
 	        height:layout.height-layout.height*0.5;

diff --git a/plugins/en@flick/qml/Keyboard_en@flick_url_search.qml b/plugins/en@flick/qml/Keyboard_en@flick_url_search.qml
@@ -125,9 +125,8 @@ KeyPad {
 	 anchors.bottom:parent.bottom
 	 spacing: 0
 
-	    SymbolShiftKey {
-	        id: symShiftKey;
-	        label: Languages.languageIdToName(maliit_input_method.activeLanguage);
+	    LayoutBar {
+	        id: layoutBar;
 		leaves: ["abc", "àþç", "", "😃", ""];
 	        width: parent.width;
 	        height:layout.height-layout.height*0.5;

diff --git a/qml/keys/LayoutBar.qml b/qml/keys/LayoutBar.qml
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+import "key_constants.js" as UI
+import "languages.js" as Languages
+
+FlickActionKey {
+    iconNormal:["", "", "", "", ""]
+    iconShifted:["", "", "", "", ""]
+    iconCapsLock:["", "", "", "", ""]
+    leaves: ["?123", "", "", "😃", ""]
+    label: Languages.languageIdToName(maliit_input_method.activeLanguage)
+    leavesFontSize: 30;
+    overridePressArea: true;
+    onReleased: {
+	    if (index == 0) {
+		    panel.state = panel.state == "CHARACTERS" ? "SYMBOLS" : "CHARACTERS";
+	    } else if (index == 1) {
+	            panel.state = panel.state == "SYMBOLS" ? "CHARACTERS" : "SYMBOLS";
+	    } else if (index == 2) {
+	            panel.state = panel.state == "SYMBOLS" ? "CHARACTERS" : "SYMBOLS";
+	    } else if (index == 3) {
+		    panel.state = panel.state == "EMOJI" ? "CHARACTERS" : "EMOJI";
+	    }
+	}
+    onPressed: {
+        if (maliit_input_method.useAudioFeedback)
+            audioFeedback.play();
+
+        if (maliit_input_method.useHapticFeedback)
+            pressEffect.start();
+
+    }
+}
diff --git a/qml/keys/SymbolShiftKey.qml b/qml/keys/SymbolShiftKey.qml
@@ -17,31 +17,24 @@
 import QtQuick 2.4
 
 import "key_constants.js" as UI
-import "languages.js" as Languages
 
-FlickActionKey {
-    label: "?123"
-    shifted:"?123"
-    leaves: ["abc", "", "?123", "😃", ""]
-    leavesFontSize: 30;
+ActionKey {
+    label: "?123";
+    shifted: "?123";
+    action: "symbols";
+
     overridePressArea: true;
-    onReleased: {
-	    if (index == 0) {
-		    panel.state = panel.state == "CHARACTERS" ? "SYMBOLS" : "CHARACTERS";
-	    } else if (index == 1) {
-	            panel.state = panel.state == "SYMBOLS" ? "CHARACTERS" : "SYMBOLS";
-	    } else if (index == 2) {
-	            panel.state = panel.state == "SYMBOLS" ? "CHARACTERS" : "SYMBOLS";
-	    } else if (index == 3) {
-		    panel.state = panel.state == "EMOJI" ? "CHARACTERS" : "EMOJI";
-	    }
-	}
+
     onPressed: {
         if (maliit_input_method.useAudioFeedback)
             audioFeedback.play();
 
         if (maliit_input_method.useHapticFeedback)
             pressEffect.start();
 
+        if (panel.state == "CHARACTERS")
+            panel.state = "SYMBOLS";
+        else
+            panel.state = "CHARACTERS";
     }
 }
diff --git a/qml/keys/qmldir b/qml/keys/qmldir
@@ -28,3 +28,4 @@ FlickPopKey 1.0 FlickPopKey.qml
 CursorKey 1.0 CursorKey.qml
 StringKey 1.0 StringKey.qml
 CategoryKey 1.0 CategoryKey.qml
+LayoutBar 1.0 LayoutBar.qml
diff --git a/qml/languages/Keyboard_accents.qml b/qml/languages/Keyboard_accents.qml
@@ -124,9 +124,8 @@ KeyPad {
 	 anchors.bottom:parent.bottom
 	 spacing: 0
 
-	    SymbolShiftKey {
-	        id: symShiftKey;
-	        label: Languages.languageIdToName(maliit_input_method.activeLanguage);
+	    LayoutBar {
+	        id: layoutBar;
 		leaves: ["abc", "abc", "", "😃", ""];
 	        width: parent.width;
 	        height:layout.height-layout.height*0.5;

diff --git a/qml/languages/Keyboard_emoji.qml b/qml/languages/Keyboard_emoji.qml
@@ -53,7 +53,7 @@ KeyPad {
                     chars = recentEmoji.concat(Emoji.emoji);
 
                     for (var i = 0; i < chars.length; i++) {
-                        c1.model.append({char: chars[i]});                        
+                        c1.model.append({char: chars[i]});
                     }
 
                     rs = tx.executeSql('SELECT contentX, visibleIndex FROM State');
@@ -100,7 +100,7 @@ KeyPad {
             // If the list is full remove the last emoji before inserting
             if (recentEmoji.length >= maxRecent || recentEmoji[recentEmoji.length - 1] == "") {
                 recentEmoji.splice(recentEmoji.length - 1, 1);
-            } 
+            }
 
             recentEmoji.unshift(emoji);
 
@@ -127,7 +127,7 @@ KeyPad {
                         tx.executeSql('DELETE FROM Recent ORDER BY time ASC LIMIT ?', rs.rows.item(0).totalRecent - maxRecent);
                     }
                 }
-            );     
+            );
         }
     }
 
@@ -211,9 +211,9 @@ KeyPad {
 	SymbolShiftKey {
 	    id: symShiftKey;
 	    label: "ABC";
-	    leaves: ["ABC", "", "?123", "ABC", ""];
 	    shifted: label;
-	    height: parent.height; 
+	    padding: 0;
+	    height: parent.height;
 	}
 
         CategoryKey {
@@ -226,11 +226,11 @@ KeyPad {
                     pressEffect.start();
                 internal.jumpTo(0);
             }
-        }           
- 
+        }
+
         CategoryKey {
             label: "😀"
-            highlight: (c1.midVisibleIndex >= internal.recentEmoji.length 
+            highlight: (c1.midVisibleIndex >= internal.recentEmoji.length
                         && c1.midVisibleIndex < 540 + internal.recentEmoji.length
                         && !recentCat.highlight)
                        || c1.midVisibleIndex == -1