Merge lp:~unity-team/unity-api/rtm-14.09-staging into lp:unity-api/rtm-14.09

Proposed by Michał Sawicz on 2014-12-12
Status: Merged
Approved by: Albert Astals Cid on 2014-12-12
Approved revision: 162
Merged at revision: 162
Proposed branch: lp:~unity-team/unity-api/rtm-14.09-staging
Merge into: lp:unity-api/rtm-14.09
Diff against target: 79 lines (+30/-1)
5 files modified
debian/changelog (+6/-0)
include/unity/shell/scopes/CMakeLists.txt (+1/-1)
include/unity/shell/scopes/ScopesInterface.h (+10/-0)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp (+10/-0)
test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h (+3/-0)
To merge this branch: bzr merge lp:~unity-team/unity-api/rtm-14.09-staging
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2014-12-12 Approve on 2014-12-12
Review via email: mp+244567@code.launchpad.net
To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Looks like a proper backport of what landed in unity-api vivid trunk

review: Approve
163. By Michał Sawicz on 2014-12-12

Bump version

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 2014-10-03 16:52:41 +0000
3+++ debian/changelog 2014-12-12 13:03:12 +0000
4@@ -1,3 +1,9 @@
5+unity-api (7.94~launcher4-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Add setFavorite/moveFavoriteTo
8+
9+ -- Albert Astals Cid <albert.astals@canonical.com> Mon, 20 Oct 2014 16:43:28 -0400
10+
11 unity-api (7.92+14.10.20141003.1-0ubuntu1) utopic; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
16--- include/unity/shell/scopes/CMakeLists.txt 2014-07-25 14:08:42 +0000
17+++ include/unity/shell/scopes/CMakeLists.txt 2014-12-12 13:03:12 +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 4)
23+set(VERSION 5)
24 set(PKGCONFIG_NAME "unity-shell-scopes")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/scopes/ScopesInterface.h'
29--- include/unity/shell/scopes/ScopesInterface.h 2014-08-01 13:09:00 +0000
30+++ include/unity/shell/scopes/ScopesInterface.h 2014-12-12 13:03:12 +0000
31@@ -88,6 +88,16 @@
32 */
33 Q_INVOKABLE virtual unity::shell::scopes::ScopeInterface* getScope(QString const& scopeId) const = 0;
34
35+ /**
36+ * @brief Set the favorite bit of the given scope.
37+ */
38+ Q_INVOKABLE virtual void setFavorite(QString const& scopeId, bool favorite) = 0;
39+
40+ /**
41+ * @brief Move the given favorite scope to the given index.
42+ */
43+ Q_INVOKABLE virtual void moveFavoriteTo(QString const& scopeId, int index) = 0;
44+
45 // @cond
46 virtual bool loaded() const = 0;
47 virtual int count() const = 0;
48
49=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp'
50--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp 2014-08-01 13:09:00 +0000
51+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp 2014-12-12 13:03:12 +0000
52@@ -82,3 +82,13 @@
53 // Unimplemented
54 return nullptr;
55 }
56+
57+void MockScopes::setFavorite(QString const&, bool)
58+{
59+ // Unimplemented
60+}
61+
62+void MockScopes::moveFavoriteTo(QString const&, int)
63+{
64+ // Unimplemented
65+}
66
67=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h'
68--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h 2014-08-01 13:09:00 +0000
69+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h 2014-12-12 13:03:12 +0000
70@@ -43,6 +43,9 @@
71 int count() const override;
72 unity::shell::scopes::ScopeInterface* overviewScope() const override;
73
74+ void setFavorite(QString const& scopeId, bool favorite) override;
75+ void moveFavoriteTo(QString const& scopeId, int index) override;
76+
77 private:
78 QList<MockScope*> m_scopes;
79 QHash<int, QByteArray> m_roles;

Subscribers

People subscribed via source and target branches

to all changes: