Merge pull request #4138 from nyalldawson/touch

Rework map touch tool

Author: m-kuhn

CMakeLists.txt

@@ -269,23 +269,6 @@ IF (WITH_QTMOBILITY)
     FIND_PACKAGE(QtMobility 1.1.0)
 ENDIF (WITH_QTMOBILITY)
 
-IF (ANDROID)
-  SET (DEFAULT_WITH_TOUCH TRUE)
-ELSE (ANDROID)
-  SET (DEFAULT_WITH_TOUCH FALSE)
-ENDIF (ANDROID)
-
-#Add a touch mode if Qt has Qt Gestures
-SET (WITH_TOUCH ${DEFAULT_WITH_TOUCH} CACHE BOOL "Determines if touch interface related code should be build")
-
-IF (WITH_TOUCH)
-  # following variable is used in qgsconfig.h
-  SET (HAVE_TOUCH TRUE)
-  MESSAGE (STATUS "Touch support enabled")
-ELSE (WITH_TOUCH)
-  MESSAGE (STATUS "Touch support disabled")
-ENDIF (WITH_TOUCH)
-
 # search for QScintilla2 (C++ lib)
 FIND_PACKAGE(QScintilla REQUIRED)
 

cmake_templates/qgsconfig.h.in

@@ -48,8 +48,6 @@
 
 #cmakedefine HAVE_ORACLE
 
-#cmakedefine HAVE_TOUCH
-
 #cmakedefine HAVE_OSGEARTHQT
 
 #cmakedefine SERVER_SKIP_ECW

doc/api_break.dox

@@ -269,6 +269,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsMapCanvasMap. It is an internal class used by map canvas.
 - QgsMapLayerRegistry. Its functionality has been moved to QgsProject.
 - QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
+- QgsMapToolTouch. The touch navigation functionality is now built into the standard QgsMapToolPan tool.
 - QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
 - QgsProjectBadLayerGuiHandler was removed. It was unused in QGIS code and barely useful. Implement your own QgsProjectBadLayerHandler subclass if needed.
@@ -360,6 +361,7 @@ QgisInterface        {#qgis_api_break_3_0_QgisInterface}
 
 - fileMenu() has been removed, use projectMenu() instead.
 - actionRemoveLayer was removed as it no longer exists.
+- actionTouch was removed, as the corresponding action no longer exists (see notes on QgsMapToolTouch)
 
 
 QgsAbstractGeometry        {#qgis_api_break_3_0_QgsAbstractGeometry}

ms-windows/cygwin/package.sh

@@ -28,7 +28,6 @@ cmake -D BUILDNAME="cygwin" \
         -D WITH_QSPATIALITE=TRUE \
         -D WITH_SERVER=TRUE \
         -D WITH_GLOBE=TRUE \
-        -D WITH_TOUCH=TRUE \
         -D WITH_ORACLE=FALSE \
 	-D CMAKE_LEGACY_CYGWIN_WIN32=0 \
 	-D PYUIC4_PROGRAM=/usr/lib/python2.7/site-packages/PyQt4/pyuic4 \

ms-windows/osgeo4w/package-nightly.cmd

@@ -167,7 +167,6 @@ cmake -G Ninja ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^
-	-D WITH_TOUCH=TRUE ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^

ms-windows/osgeo4w/package.cmd

@@ -160,7 +160,6 @@ cmake -G Ninja ^
 	-D WITH_GRASS7=TRUE ^
 	-D GRASS_PREFIX7=%GRASS72_PATH:\=/% ^
 	-D WITH_GLOBE=FALSE ^
-	-D WITH_TOUCH=TRUE ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
 	-D CMAKE_CXX_FLAGS_RELEASE="/MD /MP /O2 /Ob2 /D NDEBUG" ^

python/CMakeLists.txt

@@ -130,10 +130,6 @@ ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} ARM)
 ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
 
-IF(NOT WITH_TOUCH)
-  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_TOUCH)
-ENDIF(NOT WITH_TOUCH)
-
 IF(NOT QT_MOBILITY_LOCATION_FOUND)
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} MOBILITY_LOCATION)
 ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)

python/gui/gui.sip

@@ -117,7 +117,6 @@
 %Include qgsmaptoolidentify.sip
 %Include qgsmaptoolidentifyfeature.sip
 %Include qgsmaptoolpan.sip
-%Include qgsmaptooltouch.sip
 %Include qgsmaptoolzoom.sip
 %Include qgsmaplayerstylemanagerwidget.sip
 %Include qgsmessagebar.sip

python/gui/qgisinterface.sip

@@ -404,8 +404,6 @@ class QgisInterface : QObject
     // View menu actions
     //! Get access to the native pan action. Call trigger() on it to set the default pan map tool.
     virtual QAction *actionPan() = 0;
-    //! Get access to the native touch action.
-    virtual QAction *actionTouch() = 0;
     //! Get access to the native pan to selected action. Call trigger() on it to pan the map canvas to the selection.
     virtual QAction *actionPanToSelected() = 0;
     //! Get access to the native zoom in action. Call trigger() on it to set the default zoom in map tool.

python/gui/qgsmapcanvas.sip

@@ -1,5 +1,3 @@
-%Feature HAVE_TOUCH
-
 /** \ingroup gui
  * Map canvas is a class for displaying all GIS data types on a canvas.
  */
@@ -486,10 +484,9 @@ class QgsMapCanvas : QGraphicsView
     void messageEmitted( const QString& title, const QString& message, QgsMessageBar::MessageLevel = QgsMessageBar::INFO );
 
   protected:
-%If (HAVE_TOUCH)
+
     //! Overridden standard event to be gestures aware
     bool event( QEvent * e );
-%End
 
     //! Overridden key press event
     void keyPressEvent( QKeyEvent * e );