Update copyrights

[modules/jobmanager.git] / src / genericgui / JM_EditSalomeResource.cxx

diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx
index 517fe44cf9d9bcd3710327b3acf57f55ad66a90d..3753ab458bb21203bc5449e6e974a4122a161f50 100644 (file)
--- a/src/genericgui/JM_EditSalomeResource.cxx
+++ b/src/genericgui/JM_EditSalomeResource.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,20 @@
 #include "JM_EditSalomeResource.hxx"
 #include "BL_Traces.hxx"
 
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QInputDialog>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QVBoxLayout>
+
 using namespace std;
 
 JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices * salome_services,
@@ -52,6 +66,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _protocol_line->addItem("ssh");
   _protocol_line->addItem("rsh");
   _protocol_line->addItem("sh");
+  _protocol_line->addItem("rsync");
   _protocol_line->setCurrentIndex(0);
 
   QLabel * componentList_label = new QLabel("Component List:");
@@ -137,11 +152,11 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _batch_line->addItem("LSF", "lsf");
   _batch_line->addItem("SGE", "sge");
   _batch_line->addItem("SLURM", "slurm");
-  _batch_line->addItem("VISHNU", "vishnu");
   _batch_line->addItem("CooRM (limited support)", "coorm");
   _batch_line->addItem("LoadLeveler (limited support)", "ll");
   _batch_line->addItem("OAR (limited support)", "oar");
   _batch_line->addItem("PBS (limited support)", "pbs");
+  _batch_line->addItem("VISHNU (limited support)", "vishnu");
   _batch_line->setCurrentIndex(0);
 
   QLabel * mpiImpl_label = new QLabel("MPI impl:");
@@ -226,6 +241,8 @@ JM::EditSalomeResource::get_infos()
     _protocol_line->setCurrentIndex(1);
   else if(protocol == "sh")
     _protocol_line->setCurrentIndex(2);
+  else if(protocol == "rsync")
+    _protocol_line->setCurrentIndex(3);
   else
     _protocol_line->setCurrentIndex(-1);
 
@@ -331,12 +348,12 @@ JM::EditSalomeResource::accept()
   BL::ResourceDescr resource;
 
   // Text
-  resource.name = _name_line->text().trimmed().toStdString();
+  resource.name = _name_line->text().trimmed().toUtf8().constData();
   resource.hostname = _hostname_line->text().trimmed().toStdString();
   resource.username = _username_line->text().trimmed().toStdString();
-  resource.applipath = _applipath_line->text().trimmed().toStdString();
+  resource.applipath = _applipath_line->text().trimmed().toUtf8().constData();
   resource.OS = _os_line->text().trimmed().toStdString();
-  resource.working_directory = _working_directory->text().trimmed().toStdString();
+  resource.working_directory = _working_directory->text().trimmed().toUtf8().constData();
   resource.can_launch_batch_jobs = (_can_launch_batch_jobs->checkState() == Qt::Checked);
   resource.can_run_containers = (_can_run_containers->checkState() == Qt::Checked);