Merge from V6_main

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index f8e439b62ac76690298a088836abff53d6e686b1..b042c4fa8f6a85c5b2d30bcc37043cea2eef4c57 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -50,6 +50,8 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _protocol_line->addItem("ssh");
   _protocol_line->addItem("rsh");
   _protocol_line->addItem("srun");
+  _protocol_line->addItem("pbsdsh");
+  _protocol_line->addItem("blaunch");
   _protocol_line->setCurrentIndex(-1);
 
   QLabel * componentList_label = new QLabel("Component List:");
@@ -114,6 +116,8 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _iprotocol_line->addItem("ssh");
   _iprotocol_line->addItem("rsh");
   _iprotocol_line->addItem("srun");
+  _iprotocol_line->addItem("pbsdsh");
+  _iprotocol_line->addItem("blaunch");
   _iprotocol_line->setCurrentIndex(-1);
 
   QLabel * batch_label = new QLabel("Batch:");
@@ -199,6 +203,10 @@ JM::EditSalomeResource::get_infos()
     _protocol_line->setCurrentIndex(1);
   else if(protocol == "srun")
     _protocol_line->setCurrentIndex(2);
+  else if(protocol == "pbsdsh")
+    _protocol_line->setCurrentIndex(3);
+  else if(protocol == "blaunch")
+    _protocol_line->setCurrentIndex(4);
   else
     _protocol_line->setCurrentIndex(-1);
 
@@ -209,6 +217,10 @@ JM::EditSalomeResource::get_infos()
     _iprotocol_line->setCurrentIndex(1);
   else if (iprotocol == "srun")
     _iprotocol_line->setCurrentIndex(2);
+  else if (iprotocol == "pbsdsh")
+    _iprotocol_line->setCurrentIndex(3);
+  else if (iprotocol == "blaunch")
+    _iprotocol_line->setCurrentIndex(4);
   else
     _iprotocol_line->setCurrentIndex(-1);