Merge lp:~kissiel/checkbox/converged-keyboard-support into lp:checkbox

[Maciej Kisielewski]

This MR brings keyboard support to Checkbox-Converged.

There are two distinct new features:

--- Filtering on selection screens ---

    The goals for filtering were as follows:
     * case insensitive, i.e. 'foo' in 'Foo' matches
     * any position in the string, i.e. 'oo' in 'Foo' matches
     * support for regex, i.e. 'F..b..' in 'Foobar' matches

    Additional goals for UX were to keep toggle selection action, but to make it
    apply on filtered list. Example scenarios:
     original list = [foo, bar, baz]
     none selected
     query for 'ba'
     -> bar and baz visible on the list
     toggle selection
     -> both - bar and baz are selected
     clear the query string
     -> foo is not selected, bar and bas are
    Deselection should mirrors this behaviour

--- Enable key shortcuts in the app ---
As requested here: https://bugs.launchpad.net/checkbox-converged/+bug/1318466, currently supported keystrokes are:

for selection screens:
    * alt + c - same as hitting continue (if anything is selected)
    * ctrl + a - select all / deselect all (toggle selection - same as the header action)

'in test' screens:
    * alt + t - to start the test (if in intro) or continue (if outcome is automatically resolved)
    * alt + p - to pass the test
    * alt + f - to fail the test
    * alt + s - to skip the test
    * alt + c - to enter comment

[Sylvain Pineau (sylvain-pineau)]

Two issues with the first screens:

1. In addition to the continue button, you could also add a keyboard shortcut for the first screen "start testing"

2. The selection screens Alt+C does the right job but does not grey out the continue button.

review: Needs Fixing

[Sylvain Pineau (sylvain-pineau)]

@kissiel

Could you please rebase this branch on trunk. I'd like to give it a second look since we're now using converged launchers (you know some of us are fond of keyboard shortcuts)

[Maciej Kisielewski (kissiel)]

> Two issues with the first screens:
>
> 1. In addition to the continue button, you could also add a keyboard shortcut
> for the first screen "start testing"
>
> 2. The selection screens Alt+C does the right job but does not grey out the
> continue button.

Added both things.
Rebased on current trunk.

[Pierre Equoy (pieq)]

The search filter is very handy, thanks!

Regarding the shortcuts, given there is no visual clues, it's a bit weird to have one (alt+C) that is "continue" in some screens and "comment" in others.

I'm not sure I understood how to use "alt+T". It unselects the test that is highlighted, but since there is no way to move the selection using the keyboard in the first place, its usefulness is limited (unless I missed something).

for the in test screens, I would suggest to use something similar to the cli:

    - alt + T ("Test") to start the test
    - alt + P ("Passed") to pass the test
    - alt + F ("Failed") to fail the test
    - alt + S ("Skipped") to skip the test
    - alt + C ("Comment") to comment the test

for selection screens:
    * alt + c - same as hitting continue (if anything is selected)
    * alt + t - toggle selection (same as the header action)

'in test' screens:
    * alt + t - to start the test (if in intro) or continue (if outcome is automatically resolved)
    * alt + y - to pass the test
    * alt + n - to fail the test
    * alt + x - to skip the test
    * alt + c - to enter comment

[Pierre Equoy (pieq)]

The search filter is very handy, thanks!

Regarding the shortcuts, given there is no visual clues, it's a bit weird to have one (alt+C) that is "continue" in some screens and "comment" in others.

I'm not sure I understood how to use "alt+T". It unselects the test that is highlighted, but since there is no way to move the selection using the keyboard in the first place, its usefulness is limited (unless I missed something).

for the in test screens, I would suggest to use something similar to the cli:

    - alt + T ("Test") to start the test
    - alt + P ("Passed") to pass the test
    - alt + F ("Failed") to fail the test
    - alt + S ("Skipped") to skip the test
    - alt + C ("Comment") to comment the test

[Maciej Kisielewski (kissiel)]

> The search filter is very handy, thanks!
>
> Regarding the shortcuts, given there is no visual clues, it's a bit weird to
> have one (alt+C) that is "continue" in some screens and "comment" in others.
>
> I'm not sure I understood how to use "alt+T". It unselects the test that is
> highlighted, but since there is no way to move the selection using the
> keyboard in the first place, its usefulness is limited (unless I missed
> something).
>
> for the in test screens, I would suggest to use something similar to the cli:
>
> - alt + T ("Test") to start the test
> - alt + P ("Passed") to pass the test
> - alt + F ("Failed") to fail the test
> - alt + S ("Skipped") to skip the test
> - alt + C ("Comment") to comment the test

I like those shortcuts more.
What would you like to have for 'toggle selection' action and 'continue' on selection screens?

[Pierre Equoy (pieq)]

I think alt + T for "continue", just to keep the consistency with the later screens (where we press alt + T to start a test).

For the selection, since it's an all or nothing type of selection, maybe alt + A ?

[Maciej Kisielewski (kissiel)]

> I think alt + T for "continue", just to keep the consistency with the later
> screens (where we press alt + T to start a test).
>
> For the selection, since it's an all or nothing type of selection, maybe alt +
> A ?

Instead of 'alt+a' I went with more natural 'ctrl+a'.
I made the rest as you suggested.

[Pierre Equoy (pieq)]

Yes, good idea for Ctrl+A!

Thanks Maciek :)

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2016-07-08 10:21:16 +0000
+++ checkbox-touch/checkbox-touch.qml	2016-07-11 12:39:56 +0000
@@ -87,6 +87,13 @@
         }
     }
 
+    KeysDelegator {
+        id: rootKeysDelegator
+    }
+
+    // forward all keypresses to the delegator
+    Keys.onPressed: rootKeysDelegator.keyPress(event)
+
     Component.onCompleted: {
         i18n.domain = "com.ubuntu.checkbox";
         if (args.values["autopilot"]) {
@@ -198,6 +205,13 @@
     PageStack {
         id: pageStack
         Component.onCompleted: push(welcomePage)
+        onCurrentPageChanged: {
+            if (pageStack.depth > 1) {
+                // there was something before, we need to pop it from the kd's activeStack
+                rootKeysDelegator.activeStack.pop();
+            }
+            rootKeysDelegator.activeStack.push(pageStack.currentPage);
+        }
     }
 
     WelcomePage {
@@ -310,6 +324,13 @@
         title: i18n.tr("Select test plan")
         onlyOneAllowed: true
         largeBuffer: args.values["autopilot"]
+        onVisibleChanged: {
+            if (visible) {
+                rootKeysDelegator.onKeyPressed.connect(keys.keyPress)
+            } else {
+                rootKeysDelegator.onKeyPressed.disconnect(keys.keyPress)
+            }
+        }
 
         function setup(testplan_info_list) {
             if (testplan_info_list.length<1) {
@@ -336,6 +357,13 @@
         objectName: "categorySelectionPage"
         title: i18n.tr("Select categories")
         largeBuffer: args.values["autopilot"]
+        onVisibleChanged: {
+            if (visible) {
+                rootKeysDelegator.onKeyPressed.connect(keys.keyPress)
+            } else {
+                rootKeysDelegator.onKeyPressed.disconnect(keys.keyPress)
+            }
+        }
 
         function setup(continuation) {
             app.getCategories(function(response) {
@@ -372,6 +400,13 @@
         title: i18n.tr("Select tests")
         continueText: i18n.tr("Start testing")
         largeBuffer: args.values["autopilot"]
+        onVisibleChanged: {
+            if (visible) {
+                rootKeysDelegator.onKeyPressed.connect(keys.keyPress)
+            } else {
+                rootKeysDelegator.onKeyPressed.disconnect(keys.keyPress)
+            }
+        }
 
         function setup(continuation) {
             app.getTests(function(response) {

=== modified file 'checkbox-touch/components/ConfirmationDialog.qml'
--- checkbox-touch/components/ConfirmationDialog.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/ConfirmationDialog.qml	2016-07-11 12:39:56 +0000
@@ -66,21 +66,21 @@
             title: question
 
             Button {
+                id: yesButton
                 text: i18n.tr("YES")
                 objectName: "yesButton"
                 color: UbuntuColors.green
                 onClicked: {
-                    answer(true, checkBox.checked);
-                    PopupUtils.close(dlg);
+                    _giveAnswer(true);
                 }
             }
             Button {
+                id: noButton
                 text: i18n.tr("NO")
                 objectName: "noButton"
                 color: UbuntuColors.red
                 onClicked: {
-                    answer(false, checkBox.checked);
-                    PopupUtils.close(dlg);
+                    _giveAnswer(false);
                 }
             }
 
@@ -102,6 +102,17 @@
                     }
                 }
             }
+            Component.onCompleted: {
+                rootKeysDelegator.setHandler('alt+y', confirmationDialog, yesButton.clicked);
+                rootKeysDelegator.setHandler('alt+n', confirmationDialog, noButton.clicked);
+                rootKeysDelegator.activeStack.push(confirmationDialog);
+            }
+            function _giveAnswer(confirmation) {
+                // ensures that dialog is closed
+                answer(confirmation, checkBox.checked);
+                PopupUtils.close(dlg);
+                rootKeysDelegator.activeStack.pop();
+            }
         }
     }
 }

=== modified file 'checkbox-touch/components/ConfirmationLogic.js'
--- checkbox-touch/components/ConfirmationLogic.js	2014-10-28 15:03:19 +0000
+++ checkbox-touch/components/ConfirmationLogic.js	2016-07-11 12:39:56 +0000
@@ -1,5 +1,7 @@
 .import Ubuntu.Components.Popups 1.0 as Popups
 
+.import QtQuick 2.0 as QtQuick
+
 function confirmRequest(caller, options, continuation) {
     // if the question was answered before and user selected to
     // remember their selection - 'returning' true
@@ -7,7 +9,14 @@
         continuation(true);
         return;
     }
-    var popup = Qt.createComponent(Qt.resolvedUrl("ConfirmationDialog.qml")).createObject(caller);
+    var component = Qt.createComponent(Qt.resolvedUrl("ConfirmationDialog.qml"));
+    if (component.status == QtQuick.Component.Error) {
+        var msg = i18n.tr("could not create ConfirmationDialog component\n'") + component.errorString();
+        console.error(msg);
+        ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
+    }
+    var popup = component.createObject(caller);
+
     popup.withRemember = options.remember;
     popup.question = options.question;
     popup.answer.connect(function(result, remember) {

=== modified file 'checkbox-touch/components/InteractIntroPage.qml'
--- checkbox-touch/components/InteractIntroPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/InteractIntroPage.qml	2016-07-11 12:39:56 +0000
@@ -57,8 +57,12 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
@@ -111,4 +115,9 @@
             }
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', userInteractVerifyIntroPage, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', userInteractVerifyIntroPage, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+t', userInteractVerifyIntroPage, startTestButton.clicked);
+    }
 }

=== added file 'checkbox-touch/components/KeysDelegator.qml'
--- checkbox-touch/components/KeysDelegator.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/KeysDelegator.qml	2016-07-11 12:39:56 +0000
@@ -0,0 +1,226 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+/*! \brief Helper for delegating keypresses
+    \inherits Item
+
+    This component helps to register keystroke handlers in a human-friendly
+    manner. Once handler is assigned to a given keystroke, the next time
+    keyPress will be called with event matching the key combination expressed
+    as registered keystroke, the supplied handler will be called.
+    There are two kinds of handlers: owned (normal), and 'global'.
+    Owned are registered with 'owner' parameter, that owner must match the top
+    of the 'activeStack' in order for the handler to be called.
+    Global handlers are handler regardless of what's on activeStack.
+    Note that owned handlers take precedence over global ones. I.e. if you have
+    registered two handlers for the same keystroke and the owner of the owned
+    one is on activeStack, ONLY that one will be called.
+    Example usage:
+    KeysDelegator {
+        id: keysDelegator
+    }
+    Keys.onPressed: keysDelegator.keyPress(event)
+    (...)
+    kd.setGlobalHandler('ctrl+q', Qt.quit);
+    kd.setHandler('ctrl+y', yesButton.clicked);
+*/
+
+Item {
+
+    /*!
+      Gets signalled when no handler was found for given keystroke.
+     */
+    signal keyPressed(var event);
+
+    /*!
+      Handle a keyboard event.
+      This is intended to be called as a handler for Keys.onPressed in your MainView.
+     */
+    function keyPress(event) {
+        // build the keystroke string
+        var keystroke ='';
+        if (event.modifiers & Qt.AltModifier) keystroke += 'alt+';
+        if (event.modifiers & Qt.ControlModifier) keystroke += 'ctrl+';
+        if (event.modifiers & Qt.ShiftModifier) keystroke += 'shift+';
+        keystroke += String.fromCharCode(event.key).toLowerCase();
+
+        var ownedHandlerHit = false;
+        // get the object this keystroke should be processed for
+        if (activeStack.length > 0) {
+            var candidate = activeStack[activeStack.length - 1];
+            if (candidate in _handlers) {
+                if (keystroke in _handlers[candidate]) {
+                    _handlers[candidate][keystroke]();
+                    ownedHandlerHit = true;
+                }
+            }
+        }
+        if (!ownedHandlerHit) {
+            if (keystroke in _globalHandlers) {
+                _globalHandlers[keystroke]();
+            } else {
+                // no handlers set, forwarding as keyPressed signal
+                keyPressed(event);
+            }
+        }
+    }
+
+    /*!
+      Make given page receive all (yet) unhandled keystrokes while it's visible.
+      Note, page must have its own KeysDelegator exposed as 'keys'.
+     */
+    function forwardPressesWhileVisible(page) {
+        var handler = function() {
+            if (page.visible == true) {
+                root.onKeyPressed.connect(page.keys.keyPress);
+            } else {
+                root.onKeyPressed.disconnect(page.keys.keyPress);
+            }
+        }
+        page.onVisibleChanged.connect(handler);
+        page.Component.onDestruction.connect(function() {
+            page.onVisibleChanged.disconnect(handler);
+        });
+    }
+
+    /*!
+      Set handler for given keystroke.
+      This function stores `handler` as the function that is to be called if
+      `keystroke` is processed and owner is on the top of the activeStack.
+      `keystroke` is in form of [<mod_key>+...]<key>, E.g. 'ctrl+x'
+
+      If called with the keystroke that's already in the registry, it will
+      overwrite the previous handler.
+     */
+    function setHandler(keystroke, owner, handler) {
+        if (!(owner in _handlers)) {
+            _handlers[owner] = [];
+        }
+
+        _handlers[owner][_normalizeKeystroke(keystroke)] = handler;
+    }
+
+    /*!
+      Unset handler for a given keystroke for a given owner.
+
+      It silently ignores keystroke entries that are not in the registry
+     */
+    function unsetHandler(keystroke, owner) {
+        if (!(owner in _handlers)) {
+            return;
+        }
+        delete _handlers[owner][_normalizeKeystroke(keystroke)];
+    }
+
+    /*!
+      Unset handlers owned by the given owner.
+     */
+    function unsetHandlersByOwner(owner) {
+        _handlers[owner] = [];
+    }
+
+    /*!
+      Unset all handlers.
+     */
+    function unsetAllHandlers() {
+        _handlers = [];
+    }
+
+    /*!
+      Set global handler for a keystroke.
+     */
+    function setGlobalHandler(keystroke, handler) {
+        _globalHandlers[_normalizeKeystroke(keystroke)] = handler;
+    }
+
+    /*!
+      Unset global handler for a given keystroke.
+      NOTE: owned handlers will not be affected
+     */
+    function unsetGlobalHandler(keystroke) {
+        delete _globalHandlers[_normalizeKeystroke(keystroke)];
+    }
+
+    /*!
+      Unset all global handlers.
+      NOTE: owned handlers will not be affected
+     */
+    function unsetAllGlobalHandlers() {
+        _globalHandlers = [];
+    }
+
+    property var activeStack: []
+
+    property var _handlers : []
+
+    property var _globalHandlers : []
+
+    /*!
+      Validate and normalize keystroke description.
+
+      This function 'repairs' strings that depict keystroke to match following template:
+      [<mod_key>+...]<key>
+      where:
+        * `mod_key`is one of the modifier keys defined as `allowedModifiers` below
+        * given `mod_key` is supplied at most once
+        * `key` is an lowercase alphanumeric character - [a-z0-9]
+        * supplied `mod_key`s occur in alphabetic order
+
+      Examples:
+        _normalizeKeystroke('ctrl+alt+K') -> 'alt+ctrl+k'
+        _normalizeKeystroke('Q') -> 'q'
+        _normalizeKeystroke('shift+W') -> 'shift+w'
+
+      Returns normalized keystroke
+      Throws an `Error` when parsing of keystroke string failed
+     */
+    function _normalizeKeystroke(keystroke) {
+        var allowedModifiers = ['alt', 'ctrl', 'shift'];
+        var parts = keystroke.toLowerCase().split('+');
+        var k = parts.pop();
+        if (!k) {
+           throw  new Error('Missing key in the keystroke. Got: "%1"'.arg(keystroke));
+        }
+        if (!k.match(/^[a-z0-9]$/)) {
+            throw  new Error('Picked key "%1" is not an alphanumeric. Got: "%2"'.arg(k).arg(keystroke));
+        }
+
+        var modifiers = {}
+
+        while (parts.length > 0) {
+            var modifier = parts.shift();
+            if (allowedModifiers.indexOf(modifier) < 0) {
+                throw new Error('Unknown modifier key "%1". Allowed modifiers: %2'.arg(modifier).arg(allowedModifiers));
+            }
+            modifiers[modifier] = true;
+        }
+        var normalizedKeystroke = '';
+        for (var i in allowedModifiers) {
+            if (allowedModifiers[i] in modifiers) {
+                normalizedKeystroke += allowedModifiers[i] + '+';
+            }
+        }
+        normalizedKeystroke += k;
+        return normalizedKeystroke;
+    }
+}

=== modified file 'checkbox-touch/components/ManualIntroPage.qml'
--- checkbox-touch/components/ManualIntroPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/ManualIntroPage.qml	2016-07-11 12:39:56 +0000
@@ -51,8 +51,12 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
@@ -61,6 +65,7 @@
         header: test["name"]
         body: test["description"]
         Button {
+            id: continueButton
             objectName: "continueButton"
             color: UbuntuColors.green
             Layout.fillWidth: true
@@ -70,4 +75,9 @@
             }
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', manualIntroPage, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', manualIntroPage, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+t', manualIntroPage, continueButton.clicked);
+    }
 }

=== modified file 'checkbox-touch/components/QmlConfinedPage.qml'
--- checkbox-touch/components/QmlConfinedPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/QmlConfinedPage.qml	2016-07-11 12:39:56 +0000
@@ -86,8 +86,12 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
@@ -112,6 +116,7 @@
         }
 
         LatchButton {
+            id: continueButton
             objectName: "continueButton"
             color: UbuntuColors.green
             Layout.fillWidth: true
@@ -148,4 +153,9 @@
             visible: false
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', qmlNativePage, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', qmlNativePage, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+t', qmlNativePage, continueButton.clicked);
+    }
 }

=== modified file 'checkbox-touch/components/QmlNativePage.qml'
--- checkbox-touch/components/QmlNativePage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/QmlNativePage.qml	2016-07-11 12:39:56 +0000
@@ -59,8 +59,12 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
@@ -70,6 +74,7 @@
         body: test["description"]
 
         LatchButton {
+            id: continueButton
             objectName: "continueButton"
             color: UbuntuColors.green
             Layout.fillWidth: true
@@ -107,4 +112,9 @@
             }
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', qmlNativePage, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', qmlNativePage, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+t', qmlNativePage, continueButton.clicked);
+    }
 }

=== modified file 'checkbox-touch/components/SelectionPage.qml'
--- checkbox-touch/components/SelectionPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/SelectionPage.qml	2016-07-11 12:39:56 +0000
@@ -36,6 +36,7 @@
     signal selectionDone(var selected_id_list)
     property string continueText: i18n.tr("Continue")
     readonly property alias model: selectionModel
+    property alias keys: keysDelegator
     property bool onlyOneAllowed: false
     property bool emptyAllowed: false
     property bool largeBuffer: false
@@ -44,9 +45,15 @@
     visible: false
     flickable: null
     property var selectedCount : 0
+    property var filteredSelectedCount: 0
     property var disabledSelectedCount: 0
+    property var filter: new RegExp('.*');
     state : selectedCount > 0 ? "nonempty selection" :
         (disabledSelectedCount > 0 ? "disabled only selection" : "empty selection")
+    ListModel {
+        // This model holds all items that can be selected, even when filtered-out
+        id: selectionModel
+    }
 
     // A function that needs to be called after changes are done to the model
     // to re-count number of selected items on the list
@@ -54,14 +61,30 @@
         selectedCount = 0;
         disabledSelectedCount = 0;
         for (var i=0; i < selectionModel.count; i++) {
-            if (selectionModel.get(i).mod_selected) {
-                if (selectionModel.get(i).mod_disabled) {
+            var modelItem = selectionModel.get(i);
+            if (modelItem.mod_selected) {
+                if (modelItem.mod_disabled) {
                     disabledSelectedCount++;
                 } else {
                     selectedCount++;
                 }
             }
         }
+        updateFilteredModel();
+    }
+    function updateFilteredModel() {
+        filteredSelectionModel.clear();
+        filteredSelectedCount = 0;
+        for (var i=0; i < selectionModel.count; i++) {
+            var modelItem = selectionModel.get(i);
+            modelItem['fullListIndex'] = i;
+            if (modelItem.mod_name.search(filter) > -1) {
+                filteredSelectionModel.append(modelItem);
+                if (modelItem.mod_selected) {
+                    filteredSelectedCount++;
+                }
+            }
+        }
     }
     function gatherSelection() {
         var selected_id_list = [];
@@ -77,28 +100,27 @@
         continueButton.unlatch();
     }
     function deselectAll() {
-        selectedCount = 0;
-        disabledSelectedCount = 0;
-        for (var i=0; i<selectionModel.count; i++) {
-            if (!selectionModel.get(i)["mod_disabled"]) {
-                selectionModel.setProperty(i, "mod_selected", false);
-            } else {
-                if (selectionModel.get(i).mod_selected) {
-                    disabledSelectedCount++;
+        for (var i=0; i<filteredSelectionModel.count; i++) {
+            var modelItem = filteredSelectionModel.get(i);
+            if (!modelItem.mod_disabled) {
+                if (modelItem.mod_selected) {
+                    filteredSelectionModel.setProperty(i, "mod_selected", false);
+                    selectionModel.setProperty(modelItem.fullListIndex, "mod_selected", false);
+                    selectedCount--;
+                    filteredSelectedCount--;
                 }
             }
         }
     }
     function selectAll() {
-        selectedCount = 0;
-        disabledSelectedCount = 0;
-        for (var i=0; i<selectionModel.count; i++) {
-            if (!selectionModel.get(i)["mod_disabled"]) {
-                selectionModel.setProperty(i, "mod_selected", true);
-                selectedCount++;
-            } else {
-                if (selectionModel.get(i).mod_selected) {
-                    disabledSelectedCount++;
+        for (var i=0; i<filteredSelectionModel.count; i++) {
+            var modelItem = filteredSelectionModel.get(i);
+            if (!modelItem.mod_disabled) {
+                if (!modelItem.mod_selected) {
+                    filteredSelectionModel.setProperty(i, "mod_selected", true);
+                    selectionModel.setProperty(modelItem.fullListIndex, "mod_selected", true);
+                    selectedCount++;
+                    filteredSelectedCount++;
                 }
             }
         }
@@ -117,12 +139,25 @@
                     visible: !onlyOneAllowed
                     onTriggered: {
                         if (state === "empty selection" || state == "disabled only selection") {
-                            selectAll();
+                            if (!onlyOneAllowed) // still reachable via key shortcut
+                                selectAll();
                         }
                         else if (state === "nonempty selection") {
                             deselectAll();
                         }
-
+                    }
+                },
+                Action {
+                    id: findAction
+                    text: i18n.tr("Find")
+                    iconName: 'find'
+                    onTriggered: {
+                        if (!searchBox.visible) {
+                            searchBox.visible = true;
+                            searchBox.forceActiveFocus();
+                        } else {
+                            searchBox.visible = false;
+                        }
                     }
                 }
             ]
@@ -145,6 +180,32 @@
          }
     ]
 
+    KeysDelegator {
+        id: keysDelegator
+        onKeyPressed: {
+            var c = event.text
+            if (event.modifiers == 0 && c.search(/[a-z]/, 'i') > -1) {
+                searchBox.insert(searchBox.cursorPosition, c)
+                searchBox.forceActiveFocus();
+                searchBox.visible = true
+                searchBox.focus = true
+            }
+            if (event.key == Qt.Key_Escape) {
+                searchBox.text = '';
+                searchBox.focus = false;
+                searchBox.visible = false;
+            }
+        }
+        Component.onCompleted: {
+            rootKeysDelegator.setHandler('alt+t', root, function() {
+                if (selectedCount > 0 || disabledSelectedCount > 0) {
+                    continueButton.clicked();
+                }
+            });
+            rootKeysDelegator.setHandler('ctrl+a', root, toggleSelection.trigger);
+        }
+    }
+
     ColumnLayout {
         spacing: units.gu(3)
         anchors {
@@ -158,6 +219,21 @@
             rightMargin: units.gu(1)
         }
 
+        TextField {
+            id: searchBox
+            Layout.fillWidth: true
+            visible: false
+            onTextChanged: {
+                filter = new RegExp('.*' + text, 'i');
+                updateFilteredModel();
+            }
+            onFocusChanged: {
+                if (text == '' && focus == false) {
+                    visible = false;
+                }
+            }
+        }
+
         Component {
             id: sectionHeading
             Item {
@@ -191,7 +267,7 @@
 
         UbuntuListView {
             model: ListModel {
-                id: selectionModel
+                id: filteredSelectionModel
             }
             objectName: "listView"
             Layout.fillWidth: true
@@ -218,11 +294,23 @@
                     // Toggle the mod_selected property
                     onClicked: {
                         if (onlyOneAllowed && !checked && selectedCount > 0) {
-                            // clear other selections
                             deselectAll();
+                            // clear other selections on the original list
+                            for (var i=0; i < selectionModel.count; i++) {
+                                var modelItem = selectionModel.get(i);
+                                if (!modelItem.mod_disabled) {
+                                    if (modelItem.mod_selected) {
+                                        selectionModel.setProperty(i, "mod_selected", false);
+                                        selectedCount--;
+                                    }
+                                }
+                            }
                         }
-                        selectionModel.setProperty(index, 'mod_selected', !checked);
+                        filteredSelectionModel.setProperty(index, 'mod_selected', !checked);
                         selectedCount += checked ? 1 : -1;
+                        // propagate selection to the original list
+                        selectionModel.setProperty(fullListIndex, 'mod_selected', checked);
+
                     }
                 }
                 onClicked: checkBox.clicked()

=== modified file 'checkbox-touch/components/TestVerificationPage.qml'
--- checkbox-touch/components/TestVerificationPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/TestVerificationPage.qml	2016-07-11 12:39:56 +0000
@@ -50,13 +50,19 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
 
     TestPageBody {
+        id: body
+
         header: test["name"]
         body: test["verificationDescription"]
 
@@ -99,6 +105,13 @@
             }
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', testVerification, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', testVerification, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+p', testVerification, passButton.clicked);
+        rootKeysDelegator.setHandler('alt+f', testVerification, failButton.clicked);
+    }
+
 
     function latchingTestDone() {
         passButton.state = "latched";

=== modified file 'checkbox-touch/components/UserInteractSummaryPage.qml'
--- checkbox-touch/components/UserInteractSummaryPage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/UserInteractSummaryPage.qml	2016-07-11 12:39:56 +0000
@@ -49,8 +49,12 @@
         trailingActionBar {
             objectName: 'trailingActionBar'
             actions: [
-                AddCommentAction {},
-                SkipAction {}
+                AddCommentAction {
+                    id: addCommentAction
+                },
+                SkipAction {
+                    id: skipAction
+                }
             ]
         }
     }
@@ -97,6 +101,7 @@
         }
 
         Button {
+            id: continueButton
             color: UbuntuColors.green
             objectName: "continueButton"
             Layout.fillWidth: true
@@ -106,4 +111,9 @@
             }
         }
     }
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+s', userInteractSummary, skipAction.trigger);
+        rootKeysDelegator.setHandler('alt+c', userInteractSummary, addCommentAction.trigger);
+        rootKeysDelegator.setHandler('alt+t', userInteractSummary, continueButton.clicked);
+    }
 }

=== modified file 'checkbox-touch/components/WelcomePage.qml'
--- checkbox-touch/components/WelcomePage.qml	2016-06-30 12:19:17 +0000
+++ checkbox-touch/components/WelcomePage.qml	2016-07-11 12:39:56 +0000
@@ -124,4 +124,8 @@
         text: i18n.tr("Start testing")
         onLatchedClicked: startTestingTriggered();
     }
+
+    Component.onCompleted: {
+        rootKeysDelegator.setHandler('alt+t', welcomePage, startTestButton.clicked);
+    }
 }

=== added file 'checkbox-touch/tests/unit/tst_KeysDelegator.qml'
--- checkbox-touch/tests/unit/tst_KeysDelegator.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/tests/unit/tst_KeysDelegator.qml	2016-07-11 12:39:56 +0000
@@ -0,0 +1,242 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Maciej Kisielewski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../components"
+
+Item {
+    KeysDelegator {
+        id: kd
+    }
+    UbuntuTestCase {
+        name: "KeysDelegatorTestCase"
+        when: windowShown
+
+        function cleanup() {
+            kd.unsetAllHandlers();
+        }
+
+        function test_normalizeKeyStroke_LowerCaseKeyOnly() {
+            var result = kd._normalizeKeystroke('a');
+            compare(result, 'a');
+        }
+
+        function test_normalizeKeystroke_UpperCaseKeyOnly() {
+            var result = kd._normalizeKeystroke('A');
+            compare(result, 'a');
+        }
+
+        function test_normalize_UnorderedModifiers() {
+            var result = kd._normalizeKeystroke('shift+alt+ctrl+X');
+            compare(result, 'alt+ctrl+shift+x');
+        }
+
+        function test_normalizeKeystroke_ctrlOnly() {
+            var result = kd._normalizeKeystroke('ctrl+5');
+            compare(result, 'ctrl+5');
+        }
+
+        function test_normalizeKeystroke_modifierRepeated() {
+            var result = kd._normalizeKeystroke('ctrl+alt+alt+ctrl+q');
+            compare(result, 'alt+ctrl+q');
+        }
+
+        function test_normalizeKeystroke_throws_noKey() {
+            try {
+                var result = kd._normalizeKeystroke('ctrl+');
+                fail("Didn't fail with missing key");
+            } catch (e) {
+                verify(e.message.match(/Missing key in the keystroke.*/), '"Missing key" error message matches');
+            }
+
+        }
+
+        function test_normalizeKeystroke_throws_unknownModifier() {
+            try {
+                var result = kd._normalizeKeystroke('select+X');
+                fail("Didn't fail with unknown modifier");
+            } catch (e) {
+                verify(e.message.match(/Unknown modifier key.*/), '"Unknown modifier key" error message matches');
+            }
+        }
+
+        function test_normalizeKeystroke_thows_badKey() {
+            try {
+                var result = kd._normalizeKeystroke('ctrl+[');
+                fail("Didn't fail with '[' as the key");
+            } catch (e) {
+                verify(e.message.match(/Picked key "\[" is not an alphanumeric.*/), '"Picked key is not an alphanumeric" error message matches');
+            }
+        }
+
+        function test_normalizeKeystroke_thows_reverseOrder() {
+            try {
+                var result = kd._normalizeKeystroke('b+ctrl');
+                fail("Didn't fail with 'ctrl' as the key");
+            } catch (e) {
+                verify(e.message.match(/Picked key "ctrl" is not an alphanumeric.*/), '"Picked key is not an alphanumeric" error message matches');
+            }
+        }
+
+        function test_endToEnd_smoke() {
+            var result = 0;
+            var handler = function() {
+                result++;
+            }
+            kd.setHandler('alt+r', 'mock', handler)
+            var altR = {"objectName":"","key":82,"text":"r","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":27,"accepted":false}
+            kd.activeStack.push('mock');
+            kd.keyPress(altR);
+            kd.activeStack.pop();
+            compare(result, 1);
+        }
+
+        function test_endToEnd_unsetting() {
+            var result = 0;
+            var handler = function() {
+                result++;
+            }
+            kd.setHandler('alt+e', 'mock', handler)
+            kd.unsetHandler('alt+e', 'mock')
+            var altE = {"objectName":"","key":69,"text":"e","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":26,"accepted":false}
+            kd.activeStack.push('mock');
+            kd.keyPress(altE);
+            kd.activeStack.pop();
+            compare(result, 0);
+        }
+        function test_unsetHandler_nonExisting() {
+            kd.unsetHandler('shift+m');
+        }
+
+        function test_endToEnd_overwriteHandler() {
+            var result = '';
+            var handlerFoo = function() {
+                result += 'foo'
+            }
+            var handlerBar = function() {
+                result += 'bar'
+            }
+            kd.setHandler('alt+w', 'mock', handlerFoo)
+            kd.setHandler('alt+w', 'mock', handlerBar) // this should overwrite the handler, making handlerBar the one in force
+            var altW = {"objectName":"","key":87,"text":"w","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":25,"accepted":false}
+            kd.activeStack.push('mock');
+            kd.keyPress(altW);
+            kd.activeStack.pop();
+            compare(result, 'bar');
+        }
+
+        function test_endToEnd_global_smoke() {
+            var result = 0;
+            var handler = function() {
+                result++;
+            }
+            kd.setGlobalHandler('ctrl+g', handler);
+            var ctrlG = {"objectName":"","key":71,"text":"\u0007","modifiers":67108864,"isAutoRepeat":false,"count":1,"nativeScanCode":42,"accepted":false}
+            kd.keyPress(ctrlG);
+            compare(result, 1);
+        }
+
+        function test_endToEnd_global_unsetting() {
+            var result = 0;
+            var handler = function() {
+                result++;
+            }
+            kd.setGlobalHandler('alt+e', handler)
+            kd.unsetGlobalHandler('alt+e')
+            var altE = {"objectName":"","key":69,"text":"e","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":26,"accepted":false}
+            kd.keyPress(altE);
+            compare(result, 0);
+        }
+
+        function test_endToEnd_ownedOverGlobal() {
+            var result = '';
+            var ownedHandler = function() {
+                result += 'owned';
+            }
+            var globalHandler = function() {
+                result += 'global';
+            }
+            kd.setHandler('ctrl+h', 'mock', ownedHandler);
+            kd.setGlobalHandler('ctrl+h', globalHandler);
+            var ctrlH = {"objectName":"","key":72,"text":"\b","modifiers":67108864,"isAutoRepeat":false,"count":1,"nativeScanCode":43,"accepted":false};
+            kd.activeStack.push('mock');
+            kd.keyPress(ctrlH);
+            kd.activeStack.pop();
+            compare(result, 'owned');
+        }
+
+        function test_keyPress_capturesHandled() {
+            var result = '';
+            var handler = function() {
+                result += 'from handler'
+            }
+            var signalHandler = function() {
+                result += 'from signal'
+            }
+            kd.onKeyPressed.connect(signalHandler);
+
+            kd.setHandler('alt+r', 'mock', handler)
+            var altR = {"objectName":"","key":82,"text":"r","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":27,"accepted":false}
+            kd.activeStack.push('mock');
+            kd.keyPress(altR);
+            kd.activeStack.pop();
+            compare(result, 'from handler');
+        }
+
+        function test_keyPress_forwardsUnhandled() {
+            var result = '';
+            var handler = function() {
+                result += 'from handler'
+            }
+            var signalHandler = function() {
+                result += 'from signal'
+            }
+            kd.onKeyPressed.connect(signalHandler);
+
+            kd.setHandler('alt+x', 'mock', handler)
+            var altR = {"objectName":"","key":82,"text":"r","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":27,"accepted":false}
+            kd.activeStack.push('mock');
+            kd.keyPress(altR);
+            kd.activeStack.pop();
+            compare(result, 'from signal');
+        }
+
+        function test_keyPress_forwardsUnhandledAfterUnsetting() {
+            var result = '';
+            var handler = function() {
+                result += 'from handler'
+            }
+            var signalHandler = function() {
+                result += 'from signal'
+            }
+            kd.onKeyPressed.connect(signalHandler);
+
+            kd.setHandler('alt+r', 'mock', handler)
+            kd.unsetHandler('alt+r', 'mock', handler)
+            var altR = {"objectName":"","key":82,"text":"r","modifiers":134217728,"isAutoRepeat":false,"count":1,"nativeScanCode":27,"accepted":false}
+            kd.keyPress(altR);
+            compare(result, 'from signal');
+        }
+    }
+}
+