--- a/ginebra2/WebTouchNavigation.h Fri May 14 15:40:36 2010 +0300
+++ b/ginebra2/WebTouchNavigation.h Tue Jun 29 00:46:29 2010 -0400
@@ -1,21 +1,24 @@
/*
* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* 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 Lesser General Public License for more details.
*
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program. If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
*
-* Description:
+* Description:
*
*/
-
#ifndef __WEBTOUCHNAVIGATION_H__
#define __WEBTOUCHNAVIGATION_H__
@@ -39,14 +42,14 @@
~DecelEdit() {};
public slots:
void setDecel();
-private:
+private:
WebTouchNavigation* m_nav;
-
+
};
-class WebTouchNavigation : public QObject,
+class WebTouchNavigation : public QObject,
public KineticScrollable
{
Q_OBJECT
@@ -54,37 +57,37 @@
WebTouchNavigation(QGraphicsWebView* view);
virtual ~WebTouchNavigation();
void handleQStmGesture(QStm_Gesture* gesture);
-
+
//from KineticScrollable
- void scrollTo(QPoint& pos);
+ void scrollTo(QPoint& pos);
QPoint getScrollPosition();
QPoint getInitialPosition();
QPointF getInitialSpeed();
-
+
private:
void doTap(QStm_Gesture* gesture);
void doPan(QStm_Gesture* gesture);
void doFlick(QStm_Gesture* gesture);
void doTouch(QStm_Gesture* gesture);
void stopScrolling();
-
+
QPointF mapFromGlobal(const QPointF& gpos);
-
+
public slots:
- void pan();
+ void pan();
-private:
+private:
QTimer* m_scrollTimer;
- QPoint m_scrollDelta;
- bool m_scrolling;
+ QPoint m_scrollDelta;
+ bool m_scrolling;
QPointF m_kineticSpeed;
QGraphicsWebView* m_view;
QWebPage* m_webPage;
QWebFrame* m_frame;
KineticHelper* m_kinetic;
DecelEdit* m_decelEdit;
-
-
+
+
friend class DecelEdit;
};