Merge from BR_PARAVIS_DEV 29Dec09

[modules/paravis.git] / src / PVGUI / PVGUI_Module_actions.cxx

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index 38d55b4ffac375bde83c40deaf72d735f6113966..78a3aea1bbf554311ba11b12f75428cf3a0724cd 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -31,7 +31,7 @@
 #include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
-#include <LightApp_Application.h>
+#include <SalomeApp_Application.h>
 
 #include <QAction>
 #include <QMenu>
@@ -48,6 +48,9 @@
 #include <pqUndoStack.h>
 #include <pqVCRController.h>
 
+#include "PVGUI_Tools.h"
+
+
 /*!
   \brief Create actions for ParaView GUI operations
   duplicating menus and toolbars in MainWindow class of
@@ -68,7 +71,9 @@ void PVGUI_Module::pvCreateActions()
   aPixmap = resMgr->loadPixmap( "ParaView", tr("ICON_OPEN_FILE"), false );
   createAction( OpenFileId, tr("TOP_OPEN_FILE"), QIcon(aPixmap),
                 tr("MEN_OPEN"), tr("STB_OPEN_FILE"), 
-               0, desk, false, &Implementation->Core, SLOT( onFileOpen() ) );
+   //0, desk, false, &Implementation->Core, SLOT( onFileOpen() ) );
+  // This avoids an immediate exception on wrong MED file opening
+               0, desk, false, this, SLOT( onOpenFile() ) );
 
   // Load State
   anAction = createAction( LoadStateId, tr("TOP_LOAD_STATE"), QIcon(),
@@ -857,7 +862,7 @@ void PVGUI_Module::pvCreateToolBars()
 QMenu* PVGUI_Module::getMenu( const int id )
 {
   QMenu* res = 0;
-  LightApp_Application* anApp = getApp();
+  SalomeApp_Application* anApp = getApp();
   SUIT_Desktop* desk = anApp->desktop();
   if ( desk ){
     QtxActionMenuMgr* menuMgr = desk->menuMgr();