Changed default 'z-Tree' installation path

README.md

@@ -4,7 +4,7 @@
 
 The easiest way to build and install _Labcontrol_ is to open the `labcontrol.pro` file with _Qt Creator_ and build the project. Afterwards _Labcontrol_ can be started by running the created executable file. To build correctly _Qt5_ has to be available and must be know to _Qt Creator_.
 
-To work properly _Labcontrol_ requires a file named `labcontrol.conf` in `/etc/xdg/Economic\ Laboratory`. This directory must be created, the existing dummy file be copied there and afterwards be modified according to the laboratory's needs. All _z-Tree_ executables should reside in sub-directories of `/opt` following the naming scheme `zTree_X.Y.ZZ`.
+To work properly _Labcontrol_ requires a file named `labcontrol.conf` in `/etc/xdg/Economic\ Laboratory`. This directory must be created, the existing dummy file be copied there and afterwards be modified according to the laboratory's needs. All _z-Tree_ executables should reside in sub-directories of `/opt/z-Leaves` following the naming scheme `zTree_X.Y.ZZ`.
 
 Receipt creation requires at least one receipt template in `/usr/share/labcontrol`. The name of the header file should match the pattern `NAMETHEHEADERSHALLHAVE_header.tex` to be recognized.
 

data/Labcontrol.conf

@@ -53,4 +53,4 @@ webcams="webcam_left|webcam_right"
 wmctrl_command=/usr/bin/wmctrl
 xset_command=/usr/bin/xset
 # The folder were all zTree versions are installed (in subfolders matching the scheme zTree_X.Y.Z)
-ztree_installation_directory=/opt
+ztree_installation_directory=/opt/z-Leaves

data/scripts/start_zLeaf_labcontrol2.sh

@@ -2,14 +2,14 @@
 
 # Start a zLeaf with the given arguments
 if [ $# == 2 ]; then
-	DISPLAY=:0.0 /usr/bin/wine /opt/zTree_$1/zleaf.exe /server $2 &
+	DISPLAY=:0.0 /usr/bin/wine /opt/z-Leaves/zTree_$1/zleaf.exe /server $2 &
 	exit
 fi
 if [ $# == 3 ]; then
-	DISPLAY=:0.0 /usr/bin/wine /opt/zTree_$1/zleaf.exe /server $2 /channel $3 &
+	DISPLAY=:0.0 /usr/bin/wine /opt/z-Leaves/zTree_$1/zleaf.exe /server $2 /channel $3 &
 	exit
 fi
 if [ $# == 4 ]; then
-	DISPLAY=:0.0 /usr/bin/wine /opt/zTree_$1/zleaf.exe /server $2 /channel $3 /name $4 &
+	DISPLAY=:0.0 /usr/bin/wine /opt/z-Leaves/zTree_$1/zleaf.exe /server $2 /channel $3 /name $4 &
 	exit
 fi