From 2e0048afd1283e5995ec26a1d31643dc32e8d97a Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 7 Feb 2013 18:47:37 +0100 Subject: Introduce private plugin Change-Id: I4beedc773df5b9b207554b55e86aa1439cb4d06e Reviewed-by: Jens Bache-Wiig --- src/private/qwheelarea_p.h | 121 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 src/private/qwheelarea_p.h (limited to 'src/private/qwheelarea_p.h') diff --git a/src/private/qwheelarea_p.h b/src/private/qwheelarea_p.h new file mode 100644 index 00000000..35822b15 --- /dev/null +++ b/src/private/qwheelarea_p.h @@ -0,0 +1,121 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Components project. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QWHEELAREA_P_H +#define QWHEELAREA_P_H + +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class QWheelArea : public QQuickItem +{ + Q_OBJECT + Q_PROPERTY(qreal verticalDelta READ verticalDelta WRITE setVerticalDelta NOTIFY verticalWheelMoved) + Q_PROPERTY(qreal horizontalDelta READ horizontalDelta WRITE setHorizontalDelta NOTIFY horizontalWheelMoved) + Q_PROPERTY(qreal horizontalMinimumValue READ horizontalMinimumValue WRITE setHorizontalMinimumValue) + Q_PROPERTY(qreal horizontalMaximumValue READ horizontalMaximumValue WRITE setHorizontalMaximumValue) + Q_PROPERTY(qreal verticalMinimumValue READ verticalMinimumValue WRITE setVerticalMinimumValue) + Q_PROPERTY(qreal verticalMaximumValue READ verticalMaximumValue WRITE setVerticalMaximumValue) + Q_PROPERTY(qreal horizontalValue READ horizontalValue WRITE setHorizontalValue) + Q_PROPERTY(qreal verticalValue READ verticalValue WRITE setVerticalValue) + Q_PROPERTY(qreal scrollSpeed READ scrollSpeed WRITE setScrollSpeed NOTIFY scrollSpeedChanged) + +public: + QWheelArea(QQuickItem *parent = 0); + virtual ~QWheelArea(); + + void setHorizontalMinimumValue(qreal value); + qreal horizontalMinimumValue() const; + + void setHorizontalMaximumValue(qreal value); + qreal horizontalMaximumValue() const; + + void setVerticalMinimumValue(qreal value); + qreal verticalMinimumValue() const; + + void setVerticalMaximumValue(qreal value); + qreal verticalMaximumValue() const; + + void setHorizontalValue(qreal value); + qreal horizontalValue() const; + + void setVerticalValue(qreal value); + qreal verticalValue() const; + + void setVerticalDelta(qreal value); + qreal verticalDelta() const; + + void setHorizontalDelta(qreal value); + qreal horizontalDelta() const; + + void setScrollSpeed(qreal value); + qreal scrollSpeed() const; + + void wheelEvent(QWheelEvent *event); + +Q_SIGNALS: + void verticalValueChanged(); + void horizontalValueChanged(); + void verticalWheelMoved(); + void horizontalWheelMoved(); + void scrollSpeedChanged(); + +private: + qreal m_horizontalMinimumValue; + qreal m_horizontalMaximumValue; + qreal m_verticalMinimumValue; + qreal m_verticalMaximumValue; + qreal m_horizontalValue; + qreal m_verticalValue; + qreal m_verticalDelta; + qreal m_horizontalDelta; + qreal m_scrollSpeed; + + Q_DISABLE_COPY(QWheelArea) +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QWheelArea) + +#endif // QWHEELAREA_P_H -- cgit v1.2.1 From 83edbb617602a34c1e802118351b059f5bdd95af Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 21 Feb 2013 16:06:26 +0100 Subject: Replaced BSD with LGPL license to conform with Qt Project modules We want to use the same license as the other Qt modules. QML files stay as BSD for now. Change-Id: I10b1484f5ab0dfe2138ff7e045d0ecfd85556aa1 Reviewed-by: Jens Bache-Wiig --- src/private/qwheelarea_p.h | 55 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 27 deletions(-) (limited to 'src/private/qwheelarea_p.h') diff --git a/src/private/qwheelarea_p.h b/src/private/qwheelarea_p.h index 35822b15..576f9bfc 100644 --- a/src/private/qwheelarea_p.h +++ b/src/private/qwheelarea_p.h @@ -1,38 +1,39 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt Components project. +** This file is part of the Qt Quick Controls module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. ** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. ** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** ** $QT_END_LICENSE$ ** -- cgit v1.2.1 From c9a7814c871c0236228e665e2a3fb7f61b905cc4 Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Mon, 4 Mar 2013 10:12:42 +0800 Subject: QWheelArea: Cleanup header include statements Change-Id: I74044f286ce206b72809950dd78758869ad6be04 Reviewed-by: J-P Nurmi --- src/private/qwheelarea_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/private/qwheelarea_p.h') diff --git a/src/private/qwheelarea_p.h b/src/private/qwheelarea_p.h index 576f9bfc..ac556816 100644 --- a/src/private/qwheelarea_p.h +++ b/src/private/qwheelarea_p.h @@ -43,7 +43,6 @@ #define QWHEELAREA_P_H #include -#include #include QT_BEGIN_NAMESPACE -- cgit v1.2.1