From a63b55f7254dd5908d1024335b74f5d220d3b0c6 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 30 Aug 2013 20:26:39 +0200
Subject: [PATCH] Some work on context menu.

---
 src/core/defs.h.in      | 12 +++++++++---
 src/gui/basewebview.cpp | 32 +++++++++++++-------------------
 src/gui/formsettings.ui |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/core/defs.h.in b/src/core/defs.h.in
index fbbe18ece..e61032b69 100644
--- a/src/core/defs.h.in
+++ b/src/core/defs.h.in
@@ -3,11 +3,12 @@
 
 #include <QtGlobal>
 #if QT_VERSION >= 0x050000
-#include <QtWebKitVersion>
-#else
+#include <qwebkitglobal.h>
+#elif QT_VERSION >= 0x040600
 #include <qwebkitversion.h>
 #endif
 
+
 #define CMAKE_VERSION       "@CMAKE_VERSION@"
 #define CMAKE_SYSTEM        "@CMAKE_SYSTEM@"
 
@@ -18,7 +19,12 @@
 #define APP_AUTHORS         "@APP_AUTHOR@"
 #define APP_URL             "@APP_URL@"
 #define APP_VERSION         "@APP_VERSION@"
-#define APP_USERAGENT       QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@; Webkit/") + QTWEBKIT_VERSION_STR
+
+#if QT_VERSION >= 0x040600
+#define APP_USERAGENT       QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@; Webkit/") + qWebKitVersion()
+#else
+#define APP_USERAGENT       QString("@APP_NAME@/@APP_VERSION@ (@APP_URL@) on @CMAKE_SYSTEM@;")
+#endif
 
 #define APP_CFG_PATH        "data/config/config.ini"
 #define APP_CFG_GUI         "gui"
diff --git a/src/gui/basewebview.cpp b/src/gui/basewebview.cpp
index c60d6943f..811abb590 100644
--- a/src/gui/basewebview.cpp
+++ b/src/gui/basewebview.cpp
@@ -14,7 +14,7 @@
 BaseWebView::BaseWebView(QWidget *parent)
   : QWebView(parent), m_page(new BaseWebPage(this)) {
   setPage(m_page);
-  setContextMenuPolicy(Qt::NoContextMenu);
+  setContextMenuPolicy(Qt::CustomContextMenu);
   initializeActions();
   createConnections();
 }
@@ -142,8 +142,7 @@ void BaseWebView::popupContextMenu(const QPoint &pos) {
 }
 
 void BaseWebView::mousePressEvent(QMouseEvent *event) {
-  if ((event->button() & Qt::MiddleButton) ||
-      (event->button() & Qt::LeftButton && event->modifiers() & Qt::ControlModifier)) {
+  if (event->button() & Qt::LeftButton && event->modifiers() & Qt::ControlModifier) {
     QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(event->pos());
 
     // Check if user clicked with middle mouse button on some
@@ -161,50 +160,45 @@ void BaseWebView::mousePressEvent(QMouseEvent *event) {
       return;
     }
   }
-  else if (event->button() & Qt::RightButton) {
+  else if (event->button() & Qt::MiddleButton) {
     m_gestureOrigin = event->pos();
+    return;
   }
 
   QWebView::mousePressEvent(event);
 }
 
 void BaseWebView::mouseReleaseEvent(QMouseEvent *event) {
-  QWebView::mouseReleaseEvent(event);
-
-  if (event->button() & Qt::RightButton) {
+  if (event->button() & Qt::MiddleButton) {
     bool are_gestures_enabled = Settings::getInstance()->value(APP_CFG_BROWSER,
                                                                "gestures_enabled",
                                                                true).toBool();
     if (are_gestures_enabled) {
       QPoint release_point = event->pos();
       int left_move = m_gestureOrigin.x() - release_point.x();
-      int right_move = release_point.x() - m_gestureOrigin.x();
+      int right_move = -left_move;
       int top_move = m_gestureOrigin.y() - release_point.y();
-      int bottom_move = release_point.y() - m_gestureOrigin.y();
+      int bottom_move = -top_move;
       int total_max = qMax(qMax(qMax(left_move, right_move),
                                 qMax(top_move, bottom_move)),
                            40);
 
-      if (total_max == left_move && are_gestures_enabled) {
+      if (total_max == left_move) {
         back();
       }
-      else if (total_max == right_move && are_gestures_enabled) {
+      else if (total_max == right_move) {
         forward();
       }
-      else if (total_max == top_move && are_gestures_enabled) {
+      else if (total_max == top_move) {
         reload();
       }
-      else if (total_max == bottom_move && are_gestures_enabled) {
+      else if (total_max == bottom_move) {
         emit newTabRequested();
       }
-      else {
-        emit customContextMenuRequested(event->pos());
-      }
-    }
-    else {
-      emit customContextMenuRequested(event->pos());
     }
   }
+
+  QWebView::mouseReleaseEvent(event);
 }
 
 void BaseWebView::paintEvent(QPaintEvent *event) {
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 3131bf9d3..b986b9d81 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -337,7 +337,7 @@
            <item row="3" column="0" colspan="2">
             <widget class="QLabel" name="m_lblMouseGestures">
              <property name="text">
-              <string>Mouse gestures work with right mouse button. Possible gestures are:
+              <string>Mouse gestures work with middle mouse button. Possible gestures are:
 &lt;ul&gt;
 &lt;li&gt;previous web page (drag mouse left)&lt;/li&gt;
 &lt;li&gt;next web page (drag mouse right)&lt;/li&gt;