Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	lib64/nomadgui-gtk.linux.x86_64.jar

NomadVM.sh

@@ -73,9 +73,27 @@ echo "Finished at $FINISHED_DATE" >> $FILE
 rm -f $TEMP_FILE
 rm -f $TEMP_FILE2
 
-if [ $STATUS -ne 0 ];
+if [ $STATUS -eq 254 ];
 then
-	# Call the nomadmail application to send the mail of crash by the Nomad server.
-	/usr/lib/jvm/jdk10.0.1/bin/java -DvirtualHome=/tmp/nomad/nomadgui-release -Djava.library.path=lib64/common/calculator:/usr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu/jni -Djava.util.logging.config.file=conf/client/logging.properties -jar lib64/nomadmail.jar "$FILE"
+	echo "In case of crash, could you please described what you are doing before it:" > $TEMP_FILE
+	echo "" >> $TEMP_FILE
+	CRASHMESSAGE=`zenity --text-info  --filename=$TEMP_FILE --editable --ok-label="Send" --title="Nomad Crash Report"`
+	if [ -n "$CRASHMESSAGE" ];
+	then
+		echo $CRASHMESSAGE > $TEMP_FILE2
+		/usr/lib/jvm/jdk10.0.1/bin/java -DvirtualHome=/tmp/nomad/nomadgui-release -Djava.library.path=lib64/common/calculator:/usr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu/jni -Djava.util.logging.config.file=conf/client/logging.properties -jar lib64/nomadmail.jar "$TEMP_FILE2"
+		rm -f $TEMP_FILE2
+	fi
+	rm -f $TEMP_FILE
+
+else
+
+	if [ $STATUS -ne 0 ];
+	then
+		# Call the nomadmail application to send the mail of crash by the Nomad server.
+		/usr/lib/jvm/jdk10.0.1/bin/java -DvirtualHome=/tmp/nomad/nomadgui-release -Djava.library.path=lib64/common/calculator:/usr/lib:/usr/lib:/usr/lib/x86_64-linux-gnu/jni -Djava.util.logging.config.file=conf/client/logging.properties -jar lib64/nomadmail.jar "$FILE"
+	
+	fi
 
 fi
+	
\ No newline at end of file

conf/client/clientMessages.properties

@@ -328,9 +328,12 @@ closeChatMessage=Close chat
 openChatMessage=Open chat
 chatSendMessageLabel=Send a message
 chatShellTitle=Online chat
+usersShellTitle=Connected users
 incomingChatMessage=You have a new message!
 authorizedRemoteControlToolTip=Forbid remote control to Nomad
 forbiddenRemoteControlToolTip=Allow remote control to Nomad
+usersImageToolTip=See connected users
+
 
 serverEndedOnErrorMessage=An error occurred, the server is no longer running.\nThe client is going to be shutdown.  
 serverEndedOnKilledMessage=Nomad server has been killed.\nThe client is going to be shutdown.
@@ -354,3 +357,8 @@ logAsAdminMessage=Log as administrator
 cannotEnableRACIfAdminLoggedInMessage=Cannot authorize remote access while administrator is logged in!
 enableRemoteAccessMessage=Enable remote access
 widgetIsDisableForRemoteClientMessage=File Chooser is not available on remote client yet!\nPlease type the file name in the text box. 
+
+usersControllerMissingMessage=Functionnality not yet configured on this instrument.\nContact SCI
+nomadlogsNotAvailableOnVisaMessage=Nomadlogs is not available yet on Visa instances.\nUse your web browser to see logs.
+commandBoxGoToSettingsTooltip=Go to settings plugin for
+attachFileMessage=Attach a file
\ No newline at end of file

conf/client/commandLine.txt

@@ -72,6 +72,7 @@ coll5,5,command
 rafin,5,command
 kco,3,command
 magfin,4,command
+inibpb,4,command
 for,3,keyword
 endfor,6,keyword
 break,5,keyword

conf/client/config.properties

@@ -95,6 +95,6 @@ serverTestMode=false
 
 fcuFilesDirectory=Fcu
 
-instrumentsAllowingPALFiles=gamma34,gamma24,gamma26,in12,thales,in20,in3,gamma23,in22nomad
+instrumentsAllowingPALFiles=gamma34,gamma24,gamma26,in12,thales,in20,in3,gamma23,in22
 
 

settings.properties

 nomadGUIHome=/tmp/nomad/nomadgui-release
-nomadSenddata=0
+nomadSenddata=1
 clientType=remote
 nomadServerEndpoint=tcp://testscigpfsinst.ill.fr:7000
 mockMode=false