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

[Michał Sawicz]

[Albert Astals Cid (aacid)]

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

review: Approve

[lp:~unity-team/unity-api/rtm-14.09-staging]

163. By Michał Sawicz on 2014-12-12

Bump version

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-03 16:52:41 +0000
+++ debian/changelog	2014-12-12 13:03:12 +0000
@@ -1,3 +1,9 @@
+unity-api (7.94~launcher4-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add setFavorite/moveFavoriteTo
+
+ -- Albert Astals Cid <[e-mail]>  Mon, 20 Oct 2014 16:43:28 -0400
+
 unity-api (7.92+14.10.20141003.1-0ubuntu1) utopic; urgency=medium
 
   [ Michael Zanetti ]

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2014-07-25 14:08:42 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2014-12-12 13:03:12 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 4)
+set(VERSION 5)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/scopes/ScopesInterface.h'
--- include/unity/shell/scopes/ScopesInterface.h	2014-08-01 13:09:00 +0000
+++ include/unity/shell/scopes/ScopesInterface.h	2014-12-12 13:03:12 +0000
@@ -88,6 +88,16 @@
      */
     Q_INVOKABLE virtual unity::shell::scopes::ScopeInterface* getScope(QString const& scopeId) const = 0;
 
+    /**
+     * @brief Set the favorite bit of the given scope.
+     */
+    Q_INVOKABLE virtual void setFavorite(QString const& scopeId, bool favorite) = 0;
+
+    /**
+     * @brief Move the given favorite scope to the given index.
+     */
+    Q_INVOKABLE virtual void moveFavoriteTo(QString const& scopeId, int index) = 0;
+
     // @cond
     virtual bool loaded() const = 0;
     virtual int count() const = 0;

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp	2014-08-01 13:09:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.cpp	2014-12-12 13:03:12 +0000
@@ -82,3 +82,13 @@
     // Unimplemented
     return nullptr;
 }
+
+void MockScopes::setFavorite(QString const&, bool)
+{
+    // Unimplemented
+}
+
+void MockScopes::moveFavoriteTo(QString const&, int)
+{
+    // Unimplemented
+}

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h	2014-08-01 13:09:00 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScopes.h	2014-12-12 13:03:12 +0000
@@ -43,6 +43,9 @@
     int count() const override;
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
 
+    void setFavorite(QString const& scopeId, bool favorite) override;
+    void moveFavoriteTo(QString const& scopeId, int index) override;
+
 private:
     QList<MockScope*> m_scopes;
     QHash<int, QByteArray> m_roles;