Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ZLevelsDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ZLevelsDlg.cxx b/src/HYDROGUI/HYDROGUI_ZLevelsDlg.cxx
index 1833abf1efa49a47aa61ef0343e5ee0a18734177..2fc1bf240f612ed8edc5d9669d38c3b2441c4e69 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ZLevelsDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ZLevelsDlg.cxx
@@ -59,13 +59,15 @@ HYDROGUI_ZLevelsDlg::HYDROGUI_ZLevelsDlg( QWidget* theParent, HYDROGUI_Module* t
   myAllObjects = new QCheckBox( tr( "ALL_OBJECTS" ) );
 
   // Apply and close buttons
+  myApplyAndClose = new QPushButton( tr("APPLY_AND_CLOSE") );
+  myApplyAndClose->setDefault( true );
   myApply = new QPushButton( tr("APPLY") );
-  myApply->setDefault( true );
   myClose = new QPushButton( tr("CLOSE") );
   
   // Layout
   // apply and close buttons
   QHBoxLayout* aDlgButtonsLayout = new QHBoxLayout(); 
+  aDlgButtonsLayout->addWidget( myApplyAndClose );
   aDlgButtonsLayout->addWidget( myApply );
   aDlgButtonsLayout->addWidget( myClose );
   aDlgButtonsLayout->addStretch();
@@ -77,6 +79,7 @@ HYDROGUI_ZLevelsDlg::HYDROGUI_ZLevelsDlg( QWidget* theParent, HYDROGUI_Module* t
   // Connections
   connect( myAllObjects, SIGNAL( stateChanged( int ) ), this, SLOT( onStateChanged() ) );
 
+  connect( myApplyAndClose, SIGNAL( clicked() ), this, SIGNAL( applyOrderAndClose() ) );
   connect( myApply, SIGNAL( clicked() ), this, SIGNAL( applyOrder() ) );
   connect( myClose, SIGNAL( clicked() ), this, SLOT( reject() ) );