management of closing windows

[modules/filter.git] / src / FILTERGUI / SelectField.cxx

diff --git a/src/FILTERGUI/SelectField.cxx b/src/FILTERGUI/SelectField.cxx
index 7dfdb76377af319ca4c1fc5c7a04417cf805edbd..2e2e5b0769f32cf1652054125086e9b797969a68 100644 (file)
--- a/src/FILTERGUI/SelectField.cxx
+++ b/src/FILTERGUI/SelectField.cxx
@@ -30,7 +30,7 @@
 SelectField::SelectField(FilterGUI* theModule,const QString& file, 
                         const char* name,
                         bool modal, WFlags fl)
-  : QDialog(FILTER::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | Qt::WDestructiveClose),
+  : QDialog(FILTER::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
     myFilterGUI( theModule ),
     _file(file),
     _mesh(0),
@@ -123,20 +123,24 @@ SelectField::SelectField(FilterGUI* theModule,const QString& file,
   _buttonHelp = new QPushButton(_GroupButtons, "buttonHelp");
   _buttonHelp->setText(tr("FILTER_BUT_HELP" ));
   _buttonHelp->setAutoDefault(TRUE);
-  _GroupButtonsLayout->addWidget(_buttonHelp, 0, 1);
-  _buttonClose = new QPushButton(_GroupButtons, "buttonClose");
-  _buttonClose->setText(tr("FILTER_BUT_CLOSE" ));
-  _buttonClose->setAutoDefault(TRUE);
-  _GroupButtonsLayout->addWidget(_buttonClose, 0, 0);
+  _GroupButtonsLayout->addWidget(_buttonHelp, 0, 2);
+  _buttonCancel = new QPushButton(_GroupButtons, "buttonClose");
+  _buttonCancel->setText(tr("FILTER_BUT_CANCEL" ));
+  _buttonCancel->setAutoDefault(TRUE);
+  _GroupButtonsLayout->addWidget(_buttonCancel, 0, 1);
+  _buttonOk = new QPushButton(_GroupButtons, "buttonOk");
+  _buttonOk->setText(tr("FILTER_BUT_OK" ));
+  _buttonOk->setAutoDefault(TRUE);
+  _GroupButtonsLayout->addWidget(_buttonOk, 0, 0);
   _myGroupLayout->addWidget( _GroupButtons, row, 0 );
   row++;
 
   connect( _myList, SIGNAL(clicked(QListViewItem *)), this, SLOT(fieldSelected(QListViewItem *)));
   connect( _mySlider, SIGNAL(sliderReleased()), this, SLOT(tsSelected()));
-  connect(_buttonClose, SIGNAL(clicked()), this, SLOT(ClickOnClose()));
+  connect(_buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel()));
+  connect(_buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
   connect(_buttonHelp, SIGNAL(clicked()),   this, SLOT(ClickOnHelp()));
 
-  this->show(); /* displays Dialog */
 }
 
 SelectField::~SelectField()
@@ -178,7 +182,13 @@ void SelectField::tsSelected()
   MESSAGE("Time step " << _ts );
 }
 
-void SelectField::ClickOnClose()
+void SelectField::ClickOnOk()
+{
+  MESSAGE("click on Ok");
+  accept();
+}
+
+void SelectField::ClickOnCancel()
 {
   MESSAGE("click on Cancel");
   reject();