Merge branch 'release-0.6.6' into release

Author: dg0yt

CMakeLists.txt

@@ -39,7 +39,7 @@ set(Mapper_VERSION_MAJOR 0)
 set(Mapper_VERSION_MINOR 6)
 if(NOT Mapper_VERSION_PATCH)
 	# This can be configured when running cmake
-	set(Mapper_VERSION_PATCH 5)
+	set(Mapper_VERSION_PATCH 6)
 endif()
 
 set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")
@@ -55,6 +55,16 @@ if(NOT "${output_md5}" STREQUAL "${file_md5}")
 	file(WRITE "${MAPPER_VERSION_PRI}" "${output}")
 endif()
 
+set(android_manifest "${PROJECT_SOURCE_DIR}/android/AndroidManifest.xml")
+file(READ "${android_manifest}" current)
+if(NOT current MATCHES " android:versionName=.${Mapper_VERSION_MAJOR}\\.${Mapper_VERSION_MINOR}\\.${Mapper_VERSION_PATCH}. ")
+	set(android_version_name "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
+	math(EXPR android_version_int "${Mapper_VERSION_MAJOR} * 10000 + ${Mapper_VERSION_MINOR} * 100 + ${Mapper_VERSION_PATCH}")
+	string(REGEX REPLACE "( android:versionName=.)[0-9]*\\.[0-9]*\\.[0-9]*(. )" "\\1${android_version_name}\\2" output "${current}")
+	string(REGEX REPLACE "( android:versionCode=.)[0-9]*(. )" "\\1${android_version_int}\\2" output "${output}")
+	file(WRITE "${android_manifest}" "${output}")
+endif()
+
 if(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 	message(AUTHOR_WARNING "In-source builds are discouraged for development.")
 endif()

INSTALL.md

@@ -50,7 +50,7 @@ You can change the cmake option `Mapper_BUILD_PROJ` to adjust this.
 
 ## Getting the Source
 
-Download a tarball from
+Download a zip or tar.gz Source code archive from
 
 https://github.com/OpenOrienteering/mapper/releases
 
@@ -216,10 +216,3 @@ to change this. As already stated, this is untested, and you might need to look
 additional tweaks.
 
 
-## Making a source package
-
-Start from a clean git working directory. Run
-
-```
-make Mapper_Source
-```

README.md

@@ -12,17 +12,13 @@ OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
  - [OpenOrienteering Blog](http://www.openorienteering.org/)
 
 
-## Contributing
-
-### Writing Code
+## Reporting Issues and Asking for Help
 
-For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrienteering/mapper/blob/master/INSTALL.md).
-Pull requests are very welcome.
+Issues and possible improvements can be posted to our public [Ticket system](https://github.com/OpenOrienteering/mapper/issues).
+Please make sure you provide all relevant information about your problem or idea.
 
- - [Issue tracker](https://github.com/OpenOrienteering/mapper/issues)
- - [API documentation](http://www.openorienteering.org/api-docs/mapper/)
- - [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
 
+## Contributing
 
 ### Translating
 
@@ -35,10 +31,14 @@ The Mapper manual lives in its [own repository](https://github.com/OpenOrienteer
 which contains all information for you to get started.
 
 
-### Reporting Issues
+### Writing Code
 
-Issues and possible improvements can be posted to our public [Ticket system](https://github.com/OpenOrienteering/mapper/issues).
-Please make sure you provide all relevant information about your problem or idea.
+For building Mapper from source see [`INSTALL.md`](https://github.com/OpenOrienteering/mapper/blob/master/INSTALL.md).
+Pull requests are very welcome.
+
+ - [Issue tracker](https://github.com/OpenOrienteering/mapper/issues)
+ - [API documentation](http://www.openorienteering.org/api-docs/mapper/)
+ - [Developer wiki](https://github.com/OpenOrienteering/mapper/wiki)
 
 
 ## License

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.5" android:versionCode="5" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.6" android:versionCode="606" package="org.openorienteering.mapper" android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

doc/manual/pages/android-app.md

@@ -89,3 +89,8 @@ Sets a point object at the GPS position. Selecting this button first enters an a
 (16) Symbol selector
 
 Displays the active symbol, and opens the symbol selection screen when touched.
+
+(17) Map parts selector
+
+This button opens a popup for changing the active map part.
+

doc/manual/pages/images/Android_UI_explanation.png

@@ -22,6 +22,10 @@ CONFIG  -= debug_and_release
 !equals(OUT_PWD, $$PWD) {
     # Copy examples to shadow build dir.
     examples.target   = examples.stamp
+    examples.depends  =
+      "$$PWD/complete map.omap"
+      "$$PWD/forest sample.omap"
+      "$$PWD/overprinting.omap"
     examples.commands = \
       $(COPY_FILE) \"$$PWD\"/*.omap \"$$OUT_PWD/\" && \
       echo > $$examples.target