IPAL 0052196: TC7.3.0:runSalome --logger --modules=COMPONENT,CALCULATOR throw trace...

[modules/gui.git] / src / LightApp / LightApp_PreferencesDlg.cxx

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index 748d42b54bbf60b000aa6ca35d5fcdb7f3feedaa..2c2458f70d0a83b5141ee861b47fb234f88102f2 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:      LightApp_PreferencesDlg.cxx
 // Author:    Sergey TELKOV
 //
@@ -28,6 +29,7 @@
 #include "QtxResourceMgr.h"
 
 #include <SUIT_MessageBox.h>
+#include <SUIT_FileDlg.h>
 
 #include <QAbstractButton>
 #include <QVBoxLayout>
@@ -64,6 +66,8 @@ myPrefs( prefs ), mySaved ( false )
   QAbstractButton* impBtn = userButton( insertButton( tr( "IMPORT_BTN_TEXT" ) ) );
   if( impBtn )
     connect( impBtn, SIGNAL( clicked() ), this, SLOT( onImportPref() ) );
+
+  setMinimumSize( 800, 600 );
 }
 
 /*!
@@ -132,16 +136,16 @@ void LightApp_PreferencesDlg::onApply()
 void LightApp_PreferencesDlg::onDefault()
 {
   if( SUIT_MessageBox::Ok == SUIT_MessageBox::question( this, tr( "WARNING" ), tr( "DEFAULT_QUESTION" ),
-                                                       SUIT_MessageBox::Ok | SUIT_MessageBox::Cancel,
-                                                       SUIT_MessageBox::Ok ) )
+                                                        SUIT_MessageBox::Ok | SUIT_MessageBox::Cancel,
+                                                        SUIT_MessageBox::Ok ) )
     {
       if ( myPrefs && myPrefs->resourceMgr() )
-       {
+        {
           QtxResourceMgr::WorkingMode prev = myPrefs->resourceMgr()->workingMode();
-         myPrefs->resourceMgr()->setWorkingMode( QtxResourceMgr::IgnoreUserValues );
-         myPrefs->retrieve();
+          myPrefs->resourceMgr()->setWorkingMode( QtxResourceMgr::IgnoreUserValues );
+          myPrefs->retrieve();
           myPrefs->resourceMgr()->setWorkingMode( prev );
-       }
+        }
     }
 }
 
@@ -149,20 +153,15 @@ void LightApp_PreferencesDlg::onDefault()
 void LightApp_PreferencesDlg::onImportPref()
 {
   QtxResourceMgr* mgr = myPrefs->resourceMgr();
-  if( !mgr )
-    return;
+  QStringList filtersList;
+  filtersList.append(tr("XML_FILES_FILTER"));
+  QString anInitialPath = "";
+  if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+    anInitialPath = QDir::currentPath();
 
-  QFileDialog dlg( this, tr("IMPORT_PREFERENCES"), ".", "*" );
-  dlg.setObjectName( "" );
-  //dlg.setShowHiddenFiles( true );
-  dlg.exec();
-
-  QStringList files = dlg.selectedFiles();
-  if ( files.isEmpty() )
-    return;
+  QString aName = SUIT_FileDlg::getFileName( this, anInitialPath, filtersList, tr("IMPORT_PREFERENCES"), true, true );
 
-  QString fname = files[0];
-  if( mgr->import( fname ) )
+  if( mgr->import( aName ) )
   {
     myPrefs->retrieve();
     myPrefs->toBackup();