Merge lp:~azzar1/unity-api/add-visible-role into lp:unity-api

Proposed by Andrea Azzarone
Status: Needs review
Proposed branch: lp:~azzar1/unity-api/add-visible-role
Merge into: lp:unity-api
Diff against target: 80 lines (+14/-2)
5 files modified
debian/changelog (+6/-0)
include/unity/shell/launcher/CMakeLists.txt (+1/-1)
include/unity/shell/launcher/QuickListModelInterface.h (+4/-1)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp (+2/-0)
test/qmltest/unity/shell/launcher/tst_Launcher.qml (+1/-0)
To merge this branch: bzr merge lp:~azzar1/unity-api/add-visible-role
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+316030@code.launchpad.net

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?

No.

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

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes.

 * If you changed the UI, has there been a design review?

N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

270. By Andrea Azzarone

Add visible role to quicklistModel.

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-01-20 17:08:56 +0000
3+++ debian/changelog 2017-01-31 16:16:58 +0000
4@@ -1,3 +1,9 @@
5+unity-api (8.1+17.04.20170120.1-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Add visible role to quicklistModel.
8+
9+ -- Andrea Azzarone <andrea.azzarone@canonical.com> Mon, 30 Jan 2017 21:49:45 +0100
10+
11 unity-api (8.1+17.04.20170120.1-0ubuntu1) zesty; urgency=medium
12
13 [ Pete ]
14
15=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
16--- include/unity/shell/launcher/CMakeLists.txt 2016-11-30 10:43:52 +0000
17+++ include/unity/shell/launcher/CMakeLists.txt 2017-01-31 16:16:58 +0000
18@@ -7,7 +7,7 @@
19
20 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
22-set(VERSION 11)
23+set(VERSION 12)
24 set(PKGCONFIG_NAME "unity-shell-launcher")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
29--- include/unity/shell/launcher/QuickListModelInterface.h 2016-12-14 15:57:28 +0000
30+++ include/unity/shell/launcher/QuickListModelInterface.h 2017-01-31 16:16:58 +0000
31@@ -39,6 +39,7 @@
32 * - RoleIcon (icon): The icon to be shown for this entry (QString).
33 * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
34 * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
35+ * - RoleVisible (visible): Determines if the entry is visible (boolean)
36 */
37 class UNITY_API QuickListModelInterface: public QAbstractListModel
38 {
39@@ -51,6 +52,7 @@
40 m_roleNames.insert(RoleIcon, "icon");
41 m_roleNames.insert(RoleClickable, "clickable");
42 m_roleNames.insert(RoleHasSeparator, "hasSeparator");
43+ m_roleNames.insert(RoleVisible, "visible");
44 }
45 /// @endcond
46 public:
47@@ -63,7 +65,8 @@
48 RoleLabel,
49 RoleIcon,
50 RoleClickable,
51- RoleHasSeparator
52+ RoleHasSeparator,
53+ RoleVisible
54 };
55
56 /// @cond
57
58=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
59--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2016-10-28 11:14:37 +0000
60+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2017-01-31 16:16:58 +0000
61@@ -39,6 +39,8 @@
62 return true;
63 case RoleHasSeparator:
64 return true;
65+ case RoleVisible:
66+ return true;
67 }
68 return QVariant();
69 }
70
71=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
72--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2016-11-30 10:38:23 +0000
73+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-01-31 16:16:58 +0000
74@@ -176,6 +176,7 @@
75 { tag: "Model.roles[icon]", role: "icon", type: "string" },
76 { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
77 { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" }
78+ { tag: "Model.roles[visible]", role: "visible", type: "boolean" }
79 ];
80 }
81

Subscribers

People subscribed via source and target branches

to all changes: