Merge lp:~stolowski/unity-api/value-slider-iface into lp:unity-api

[Paweł Stołowski]

ValueSliderFilter interface.

ValueSliderFilter interface.

[Albert Astals Cid (aacid)]

Looks good

review: Approve

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

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

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

review: Approve (continuous-integration)

[lp:~stolowski/unity-api/value-slider-iface]

215. By Paweł Stołowski on 2016-03-10

Merge range-input-filter-iface

216. By Paweł Stołowski on 2016-03-11

Merged range-input-filter-iface

=== modified file 'include/unity/shell/scopes/FiltersInterface.h'
--- include/unity/shell/scopes/FiltersInterface.h	2016-03-11 12:03:13 +0000
+++ include/unity/shell/scopes/FiltersInterface.h	2016-03-11 12:03:13 +0000
@@ -45,7 +45,8 @@
     enum FilterType {
         Invalid,
         OptionSelectorFilter,
-        RangeInputFilter
+        RangeInputFilter,
+        ValueSliderFilter
         // TODO add remaining filters
     };
 

=== added file 'include/unity/shell/scopes/ValueSliderFilterInterface.h'
--- include/unity/shell/scopes/ValueSliderFilterInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/ValueSliderFilterInterface.h	2016-03-11 12:03:13 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2015 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_VALUESLIDERFILTERINTERFACE_H
+#define UNITY_SHELL_SCOPES_VALUESLIDERFILTERINTERFACE_H
+
+#include <unity/SymbolExport.h>
+
+#include "FilterBaseInterface.h"
+#include "ValueSliderValuesInterface.h"
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API ValueSliderFilterInterface : public FilterBaseInterface
+{
+    Q_OBJECT
+
+public:
+    Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged)
+    Q_PROPERTY(unity::shell::scopes::ValueSliderValuesInterface* values READ values NOTIFY valuesChanged)
+    Q_PROPERTY(double minValue READ minValue NOTIFY minValueChanged)
+    Q_PROPERTY(double maxValue READ maxValue NOTIFY maxValueChanged)
+
+public:
+    FiltersInterface::FilterType filterType() const override
+    {
+        return FiltersInterface::ValueSliderFilter;
+    }
+
+    virtual double value() const = 0;
+    virtual void setValue(double)  = 0;
+    virtual double minValue() const = 0;
+    virtual double maxValue() const = 0;
+    virtual ValueSliderValuesInterface* values() const = 0;
+
+Q_SIGNALS:
+    void valueChanged();
+    void valuesChanged();
+    void minValueChanged();
+    void maxValueChanged();
+
+protected:
+    /// @cond
+    explicit ValueSliderFilterInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
+    /// @endcond
+};
+
+}
+
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::ValueSliderFilterInterface*)
+
+#endif

=== added file 'include/unity/shell/scopes/ValueSliderValuesInterface.h'
--- include/unity/shell/scopes/ValueSliderValuesInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/shell/scopes/ValueSliderValuesInterface.h	2016-03-11 12:03:13 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015 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_VALUESLIDERVALUESINTERFACE_H
+#define UNITY_SHELL_SCOPES_VALUESLIDERVALUESINTERFACE_H
+
+#include <unity/SymbolExport.h>
+#include <QAbstractListModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+
+class UNITY_API ValueSliderValuesInterface : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(SliderValueRoles)
+
+public:
+    enum Roles {
+        RoleValue = Qt::UserRole + 1,
+        RoleLabel
+    };
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleValue] = "value";
+        roles[RoleLabel] = "label";
+        return roles;
+    }
+
+protected:
+    /// @cond
+    explicit ValueSliderValuesInterface(QObject* parent = 0) : QAbstractListModel(parent) {}
+    /// @endcond
+};
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::shell::scopes::ValueSliderValuesInterface*)
+
+#endif