Merge lp:~unity-team/unity-api/scope-customizations into lp:unity-api

[Michal Hruby]

Added customizations property to ScopeInterface.

Added customizations property to ScopeInterface.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/unity-api-ci/204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/204/rebuild

review: Approve (continuous-integration)

[lp:~unity-team/unity-api/scope-customizations]

141. By Michal Hruby on 2014-06-23

Act on review comments

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/unity-api-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/206/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yup.

review: Approve

[lp:~unity-team/unity-api/scope-customizations]

142. By Michal Hruby on 2014-06-26

Revert the version bump, cause it's was not synced with debian anyway

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-16 14:45:10 +0000
+++ debian/changelog	2014-06-26 08:20:35 +0000
@@ -1,3 +1,9 @@
+unity-api (7.83-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Added customizations property to ScopeInterface.
+
+ -- Michal Hruby <[e-mail]>  Thu, 19 Jun 2014 17:17:08 +0100
+
 unity-api (7.82+14.10.20140616-0ubuntu1) utopic; urgency=medium
 
   [ Albert Astals Cid ]

=== modified file 'include/unity/shell/scopes/ScopeInterface.h'
--- include/unity/shell/scopes/ScopeInterface.h	2014-05-29 10:24:53 +0000
+++ include/unity/shell/scopes/ScopeInterface.h	2014-06-26 08:20:35 +0000
@@ -20,6 +20,7 @@
 #include <unity/SymbolExport.h>
 
 #include <QObject>
+#include <QVariantMap>
 
 namespace unity
 {
@@ -120,6 +121,11 @@
      */
     Q_PROPERTY(bool hasDepartments READ hasDepartments NOTIFY hasDepartmentsChanged)
 
+    /**
+     * @brief VariantMap with customization properties
+     */
+    Q_PROPERTY(QVariantMap customizations READ customizations NOTIFY customizationsChanged)
+
 protected:
     /// @cond
     explicit ScopeInterface(QObject* parent = 0) : QObject(parent) { }
@@ -143,6 +149,7 @@
     virtual bool isActive() const = 0;
     virtual QString currentDepartmentId() const = 0;
     virtual bool hasDepartments() const = 0;
+    virtual QVariantMap customizations() const = 0;
 
     /* setters */
     virtual void setSearchQuery(const QString& search_query) = 0;
@@ -203,6 +210,7 @@
     void isActiveChanged();
     void hasDepartmentsChanged();
     void currentDepartmentIdChanged();
+    void customizationsChanged();
     // @endcond
 
     // signals triggered by activate(..) or preview(..) requests.

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2014-05-29 10:24:53 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2014-06-26 08:20:35 +0000
@@ -95,6 +95,10 @@
     return m_hasDepartments;
 }
 
+QVariantMap MockScope::customizations() const {
+    return m_customizations;
+}
+
 void MockScope::setName(const QString &str) {
     if (str != m_name) {
         m_name = str;

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2014-05-29 10:24:53 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2014-06-26 08:20:35 +0000
@@ -43,6 +43,7 @@
     bool isActive() const override;
     bool hasDepartments() const override;
     QString currentDepartmentId() const override;
+    QVariantMap customizations() const override;
 
     /* setters */
     void setName(const QString& name);
@@ -71,6 +72,7 @@
     bool m_searching;
     bool m_isActive;
     bool m_hasDepartments;
+    QVariantMap m_customizations;
 
     QString m_previewRendererName;
 

=== modified file 'test/qmltest/unity/shell/scopes/tst_Scopes.qml'
--- test/qmltest/unity/shell/scopes/tst_Scopes.qml	2014-05-29 12:25:47 +0000
+++ test/qmltest/unity/shell/scopes/tst_Scopes.qml	2014-06-26 08:20:35 +0000
@@ -126,7 +126,8 @@
                 { tag: "Item.properties[formFactor]", constant: "formFactor", type: "string" },
                 { tag: "Item.properties[isActive]", constant: "isActive", type: "boolean" },
                 { tag: "Item.properties[currentDepartmentId]", constant: "currentDepartmentId", type: "string" },
-                { tag: "Item.properties[hasDepartments]", constant: "hasDepartments", type: "boolean" }
+                { tag: "Item.properties[hasDepartments]", constant: "hasDepartments", type: "boolean" },
+                { tag: "Item.properties[customizations]", constant: "customizations", type: "object" }
             ];
         }