Merge lp:~mzanetti/unity-api/private-quicklist-entries into lp:unity-api

Proposed by Michael Zanetti on 2017-02-24
Status: Merged
Approved by: Albert Astals Cid on 2017-02-27
Approved revision: 279
Merged at revision: 276
Proposed branch: lp:~mzanetti/unity-api/private-quicklist-entries
Merge into: lp:unity-api
Diff against target: 85 lines (+17/-3)
5 files modified
debian/changelog (+7/-0)
include/unity/shell/launcher/CMakeLists.txt (+1/-1)
include/unity/shell/launcher/QuickListModelInterface.h (+5/-1)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp (+2/-0)
test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-1)
To merge this branch: bzr merge lp:~mzanetti/unity-api/private-quicklist-entries
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2017-02-24 Approve on 2017-02-27
Unity8 CI Bot continuous-integration Approve on 2017-02-27
Review via email: mp+318220@code.launchpad.net

Commit message

Add RoleIsPrivate to launcher's quicklist model api

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:277
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/145/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4205
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4233
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4067/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4067
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4067/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Albert Astals Cid (aacid) wrote :

Q_ENUMS is "bad" use Q_ENUM

review: Needs Fixing
278. By Michael Zanetti on 2017-02-27

Q_ENUMS -> Q_ENUM

Michael Zanetti (mzanetti) wrote :

> Q_ENUMS is "bad" use Q_ENUM

oops, yeah, fixed

Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:278
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/146/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4218
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4246
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4081/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4081/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4081/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4081/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4081/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4081
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4081/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
279. By Michael Zanetti on 2017-02-27

add some comment about the new role

Albert Astals Cid (aacid) wrote :

Looks good

review: Approve
Daniel d'Andrada (dandrader) wrote :

In debian/changelog:

"""
+unity-api (8.5) zesty; urgency=medium
"""

Please next time use UNRELEASED instead of zesty. Besides being the correct state to be in, it also makes debchange work correcly. So that instead of debchange adding a new release on top of this one it will append to it instead and reformat for it to be per-author (in case they differ).

Daniel d'Andrada (dandrader) wrote :

Just run into this issue as I was rebasing a branch of mine on top of this one.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-02-23 11:22:38 +0000
3+++ debian/changelog 2017-02-27 11:42:12 +0000
4@@ -1,3 +1,10 @@
5+unity-api (8.5) zesty; urgency=medium
6+
7+ [ Michael Zanetti ]
8+ * Add RoleIsPrivate to launcher's quicklist entries
9+
10+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 24 Feb 2017 13:57:12 +0000
11+
12 unity-api (8.4+17.04.20170223-0ubuntu1) zesty; urgency=medium
13
14 [ Pete Woods ]
15
16=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
17--- include/unity/shell/launcher/CMakeLists.txt 2016-11-30 10:43:52 +0000
18+++ include/unity/shell/launcher/CMakeLists.txt 2017-02-27 11:42:12 +0000
19@@ -7,7 +7,7 @@
20
21 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
23-set(VERSION 11)
24+set(VERSION 12)
25 set(PKGCONFIG_NAME "unity-shell-launcher")
26 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
27 set(PKGCONFIG_REQUIRES "Qt5Core")
28
29=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
30--- include/unity/shell/launcher/QuickListModelInterface.h 2016-12-14 15:57:28 +0000
31+++ include/unity/shell/launcher/QuickListModelInterface.h 2017-02-27 11:42:12 +0000
32@@ -39,6 +39,7 @@
33 * - RoleIcon (icon): The icon to be shown for this entry (QString).
34 * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
35 * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
36+ * - RoleIsPrivate (isPrivate): Determines whether the entry should be shown or not in locked mode (e.g. greeter is locked)
37 */
38 class UNITY_API QuickListModelInterface: public QAbstractListModel
39 {
40@@ -51,6 +52,7 @@
41 m_roleNames.insert(RoleIcon, "icon");
42 m_roleNames.insert(RoleClickable, "clickable");
43 m_roleNames.insert(RoleHasSeparator, "hasSeparator");
44+ m_roleNames.insert(RoleIsPrivate, "isPrivate");
45 }
46 /// @endcond
47 public:
48@@ -63,8 +65,10 @@
49 RoleLabel,
50 RoleIcon,
51 RoleClickable,
52- RoleHasSeparator
53+ RoleHasSeparator,
54+ RoleIsPrivate
55 };
56+ Q_ENUM(Roles)
57
58 /// @cond
59 virtual ~QuickListModelInterface() {}
60
61=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
62--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2016-10-28 11:14:37 +0000
63+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2017-02-27 11:42:12 +0000
64@@ -39,6 +39,8 @@
65 return true;
66 case RoleHasSeparator:
67 return true;
68+ case RoleIsPrivate:
69+ return false;
70 }
71 return QVariant();
72 }
73
74=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
75--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2016-11-30 10:38:23 +0000
76+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-02-27 11:42:12 +0000
77@@ -175,7 +175,8 @@
78 { tag: "Model.roles[label]", role: "label", type: "string" },
79 { tag: "Model.roles[icon]", role: "icon", type: "string" },
80 { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
81- { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" }
82+ { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" },
83+ { tag: "Model.roles[isPrivate]", role: "isPrivate", type: "boolean" }
84 ];
85 }
86

Subscribers

People subscribed via source and target branches

to all changes: