Unity API

Merge lp:~stolowski/unity-api/range-input-filter-iface into lp:unity-api

range-input-filter-iface
Merge into trunk

Proposed by Paweł Stołowski on 2015-11-10

Status:	Merged
Approved by:	Albert Astals Cid on 2016-02-25
Approved revision:	208
Merged at revision:	215
Proposed branch:	lp:~stolowski/unity-api/range-input-filter-iface
Merge into:	lp:unity-api
Prerequisite:	lp:~stolowski/unity-api/filters-iface
Diff against target:	126 lines (+94/-1) 3 files modified include/unity/shell/scopes/RangeInputFilterInterface.h (+90/-0) test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt (+1/-0) test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp (+3/-1)
To merge this branch:	bzr merge lp:~stolowski/unity-api/range-input-filter-iface
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-03-03
Albert Astals Cid (community)		2015-11-10	Approve on 2016-02-25
Review via email: mp+277100@code.launchpad.net

Commit message

Interface for RangeInputFilter.

Description of the change

Interface for RangeInputFilter.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-02-25:

Looks good

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-03:

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

review: Approve (continuous-integration)

lp:~stolowski/unity-api/range-input-filter-iface updated on 2016-03-11

209. By Paweł Stołowski on 2016-03-10: Merged filter-iface
210. By Paweł Stołowski on 2016-03-11: Merged filter-iface

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Paweł Stołowski

Unity Team

 === added file 'include/unity/shell/scopes/RangeInputFilterInterface.h'
 --- include/unity/shell/scopes/RangeInputFilterInterface.h	1970-01-01 00:00:00 +0000
 +++ include/unity/shell/scopes/RangeInputFilterInterface.h	2016-03-11 12:03:28 +0000
@@ -0,0 +1,90 @@
++/*
++ * 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_RANGEINPUTFILTERINTERFACE_H
++#define UNITY_SHELL_SCOPES_RANGEINPUTFILTERINTERFACE_H
++
++#include <unity/SymbolExport.h>
++
++#include "FilterBaseInterface.h"
++
++namespace unity
++{
++namespace shell
++{
++namespace scopes
++{
++
++class UNITY_API RangeInputFilterInterface : public FilterBaseInterface
++{
++    Q_OBJECT
++
++public:
++    Q_PROPERTY(double startValue READ startValue WRITE setStartValue NOTIFY startValueChanged)
++    Q_PROPERTY(double endValue READ endValue WRITE setEndValue NOTIFY endValueChanged)
++    Q_PROPERTY(QString startPrefixLabel READ startPrefixLabel NOTIFY startPrefixLabelChanged)
++    Q_PROPERTY(QString startPostfixLabel READ startPostfixLabel NOTIFY startPostfixLabelChanged)
++    Q_PROPERTY(QString centralLabel READ centralLabel NOTIFY centralLabelChanged)
++    Q_PROPERTY(QString endPrefixLabel READ endPrefixLabel NOTIFY endPrefixLabelChanged)
++    Q_PROPERTY(QString endPostfixLabel READ endPostfixLabel NOTIFY endPostfixLabelChanged)
++    Q_PROPERTY(bool hasStartValue READ hasStartValue NOTIFY hasStartValueChanged)
++    Q_PROPERTY(bool hasEndValue READ hasEndValue NOTIFY hasEndValueChanged)
++
++    FiltersInterface::FilterType filterType() const override
++    {
++        return FiltersInterface::RangeInputFilter;
++    }
++
++    virtual double startValue() const = 0;
++    virtual double endValue() const = 0;
++    virtual void setStartValue(double value) = 0;
++    virtual void setEndValue(double value)  = 0;
++    virtual QString startPrefixLabel() const = 0;
++    virtual QString startPostfixLabel() const = 0;
++    virtual QString centralLabel() const = 0;
++    virtual QString endPrefixLabel() const = 0;
++    virtual QString endPostfixLabel() const = 0;
++    virtual bool hasStartValue() const = 0;
++    virtual bool hasEndValue() const = 0;
++
++    Q_INVOKABLE virtual void eraseStartValue() = 0;
++    Q_INVOKABLE virtual void eraseEndValue() = 0;
++
++Q_SIGNALS:
++    void startValueChanged();
++    void endValueChanged();
++    void hasStartValueChanged();
++    void hasEndValueChanged();
++    void startPrefixLabelChanged();
++    void startPostfixLabelChanged();
++    void centralLabelChanged();
++    void endPrefixLabelChanged();
++    void endPostfixLabelChanged();
++
++protected:
++    /// @cond
++    explicit RangeInputFilterInterface(QObject* parent = 0) : FilterBaseInterface(parent) {}
++    /// @endcond
++};
++
++}
++
++}
++}
++
++Q_DECLARE_METATYPE(unity::shell::scopes::RangeInputFilterInterface*)
++
++#endif
 === modified file 'test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt'
 --- test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2016-03-11 12:03:28 +0000
 +++ test/qmltest/mocks/plugins/Unity/Scopes/CMakeLists.txt	2016-03-11 12:03:28 +0000
@@ -27,6 +27,7 @@
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/FilterBaseInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/OptionSelectorFilterInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/OptionSelectorOptionsInterface.h
++    ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/RangeInputFilterInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/NavigationInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/ResultsModelInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/scopes/PreviewModelInterface.h
 === modified file 'test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp'
 --- test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2016-03-11 12:03:28 +0000
 +++ test/qmltest/mocks/plugins/Unity/Scopes/TestScopesPlugin.cpp	2016-03-11 12:03:28 +0000
@@ -29,6 +29,7 @@
  #include "FilterBaseInterface.h"
  #include "OptionSelectorOptionsInterface.h"
  #include "OptionSelectorFilterInterface.h"
++#include "RangeInputFilterInterface.h"
  #include "Mocks/MockScopes.h"
  #include "Mocks/MockScope.h"
@@ -45,5 +46,6 @@
      qmlRegisterUncreatableType<unity::shell::scopes::FilterBaseInterface>(uri, 0, 2, "FilterBase", "Can't create new Filter in QML. Get them from Filters instance.");
      qmlRegisterUncreatableType<unity::shell::scopes::FiltersInterface>(uri, 0, 2, "Filters", "Can't create new Filters in QML. Get them from Scope instance.");
      qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorOptionsInterface>(uri, 0, 2, "OptionSelectorOptions", "Can't create new OptionSelectorOptions in QML. Get them from OptionSelectorFilter instance.");
--    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorFilterInterface>(uri, 0, 2, "OptionSelectorFilter", "Can't create new OptionSelectorFilter in QML. Get them from Scope instance.");
++    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorFilterInterface>(uri, 0, 2, "OptionSelectorFilter", "Can't create new OptionSelectorFilter in QML. Get them from Filters instance.");
++    qmlRegisterUncreatableType<unity::shell::scopes::RangeInputFilterInterface>(uri, 0, 2, "RangeInputFilter", "Can't create new RangeInputFilter in QML. Get them from Filters instance.");
+ }