SMH: Preparation version 3.0.0 - merge (HEAD+POLYWORK)

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_XmlHandler.cxx

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index ee42768b157cc29b29571565520c9c453d4dedfe..cf3a82c95c546078cc60c5353411788a78b63eb3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -25,15 +25,22 @@
 //  Module : SMESH
 //  $Header$
 
-using namespace std;
 #define  INCLUDE_MENUITEM_DEF 
 
-#include "SMESHGUI_XmlHandler.h"
-
 // QT Include
-//#include <qaccel.h>
 #include <qfileinfo.h>
 
+#include "SMESHGUI.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_Desktop.h"
+
+#include "SMESHGUI_XmlHandler.h"
+#include "SMESHGUI_Hypotheses.h"
+
+#include "utilities.h"
+
+using namespace std;
+
 /*!
   Constructor
 */
@@ -86,10 +93,9 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       if (aResName != "")
       {
         MESSAGE("Loading Resources " << aResName);
-        QAD_ResourceMgr* resMgr = QAD_Desktop::createResourceManager();
-        QString msg;
-        if (!resMgr->loadResources(aResName, msg))
-          MESSAGE(msg);
+        SUIT_ResourceMgr* resMgr = SMESHGUI::resourceMgr();
+        resMgr->loadTranslator("resources",aResName+"_msg_en.qm");
+       resMgr->loadTranslator("resources",aResName+"_images.qm");
       }
     }
   }