Minor fixes to ResourceWidget

Add a scrollbar.
Modify some default values.

diff --git a/src/ydfx_gui/ResourceWidget.cxx b/src/ydfx_gui/ResourceWidget.cxx
index ecb36745d5e036ef762954955b0e18a260db628e..056fbd726bc946083b9abb9ad1b27f33d9146dc1 100644 (file)
--- a/src/ydfx_gui/ResourceWidget.cxx
+++ b/src/ydfx_gui/ResourceWidget.cxx
@@ -1,13 +1,14 @@
 #include "ResourceWidget.hxx"
 
 ResourceWidget::ResourceWidget(AbstractResourceModel* model, QWidget* parent)
-: QWidget(parent),
+: QScrollArea(parent),
   _model(model),
   _clusterBox(0),
   _localdirEdit(0)
 {
+  QWidget* mainWidget = new QWidget();
   QVBoxLayout *mainLayout = new QVBoxLayout();
-  setLayout(mainLayout);
+  mainWidget->setLayout(mainLayout);
   QGroupBox *resourcesBox = new QGroupBox();
   resourcesBox->setTitle(tr("Launching parameters"));
   mainLayout->addWidget(resourcesBox);
@@ -41,6 +42,9 @@ ResourceWidget::ResourceWidget(AbstractResourceModel* model, QWidget* parent)
 
   _clusterBox->setVisible(!model->isMachineInteractive(
                                                     model->getWantedMachine()));
+  mainLayout->addStretch();
+  setWidget(mainWidget);
+  setWidgetResizable (true);
 }
 
 ResourceWidget::~ResourceWidget()
@@ -128,6 +132,11 @@ QWidget * ResourceWidget::createClusterWidgets()
   inputFilesBox->setLayout(inputFilesLayout);
   _inputFilesList = new QListWidget;
   _inputFilesList->setSelectionMode(QAbstractItemView::MultiSelection);
+  std::list<std::string>::const_iterator it;
+  for(it=_model->getInFiles().begin(); it!= _model->getInFiles().end(); it++)
+  {
+    _inputFilesList->addItem(it->c_str());
+  }
   QVBoxLayout *inputButtonsLayout = new QVBoxLayout;
   QPushButton *addInputFilesButton = new QPushButton(tr("+"));
   _removeInputFilesButton = new QPushButton(tr("-"));

diff --git a/src/ydfx_gui/ResourceWidget.hxx b/src/ydfx_gui/ResourceWidget.hxx
index 8c7124979aed6680cee0d76b7a6397f9324e934e..fb85670e91ccee4f3ce58641d5a5b3d1facf3dd6 100644 (file)
--- a/src/ydfx_gui/ResourceWidget.hxx
+++ b/src/ydfx_gui/ResourceWidget.hxx
@@ -4,7 +4,7 @@
 #include <QtWidgets>
 #include "AbstractResourceModel.hxx"
 
-class YDFXWIDGETS_EXPORT ResourceWidget: public QWidget
+class YDFXWIDGETS_EXPORT ResourceWidget: public QScrollArea
 {
   Q_OBJECT
   public:

diff --git a/src/ydfx_gui/SalomeResourceModel.cxx b/src/ydfx_gui/SalomeResourceModel.cxx
index 12d89eab924d81de9559cb52b69a30803de2c0f9..dc2bcdbb5746c9b2d630c43d870d9df7a5f57a3d 100644 (file)
--- a/src/ydfx_gui/SalomeResourceModel.cxx
+++ b/src/ydfx_gui/SalomeResourceModel.cxx
@@ -9,8 +9,8 @@ SalomeResourceModel::SalomeResourceModel()
   _wantedMachine("localhost"),
   _nbProcs(1),
   _hours(0),
-  _minutes(0),
-  _wcKey(""),
+  _minutes(5),
+  _wcKey("P11U50:CARBONES"),
   _localDirectory("/tmp"),
   _remoteDirectory("/tmp"),
   _parallelizeStatus(true),