Reinhard Russinger 8 år sedan
förälder
incheckning
905c38d4a7
3 ändrade filer med 57 tillägg och 14 borttagningar
  1. 1 1
      DeclarativeInputEngine.h
  2. 5 1
      InputPanel.qml
  3. 51 12
      KeyModel.qml

+ 1 - 1
DeclarativeInputEngine.h

@@ -20,6 +20,7 @@ class DeclarativeInputEngine : public QObject
     Q_PROPERTY(bool animating READ isAnimating WRITE setAnimating NOTIFY animatingChanged FINAL)
     Q_PROPERTY(int inputMode READ inputMode WRITE setInputMode NOTIFY inputModeChanged FINAL)
     Q_ENUMS(InputMode)
+
 private:
     DeclarativeInputEnginePrivate* d;
     friend class DeclarativeInputEnginePrivate;
@@ -135,7 +136,6 @@ signals:
      */
     void inputModeChanged();
 
-
 }; // class CDeclarativeInputEngine
 
 

+ 5 - 1
InputPanel.qml

@@ -12,13 +12,17 @@ Item {
     objectName: "inputPanel"
     width: parent.width
     height: width / 4
+
+    signal hideKeyPressed
+
     // Report actual keyboard rectangle to input engine
     onYChanged: InputEngine.setKeyboardRectangle(Qt.rect(x, y, width, height))
-    signal hideKeyPressed
 
     KeyModel {
         id:keyModel
+        kbdLayout: settings.value("COMMON/KbdLayout") //"de"
     }
+
     FontLoader {
         source: "FontAwesome.otf"
     }

+ 51 - 12
KeyModel.qml

@@ -17,21 +17,60 @@ Item {
     property QtObject secondRowModel: second
     property QtObject thirdRowModel: third
     property QtObject numbersRowModel: numbers
+    property string kbdLayout: ""
 
     ListModel {
         id:numbers
-        ListElement { letter: "1"; firstSymbol: "1"}
-        ListElement { letter: "2"; firstSymbol: "2"}
-        ListElement { letter: "3"; firstSymbol: "3"}
-        ListElement { letter: "4"; firstSymbol: "4"}
-        ListElement { letter: "5"; firstSymbol: "5"}
-        ListElement { letter: "6"; firstSymbol: "6"}
-        ListElement { letter: "7"; firstSymbol: "7"}
-        ListElement { letter: "8"; firstSymbol: "8"}
-        ListElement { letter: "9"; firstSymbol: "9"}
-        ListElement { letter: "0"; firstSymbol: "0"}
-        ListElement { letter: "@"; firstSymbol: "@"}
-        // ListElement { letter: "="; firstSymbol: "+"}
+
+
+        Component.onCompleted: {
+
+            switch (kbdLayout){
+            default:
+            case "de":
+            append ({ letter: "1", firstSymbol: "1"});
+            append ({ letter: "2", firstSymbol: "2"});
+            append ({ letter: "3", firstSymbol: "3"});
+            append ({ letter: "4", firstSymbol: "4"});
+            append ({ letter: "5", firstSymbol: "5"});
+            append ({ letter: "6", firstSymbol: "6"});
+            append ({ letter: "7", firstSymbol: "7"});
+            append ({ letter: "8", firstSymbol: "8"});
+            append ({ letter: "9", firstSymbol: "9"});
+            append ({ letter: "0", firstSymbol: "0"});
+            append ({ letter: "@", firstSymbol: "€"});
+            break;
+
+            case "en":
+            append ({ letter: "1", firstSymbol: "1"});
+            append ({ letter: "2", firstSymbol: "2"});
+            append ({ letter: "3", firstSymbol: "3"});
+            append ({ letter: "4", firstSymbol: "4"});
+            append ({ letter: "5", firstSymbol: "5"});
+            append ({ letter: "6", firstSymbol: "6"});
+            append ({ letter: "7", firstSymbol: "7"});
+            append ({ letter: "8", firstSymbol: "8"});
+            append ({ letter: "9", firstSymbol: "9"});
+            append ({ letter: "0", firstSymbol: "0"});
+            append ({ letter: "$", firstSymbol: "$"});
+            break;
+
+            }
+
+        }
+
+//        ListElement { letter: "1"; firstSymbol: "1"}
+//        ListElement { letter: "2"; firstSymbol: "2"}
+//        ListElement { letter: "3"; firstSymbol: "3"}
+//        ListElement { letter: "4"; firstSymbol: "4"}
+//        ListElement { letter: "5"; firstSymbol: "5"}
+//        ListElement { letter: "6"; firstSymbol: "6"}
+//        ListElement { letter: "7"; firstSymbol: "7"}
+//        ListElement { letter: "8"; firstSymbol: "8"}
+//        ListElement { letter: "9"; firstSymbol: "9"}
+//        ListElement { letter: "0"; firstSymbol: "0"}
+//        ListElement { letter: "@"; firstSymbol: "@"}
+//        // ListElement { letter: "="; firstSymbol: "+"}
     }
 
     ListModel {