Move files to src/mapmap

Doxyfile

@@ -514,7 +514,7 @@ WARN_LOGFILE =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT = .
+INPUT = src/mapmap
 #../src
 
 # This tag can be used to specify the character encoding of the source files

INSTALL

@@ -10,6 +10,12 @@ Install the dependencies. (see below)
 
 Build it::
 
+  cd src/mapmap
+  qmake mapmap.pro
+  make
+
+Alternatively::
+
   ./build.sh
 
 Ubuntu 13.10, 14.04, 15.04 and 16.04 LTS
@@ -70,6 +76,7 @@ To edit translations
 --------------------
 You might need to update the files::
   
+  cd src/mapmap
   lupdate mapmap.pro 
 
 Then, do this::

build.sh

@@ -3,6 +3,9 @@
 # On Mac, install it from http://qt-project.org/downloads
 # set -o verbose
 
+cd $(dirname $0)
+cd src/mapmap
+
 qtversion=5.8
 
 do_create_dmg() {

run.sh

@@ -2,5 +2,11 @@
 #export GST_PLUGIN_PATH=/Library/Frameworks/GStreamer.framework/Libraries
 #export GST_DEBUG=2
 export LANG=C
-./mapmap.app/Contents/MacOS/mapmap
+
+if [[ `uname` == 'Linux' ]]; then
+  ./src/mapmap/mapmap
+else #macOS
+  ./src/mapmap/mapmap.app/Contents/MacOS/mapmap
+fi
+
 

scripts/update-changelog.sh

@@ -1,4 +1,6 @@
 #!/bin/sh
+cd $(dirname $0)
+cd src/mapmap
 set -o verbose
 # Convert markdown file to html
 markdown NEWS > docs/informations/CHANGELOG.html

sh_clean.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
+cd $(dirname $0)
+cd src/mapmap
 make clean 
 rm -rf MapMap.app mapmap.pro.user

sh_release.sh

@@ -3,6 +3,8 @@
 # On Mac, install it from http://qt-project.org/downloads
 
 unamestr=$(uname)
+cd $(dirname $0)
+cd src/mapmap
 
 if [[ $unamestr == "Darwin" ]]; then
     MAKE_CFLAGS_X86_64+="-Xarch_x86_64 -mmacosx-version-min=10.7"

sh_show_libs.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 unamestr=$(uname)
+cd $(dirname $0)
+cd src/mapmap
 
 if [[ $unamestr == "Darwin" ]]; then
     otool -L mapmap.app/Contents/MacOS/mapmap

src/MapMapProject.pro

@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+
+SUBDIRS = mapmap tests
+
+# Adds the tarball target
+tarball.target = mapmap-$${VERSION}.tar.gz
+tarball.commands = git archive --format=tar.gz -9 --prefix=mapmap-$${VERSION}/ --output=mapmap-$${VERSION}.tar.gz HEAD
+tarball.depends = .git
+QMAKE_EXTRA_TARGETS += tarball

src/mapmap/MapperGLCanvas.cpp

@@ -612,10 +612,11 @@ void MapperGLCanvas::wheelEvent(QWheelEvent *event)
     // Accept wheel scrolling event.
     event->accept();
   } else { // control is not pressed: scroll
+     QScrollBar* scrollbar;
      if (shift_is_pressed) { // shift is pressed: pans horizontally
-       QScrollBar* const scrollbar = this->horizontalScrollBar();
+       scrollbar = this->horizontalScrollBar();
      } else { // shift is not pressed: scrolls vertically
-       QScrollBar* const scrollbar = this->verticalScrollBar();
+       scrollbar = this->verticalScrollBar();
      }
      // FIXME: scrolling with the mouse doesn't currently work
      int scroll = scrollbar->value();