Fixing merge

Merge branch 'SrcSrc33'

Conflicts:
	src/webview.cpp

1 files changed, 19 insertions, 0 deletions

diff --git a/src/webview.h b/src/webview.h
index 3388348d..d3f58f2e 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -37,13 +37,24 @@
 
 // Forward Declarations
 class WebPage;
+class QTimer;
 
 
 class WebView : public QWebView
 {
     Q_OBJECT
+    Q_ENUMS(ScrollDirection)
 
 public:
+    enum ScrollDirection
+    {
+        NoScroll = 0,
+        Up = 2,
+        Down = 4,
+        Left = 6,
+        Right = 16
+    };
+    
     explicit WebView(QWidget *parent = 0);
     ~WebView();
     
@@ -71,10 +82,18 @@ private slots:
     void openLinkInNewWindow();
     void openLinkInNewTab();
 
+    void startScrollAnimation(ScrollDirection direction);
+    void stopScrollAnimation();
+    void scrollFrameChanged();
+
 private:
     WebPage *m_page;
     int m_progress;
     QString m_statusBarText;
+    QTimer *m_scrollTimer;
+    int m_scrollDirection;
+    int m_scrollSpeedVertical;
+    int m_scrollSpeedHorizontal;
 };
 
 #endif