X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_XmlHandler.cxx;h=00a1e26e1c21b7178c727d5189c47f2324e5d23d;hb=0e57fc74416cbac7bb1898edec8d8706cfdb3151;hp=9939eb73043e41f5511451c0634e65f2488291fe;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index 9939eb730..00a1e26e1 100644
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -2,7 +2,7 @@
 //  Copyright (C) 2003  CEA
 //
 //  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
+// //  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.
 //
@@ -29,12 +29,15 @@
 
 // QT Include
 #include <qfileinfo.h>
+#include <qstringlist.h>
 
-#include "QAD_ResourceMgr.h"
-#include "QAD_Desktop.h"
+#include "SMESHGUI.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_Desktop.h"
 
 #include "SMESHGUI_XmlHandler.h"
 #include "SMESHGUI_Hypotheses.h"
+#include "SMESHGUI_Utils.h"
 
 #include "utilities.h"
 
@@ -92,10 +95,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");
       }
     }
   }
@@ -112,9 +114,24 @@ bool SMESHGUI_XmlHandler::startElement (const QString&, const QString&,
       QString aHypAlType = atts.value("type");
       QString aLabel = atts.value("label-id");
       QString anIcon = atts.value("icon-id");
+      bool isAux = atts.value("auxiliary") == "true";
+      
+      QString aDimStr = atts.value("dim");
+      aDimStr = aDimStr.remove( ' ' );
+      QStringList aDimList = QStringList::split( ',', aDimStr );
+      QStringList::iterator anIter;
+      bool isOk;
+      QValueList<int> aDim;
+      for ( anIter = aDimList.begin(); anIter != aDimList.end(); ++anIter )
+      {
+        int aVal = (*anIter).toInt( &isOk );
+        if ( isOk )
+          aDim.append( aVal - 1 );
+      }
+      
       HypothesisData* aHypLibNames =
         new HypothesisData (myPluginName, myServerLib, myClientLib,
-                            aLabel, anIcon);
+                            aLabel, anIcon, aDim, isAux );
 
       if (qName == "algorithm")
       {