remove everthing but the tab key

maliit · Oct 25, 2024 · 40002c3 · 40002c3
1 parent 9043936
commit 40002c3
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 330 deletions.
diff --git a/plugins/de@terminal/qml/[email protected] b/plugins/de@terminal/qml/[email protected]
@@ -35,7 +35,7 @@ KeyPad {
             anchors.horizontalCenter: parent.horizontalCenter;
             spacing: 0
 
-            CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"] }
+            CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; }
             CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] }
             CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ë", "ê", "€"]; extendedShifted: ["3", "È","É", "Ë", "Ê", "€"] }
             CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
@@ -44,25 +44,23 @@ KeyPad {
             CharKey { label: "u"; shifted: "U"; extended: ["7", "ü","ù","ú","û"]; extendedShifted: ["7", "Ü","Ù","Ú","Û"] }
             CharKey { label: "i"; shifted: "I"; extended: ["8", "ì","í","î","ï","ı"]; extendedShifted: ["8", "Ì","Í","Î","Ï","İ"] }
             CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ò","ó","ô","õ","ø"]; extendedShifted: ["9", "Ö","Ò","Ó","Ô","Õ","Ø"] }
-            CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"] }
-            CharKey { label: "ü"; shifted: "Ü" }
+            CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
         }
 
         Row {
             anchors.horizontalCenter: parent.horizontalCenter;
             spacing: 0
 
-            CharKey { label: "a"; shifted: "A"; extended: ["ä","à","á","ã","â","å","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","Æ"] }
+            TabKey { padding: 0 }
+            CharKey { label: "a"; shifted: "A"; extended: ["ä","à","á","ã","â","å","æ"]; extendedShifted: ["Ä","À","Â","Á","Ã","Å","Æ"]; leftSide: true; }
             CharKey { label: "s"; shifted: "S"; extended: ["ß","ş","$"]; extendedShifted: ["ẞ","Ş","$"] }
             CharKey { label: "d"; shifted: "D"; }
             CharKey { label: "f"; shifted: "F"; }
             CharKey { label: "g"; shifted: "G"; extended: ["ğ"]; extendedShifted: ["Ğ"]; }
             CharKey { label: "h"; shifted: "H"; }
             CharKey { label: "j"; shifted: "J"; }
             CharKey { label: "k"; shifted: "K"; }
-            CharKey { label: "l"; shifted: "L"; extended: ["ł","£"]; extendedShifted: ["Ł","£"] }
-            CharKey { label: "ö"; shifted: "Ö"; }
-            CharKey { label: "ä"; shifted: "Ä"; }
+            CharKey { label: "l"; shifted: "L"; extended: ["ł","£"]; extendedShifted: ["Ł","£"]; rightSide: true; }
         }
 
         Row {
@@ -77,8 +75,7 @@ KeyPad {
             CharKey { label: "b"; shifted: "B"; }
             CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
             CharKey { label: "m"; shifted: "M"; }
-            CharKey { label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"] }
-            CharKey { label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"];  extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"] }
+            CharKey { label: "ä"; shifted: "Ä"; }
             BackspaceKey { padding: 0 }
         }
 
@@ -89,9 +86,11 @@ KeyPad {
             height: panel.keyHeight + Device.row_margin;
 
             SymbolShiftKey { id: symShiftKey;                            anchors.left: parent.left; height: parent.height; }
-            ControlKey     { id: ctrlKey;     label: "strg"; shifted: "strg";   anchors.left: symShiftKey.right; height: parent.height; }
-            LanguageKey    { id: languageMenuButton;                     anchors.left: ctrlKey.right; height: parent.height; }
-            SpaceKey       { id: spaceKey;                               anchors.left: languageMenuButton.right; anchors.right: enterKey.left; noMagnifier: true; height: parent.height; }
+            LanguageKey    { id: languageMenuButton;                     anchors.left: symShiftKey.right; height: parent.height; }
+            CharKey        { id: commaKey;    label: ","; shifted: ","; extended: ["'", "\"", ";", ":", "@", "&", "(", ")"]; extendedShifted: ["'", "\"", ";", ":", "@", "&", "(", ")"]; anchors.left: languageMenuButton.right; height: parent.height; }
+            SpaceKey       { id: spaceKey;                               anchors.left: commaKey.right; anchors.right: dotKey.left; noMagnifier: true; height: parent.height; }
+            CharKey        { id: dotKey;      label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"];  extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: umlaut.left; height: parent.height; }
+            CharKey        { id: umlaut;      label: "ö"; shifted: "Ö";  anchors.right: enterKey.left; height: parent.height; }
             ReturnKey      { id: enterKey;                               anchors.right: parent.right; height: parent.height; }
         }
     } // column

diff --git a/qml/keys/CapsLockKey.qml b/qml/keys/CapsLockKey.qml
diff --git a/qml/keys/ControlKey.qml b/qml/keys/ControlKey.qml
diff --git a/qml/keys/DownKey.qml b/qml/keys/DownKey.qml
diff --git a/qml/keys/EndKey.qml b/qml/keys/EndKey.qml
diff --git a/qml/keys/EscapeKey.qml b/qml/keys/EscapeKey.qml
diff --git a/qml/keys/HomeKey.qml b/qml/keys/HomeKey.qml
diff --git a/qml/keys/LeftKey.qml b/qml/keys/LeftKey.qml
diff --git a/qml/keys/PageDownKey.qml b/qml/keys/PageDownKey.qml
diff --git a/qml/keys/PageUpKey.qml b/qml/keys/PageUpKey.qml
diff --git a/qml/keys/RightKey.qml b/qml/keys/RightKey.qml
diff --git a/qml/keys/UpKey.qml b/qml/keys/UpKey.qml
diff --git a/qml/keys/qmldir b/qml/keys/qmldir
@@ -18,15 +18,4 @@ PressArea 1.0 PressArea.qml
 SpaceKey 1.0 SpaceKey.qml
 UrlKey 1.0 UrlKey.qml
 CategoryKey 1.0 CategoryKey.qml
-UpKey 1.0 UpKey.qml
-DownKey 1.0 DownKey.qml
-LeftKey 1.0 LeftKey.qml
-RightKey 1.0 RightKey.qml
-EscapeKey 1.0 EscapeKey.qml
 TabKey 1.0 TabKey.qml
-HomeKey 1.0 HomeKey.qml
-EndKey 1.0 EndKey.qml
-PageUpKey 1.0 PageUpKey.qml
-PageDownKey 1.0 PageDownKey.qml
-CapsLockKey 1.0 CapsLockKey.qml
-ControlKey 1.0 ControlKey.qml
diff --git a/src/lib/models/key.h b/src/lib/models/key.h
@@ -72,10 +72,6 @@ class Key
         ActionRightLayout, //!< Switch to right/next language layout.
         ActionHome, //!< Key moves cursor to beginning of text.
         ActionEnd, //!< Key moves cursor to end of text.
-        ActionEscape, //!< Key sends Escape
-        ActionPageUp, //!< Key sends PageUp
-        ActionPageDown, //!< Key sends PageDown
-        ActionControl, //!< Key sends Control
         NumActions
     };