Merge lp:~flscogna/ubuntu-terminal-app/json-keyboard-profiles into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Filippo Scognamiglio]

Enable layout customization through json profiles.

Enable layout customization through json profiles.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/124/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1070
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1070/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/8

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/124/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:49
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/3/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1071
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1071/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-ci/3

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/125/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1072
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1072/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/9

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/125/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:50
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/4/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1073
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1073/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-ci/4

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-ci/4/rebuild

review: Needs Fixing (continuous-integration)

[Stefano Verzegnassi (verzegnassi-stefano)]

LGTM, good work Filippo!

However, as discussed on Hangouts, the only thing that could be improved is the way you get the ConfigLocation from QStandardPaths.

Some of the returning paths are confined by the AppArmor policies, so it may be worth to use QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) which, according to Qt docs[1], "returns the directory where files of type should be written to".

Tested on utopic desktop.

[1]: http://doc.qt.io/qt-5/qstandardpaths.html#standardLocations

review: Approve

[Filippo Scognamiglio (flscogna)]

Thank you for the review Stefano. Your solution is good, and would save the need to look in directories where we are sure there won't be anything. I will add that in the next update, thank you.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested and works well on device! Thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/73/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2059
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2059/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-autolanding/5

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-autolanding/3/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2060
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2060/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-reboot-vivid-amd64-autolanding/3

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Filippo, your target for this needs to be the reboot series :-)

Merge into: lp:ubuntu-terminal-app

review: Needs Fixing

[Filippo Scognamiglio (flscogna)]

Nicholas lp:ubuntu-terminal-app is now alias for reboot, so I thought it was the same. Should I explicitly change it to /reboot?

[Nicholas Skaggs (nskaggs)]

Filippo, so you are right. I swore this was different before.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/74/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2099
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2099/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-autolanding/6

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/76/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2117
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-autolanding/8

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'po/com.ubuntu.terminal.pot'
--- po/com.ubuntu.terminal.pot	2015-01-17 02:02:04 +0000
+++ po/com.ubuntu.terminal.pot	2015-02-14 14:24:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-17 02:58+0100\n"
+"POT-Creation-Date: 2015-02-14 13:41+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -53,23 +53,7 @@
 msgid "Authentication failed"
 msgstr ""
 
-#: ../src/app/qml/KeyboardBar.qml:41
-msgid "Scroll Keys"
-msgstr ""
-
-#: ../src/app/qml/KeyboardBar.qml:46
-msgid "Functions Keys"
-msgstr ""
-
-#: ../src/app/qml/KeyboardBar.qml:51
-msgid "Command Keys"
-msgstr ""
-
-#: ../src/app/qml/KeyboardBar.qml:56
-msgid "Control Keys"
-msgstr ""
-
-#: ../src/app/qml/KeyboardBar.qml:83
+#: ../src/app/qml/KeyboardBar.qml:157
 msgid "Change Keyboard"
 msgstr ""
 

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-10-25 04:42:31 +0000
+++ src/app/CMakeLists.txt	2015-02-14 14:24:37 +0000
@@ -1,7 +1,8 @@
-file(GLOB_RECURSE QML_SRCS *.qml *.js)
+file(GLOB_RECURSE QML_SRCS *.qml *.js *.json)
 
 set(terminal_SRCS
     main.cpp
+    fileio.cpp
     ${QML_SRCS}
 )
 

=== added file 'src/app/fileio.cpp'
--- src/app/fileio.cpp	1970-01-01 00:00:00 +0000
+++ src/app/fileio.cpp	2015-02-14 14:24:37 +0000
@@ -0,0 +1,37 @@
+#include "fileio.h"
+
+FileIO::FileIO()
+{
+}
+
+bool FileIO::write(const QString& sourceUrl, const QString& data) {
+    if (sourceUrl.isEmpty())
+        return false;
+
+    QUrl url(sourceUrl);
+    QFile file(url.toLocalFile());
+    if (!file.open(QFile::WriteOnly | QFile::Truncate))
+        return false;
+
+    QTextStream out(&file);
+    out << data;
+    file.close();
+    return true;
+}
+
+QString FileIO::read(const QString& sourceUrl) {
+    if (sourceUrl.isEmpty())
+        return "";
+
+    QUrl url(sourceUrl);
+    QFile file(url.toLocalFile());
+    if (!file.open(QFile::ReadOnly))
+        return "";
+
+    QTextStream in(&file);
+    QString result = in.readAll();
+
+    file.close();
+
+    return result;
+}

=== added file 'src/app/fileio.h'
--- src/app/fileio.h	1970-01-01 00:00:00 +0000
+++ src/app/fileio.h	2015-02-14 14:24:37 +0000
@@ -0,0 +1,21 @@
+#ifndef FILEIO_H
+#define FILEIO_H
+
+#include <QObject>
+#include <QFile>
+#include <QTextStream>
+#include <QUrl>
+
+class FileIO : public QObject
+{
+    Q_OBJECT
+
+public:
+    FileIO();
+
+public slots:
+    bool write(const QString& sourceUrl, const QString& data);
+    QString read(const QString& sourceUrl);
+};
+
+#endif // FILEIO_H

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-12-05 22:52:26 +0000
+++ src/app/main.cpp	2015-02-14 14:24:37 +0000
@@ -27,14 +27,32 @@
 #include <QLibrary>
 #include <QDir>
 
+#include "fileio.h"
+
 #include <QDebug>
 
+QStringList getProfileFromDir(const QString &path) {
+    QDir layoutDir(path);
+    layoutDir.setNameFilters(QStringList("*.json"));
+
+    QStringList jsonFiles = layoutDir.entryList();
+
+    QStringList result;
+    foreach (QString s, jsonFiles) {
+        result.append(s.prepend(path));
+    }
+    return result;
+}
+
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
+    FileIO fileIO;
+    view.engine()->rootContext()->setContextProperty("fileIO", &fileIO);
+
     // Set up import paths
     QStringList importPathList = view.engine()->importPathList();
     // Prepend the location of the plugin in the build dir,
@@ -135,6 +153,7 @@
 
     view.engine()->setImportPathList(importPathList);
 
+    QStringList keyboardLayouts;
     // load the qml file
     if (qmlfile.isEmpty()) {
         QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
@@ -146,10 +165,21 @@
             qDebug() << "Trying to load QML from:" << path + "/qml/ubuntu-terminal-app.qml";
             if (fi.exists()) {
                 qmlfile = path +  "/qml/ubuntu-terminal-app.qml";
+                keyboardLayouts << getProfileFromDir(path + "/qml/KeyboardRows/Layouts/");
                 break;
             }
         }
     }
+
+    QStringList configLocations = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation);
+    foreach (const QString &path, configLocations) {
+        QString fullPath = path + "/com.ubuntu.terminal/Layouts/";
+        qDebug() << "Retrieving keyboard profiles from folder: " << fullPath;
+        keyboardLayouts << getProfileFromDir(fullPath);
+    }
+
+    view.engine()->rootContext()->setContextProperty("keyboardLayouts", keyboardLayouts);
+
     qDebug() << "using main qml file from:" << qmlfile;
     view.setSource(QUrl::fromLocalFile(qmlfile));
     view.show();

=== modified file 'src/app/qml/KeyboardBar.qml'
--- src/app/qml/KeyboardBar.qml	2015-01-16 23:04:14 +0000
+++ src/app/qml/KeyboardBar.qml	2015-02-14 14:24:37 +0000
@@ -1,10 +1,116 @@
-import QtQuick 2.0
+import QtQuick 2.2
 import Ubuntu.Components 1.1
 import "KeyboardRows"
 
+import "KeyboardRows/jsonParser.js" as Parser
+
 Rectangle {
+    id: rootItem
     color: "black"
 
+    property int selectedLayoutIndex: 0
+
+    signal simulateCommand(string command);
+    signal simulateKey(int key, int mod);
+
+    ListModel {
+        id: layoutsList
+    }
+
+    Component {
+        id: actionComponent
+        Action {
+            property int selectIndex
+            onTriggered: rootItem.selectLayout(selectIndex);
+        }
+    }
+
+    Component {
+        id: layoutComponent
+        KeyboardLayout {
+            anchors.fill: keyboardContainer
+            enabled: false
+            visible: false
+        }
+    }
+
+    function printLayouts() {
+        for (var i = 0; i < layoutsList.count; i++) {
+            console.log(layoutsList.get(i).layout.name);
+        }
+    }
+
+    function createLayoutObject(profileUrl) {
+        var object = layoutComponent.createObject(keyboardContainer);
+        object.loadProfile(fileIO.read(profileUrl));
+        return object;
+    }
+
+    function disableLayout(index) {
+        var layoutObject = layoutsList.get(index).layout;
+        layoutObject.visible = false;
+        layoutObject.enabled = false;
+        layoutObject.z = rootItem.z;
+        layoutObject.simulateKey.disconnect(simulateKey);
+        layoutObject.simulateCommand.disconnect(simulateCommand);
+    }
+
+    function enableLayout(index) {
+        var layoutObject = layoutsList.get(index).layout;
+        layoutObject.visible = true;
+        layoutObject.enabled = true;
+        layoutObject.z = rootItem.z + 0.01;
+        layoutObject.simulateKey.connect(simulateKey);
+        layoutObject.simulateCommand.connect(simulateCommand);
+    }
+
+    function selectLayout(index) {
+        if (index < 0 || index >= layoutsList.count)
+            return;
+
+        disableLayout(selectedLayoutIndex);
+        enableLayout(index);
+        selectedLayoutIndex = index;
+    }
+
+    function dropProfiles() {
+        for (var i = 0; i < layoutsList.count; i++) {
+            layoutsList.get(i).layout.destroy();
+        }
+        layoutsList.clear();
+    }
+
+    function updateSelector() {
+        var result = [];
+        for (var i = 0; i < layoutsList.count; i++) {
+            var layoutObject = layoutsList.get(i).layout;
+            var index = i;
+            var actionObject = actionComponent.createObject(rootItem);
+
+            actionObject.text = layoutObject.short_name;
+            actionObject.description = layoutObject.name;
+            actionObject.selectIndex = i;
+
+            result.push(actionObject);
+        }
+        keyboardSelector.actions = result;
+    }
+
+    function loadProfiles() {
+        for (var i = 0; i < keyboardLayouts.length; i++) {
+            try {
+                console.log("Loading Layout:", Qt.resolvedUrl(keyboardLayouts[i]));
+                var layoutObject = createLayoutObject(Qt.resolvedUrl(keyboardLayouts[i]));
+                layoutsList.append({layout: layoutObject});
+            } catch (e) {
+                console.error("Error in profile " + keyboardLayouts[i]);
+                console.error(e);
+            }
+        }
+        updateSelector();
+        selectLayout(0);
+    }
+
     PressFeedback {
         id: pressFeedbackEffect
     }
@@ -34,50 +140,18 @@
                 color: "black"
             }
         }
-
-        actions: [
-            Action {
-                text: "SCR"
-                description: i18n.tr("Scroll Keys")
-                onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ScrollKeysLayout.qml"
-            },
-            Action {
-                text: "FN"
-                description: i18n.tr("Functions Keys")
-                onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/FunctionKeysLayout.qml"
-            },
-            Action {
-                text: "CMD"
-                description: i18n.tr("Command Keys")
-                onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/SimpleCommandsLayout.qml"
-            },
-            Action {
-                text: "CTRL"
-                description: i18n.tr("Control Keys")
-                onTriggered: keyboardLoader.source = "KeyboardRows/Layouts/ControlKeysLayout.qml"
-            }
-        ]
     }
 
-    signal simulateCommand(string command);
-    signal simulateKey(int key, int mod);
-
     onSimulateKey: pressFeedbackEffect.start();
     onSimulateCommand: pressFeedbackEffect.start();
 
-    Loader {
-        id: keyboardLoader
+    Item {
+        id: keyboardContainer
         anchors.left: keyboardSelector.right
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.top: parent.top
-        source: "KeyboardRows/Layouts/ScrollKeysLayout.qml"
-
-        onLoaded: {
-            item.keyHeight = parent.height
-            item.simulateKey.connect(simulateKey);
-            item.simulateCommand.connect(simulateCommand);
-        }
+        height: units.gu(5)
 
         Rectangle {
             property string defaultString: i18n.tr("Change Keyboard");
@@ -112,4 +186,7 @@
             }
         }
     }
+
+    Component.onDestruction: dropProfiles();
+    Component.onCompleted: loadProfiles();
 }

=== added file 'src/app/qml/KeyboardRows/KeyboardLayout.qml'
--- src/app/qml/KeyboardRows/KeyboardLayout.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/KeyboardLayout.qml	2015-02-14 14:24:37 +0000
@@ -0,0 +1,103 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+import "jsonParser.js" as Parser
+
+KeyboardRow {
+    id: keyboardRow
+    keyWidth: units.gu(5)
+
+    // This label is used to compute the maximum width of all the controls.
+    Label {
+        id: hiddenLabel
+        visible: false
+    }
+
+    function dropProfile() {
+        // TODO Check if this is enough and doesn't leak.
+        for (var i = 0; i < model.length; i++)
+            model[i].destroy();
+        model = [];
+    }
+
+    function createActionString(action) {
+        switch(action.type){
+        case "key":
+            return createKeyActionString(action.key, action.mod, action.text);
+        case "string":
+            return createStringActionString(action.string, action.text);
+        }
+    }
+
+    function createOtherActionsString(actions) {
+        var result = "[";
+        for (var i = 0; i < actions.length; i++) {
+            var action = actions[i];
+            result += createActionString(action);
+
+            if (i < actions.length - 1)
+                result += ",";
+        }
+
+        return result + "]";
+    }
+
+    function createKeyActionString(key, mod, text) {
+        if (["Control", "Alt", "Shift"].indexOf(mod) === -1)
+            mod = "No";
+
+        var textString = text ? "text: \"" + text + "\";" : "";
+        return "Action { " + textString + " onTriggered: simulateKey(Qt.Key_"+ key + ", Qt." + mod + "Modifier); }";
+    }
+
+    function createStringActionString(string, text) {
+        var textString = text ? "text: \"" + text + "\";" : "";
+        return "Action { " + textString + " onTriggered: simulateCommand(\"" + string + "\"); }";
+    }
+
+    function createEntryString(text, actionString, otherActionsString) {
+        var objectString = "
+            import QtQuick 2.0
+            import Ubuntu.Components 1.1
+
+            KeyModel {
+                text: \"" + text + "\"
+                mainAction: " + actionString + "\n
+                actions:" + otherActionsString +
+            "}"
+        return objectString;
+    }
+
+    function loadProfile(profileString) {
+        dropProfile();
+
+        var maxWidth = 0;
+
+        // This function might raise exceptions which are handled in KeyboardBar.qml
+        var profile = profile = Parser.parseJson(profileString);
+
+        name = profile.name;
+        short_name = profile.short_name;
+
+        var layoutModel = []
+        for (var i = 0; i < profile.buttons.length; i++) {
+            var button = profile.buttons[i];
+            var mainActionString = createActionString(button.main_action);
+
+            var otherActionsString = button.other_actions
+                                          ? createOtherActionsString(button.other_actions)
+                                          : "[]";
+
+            var entryString = createEntryString(button.main_action.text, mainActionString, otherActionsString);
+
+            layoutModel.push(Qt.createQmlObject(entryString, keyboardRow));
+
+            hiddenLabel.text = button.main_action.text;
+            maxWidth = Math.max(hiddenLabel.width, maxWidth);
+        }
+
+        keyWidth = maxWidth + units.gu(3);
+        model = layoutModel;
+    }
+    Component.onDestruction: dropProfile();
+}

=== modified file 'src/app/qml/KeyboardRows/KeyboardRow.qml'
--- src/app/qml/KeyboardRows/KeyboardRow.qml	2015-01-16 23:04:14 +0000
+++ src/app/qml/KeyboardRows/KeyboardRow.qml	2015-02-14 14:24:37 +0000
@@ -3,7 +3,11 @@
 
 Rectangle {
     id: container
-    property list<QtObject> model
+
+    property string name
+    property string short_name
+
+    property var model: []
     property real keyWidth: units.gu(5)
     property real keyHeight: units.gu(5)
 

=== added file 'src/app/qml/KeyboardRows/Layouts/ControlKeys.json'
--- src/app/qml/KeyboardRows/Layouts/ControlKeys.json	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/Layouts/ControlKeys.json	2015-02-14 14:24:37 +0000
@@ -0,0 +1,39 @@
+{
+    "name" : "Control Keys",
+    "short_name" : "CTRL",
+
+    "buttons": [
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "CTRL+R",
+                "key" : "R",
+                "mod" : "Control"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "CTRL+C",
+                "key" : "C",
+                "mod" : "Control"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "CTRL+A",
+                "key" : "A",
+                "mod" : "Control"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "CTRL+Z",
+                "key" : "Z",
+                "mod" : "Control"
+            }
+        }
+    ]
+}

=== removed file 'src/app/qml/KeyboardRows/Layouts/ControlKeysLayout.qml'
--- src/app/qml/KeyboardRows/Layouts/ControlKeysLayout.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardRows/Layouts/ControlKeysLayout.qml	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-import ".."
-
-KeyboardRow {
-    keyWidth: units.gu(10)
-    model: [
-        KeyModel {
-            text: "CTRL+R"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_R, Qt.ControlModifier);}
-        },
-        KeyModel {
-            text: "CTRL+C"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_C, Qt.ControlModifier);}
-        },
-        KeyModel {
-            text: "CTRL+Z"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Z, Qt.ControlModifier);}
-        },
-        KeyModel {
-            text: "CTRL+A"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_A, Qt.ControlModifier);}
-        }
-    ]
-}

=== added file 'src/app/qml/KeyboardRows/Layouts/FunctionKeys.json'
--- src/app/qml/KeyboardRows/Layouts/FunctionKeys.json	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/Layouts/FunctionKeys.json	2015-02-14 14:24:37 +0000
@@ -0,0 +1,98 @@
+{
+    "name" : "Function Keys",
+    "short_name" : "FNS",
+
+    "buttons": [
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "ESC",
+                "key" : "Escape"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F1",
+                "key" : "F1"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F2",
+                "key" : "F2"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F3",
+                "key" : "F3"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F4",
+                "key" : "F4"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F5",
+                "key" : "F5"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F6",
+                "key" : "F6"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F7",
+                "key" : "F7"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F8",
+                "key" : "F8"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F9",
+                "key" : "F9"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F10",
+                "key" : "F10"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F10",
+                "key" : "F10"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "F11",
+                "key" : "F11"
+            }
+        }
+    ]
+}

=== removed file 'src/app/qml/KeyboardRows/Layouts/FunctionKeysLayout.qml'
--- src/app/qml/KeyboardRows/Layouts/FunctionKeysLayout.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardRows/Layouts/FunctionKeysLayout.qml	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-import ".."
-
-KeyboardRow {
-    keyWidth: units.gu(6)
-    model: [
-        KeyModel {
-            text: "ESC"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Escape, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "F1"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F1, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F2"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F2, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F3"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F3, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F4"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F4, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F5"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F5, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F6"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F6, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F7"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F7, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F8"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F8, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F9"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F9, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F10"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F10, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F11"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F11, Qt.NoModifier);}
-        },
-        KeyModel {
-            text: "F12"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_F12, Qt.NoModifier);}
-        }
-    ]
-}

=== added file 'src/app/qml/KeyboardRows/Layouts/ScrollKeys.json'
--- src/app/qml/KeyboardRows/Layouts/ScrollKeys.json	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/Layouts/ScrollKeys.json	2015-02-14 14:24:37 +0000
@@ -0,0 +1,77 @@
+{
+    "name" : "Scroll Keys",
+    "short_name" : "SCR",
+
+    "buttons": [
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "PG_UP",
+                "key" : "PageUp"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "PG_DN",
+                "key" : "PageDown"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "DEL",
+                "key" : "Delete"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "HOME",
+                "key" : "Home"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "END",
+                "key" : "End"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "TAB",
+                "key" : "Tab"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "\u2191",
+                "key" : "Up"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "\u2193",
+                "key" : "Down"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "\u2190",
+                "key" : "Left"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "key",
+                "text" : "\u2192",
+                "key" : "Right"
+            }
+        }
+    ]
+}

=== removed file 'src/app/qml/KeyboardRows/Layouts/ScrollKeysLayout.qml'
--- src/app/qml/KeyboardRows/Layouts/ScrollKeysLayout.qml	2014-12-07 16:11:58 +0000
+++ src/app/qml/KeyboardRows/Layouts/ScrollKeysLayout.qml	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-import ".."
-
-KeyboardRow {
-    keyWidth: units.gu(8)
-    model: [
-        KeyModel {
-            text: "PG_UP"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_PageUp, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "PG_DN"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_PageDown, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "DEL"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Delete, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "HOME"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Home, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "END"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_End, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "TAB"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Tab, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "\u2191"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Up, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "\u2193"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Down, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "\u2190"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Left, Qt.NoModifier); }
-        },
-        KeyModel {
-            text: "\u2192"
-            mainAction: Action { onTriggered: simulateKey(Qt.Key_Right, Qt.NoModifier); }
-        }
-    ]
-}

=== added file 'src/app/qml/KeyboardRows/Layouts/SimpleCommands.json'
--- src/app/qml/KeyboardRows/Layouts/SimpleCommands.json	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/Layouts/SimpleCommands.json	2015-02-14 14:24:37 +0000
@@ -0,0 +1,87 @@
+{
+    "name" : "Comamnds Key",
+    "short_name" : "CMD",
+
+    "buttons": [
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "top",
+                "string" : "top\n"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "clear",
+                "string" : "clear\n"
+            }
+        },
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "ls",
+                "string" : "ls\n"
+            },
+            "other_actions" : [
+                {
+                    "type" : "string",
+                    "text" : "-l",
+                    "string" : "ls -l\n"
+                },
+                {
+                    "type": "string",
+                    "text": "-a",
+                    "string": "ls -a\n"
+                }
+            ]
+        },
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "rm",
+                "string" : "rm "
+            },
+            "other_actions" : [
+                {
+                    "type" : "string",
+                    "text" : "-r",
+                    "string" : "rm -r "
+                }
+            ]
+        },
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "find",
+                "string" : "find "
+            },
+            "other_actions" : [
+                {
+                    "type" : "string",
+                    "text" : "-name",
+                    "string" : "find -name "
+                }
+            ]
+        },
+        {
+            "main_action" : {
+                "type": "string",
+                "text" : "chmod",
+                "string" : "chmod "
+            },
+            "other_actions" : [
+                {
+                    "type" : "string",
+                    "text" : "555",
+                    "string" : "chmod 555 "
+                },
+                {
+                    "type": "string",
+                    "text": "777",
+                    "string": "chmod 777 "
+                }
+            ]
+        }
+    ]
+}

=== removed file 'src/app/qml/KeyboardRows/Layouts/SimpleCommandsLayout.qml'
--- src/app/qml/KeyboardRows/Layouts/SimpleCommandsLayout.qml	2014-12-07 16:46:56 +0000
+++ src/app/qml/KeyboardRows/Layouts/SimpleCommandsLayout.qml	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-
-import ".."
-
-KeyboardRow {
-    keyWidth: units.gu(8)
-    model: [
-        KeyModel {
-            text: "top"
-            mainAction: Action { onTriggered: simulateCommand("top\n"); }
-        },
-        KeyModel {
-            text: "clear"
-            mainAction: Action { onTriggered: simulateCommand("clear\n"); }
-        },
-        KeyModel {
-            text: "ls"
-            mainAction: Action { onTriggered: simulateCommand("ls\n"); }
-            actions: [
-                Action { text: "-a"; onTriggered: simulateCommand("ls -a\n"); },
-                Action { text: "-l"; onTriggered: simulateCommand("ls -l\n"); }
-            ]
-        },
-        KeyModel {
-            text: "rm"
-            mainAction: Action { onTriggered: simulateCommand("rm"); }
-            actions: [
-                Action { text: "-r"; onTriggered: simulateCommand("rm -r"); }
-            ]
-        },
-        KeyModel {
-            text: "find"
-            mainAction: Action { onTriggered: simulateCommand("find"); }
-            actions: [
-                Action { text: "-name"; onTriggered: simulateCommand("find . -name "); }
-            ]
-        },
-        KeyModel {
-            text: "chmod"
-            mainAction: Action { onTriggered: simulateCommand("chmod"); }
-            actions: [
-                Action { text: "555"; onTriggered: simulateCommand("chmod 555"); },
-                Action { text: "777"; onTriggered: simulateCommand("chmod 777"); }
-            ]
-        }
-    ]
-}

=== added file 'src/app/qml/KeyboardRows/jsonParser.js'
--- src/app/qml/KeyboardRows/jsonParser.js	1970-01-01 00:00:00 +0000
+++ src/app/qml/KeyboardRows/jsonParser.js	2015-02-14 14:24:37 +0000
@@ -0,0 +1,78 @@
+.pragma library
+
+// This small library prints semantic errors of bad profiles.
+
+function isAllowed(value, allowed) {
+    return allowed.indexOf(value) !== -1;
+}
+
+function raiseException(msg, obj) {
+    throw msg + "\n" + JSON.stringify(obj, null, 2);
+}
+
+function validateKeyAction(keyObject) {
+    if (!keyObject.key)
+        return raiseException("key is missing");
+    if (keyObject.mod && !isAllowed(keyObject.mod, ["Control", "Shift", "Alt"]))
+        return raiseException("mod is invalid in", keyObject);
+}
+
+function validateStringAction(stringObject) {
+    if (!stringObject.string)
+        raiseException("string is missing in", stringObject);
+}
+
+function validateAction(actionObject) {
+    if (!actionObject.type)
+        raiseException("type is missing in", actionObject);
+    if (!isAllowed(actionObject.type, ["key", "string"]))
+        raiseException("type must be either key or string in", actionObject);
+    if (!actionObject.text)
+        raiseException("text is missing in", actionObject);
+
+    switch (actionObject.type) {
+    case "key":
+        validateKeyAction(actionObject);
+        break;
+    case "string":
+        validateStringAction(actionObject);
+        break;
+    }
+}
+
+function validateButton(buttonObject) {
+    if (!buttonObject.main_action)
+        raiseException("main_action is missing", buttonObject);
+
+    validateAction(buttonObject.main_action);
+
+    var other_actions = buttonObject.other_actions;
+    if (other_actions) {
+        if (!Array.isArray(other_actions))
+            raiseException("other_actions is not an array", other_actions);
+
+        for (var i = 0; i < other_actions.length; i++) {
+            validateAction(other_actions[i]);
+        }
+    }
+}
+
+function validateLayout(layoutObject) {
+    if (!layoutObject.name)
+        raiseException("name is missing in ", layoutObject);
+    if (!layoutObject.short_name)
+        raiseException("short_name is missing in", layoutObject);
+    if (!layoutObject.buttons)
+        raiseException("buttons is missing in", layoutObject);
+
+    for (var i = 0; i < layoutObject.buttons.length; i++) {
+        validateButton(layoutObject.buttons[i]);
+    }
+}
+
+function parseJson(jsonString) {
+    var jsonObject = JSON.parse(jsonString);
+    validateLayout(jsonObject);
+
+    return jsonObject;
+}

=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.cpp'
--- src/plugin/qmltermwidget/lib/TerminalDisplay.cpp	2014-12-02 10:47:57 +0000
+++ src/plugin/qmltermwidget/lib/TerminalDisplay.cpp	2015-02-14 14:24:37 +0000
@@ -3248,9 +3248,17 @@
     setFillColor(cs->backgroundColor());
 }
 
-void TerminalDisplay::simulateKeyPress(int key, int modifiers, bool pressed, quint32 nativeScanCode, const QString &text)
+void TerminalDisplay::simulateKeyPress(int key, int modifiers, bool pressed, quint32 nativeScanCode, QString text)
 {
     Q_UNUSED(nativeScanCode);
+
+    // TODO WORKAROUND: If text is not given we try to guess it from the unicode value.
+    // This solution is probably not complete on the domain, but works for the most common cases.
+    if (text.isEmpty()) {
+        bool shiftMod = modifiers & Qt::ShiftModifier;
+        text = QString(shiftMod ? QChar(key) : QChar(key).toLower());
+    }
+
     QEvent::Type type = pressed ? QEvent::KeyPress : QEvent::KeyRelease;
     QKeyEvent event = QKeyEvent(type, key, (Qt::KeyboardModifier) modifiers, text);
     keyPressedSignal(&event);

=== modified file 'src/plugin/qmltermwidget/lib/TerminalDisplay.h'
--- src/plugin/qmltermwidget/lib/TerminalDisplay.h	2014-11-17 21:12:53 +0000
+++ src/plugin/qmltermwidget/lib/TerminalDisplay.h	2015-02-14 14:24:37 +0000
@@ -547,7 +547,7 @@
     void setColorScheme(const QString &name);
     QStringList availableColorSchemes();
 
-    void simulateKeyPress(int key, int modifiers, bool pressed, quint32 nativeScanCode, const QString &text);
+    void simulateKeyPress(int key, int modifiers, bool pressed, quint32 nativeScanCode, QString text);
     void simulateWheel(int x, int y, int buttons, int modifiers, QPointF angleDelta);
     void simulateMouseMove(int x, int y, int button, int buttons, int modifiers);
     void simulateMousePress(int x, int y, int button, int buttons, int modifiers);