Merge branch 'master' into master

.travis.yml

@@ -16,7 +16,7 @@ notifications:
     on_start: false     # default: false
 
 before_install:
-  - mkdir -p $HOME/texlive && curl -L https://github.com/urdh/texlive-blob/releases/download/20181009/texlive.tar.xz | tar -JxC $HOME/texlive
+  - mkdir -p $HOME/texlive && curl -L https://github.com/urdh/texlive-blob/releases/download/20190725/texlive.tar.xz | tar -JxC $HOME/texlive
 
 install:
 # Sphinx requirements

en/project-management/vector-layers.rst

@@ -98,6 +98,28 @@ The field widgets from QGIS are supported on a best effort basis.
 | Others            | :nay:`✘`        | :ref:`make_it_grow`                             |
 +-------------------+-----------------+-------------------------------------------------+
 
+External Resource (photo settings)
+.................................
+
+The widget type "Attachement" is used to store the path to collected photos.
+
+.. container:: clearer text-center
+
+  .. figure:: /images/attachement-setting.png
+     :width: 600px
+     :alt: Attachement field settings
+
+The path should be set to relative. Means the pictures are stored then in a sub-directory of the project, where the link stored in the textfield is pointing to.
+
+In QField the picture is displayed. By clicking the camera symbol the camera is started to update the picture with a new photo.
+
+.. container:: clearer text-center
+
+  .. figure:: /images/qfield_picture.png
+     :width: 600px
+     :alt: Picture in QField
+
+On synchronization the sub-directory with the pictures has to be copied as well.
 
 Drag and drop designer forms
 ----------------------------

en/user-guide/index.rst

@@ -16,7 +16,7 @@ Select the project you want to open by navigating to it, or use the **Recent pro
 
 
 Map legend
-=================
+==========
 Open the **Main menu** and expend the layers list to display the legend of the map.
 
 .. image:: ../images/user-guide_legend.png
@@ -49,7 +49,7 @@ You can manage this layerlist in QGIS desktop in :menuselection:`Project --> Pro
 
 
 Searching
-=================
+=========
 Tap on the **Search button** on the top-right corner to search in the layers. 
 
 1. Tap on the **name** in the result to pan the map on the feature (the feature will be highlighted in yellow).
@@ -91,8 +91,8 @@ To use this you have to `enable mock locations on your Android device
 <https://www.youtube.com/watch?v=v1eRHmMiRJQ>`_.
 
 
-Digitalizing
-========
+Digitizing
+==========
 
 To start digitizing new features, enable the **Edit mode** in the main menu (*pencil button*) and select the layer on which you want to add a new feature (the layer will be highlighted in grey).
 
@@ -127,13 +127,14 @@ When you have added a least 2 nodes for a line or 3 nodes for a polygon, a **Sav
 Attribute form
 --------------
 
-After digitalizing a geometry, the attribute form will be displayed and the user will be asked to enter the attributes for the new feature.
-
-The checkboxes at the right of every attribute allow for remembering each attribute individually. The next time you will add a feature on the same layer, these attributes will be already pre-filled.
+After digitizing a geometry, the attribute form will be displayed if it is not suppressed
+and the user will be asked to enter the attributes for the new feature.
+The form which appears allows entering attribute values for the new feature. The checkboxes
+at the right of every attribute allow for remembering each attribute individually.
+The next time you will add a feature on the same layer, these attributes will be already pre-filled.
 
 .. image:: ../images/user-guide_digit4.png
 
-
 Delete Features
 ===============
 
@@ -142,6 +143,6 @@ Deleting features is only possible in digitize mode.
 To delete a feature, identify it first and tap the trash icon.
 
 Edit the geometry of an existing feature
-========
+========================================
 
 To complete.