Merge from BR_VISHNU

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index 19b29bb9b44982f2212d3130c17e49e28acf508d..93f26ad7494d8e2f62bbf6c595931b538efcd7a8 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -141,6 +141,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _batch_line->addItem("ccc");
   _batch_line->addItem("slurm");
   _batch_line->addItem("ll");
+  _batch_line->addItem("vishnu");
   _batch_line->setCurrentIndex(-1);
 
   QLabel * mpiImpl_label = new QLabel("MPI impl:");
@@ -252,6 +253,8 @@ JM::EditSalomeResource::get_infos()
     _batch_line->setCurrentIndex(5);
   else if (batch == "ll")
     _batch_line->setCurrentIndex(6);
+  else if (batch == "vishnu")
+    _batch_line->setCurrentIndex(7);
   else
     _batch_line->setCurrentIndex(-1);