X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fgenericgui%2FJM_EditSalomeResource.cxx;h=f0261499101698c100b07d12c442dcf37e8535c2;hb=1775e8747c6902e3e884a52e28bdba895a120e83;hp=8d408378f79bb7803c411f7f8c35b5940fd964ef;hpb=a5701ef4de4cfddb9ea5f538d816cb2e20107c18;p=modules%2Fjobmanager.git diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx index 8d40837..f026149 100644 --- a/src/genericgui/JM_EditSalomeResource.cxx +++ b/src/genericgui/JM_EditSalomeResource.cxx @@ -131,7 +131,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices * QLabel * batch_label = new QLabel("Batch Manager:"); _batch_line = new QComboBox(this); - _batch_line->addItem("None", "ssh_batch"); + _batch_line->addItem("None", "none"); _batch_line->addItem("CCC", "ccc"); _batch_line->addItem("LSF", "lsf"); _batch_line->addItem("SGE", "sge"); @@ -330,19 +330,19 @@ JM::EditSalomeResource::accept() BL::ResourceDescr resource; // Text - resource.name = _name_line->text().toStdString(); - resource.hostname = _hostname_line->text().toStdString(); - resource.username = _username_line->text().toStdString(); - resource.applipath = _applipath_line->text().toStdString(); - resource.OS = _os_line->text().toStdString(); - resource.working_directory = _working_directory->text().toStdString(); + resource.name = _name_line->text().trimmed().toStdString(); + resource.hostname = _hostname_line->text().trimmed().toStdString(); + resource.username = _username_line->text().trimmed().toStdString(); + resource.applipath = _applipath_line->text().trimmed().toStdString(); + resource.OS = _os_line->text().trimmed().toStdString(); + resource.working_directory = _working_directory->text().trimmed().toStdString(); resource.can_launch_batch_jobs = (_can_launch_batch_jobs->checkState() == Qt::Checked); resource.can_run_containers = (_can_run_containers->checkState() == Qt::Checked); // Components int count = _componentList->count(); for (int i = 0; i < count; i++) - resource.componentList.push_back(_componentList->item(i)->text().toStdString()); + resource.componentList.push_back(_componentList->item(i)->text().trimmed().toStdString()); // ComboBox resource.protocol = _protocol_line->currentText().toStdString();