PAL9628 - incorrect work of button "Save"

diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 992b6be7395bc14f38ff3f0831a65bdf39c81540..fffee22abcc1246cf5e97ebd08c4e7b291f8b526 100755 (executable)
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_FileDlg.cxx
@@ -76,9 +76,19 @@ SUIT_FileDlg::SUIT_FileDlg( QWidget* parent, bool open, bool showQuickDir, bool
 QFileDialog( parent, 0, modal ),
 myValidator( 0 ),
 myQuickCombo( 0 ), myQuickButton( 0 ), myQuickLab( 0 ),
-myOpen( open ),
-myAccepted( false )
+myOpen( open )//,
+//myAccepted( false )
 {    
+  const QObjectList* child = children();
+  QObjectList::const_iterator anIt = child->begin(), aLast = child->end();
+  for( ; anIt!=aLast; anIt++ )
+    if( (*anIt)->inherits( "QPushButton" ) )
+    {
+      QPushButton* bt = ( QPushButton* )( *anIt );
+      bt->setDefault( false );
+      bt->setAutoDefault( false );
+    }
+
   if ( parent->icon() )
     setIcon( *parent->icon() );       
   setSizeGripEnabled( true );
@@ -207,7 +217,7 @@ void SUIT_FileDlg::accept()
    * in file name editor while file name is not acceptable by acceptData()
    * (e.g. permission denied)
    */
-  if ( !myAccepted ) {
+//  if ( !myAccepted ) {
     if ( mode() != ExistingFiles ) {
       mySelectedFile = QFileDialog::selectedFile();
       addExtension();
@@ -216,10 +226,10 @@ void SUIT_FileDlg::accept()
     if ( acceptData() ) {
       myLastVisitedPath = dirPath();
       QFileDialog::accept();        
-      myAccepted = true;
+//      myAccepted = true;
     }
-  }
-  myAccepted = !myAccepted;
+//  }
+//  myAccepted = !myAccepted;
 }
 
 /*! Closes this dialog and sets the return code to 'Rejected' */

diff --git a/src/SUIT/SUIT_FileDlg.h b/src/SUIT/SUIT_FileDlg.h
index 7bf1cc663a78804b52e5fc01405a5adf46932180..bcbd24d60d97c60e47699ed8a3e5614c4bc2a13a 100755 (executable)
--- a/src/SUIT/SUIT_FileDlg.h
+++ b/src/SUIT/SUIT_FileDlg.h
@@ -64,7 +64,10 @@ protected:
    * in file name editor while file name is not acceptable by acceptData()
    * (e.g. permission denied)
    */
-  bool                myAccepted;
+//  bool                myAccepted;
+  /*! ASL: this bug can be fixed with help of call setDefault( false ) 
+   *       and setAutoDefault( false ) methods for all QPushButtons of this dialog
+   */
 
   static QString      myLastVisitedPath;  //!< last visited path
 };