Merge into trunk : stripped-down-quicklist : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-02-24	Approve on 2017-03-17
Unity8 CI Bot	continuous-integration		Needs Fixing on 2017-03-16
Ubuntu Unity PS integration team		2017-02-24	Pending
Review via email: mp+318219@code.launchpad.net

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-02-24

2839. By Michael Zanetti on 2017-02-24: fix clicking label in tryLauncher

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3202/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3203/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-24:

#

FAILED: Continuous integration, rev:2839
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3206/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3206/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-02-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3207/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-01:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3245/rebuild

FAILED: Continuous integration, rev:2839
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3245/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4262
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2534
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4290
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4124/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4124/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4124/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4124/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4124/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4124
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4124/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3245/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-03:

#

Code looks good except:

debian/control:
libunity-api-dev (>= 8.4)

the corresponding unity-api branch has 8.5

review: Needs Fixing

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-06

2840. By Michael Zanetti on 2017-03-06: bump version

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2017-03-06:

#

> Code looks good except:
>
> debian/control:
> libunity-api-dev (>= 8.4)
>
> the corresponding unity-api branch has 8.5

fixed, thanks

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-06:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3279/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-13:

#

Code looks good, just drop this from the test please:

+ print("model is", LauncherModel)

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-13:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3358/rebuild

FAILED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3358/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4425
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2652
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2652
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4453
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4286/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4286/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4286/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4286/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4286/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4286
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4286/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3358/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-14

2841. By Michael Zanetti on 2017-03-14: drop debug print

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2017-03-14:

#

> Code looks good, just drop this from the test please:
>
> + print("model is", LauncherModel)

fixed, but looks like the tests have regressed, will fix that too

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3361/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-14

2842. By Michael Zanetti on 2017-03-14: fix test

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2017-03-14:

#

fixed the test

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3363/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-14

2843. By Michael Zanetti on 2017-03-14: merge trunk

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3365/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-14:

#

On a locked screen, the whole popup is hidden (is that intended?), but still you can remnants of it on screen (a little black arrow pointing from the hidden menu to the launcher icon)

review: Needs Fixing

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-15

2844. By Michael Zanetti on 2017-03-15

add a custom proxy model for the quicklist

UnitySortFilterProxyModel doesn't seem to be reliable enough with the RegExp(boolean)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2017-03-15:

#

> On a locked screen, the whole popup is hidden (is that intended?), but still
> you can remnants of it on screen (a little black arrow pointing from the
> hidden menu to the launcher icon)

fixed

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-15:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3394/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-15:

#

The "Unpin" menu entry is still present, although it should be hidden

review: Needs Fixing

lp:~mzanetti/unity8/stripped-down-quicklist updated on 2017-03-16

2845. By Michael Zanetti on 2017-03-16: make pin/unpin private too

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-03-16:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3413/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-16:

#

Yup, this works fine now, only the CI run needs fixing

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Waiting

review: Approve

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2017-03-17:

#

The CI is passing fine in the toplevel branch (https://code.launchpad.net/~mzanetti/unity8/surfacetitles-in-quicklist/+merge/318771), so it will have to do here as well due to unity-api woes

review: Approve

Unity 8

Merge lp:~mzanetti/unity8/stripped-down-quicklist into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-02-21 13:23:14 +0000
 +++ CMakeLists.txt	2017-03-16 11:53:52 +0000
@@ -74,7 +74,7 @@
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=11)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=12)
  pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
  pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
  pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3)
 === modified file 'debian/control'
 --- debian/control	2017-02-08 19:53:52 +0000
 +++ debian/control	2017-03-16 11:53:52 +0000
@@ -38,7 +38,7 @@
                 libubuntugestures5-private-dev (>= 1.3.2030),
                 libudev-dev,
                 libudm-common-dev,
--               libunity-api-dev (>= 8.2),
++               libunity-api-dev (>= 8.5),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!arm64 !armhf],
@@ -132,7 +132,7 @@
           qtdeclarative5-qtmir-plugin (>= 0.4.8),
           qtdeclarative5-ubuntu-telephony0.1,
           ubuntu-system-settings (>= 0.4),
--         unity-launcher-impl-10,
++         unity-launcher-impl-12,
           unity8-common (= ${source:Version}),
           unity8-private (= ${binary:Version}),
           unity8-private | unity-launcher-impl,
@@ -235,7 +235,7 @@
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-launcher-impl,
--          unity-launcher-impl-10,
++          unity-launcher-impl-12,
  Description: Unity 8 private libs
   The Unity 8 shell is the primary user interface for Ubuntu devices.
+  .
 === modified file 'plugins/Greeter/Unity/Launcher/quicklistmodel.cpp'
 --- plugins/Greeter/Unity/Launcher/quicklistmodel.cpp	2015-02-11 14:11:26 +0000
 +++ plugins/Greeter/Unity/Launcher/quicklistmodel.cpp	2017-03-16 11:53:52 +0000
@@ -65,6 +65,8 @@
          return m_list.at(index.row()).icon();
      case RoleClickable:
          return m_list.at(index.row()).clickable();
++    case RoleIsPrivate:
++        return false; // The greeter plugin would just not add any private entries
+     }
      return QVariant();
+ }
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2016-11-30 10:32:23 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2017-03-16 11:53:52 +0000
@@ -48,11 +48,13 @@
      QuickListEntry pinningAction;
      pinningAction.setActionId(QStringLiteral("pin_item"));
      pinningAction.setText(gettext("Pin shortcut"));
++    pinningAction.setIsPrivate(true);
      m_quickList->appendAction(pinningAction);
      m_quitAction.setActionId(QStringLiteral("stop_item"));
      m_quitAction.setIcon(QStringLiteral("application-exit"));
      m_quitAction.setText(gettext("Quit"));
++    m_quitAction.setIsPrivate(true);
+ }
  QString LauncherItem::appId() const
@@ -120,6 +122,7 @@
      QuickListEntry entry;
      entry.setActionId(QStringLiteral("pin_item"));
      entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
++    entry.setIsPrivate(true);
      m_quickList->updateAction(entry);
+ }
 === modified file 'plugins/Unity/Launcher/quicklistentry.cpp'
 --- plugins/Unity/Launcher/quicklistentry.cpp	2016-10-27 13:00:34 +0000
 +++ plugins/Unity/Launcher/quicklistentry.cpp	2017-03-16 11:53:52 +0000
@@ -20,6 +20,7 @@
  QuickListEntry::QuickListEntry()
      : m_hasSeparator(false)
++    , m_isPrivate(false)
+ {
+ }
@@ -72,3 +73,13 @@
+ {
      return !other.actionId().isEmpty() && other.actionId() == m_actionId;
+ }
++
++bool QuickListEntry::isPrivate() const
++{
++    return m_isPrivate;
++}
++
++void QuickListEntry::setIsPrivate(bool isPrivate)
++{
++    m_isPrivate = isPrivate;
++}
 === modified file 'plugins/Unity/Launcher/quicklistentry.h'
 --- plugins/Unity/Launcher/quicklistentry.h	2016-10-27 13:00:34 +0000
 +++ plugins/Unity/Launcher/quicklistentry.h	2017-03-16 11:53:52 +0000
@@ -42,11 +42,15 @@
      bool operator==(const QuickListEntry & other);
++    bool isPrivate() const;
++    void setIsPrivate(bool isPrivate);
++
  private:
      QString m_actionId;
      QString m_text;
      QString m_icon;
      bool m_hasSeparator;
++    bool m_isPrivate;
  };
  #endif // QUICKLISTENTRY
 === modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
 --- plugins/Unity/Launcher/quicklistmodel.cpp	2016-10-27 13:00:34 +0000
 +++ plugins/Unity/Launcher/quicklistmodel.cpp	2017-03-16 11:53:52 +0000
@@ -81,6 +81,8 @@
          return m_list.at(index.row()).clickable();
      case RoleHasSeparator:
          return m_list.at(index.row()).hasSeparator();
++    case RoleIsPrivate:
++        return m_list.at(index.row()).isPrivate();
+     }
      return QVariant();
+ }
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2017-01-26 09:32:20 +0000
 +++ plugins/Utils/CMakeLists.txt	2017-03-16 11:53:52 +0000
@@ -36,6 +36,7 @@
      URLDispatcher.cpp
      tabfocusfence.cpp
      expressionfiltermodel.cpp
++    quicklistproxymodel.cpp
      plugin.cpp
+     )
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2017-01-26 09:32:20 +0000
 +++ plugins/Utils/plugin.cpp	2017-03-16 11:53:52 +0000
@@ -42,6 +42,7 @@
  #include "appdrawerproxymodel.h"
  #include "tabfocusfence.h"
  #include "expressionfiltermodel.h"
++#include "quicklistproxymodel.h"
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
@@ -88,4 +89,5 @@
      qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
      qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
      qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");
++    qmlRegisterType<QuickListProxyModel>(uri, 0, 1, "QuickListProxyModel");
+ }
 === added file 'plugins/Utils/quicklistproxymodel.cpp'
 --- plugins/Utils/quicklistproxymodel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/quicklistproxymodel.cpp	2017-03-16 11:53:52 +0000
@@ -0,0 +1,72 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * 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/>.
++ */
++
++#include "quicklistproxymodel.h"
++
++#include <QDebug>
++
++QuickListProxyModel::QuickListProxyModel(QObject *parent):
++    QSortFilterProxyModel(parent)
++{
++    connect(this, &QAbstractListModel::rowsInserted, this, &QuickListProxyModel::countChanged);
++    connect(this, &QAbstractListModel::rowsRemoved, this, &QuickListProxyModel::countChanged);
++    connect(this, &QAbstractListModel::layoutChanged, this, &QuickListProxyModel::countChanged);
++}
++
++QAbstractItemModel *QuickListProxyModel::source() const
++{
++    return m_source;
++}
++
++bool QuickListProxyModel::privateMode() const
++{
++    return m_privateMode;
++}
++
++void QuickListProxyModel::setPrivateMode(bool privateMode)
++{
++    if (m_privateMode != privateMode) {
++        m_privateMode = privateMode;
++        invalidateFilter();
++        Q_EMIT privateModeChanged();
++    }
++}
++
++void QuickListProxyModel::setSource(QAbstractItemModel *source)
++{
++    if (m_source != source) {
++        m_source = source;
++        setSourceModel(m_source);
++        connect(m_source, &QAbstractItemModel::rowsRemoved, this, &QuickListProxyModel::invalidate);
++        connect(m_source, &QAbstractItemModel::rowsInserted, this, &QuickListProxyModel::invalidate);
++        Q_EMIT sourceChanged();
++    }
++}
++
++int QuickListProxyModel::count() const
++{
++    return rowCount();
++}
++
++bool QuickListProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
++{
++    Q_UNUSED(source_parent)
++
++    if (m_privateMode) {
++        return !m_source->data(m_source->index(source_row, 0), QuickListModelInterface::RoleIsPrivate).toBool();
++    }
++    return true;
++}
 === added file 'plugins/Utils/quicklistproxymodel.h'
 --- plugins/Utils/quicklistproxymodel.h	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/quicklistproxymodel.h	2017-03-16 11:53:52 +0000
@@ -0,0 +1,52 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * 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/>.
++ */
++
++#include <QSortFilterProxyModel>
++
++#include <unity/shell/launcher/QuickListModelInterface.h>
++
++using namespace unity::shell::launcher;
++
++class QuickListProxyModel: public QSortFilterProxyModel
++{
++    Q_OBJECT
++    Q_PROPERTY(QAbstractItemModel* source READ source WRITE setSource NOTIFY sourceChanged)
++    Q_PROPERTY(bool privateMode READ privateMode WRITE setPrivateMode NOTIFY privateModeChanged)
++    Q_PROPERTY(int count READ count NOTIFY countChanged)
++
++public:
++    QuickListProxyModel(QObject* parent = nullptr);
++
++    QAbstractItemModel* source() const;
++    void setSource(QAbstractItemModel* source);
++
++    bool privateMode() const;
++    void setPrivateMode(bool privateMode);
++
++    int count() const;
++
++protected:
++    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
++
++Q_SIGNALS:
++    void sourceChanged();
++    void privateModeChanged();
++    void countChanged();
++
++private:
++    QAbstractItemModel* m_source = nullptr;
++    bool m_privateMode;
++};
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2017-02-24 10:44:53 +0000
 +++ qml/Launcher/Launcher.qml	2017-03-16 11:53:52 +0000
@@ -33,6 +33,7 @@
      property Item blurSource: null
      property int topPanelHeight: 0
      property bool drawerEnabled: true
++    property alias privateMode: panel.privateMode
      property int panelWidth: units.gu(10)
      property int dragAreaWidth: units.gu(1)
 === modified file 'qml/Launcher/LauncherPanel.qml'
 --- qml/Launcher/LauncherPanel.qml	2017-02-28 12:58:42 +0000
 +++ qml/Launcher/LauncherPanel.qml	2017-03-16 11:53:52 +0000
@@ -19,6 +19,7 @@
  import Ubuntu.Components 1.3
  import Unity.Launcher 0.1
  import Ubuntu.Components.Popups 1.3
++import Utils 0.1
  import "../Components"
  Rectangle {
@@ -29,6 +30,7 @@
      property var model
      property bool inverted: false
++    property bool privateMode: false
      property bool dragging: false
      property bool moving: launcherListView.moving || launcherListView.flicking
      property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
@@ -811,7 +813,11 @@
                  Repeater {
                      id: popoverRepeater
--                    model: quickList.model
++                    objectName: "popoverRepeater"
++                    model: QuickListProxyModel {
++                        source: quickList.model
++                        privateMode: root.privateMode
++                    }
                      ListItem {
                          objectName: "quickListEntry" + index
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2017-02-21 16:21:34 +0000
 +++ qml/Shell.qml	2017-03-16 11:53:52 +0000
@@ -559,6 +559,7 @@
              blurSource: greeter.shown ? greeter : stages
              topPanelHeight: panel.panelHeight
              drawerEnabled: !greeter.active
++            privateMode: greeter.active
              onShowDashHome: showHome()
              onLauncherApplicationSelected: {
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.h'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.h	2016-05-13 11:14:15 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2017-03-16 11:53:52 +0000
@@ -28,7 +28,7 @@
  class MockLauncherModel: public LauncherModelInterface
+ {
--   Q_OBJECT
++    Q_OBJECT
  public:
      MockLauncherModel(QObject* parent = 0);
 === modified file 'tests/mocks/Unity/Launcher/MockQuickListModel.cpp'
 --- tests/mocks/Unity/Launcher/MockQuickListModel.cpp	2016-10-27 13:00:34 +0000
 +++ tests/mocks/Unity/Launcher/MockQuickListModel.cpp	2017-03-16 11:53:52 +0000
@@ -39,6 +39,8 @@
          return index.row() == 1 ? false : true;
      case RoleHasSeparator:
          return index.row() <= 1 ? true : false;
++    case RoleIsPrivate:
++        return index.row() == 4 ? true : false;
+     }
      return QVariant();
+ }
@@ -46,5 +48,5 @@
  int MockQuickListModel::rowCount(const QModelIndex &parent) const
+ {
      Q_UNUSED(parent)
--    return 4;
++    return 5;
+ }
 === modified file 'tests/mocks/Unity/Launcher/MockQuickListModel.h'
 --- tests/mocks/Unity/Launcher/MockQuickListModel.h	2015-04-30 09:31:51 +0000
 +++ tests/mocks/Unity/Launcher/MockQuickListModel.h	2017-03-16 11:53:52 +0000
@@ -27,6 +27,8 @@
  class MockQuickListModel: public QuickListModelInterface
+ {
      Q_OBJECT
++    Q_PROPERTY(int count READ rowCount)
++
  public:
      MockQuickListModel(QObject *parent = 0);
 === modified file 'tests/mocks/Utils/CMakeLists.txt'
 --- tests/mocks/Utils/CMakeLists.txt	2017-01-26 09:32:20 +0000
 +++ tests/mocks/Utils/CMakeLists.txt	2017-03-16 11:53:52 +0000
@@ -27,6 +27,7 @@
      ${CMAKE_SOURCE_DIR}/plugins/Utils/appdrawerproxymodel.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/tabfocusfence.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/expressionfiltermodel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/quicklistproxymodel.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
@@ -35,6 +36,7 @@
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
++    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
      constants.cpp
      plugin.cpp
      windowstatestorage.cpp
 === modified file 'tests/mocks/Utils/plugin.cpp'
 --- tests/mocks/Utils/plugin.cpp	2017-01-26 09:32:20 +0000
 +++ tests/mocks/Utils/plugin.cpp	2017-03-16 11:53:52 +0000
@@ -43,6 +43,7 @@
  #include <appdrawerproxymodel.h>
  #include <tabfocusfence.h>
  #include <expressionfiltermodel.h>
++#include <quicklistproxymodel.h>
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
@@ -88,4 +89,5 @@
      qmlRegisterType<AppDrawerProxyModel>(uri, 0, 1, "AppDrawerProxyModel");
      qmlRegisterType<TabFocusFenceItem>(uri, 0, 1, "TabFocusFence");
      qmlRegisterType<ExpressionFilterModel>(uri, 0, 1, "ExpressionFilterModel");
++    qmlRegisterType<QuickListProxyModel>(uri, 0, 1, "QuickListProxyModel");
+ }
 === modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
 --- tests/qmltests/Launcher/tst_Launcher.qml	2017-01-26 09:09:18 +0000
 +++ tests/qmltests/Launcher/tst_Launcher.qml	2017-03-16 11:53:52 +0000
@@ -97,6 +97,11 @@
+     }
      Binding {
          target: launcherLoader.item
++        property: "privateMode"
++        value: privateModeCheckBox.checked
++    }
++    Binding {
++        target: launcherLoader.item
          property: "panelWidth"
          value: units.gu(Math.round(widthSlider.value))
+     }
@@ -120,6 +125,20 @@
+             }
+         }
++        RowLayout {
++            CheckBox {
++                id: privateModeCheckBox
++                checked: false
++            }
++            Label {
++                text: "Private mode (lockscreen locked)"
++                AbstractButton {
++                    anchors.fill: parent
++                    onClicked: privateModeCheckBox.checked = !privateModeCheckBox.checked
++                }
++            }
++        }
++
          Slider {
              id: widthSlider
              Layout.fillWidth: true
@@ -1242,6 +1261,7 @@
              keyClick(Qt.Key_Down);
              keyClick(Qt.Key_Down);
              keyClick(Qt.Key_Down);
++            keyClick(Qt.Key_Down);
              tryCompare(quickList, "selectedIndex", 0)
              // Left gets us back to the launcher
@@ -1493,6 +1513,28 @@
              compare(launcher.state, "visibleTemporary");
+         }
++        function test_hideQuicklistItemsInPrivateModel_data() {
++            return [
++                { tag: "private mode", private: true },
++                { tag: "normal mode", private: false }
++            ];
++        }
++
++        function test_hideQuicklistItemsInPrivateModel(data) {
++            privateModeCheckBox.checked = data.private;
++
++            revealByEdgePush();
++
++            var item = findChild(launcher, "launcherDelegate4");
++            var quickListShape = findChild(launcher, "quickListShape")
++
++            mousePress(item)
++            tryCompare(quickListShape, "visible", true)
++
++            var repeater = findChild(launcher, "popoverRepeater");
++            tryCompare(repeater, "count", LauncherModel.get(4).quickList.count - (data.private ? 1 : 0))
++        }
++
          function test_hintOnSizeChange() {
              var oldSize = launcher.panelWidth;
              launcher.maxPanelX = -launcher.panelWidth;