Bug 9193:

[modules/gui.git] / src / SalomeApp / SalomeApp_Application.cxx

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 401317f2dce29a6c5469eb03146201ac37559ed7..6063e1fa77d2f7c799e7520a79d805eae69039c7 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -483,16 +483,12 @@ void SalomeApp_Application::onSelectionChanged()
 
 void SalomeApp_Application::onAboutRefresh()
 {
-  SalomeApp_DataModel* dm = 0;
-  if ( activeModule() )
-  {
-    CAM_DataModel* camDM = activeModule()->dataModel();
+  for ( ModuleListIterator it = modules(); it.current(); ++it )
+  {    
+    CAM_DataModel* camDM = it.current()->dataModel();
     if ( camDM && camDM->inherits( "SalomeApp_DataModel" ) )
-      dm = (SalomeApp_DataModel*)camDM;
+      ((SalomeApp_DataModel*)camDM)->update();
   }
-
-  if ( dm )
-    dm->update();
 }
 
 void SalomeApp_Application::setActiveStudy( SUIT_Study* study )
@@ -843,7 +839,7 @@ void SalomeApp_Application::onLoadScript( )
   filtersList.append(tr("PYTHON_FILES_FILTER"));
   filtersList.append(tr("ALL_FILES_FILTER"));
   
-  QString aFile = SUIT_FileDlg::getFileName(desktop(), "", filtersList, tr("TOT_DESK_FILE_LOAD_SCRIPT"), true, false);
+  QString aFile = SUIT_FileDlg::getFileName(desktop(), "", filtersList, tr("TOT_DESK_FILE_LOAD_SCRIPT"), true, true );
   if(!aFile.isEmpty()) {
     QString command = QString("execfile(\"%1\")").arg(aFile);
     
@@ -1127,3 +1123,11 @@ void SalomeApp_Application::onProperties()
 
   //study->updateCaptions();
 }
+
+QString SalomeApp_Application::getFileName( bool open )
+{
+  QStringList filtersList;
+  filtersList.append( getFileFilter() );
+  QString initial = open ? QString( "" ) : ( activeStudy() ? activeStudy()->studyName() : QString( "" ) );
+  return SUIT_FileDlg::getFileName( desktop(), initial, filtersList, QString::null, open, true );
+}