Merge lp:~stolowski/unity-api/social-attributes-role into lp:unity-api

[Paweł Stołowski]

Added RoleSocialActions.

Added RoleSocialActions.

[Andrea Cimitan (cimi)]

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:217
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/43/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/993/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1009/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1009/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1007/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1007/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1007/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1007/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1007/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1007/console

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

review: Needs Fixing (continuous-integration)

[lp:~stolowski/unity-api/social-attributes-role]

218. By Paweł Stołowski on 2016-03-24

Merged trunk + bump

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:217
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/46/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1133
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1121
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1121
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1119
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1119/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:218
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/52/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1154/console

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

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

+1

review: Approve

[lp:~stolowski/unity-api/social-attributes-role]

219. By Paweł Stołowski on 2016-04-15

Merged trunk + bump

220. By Paweł Stołowski on 2016-04-26

Merged trunk

221. By Paweł Stołowski on 2016-04-26

Fix version

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-13 18:39:21 +0000
+++ debian/changelog	2016-04-26 15:30:33 +0000
@@ -1,3 +1,9 @@
+unity-api (7.111) UNRELEASED; urgency=medium
+
+  * Added RoleSocialActions to ResultsModelInterface of scopes.
+
+ -- Pawel Stolowski <[e-mail]>  Thu, 25 Apr 2016 10:00:42 +0100
+
 unity-api (7.110+16.04.20160413-0ubuntu1) xenial; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2016-03-07 08:27:45 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2016-04-26 15:30:33 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 11)
+set(VERSION 12)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/scopes/ResultsModelInterface.h'
--- include/unity/shell/scopes/ResultsModelInterface.h	2015-09-16 10:05:47 +0000
+++ include/unity/shell/scopes/ResultsModelInterface.h	2016-04-26 15:30:33 +0000
@@ -71,7 +71,8 @@
         RoleAttributes,
         RoleBackground,
         RoleOverlayColor,
-        RoleQuickPreviewData ///< Data for UI quick previewing. In case of audio should contain uri and duration
+        RoleQuickPreviewData, ///< Data for UI quick previewing. In case of audio should contain uri and duration
+        RoleSocialActions  ///< Data for social actions (in-card actions such as "+1").
     };
 
     // @cond
@@ -96,6 +97,7 @@
         roles[RoleAttributes] = "attributes";
         roles[RoleBackground] = "background";
         roles[RoleOverlayColor] = "overlayColor";
+        roles[RoleSocialActions] = "socialActions";
         return roles;
     }
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp	2014-07-18 12:56:46 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockResultsModel.cpp	2016-04-26 15:30:33 +0000
@@ -67,6 +67,8 @@
         case RoleUri:
         case RoleCategoryId:
         case RoleDndUri:
+        case RoleAttributes:
+        case RoleSocialActions:
         default:
             return QString();
     }

=== modified file 'test/qmltest/unity/shell/scopes/tst_Scopes.qml'
--- test/qmltest/unity/shell/scopes/tst_Scopes.qml	2016-03-07 08:27:25 +0000
+++ test/qmltest/unity/shell/scopes/tst_Scopes.qml	2016-04-26 15:30:33 +0000
@@ -427,6 +427,7 @@
                 { tag: "Model.roles[attributes]", role: "attributes", type: "string" },
                 { tag: "Model.roles[background]", role: "background", type: "object" },
                 { tag: "Model.roles[overlayColor]", role: "overlayColor", type: "string" },
+                { tag: "Model.roles[socialActions]", role: "socialActions", type: "string" },
             ];
         }