Merge lp:~stolowski/unity-api/expandable-filter-widget into lp:unity-api

[Paweł Stołowski]

Added ExpandableFilterWidgetInterface.

Added ExpandableFilterWidgetInterface.

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

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

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good.

review: Approve

[lp:~stolowski/unity-api/expandable-filter-widget]

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

Merged social-attributes

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

Merged social attr

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-13 18:39:21 +0000
+++ debian/changelog	2016-04-26 11:12:23 +0000
@@ -1,3 +1,10 @@
+unity-api (7.111) UNRELEASED; urgency=medium
+
+  * Added RoleSocialActions to ResultsModelInterface of scopes.
+  * Added ExpandableFilterWidgetInterface.
+
+ -- 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 11:12:23 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 11)
+set(VERSION 13)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== added file 'include/unity/shell/scopes/ExpandableFilterWidgetInterface.h'
--- include/unity/shell/scopes/ExpandableFilterWidgetInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/ExpandableFilterWidgetInterface.h	2016-04-26 11:12:23 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_SHELL_SCOPES_EXPANDABLEFILTERWIDGETINTERFACE_H
+#define UNITY_SHELL_SCOPES_EXPANDABLEFILTERWIDGETINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include "FilterBaseInterface.h"
+#include "FiltersInterface.h"
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API ExpandableFilterWidgetInterface : public FilterBaseInterface
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(unity::shell::scopes::FiltersInterface* filters READ filters CONSTANT)
+
+    FiltersInterface::FilterType filterType() const override
+    {
+        return FiltersInterface::ExpandableFilterWidget;
+    }
+
+    virtual FiltersInterface* filters() const = 0;
+
+protected:
+    /// @cond
+    explicit ExpandableFilterWidgetInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::ExpandableFilterWidgetInterface *)
+
+#endif

=== modified file 'include/unity/shell/scopes/FiltersInterface.h'
--- include/unity/shell/scopes/FiltersInterface.h	2015-11-24 11:25:15 +0000
+++ include/unity/shell/scopes/FiltersInterface.h	2016-04-26 11:12:23 +0000
@@ -46,7 +46,8 @@
         Invalid,
         OptionSelectorFilter,
         RangeInputFilter,
-        ValueSliderFilter
+        ValueSliderFilter,
+        ExpandableFilterWidget
         // TODO add remaining filters
     };
 

=== 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 11:12:23 +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 11:12:23 +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 11:12:23 +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" },
             ];
         }