Merge branch 'ASL_TREE_STATE' into asl/hydro_porting_741

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

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index c9b5535dc691ce36a6b2d06cd18a38ef264c66fb..e2d29ec6f2d3b799994a278e29026b33d7f59487 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,7 +28,10 @@
 
 #include "QtxResourceMgr.h"
 
+#include <SUIT_Session.h>
+#include <SUIT_Application.h>
 #include <SUIT_MessageBox.h>
+#include <SUIT_FileDlg.h>
 
 #include <QAbstractButton>
 #include <QVBoxLayout>
@@ -38,7 +41,7 @@
   Constructor.
 */
 LightApp_PreferencesDlg::LightApp_PreferencesDlg( LightApp_Preferences* prefs, QWidget* parent )
-: QtxDialog( parent, true, true, OK | Close | Apply ),
+: QtxDialog( parent, true, true, OK | Close | Apply | Help ),
 myPrefs( prefs ), mySaved ( false )
 {
   setWindowTitle( tr( "CAPTION" ) );
@@ -114,6 +117,9 @@ void LightApp_PreferencesDlg::reject()
 /*!Do nothing.*/
 void LightApp_PreferencesDlg::onHelp()
 {
+  SUIT_Application* app = SUIT_Session::session()->activeApplication();
+  if ( app )
+    app->onHelpContextModule( "GUI", "setting_preferences_page.html" );
 }
 
 /*!Store preferences on apply.*/
@@ -152,20 +158,15 @@ void LightApp_PreferencesDlg::onDefault()
 void LightApp_PreferencesDlg::onImportPref()
 {
   QtxResourceMgr* mgr = myPrefs->resourceMgr();
-  if( !mgr )
-    return;
-
-  QFileDialog dlg( this, tr("IMPORT_PREFERENCES"), ".", "*" );
-  dlg.setObjectName( "" );
-  //dlg.setShowHiddenFiles( true );
-  dlg.exec();
+  QStringList filtersList;
+  filtersList.append(tr("XML_FILES_FILTER"));
+  QString anInitialPath = "";
+  if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+    anInitialPath = QDir::currentPath();
 
-  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();