Merge lp:~osomon/webbrowser-app/qquickshortcuts into lp:webbrowser-app

[Olivier Tilloy]

Import QQuickShortcut from Qt 5.5 to properly handle window-level keyboard shortcuts.
We cannot bump the dependency on Qt to 5.5 as the stable overlay PPA for devices currently has Qt 5.4.1.

[lp:~osomon/webbrowser-app/qquickshortcuts]

1389. By Olivier Tilloy on 2016-03-29

Remove an incorrect condition now that the QInputInfo API is available.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1389
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2677/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6789/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6800/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2677/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/qquickshortcuts]

1390. By Olivier Tilloy on 2016-03-29

Fix failing autopilot test.

1391. By Olivier Tilloy on 2016-03-30

Filter out autopilot-emulated keyboards.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1391
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/111/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/111/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/111/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/111/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/qquickshortcuts]

1392. By Olivier Tilloy on 2016-04-08

Do not change focus unnecessarily when switching tabs: clear the address bar instead if needed.

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-02-09 21:19:41 +0000
+++ src/app/CMakeLists.txt	2016-04-08 16:47:47 +0000
@@ -27,13 +27,15 @@
     session-storage.cpp
     single-instance-manager.cpp
     webbrowser-window.cpp
+    qquickshortcut.cpp
 )
 
 add_library(${COMMONLIB} STATIC ${COMMONLIB_SRC})
 
 include_directories(${unity8_SOURCE_DIR}/libs/UbuntuGestures
                     ${unity8_SOURCE_DIR}/plugins
-                    ${LIBAPPARMOR_INCLUDE_DIRS})
+                    ${LIBAPPARMOR_INCLUDE_DIRS}
+                    ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 target_link_libraries(${COMMONLIB}
     Qt5::Core
     Qt5::Gui

=== added file 'src/app/FilteredKeyboardModel.qml'
--- src/app/FilteredKeyboardModel.qml	1970-01-01 00:00:00 +0000
+++ src/app/FilteredKeyboardModel.qml	2016-04-08 16:47:47 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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.4
+import Ubuntu.Components 1.3
+import Unity.InputInfo 0.1
+
+SortFilterModel {
+    model: InputDeviceModel {
+        deviceFilter: InputInfo.Keyboard
+    }
+    filter {
+        // Filter out autopilot-emulated keyboards
+        // (see https://launchpad.net/bugs/1542224).
+        property: "name"
+        pattern: /^(?!py-evdev-uinput).*$/
+    }
+}

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2016-02-09 22:03:25 +0000
+++ src/app/browserapplication.cpp	2016-04-08 16:47:47 +0000
@@ -38,6 +38,7 @@
 #include "favicon-fetcher.h"
 #include "meminfo.h"
 #include "mime-database.h"
+#include "qquickshortcut_p.h"
 #include "session-storage.h"
 #include "webbrowser-window.h"
 
@@ -179,6 +180,7 @@
     qmlRegisterSingletonType<MemInfo>(uri, 0, 1, "MemInfo", MemInfo_singleton_factory);
     qmlRegisterSingletonType<MimeDatabase>(uri, 0, 1, "MimeDatabase", MimeDatabase_singleton_factory);
     qmlRegisterType<SessionStorage>(uri, 0, 1, "SessionStorage");
+    qmlRegisterType<QQuickShortcut>(uri, 0, 1, "Shortcut");
 
     const char* gesturesUri = "Ubuntu.Gestures";
     qmlRegisterSingletonType<Direction>(gesturesUri, 0, 1, "Direction", Direction_singleton_factory);

=== added file 'src/app/qquickshortcut.cpp'
--- src/app/qquickshortcut.cpp	1970-01-01 00:00:00 +0000
+++ src/app/qquickshortcut.cpp	2016-04-08 16:47:47 +0000
@@ -0,0 +1,283 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickshortcut_p.h"
+
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickwindow.h>
+#include <QtGui/private/qguiapplication_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmltype Shortcut
+    \instantiates QQuickShortcut
+    \inqmlmodule QtQuick
+    \since 5.5
+    \ingroup qtquick-input
+    \brief Provides keyboard shortcuts
+
+    The Shortcut type provides a way of handling keyboard shortcuts. The shortcut can
+    be set to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts},
+    or it can be described with a string containing a sequence of up to four key
+    presses that are needed to \l{Shortcut::activated}{activate} the shortcut.
+
+    \qml
+    Item {
+        id: view
+
+        property int currentIndex
+
+        Shortcut {
+            sequence: StandardKey.NextChild
+            onActivated: view.currentIndex++
+        }
+    }
+    \endqml
+
+    \sa Keys
+*/
+
+/*! \qmlsignal QtQuick::Shortcut::activated()
+
+    This signal is emitted when the shortcut is activated.
+
+    The corresponding handler is \c onActivated.
+*/
+
+/*! \qmlsignal QtQuick::Shortcut::activatedAmbiguously()
+
+    This signal is emitted when the shortcut is activated ambigously,
+    meaning that it matches the start of more than one shortcut.
+
+    The corresponding handler is \c onActivatedAmbiguously.
+*/
+
+QQuickShortcut::QQuickShortcut(QObject *parent) : QObject(parent), m_id(0),
+    m_enabled(true), m_completed(false), m_autorepeat(true), m_context(Qt::WindowShortcut)
+{
+}
+
+QQuickShortcut::~QQuickShortcut()
+{
+    ungrabShortcut();
+}
+
+/*!
+    \qmlproperty keysequence QtQuick::Shortcut::sequence
+
+    This property holds the shortcut's key sequence. The key sequence can be set
+    to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts}, or
+    it can be described with a string containing a sequence of up to four key
+    presses that are needed to \l{Shortcut::activated}{activate} the shortcut.
+
+    The default value is an empty key sequence.
+
+    \qml
+    Shortcut {
+        sequence: "Ctrl+E,Ctrl+W"
+        onActivated: edit.wrapMode = TextEdit.Wrap
+    }
+    \endqml
+*/
+QVariant QQuickShortcut::sequence() const
+{
+    return m_sequence;
+}
+
+void QQuickShortcut::setSequence(const QVariant &sequence)
+{
+    if (sequence == m_sequence)
+        return;
+
+    QKeySequence shortcut;
+    if (sequence.type() == QVariant::Int)
+        shortcut = QKeySequence(static_cast<QKeySequence::StandardKey>(sequence.toInt()));
+    else
+        shortcut = QKeySequence::fromString(sequence.toString());
+
+    grabShortcut(shortcut, m_context);
+
+    m_sequence = sequence;
+    m_shortcut = shortcut;
+    emit sequenceChanged();
+}
+
+/*!
+    \qmlproperty bool QtQuick::Shortcut::enabled
+
+    This property holds whether the shortcut is enabled.
+
+    The default value is \c true.
+*/
+bool QQuickShortcut::isEnabled() const
+{
+    return m_enabled;
+}
+
+void QQuickShortcut::setEnabled(bool enabled)
+{
+    if (enabled == m_enabled)
+        return;
+
+    if (m_id)
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, m_id, this);
+
+    m_enabled = enabled;
+    emit enabledChanged();
+}
+
+/*!
+    \qmlproperty bool QtQuick::Shortcut::autoRepeat
+
+    This property holds whether the shortcut can auto repeat.
+
+    The default value is \c true.
+*/
+bool QQuickShortcut::autoRepeat() const
+{
+    return m_autorepeat;
+}
+
+void QQuickShortcut::setAutoRepeat(bool repeat)
+{
+    if (repeat == m_autorepeat)
+        return;
+
+    if (m_id)
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutAutoRepeat(repeat, m_id, this);
+
+    m_autorepeat = repeat;
+    emit autoRepeatChanged();
+}
+
+/*!
+    \qmlproperty enumeration QtQuick::Shortcut::context
+
+    This property holds the \l{Qt::ShortcutContext}{shortcut context}.
+
+    Supported values are:
+    \list
+    \li \c Qt.WindowShortcut (default) - The shortcut is active when its parent item is in an active top-level window.
+    \li \c Qt.ApplicationShortcut - The shortcut is active when one of the application's windows are active.
+    \endlist
+
+    \qml
+    Shortcut {
+        sequence: StandardKey.Quit
+        context: Qt.ApplicationShortcut
+        onActivated: Qt.quit()
+    }
+    \endqml
+*/
+Qt::ShortcutContext QQuickShortcut::context() const
+{
+    return m_context;
+}
+
+void QQuickShortcut::setContext(Qt::ShortcutContext context)
+{
+    if (context == m_context)
+        return;
+
+    grabShortcut(m_shortcut, context);
+
+    m_context = context;
+    emit contextChanged();
+}
+
+void QQuickShortcut::classBegin()
+{
+}
+
+void QQuickShortcut::componentComplete()
+{
+    m_completed = true;
+    grabShortcut(m_shortcut, m_context);
+}
+
+bool QQuickShortcut::event(QEvent *event)
+{
+    if (m_enabled && event->type() == QEvent::Shortcut) {
+        QShortcutEvent *se = static_cast<QShortcutEvent *>(event);
+        if (se->shortcutId() == m_id && se->key() == m_shortcut){
+            if (se->isAmbiguous())
+                emit activatedAmbiguously();
+            else
+                emit activated();
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool qQuickShortcutContextMatcher(QObject *obj, Qt::ShortcutContext context)
+{
+    switch (context) {
+    case Qt::ApplicationShortcut:
+        return true;
+    case Qt::WindowShortcut:
+        while (obj && !obj->isWindowType()) {
+            obj = obj->parent();
+            if (QQuickItem *item = qobject_cast<QQuickItem *>(obj))
+                obj = item->window();
+        }
+        return obj && obj == QGuiApplication::focusWindow();
+    default:
+        return false;
+    }
+}
+
+void QQuickShortcut::grabShortcut(const QKeySequence &sequence, Qt::ShortcutContext context)
+{
+    ungrabShortcut();
+
+    if (m_completed && !sequence.isEmpty()) {
+        QGuiApplicationPrivate *pApp = QGuiApplicationPrivate::instance();
+        m_id = pApp->shortcutMap.addShortcut(this, sequence, context, qQuickShortcutContextMatcher);
+        if (!m_enabled)
+            pApp->shortcutMap.setShortcutEnabled(false, m_id, this);
+        if (!m_autorepeat)
+            pApp->shortcutMap.setShortcutAutoRepeat(false, m_id, this);
+    }
+}
+
+void QQuickShortcut::ungrabShortcut()
+{
+    if (m_id) {
+        QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(m_id, this);
+        m_id = 0;
+    }
+}
+
+QT_END_NAMESPACE

=== added file 'src/app/qquickshortcut_p.h'
--- src/app/qquickshortcut_p.h	1970-01-01 00:00:00 +0000
+++ src/app/qquickshortcut_p.h	2016-04-08 16:47:47 +0000
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQuick module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKSHORTCUT_P_H
+#define QQUICKSHORTCUT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qobject.h>
+#include <QtCore/qvariant.h>
+#include <QtGui/qkeysequence.h>
+#include <QtQml/qqmlparserstatus.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickShortcut : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(QVariant sequence READ sequence WRITE setSequence NOTIFY sequenceChanged FINAL)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
+    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL)
+    Q_PROPERTY(Qt::ShortcutContext context READ context WRITE setContext NOTIFY contextChanged FINAL)
+
+public:
+    explicit QQuickShortcut(QObject *parent = Q_NULLPTR);
+    ~QQuickShortcut();
+
+    QVariant sequence() const;
+    void setSequence(const QVariant &sequence);
+
+    bool isEnabled() const;
+    void setEnabled(bool enabled);
+
+    bool autoRepeat() const;
+    void setAutoRepeat(bool repeat);
+
+    Qt::ShortcutContext context() const;
+    void setContext(Qt::ShortcutContext context);
+
+Q_SIGNALS:
+    void sequenceChanged();
+    void enabledChanged();
+    void autoRepeatChanged();
+    void contextChanged();
+
+    void activated();
+    void activatedAmbiguously();
+
+protected:
+    void classBegin() Q_DECL_OVERRIDE;
+    void componentComplete() Q_DECL_OVERRIDE;
+    bool event(QEvent *event) Q_DECL_OVERRIDE;
+
+    void grabShortcut(const QKeySequence &sequence, Qt::ShortcutContext context);
+    void ungrabShortcut();
+
+private:
+    int m_id;
+    bool m_enabled;
+    bool m_completed;
+    bool m_autorepeat;
+    QKeySequence m_shortcut;
+    Qt::ShortcutContext m_context;
+    QVariant m_sequence;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKSHORTCUT_P_H

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-03-07 18:44:34 +0000
+++ src/app/webbrowser/Browser.qml	2016-04-08 16:47:47 +0000
@@ -63,21 +63,6 @@
     }
 
     Connections {
-        target: tabsModel
-        onCurrentIndexChanged: {
-            // Remove focus from the address bar when the current tab
-            // changes to ensure that its contents are updated.
-            contentsContainer.forceActiveFocus()
-
-            // In narrow mode, the tabslist is a stack:
-            // the current tab is always at the top.
-            if (!browser.wide) {
-                tabsModel.move(tabsModel.currentIndex, 0)
-            }
-        }
-    }
-
-    Connections {
         target: currentWebview
 
         /* Note that we are connecting the mediaAccessPermissionRequested signal
@@ -111,6 +96,10 @@
         deviceFilter: InputInfo.TouchScreen
     }
 
+    FilteredKeyboardModel {
+        id: keyboardModel
+    }
+
     Component {
         id: mediaAccessDialogComponent
         MediaAccessDialog { }
@@ -1425,21 +1414,12 @@
     Component {
         id: bookmarkOptionsComponent
         BookmarkOptions {
-            id: bookmarkOptions
             folderModel: BookmarksFolderListModel {
                 sourceModel: BookmarksModel
             }
 
-            Component.onCompleted: {
-                forceActiveFocus()
-            }
+            Component.onCompleted: forceActiveFocus()
 
-            // Fragile workaround for https://launchpad.net/bugs/1546677.
-            // By destroying the popover, its visibility isn’t changed to
-            // false, and thus the bookmark is not removed.
-            function closeAndConfirm() {
-                destroy()
-            }
             onVisibleChanged: {
                 if (!visible) {
                     BookmarksModel.remove(bookmarkUrl)
@@ -1452,28 +1432,11 @@
                 }
             }
 
-            Keys.onPressed: {
-                if (bookmarkOptionsShortcuts.processKey(event.key, event.modifiers)) {
-                    event.accepted = true
-                }
-            }
-
-            KeyboardShortcuts {
-                id: bookmarkOptionsShortcuts
-                KeyboardShortcut {
-                    key: Qt.Key_Return
-                    onTriggered: closeAndConfirm()
-                }
-
-                KeyboardShortcut {
-                    modifiers: Qt.ControlModifier
-                    key: Qt.Key_D
-                    onTriggered: {
-                        BookmarksModel.remove(bookmarkUrl)
-                        closeAndConfirm()
-                    }
-                }
-            }
+            // Fragile workaround for https://launchpad.net/bugs/1546677.
+            // By destroying the popover, its visibility isn’t changed to
+            // false, and thus the bookmark is not removed.
+            Keys.onEnterPressed: destroy()
+            Keys.onReturnPressed: destroy()
         }
     }
 
@@ -1627,16 +1590,7 @@
         }
 
         function maybeFocusAddressBar() {
-            // XXX: this is not the right condition, but it is better than
-            // inferring a "desktop" form factor from various heuristics.
-            // The real fix is to detect whether there is a physical keyboard
-            // connected, for which there is currently no API yet (there will
-            // be a QInputInfo API in a future version of Qt).
-            // Wide mode might be in use on a device without a physical
-            // keyboard (e.g. a 10" tablet), and conversely the browser window
-            // might be shrinked to a narrow layout on a desktop setup with a
-            // physical keyboard and no OSK.
-            if (browser.wide) {
+            if (keyboardModel.count > 0) {
                 focusAddressBar()
             } else {
                 contentsContainer.forceActiveFocus()
@@ -1682,14 +1636,14 @@
             }
         }
 
+        property var currentBookmarkOptionsDialog: null
         function addBookmark(url, title, icon, location) {
             if (title == "") title = UrlUtils.removeScheme(url)
             BookmarksModel.add(url, title, icon, "")
             if (location === undefined) location = chrome.bookmarkTogglePlaceHolder
-            PopupUtils.open(bookmarkOptionsComponent,
-                            location,
-                            {"bookmarkUrl": url,
-                             "bookmarkTitle": title})
+            var properties = {"bookmarkUrl": url, "bookmarkTitle": title}
+            currentBookmarkOptionsDialog = PopupUtils.open(bookmarkOptionsComponent,
+                                                           location, properties)
         }
     }
 
@@ -1926,6 +1880,13 @@
 
     Connections {
         target: tabsModel
+        onCurrentIndexChanged: {
+            // In narrow mode, the tabslist is a stack:
+            // the current tab is always at the top.
+            if (!browser.wide) {
+                tabsModel.move(tabsModel.currentIndex, 0)
+            }
+        }
         onCurrentTabChanged: {
             chrome.findInPageMode = false
             var tab = tabsModel.currentTab
@@ -1972,206 +1933,187 @@
         }
     }
 
-    Keys.onPressed: if (shortcuts.processKey(event.key, event.modifiers)) event.accepted = true
-    KeyboardShortcuts {
-        id: shortcuts
-
-        // Ctrl+Tab or Ctrl+PageDown: cycle through open tabs
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_Tab
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.switchToNextTab()
-        }
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_PageDown
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.switchToNextTab()
-        }
-
-        // Ctrl+Shift+Tab or Ctrl+PageUp: cycle through open tabs in reverse order
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_Backtab
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.switchToPreviousTab()
-        }
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_PageUp
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.switchToPreviousTab()
-        }
-
-        // Ctrl+Shift+W or Ctrl+Shift+T: Undo close tab
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier | Qt.ShiftModifier
-            key: Qt.Key_W
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.undoCloseTab()
-        }
-
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier | Qt.ShiftModifier
-            key: Qt.Key_T
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.undoCloseTab()
-        }
-
-        // Ctrl+W or Ctrl+F4: Close the current tab
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_W
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.closeCurrentTab()
-        }
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_F4
-            enabled: tabContainer.visible || recentView.visible
-            onTriggered: internal.closeCurrentTab()
-        }
-
-        // Ctrl+T: Open a new Tab
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_T
-            enabled: tabContainer.visible || recentView.visible ||
-                     bookmarksViewLoader.active || historyViewLoader.active
-            onTriggered: {
-                openUrlInNewTab("", true)
-                if (recentView.visible) recentView.reset()
-                bookmarksViewLoader.active = false
-                historyViewLoader.active = false
-            }
-        }
-
-        // F6 or Ctrl+L or Alt+D: Select the content in the address bar
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_L
-            enabled: tabContainer.visible
-            onTriggered: internal.focusAddressBar(true)
-        }
-        KeyboardShortcut {
-            modifiers: Qt.AltModifier
-            key: Qt.Key_D
-            enabled: tabContainer.visible
-            onTriggered: internal.focusAddressBar(true)
-        }
-        KeyboardShortcut {
-            key: Qt.Key_F6
-            enabled: tabContainer.visible
-            onTriggered: internal.focusAddressBar(true)
-        }
-
-        // Ctrl+D: Toggle bookmarked state on current Tab
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_D
-            enabled: tabContainer.visible
-            onTriggered: {
-                if (currentWebview) {
-                    if (BookmarksModel.contains(currentWebview.url)) {
-                        BookmarksModel.remove(currentWebview.url)
-                    } else {
-                        internal.addBookmark(currentWebview.url, currentWebview.title, currentWebview.icon)
-                    }
+    // TODO: internationalize non-standard key sequences?
+
+    // Ctrl+Tab or Ctrl+PageDown: cycle through open tabs
+    Shortcut {
+        sequence: StandardKey.NextChild
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.switchToNextTab()
+    }
+    Shortcut {
+        sequence: "Ctrl+PgDown"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.switchToNextTab()
+    }
+
+    // Ctrl+Shift+Tab or Ctrl+PageUp: cycle through open tabs in reverse order
+    Shortcut {
+        sequence: StandardKey.PreviousChild
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.switchToPreviousTab()
+    }
+    Shortcut {
+        sequence: "Ctrl+Shift+Tab"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.switchToPreviousTab()
+    }
+    Shortcut {
+        sequence: "Ctrl+PgUp"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.switchToPreviousTab()
+    }
+
+    // Ctrl+W or Ctrl+F4: Close the current tab
+    Shortcut {
+        sequence: StandardKey.Close
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.closeCurrentTab()
+    }
+    Shortcut {
+        sequence: "Ctrl+F4"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.closeCurrentTab()
+    }
+
+    // Ctrl+Shift+W or Ctrl+Shift+T: Undo close tab
+    Shortcut {
+        sequence: "Ctrl+Shift+W"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.undoCloseTab()
+    }
+    Shortcut {
+        sequence: "Ctrl+Shift+T"
+        enabled: tabContainer.visible || recentView.visible
+        onActivated: internal.undoCloseTab()
+    }
+
+    // Ctrl+T: Open a new Tab
+    Shortcut {
+        sequence: StandardKey.AddTab
+        enabled: tabContainer.visible || recentView.visible ||
+                 bookmarksViewLoader.active || historyViewLoader.active
+        onActivated: {
+            openUrlInNewTab("", true)
+            if (recentView.visible) recentView.reset()
+            bookmarksViewLoader.active = false
+            historyViewLoader.active = false
+        }
+    }
+
+    // F6 or Ctrl+L or Alt+D: Select the content in the address bar
+    Shortcut {
+        sequence: "F6"
+        enabled: tabContainer.visible
+        onActivated: internal.focusAddressBar(true)
+    }
+    Shortcut {
+        sequence: "Ctrl+L"
+        enabled: tabContainer.visible
+        onActivated: internal.focusAddressBar(true)
+    }
+    Shortcut {
+        sequence: "Alt+D"
+        enabled: tabContainer.visible
+        onActivated: internal.focusAddressBar(true)
+    }
+
+    // Ctrl+D: Toggle bookmarked state on current Tab
+    Shortcut {
+        sequence: "Ctrl+D"
+        enabled: tabContainer.visible
+        onActivated: {
+            if (internal.currentBookmarkOptionsDialog) {
+                internal.currentBookmarkOptionsDialog.hide()
+            } else if (currentWebview) {
+                if (BookmarksModel.contains(currentWebview.url)) {
+                    BookmarksModel.remove(currentWebview.url)
+                } else {
+                    internal.addBookmark(currentWebview.url, currentWebview.title, currentWebview.icon)
                 }
             }
         }
-
-        // Ctrl+H: Show History
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_H
-            enabled: tabContainer.visible
-            onTriggered: historyViewLoader.active = true
-        }
-
-        // Ctrl+Shift+O: Show Bookmarks
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier | Qt.ShiftModifier
-            key: Qt.Key_O
-            enabled: tabContainer.visible
-            onTriggered: bookmarksViewLoader.active = true
-        }
-
-        // Alt+← or Backspace: Goes to the previous page in history
-        KeyboardShortcut {
-            modifiers: Qt.AltModifier
-            key: Qt.Key_Left
-            enabled: tabContainer.visible
-            onTriggered: internal.historyGoBack()
-        }
-        KeyboardShortcut {
-            key: Qt.Key_Backspace
-            enabled: tabContainer.visible
-            onTriggered: internal.historyGoBack()
-        }
-
-        // Alt+→ or Shift+Backspace: Goes to the next page in history
-        KeyboardShortcut {
-            modifiers: Qt.AltModifier
-            key: Qt.Key_Right
-            enabled: tabContainer.visible
-            onTriggered: internal.historyGoForward()
-        }
-        KeyboardShortcut {
-            modifiers: Qt.ShiftModifier
-            key: Qt.Key_Backspace
-            enabled: tabContainer.visible
-            onTriggered: internal.historyGoForward()
-        }
-
-        // F5 or Ctrl+R: Reload current Tab
-        KeyboardShortcut {
-            key: Qt.Key_F5
-            enabled: tabContainer.visible
-            onTriggered: if (currentWebview) currentWebview.reload()
-        }
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_R
-            enabled: tabContainer.visible
-            onTriggered: if (currentWebview) currentWebview.reload()
-        }
-
-        // Ctrl+F: Find in Page
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_F
-            enabled: tabContainer.visible && !newTabViewLoader.active
-            onTriggered: chrome.findInPageMode = true
-        }
-
-        // Ctrl+J: Show downloads page
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_J
-            enabled: chrome.visible &&
-                     downloadHandlerLoader.status == Loader.Ready &&
-                     contentHandlerLoader.status == Loader.Ready &&
-                     !downloadsViewLoader.active
-            onTriggered: downloadsViewLoader.active = true
-        }
-
-        // Ctrl+Shift+G: Find previous
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier | Qt.ShiftModifier
-            key: Qt.Key_G
-            enabled: currentWebview && chrome.findInPageMode
-            onTriggered: currentWebview.findController.previous()
-        }
-
-        // Ctrl+G: Find next
-        KeyboardShortcut {
-            modifiers: Qt.ControlModifier
-            key: Qt.Key_G
-            enabled: currentWebview && chrome.findInPageMode
-            onTriggered: currentWebview.findController.next()
-        }
+    }
+
+    // Ctrl+H: Show History
+    Shortcut {
+        sequence: "Ctrl+H"
+        enabled: tabContainer.visible
+        onActivated: historyViewLoader.active = true
+    }
+
+    // Ctrl+Shift+O: Show Bookmarks
+    Shortcut {
+        sequence: "Ctrl+Shift+O"
+        enabled: tabContainer.visible
+        onActivated: bookmarksViewLoader.active = true
+    }
+
+    // Alt+← or Backspace: Goes to the previous page in history
+    Shortcut {
+        sequence: StandardKey.Back
+        enabled: tabContainer.visible
+        onActivated: internal.historyGoBack()
+    }
+    Shortcut {
+        sequence: "Backspace"
+        enabled: tabContainer.visible
+        onActivated: internal.historyGoBack()
+    }
+
+    // Alt+→ or Shift+Backspace: Goes to the next page in history
+    Shortcut {
+        sequence: StandardKey.Forward
+        enabled: tabContainer.visible
+        onActivated: internal.historyGoForward()
+    }
+    Shortcut {
+        sequence: "Shift+Backspace"
+        enabled: tabContainer.visible
+        onActivated: internal.historyGoForward()
+    }
+
+    // F5 or Ctrl+R: Reload current Tab
+    Shortcut {
+        sequence: StandardKey.Refresh
+        enabled: tabContainer.visible
+        onActivated: if (currentWebview) currentWebview.reload()
+    }
+    Shortcut {
+        sequence: "F5"
+        enabled: tabContainer.visible
+        onActivated: if (currentWebview) currentWebview.reload()
+    }
+
+    // Ctrl+F: Find in Page
+    Shortcut {
+        sequence: StandardKey.Find
+        enabled: tabContainer.visible && !newTabViewLoader.active
+        onActivated: chrome.findInPageMode = true
+    }
+
+    // Ctrl+J: Show downloads page
+    Shortcut {
+        sequence: "Ctrl+J"
+        enabled: chrome.visible &&
+                 downloadHandlerLoader.status == Loader.Ready &&
+                 contentHandlerLoader.status == Loader.Ready &&
+                 !downloadsViewLoader.active
+        onActivated: downloadsViewLoader.active = true
+    }
+
+    // Ctrl+G: Find next
+    Shortcut {
+        sequence: StandardKey.FindNext
+        enabled: currentWebview && chrome.findInPageMode
+        onActivated: currentWebview.findController.next()
+    }
+
+    // Ctrl+Shift+G: Find previous
+    Shortcut {
+        sequence: StandardKey.FindPrevious
+        enabled: currentWebview && chrome.findInPageMode
+        onActivated: currentWebview.findController.previous()
     }
 
     Loader {

=== removed file 'src/app/webbrowser/KeyboardShortcut.qml'
--- src/app/webbrowser/KeyboardShortcut.qml	2015-08-10 15:22:00 +0000
+++ src/app/webbrowser/KeyboardShortcut.qml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app 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.
- *
- * webbrowser-app 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.4
-import Ubuntu.Components 1.3
-
-Action {
-    property int key
-    property int modifiers: Qt.NoModifier
-}

=== removed file 'src/app/webbrowser/KeyboardShortcuts.qml'
--- src/app/webbrowser/KeyboardShortcuts.qml	2015-08-10 15:22:00 +0000
+++ src/app/webbrowser/KeyboardShortcuts.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app 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.
- *
- * webbrowser-app 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.4
-
-Item {
-    function processKey(key, modifiers) {
-        for (var i = 0; i < data.length; i++) {
-            var shortcut = data[i];
-
-            if (!shortcut.enabled) continue
-            if (key !== shortcut.key) continue
-
-            if (shortcut.modifiers === Qt.NoModifier) {
-                if (modifiers === Qt.NoModifier) {
-                    shortcut.trigger()
-                    return true
-                }
-            } else if ((modifiers & shortcut.modifiers) === shortcut.modifiers) {
-                shortcut.trigger()
-                return true
-            }
-        }
-        return false
-    }
-}

=== modified file 'src/app/webbrowser/ListViewHighlight.qml'
--- src/app/webbrowser/ListViewHighlight.qml	2016-02-10 17:20:47 +0000
+++ src/app/webbrowser/ListViewHighlight.qml	2016-04-08 16:47:47 +0000
@@ -18,7 +18,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Unity.InputInfo 0.1
+import ".."
 
 Rectangle {
     color: "transparent"
@@ -33,8 +33,7 @@
 
     readonly property bool hasKeyboard: keyboardModel.count > 0
 
-    InputDeviceModel {
+    FilteredKeyboardModel {
         id: keyboardModel
-        deviceFilter: InputInfo.Keyboard
     }
 }

=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml	2016-03-01 09:20:32 +0000
+++ src/app/webbrowser/NavigationBar.qml	2016-04-08 16:47:47 +0000
@@ -220,15 +220,18 @@
         id: internal
         property var openDrawer: null
         readonly property var webview: tab ? tab.webview : null
+    }
 
-        onWebviewChanged: {
-            if (webview) {
-                addressbar.actualUrl = webview.url
-                addressbar.securityStatus = webview.securityStatus
-            } else {
-                addressbar.actualUrl = ""
-                addressbar.securityStatus = null
+    onTabChanged: {
+        if (tab) {
+            addressbar.actualUrl = tab.url
+            addressbar.securityStatus = (tab.webview ? tab.webview.securityStatus : null)
+            if (!tab.url.toString() && editing) {
+                addressbar.text = ""
             }
+        } else {
+            addressbar.actualUrl = ""
+            addressbar.securityStatus = null
         }
     }
 

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-01-21 10:29:17 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-04-08 16:47:47 +0000
@@ -103,7 +103,7 @@
         self.check_tab_number(2)
         self.main_window.press_key('Ctrl+Page_Down')
         self.check_tab_number(0)
-        self.main_window.press_key('Shift+Ctrl+Tab')
+        self.main_window.press_key('Ctrl+Shift+Tab')
         if self.main_window.wide:
             self.check_tab_number(2)
         else:
@@ -493,3 +493,24 @@
 
         self.main_window.press_key('Ctrl+w')
         self.assert_number_webviews_eventually(1)
+
+    def test_addressbar_cleared_when_opening_new_tab(self):
+        # Verify that when opening a new tab while the address bar was focused,
+        # the address bar is cleared.
+        self.main_window.press_key('Ctrl+l')
+        self.address_bar.activeFocus.wait_for(True)
+        self.assertThat(self.address_bar.text, Eventually(Equals(self.url)))
+        self.main_window.press_key('Ctrl+t')
+        self.address_bar.activeFocus.wait_for(True)
+        self.assertThat(self.address_bar.text, Eventually(Equals("")))
+
+    def test_addressbar_cleared_when_switching_between_new_tabs(self):
+        # Verify that when opening a new tab while a new tab was already open
+        # with text input in the address bar, the address bar is cleared.
+        self.main_window.press_key('Ctrl+t')
+        self.address_bar.activeFocus.wait_for(True)
+        self.assertThat(self.address_bar.text, Eventually(Equals("")))
+        self.address_bar.write("abc")
+        self.main_window.press_key('Ctrl+t')
+        self.address_bar.activeFocus.wait_for(True)
+        self.assertThat(self.address_bar.text, Eventually(Equals("")))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_private.py'
--- tests/autopilot/webbrowser_app/tests/test_private.py	2016-01-21 10:29:17 +0000
+++ tests/autopilot/webbrowser_app/tests/test_private.py	2016-04-08 16:47:47 +0000
@@ -16,6 +16,7 @@
 
 from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
 
@@ -30,7 +31,7 @@
         self.assert_number_incognito_webviews_eventually(1)
         self.assertTrue(self.main_window.is_new_private_tab_view_visible())
         self.assertThat(address_bar.activeFocus,
-                        Eventually(Equals(self.main_window.wide)))
+                        Eventually(Equals(model() == 'Desktop')))
         self.assertThat(address_bar.text, Eventually(Equals("")))
 
         self.main_window.leave_private_mode()