From: vsr <vsr@opencascade.com>
Date: Mon, 23 Apr 2012 10:38:03 +0000 (+0000)
Subject: Merge from TRIPOLI_3_2_BR branch (TRIPOLI_321 tag)
X-Git-Tag: TRIPOLI_323~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee4d9412ccc9f6700bcf98faec8d1a2246248fdc;p=modules%2Fgui.git

Merge from TRIPOLI_3_2_BR branch (TRIPOLI_321 tag)
---

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index bd60be944..cd70c4858 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -393,7 +393,7 @@ QPixmap QtxResourceMgr::Resources::loadPixmap( const QString& sect, const QStrin
 QTranslator* QtxResourceMgr::Resources::loadTranslator( const QString& sect, const QString& prefix, const QString& name ) const
 {
   QTranslator* trans = new QtxTranslator( 0 );
-  QString fname = fileName( sect, prefix, name );
+  QString fname = QDir::convertSeparators( fileName( sect, prefix, name ) );
   if ( !trans->load( Qtx::file( fname, false ), Qtx::dir( fname ) ) )
   {
     delete trans;
@@ -507,7 +507,7 @@ bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Sectio
   \param importHistory list of already imported resources files (to prevent import loops)
   \return \c true on success or \c false on error
 */
-bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Section>& secMap, QSet<QString>& importHistory)
+bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Section>& secMap, QSet<QString>& importHistory )
 {
   QString aFName = fname.trimmed();
   if ( !QFileInfo( aFName ).exists() )
@@ -580,9 +580,10 @@ bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Sectio
     }
     else if ( section == "import" )
     {
-      QFileInfo impFInfo( data );
+      QString impFile = QDir::convertSeparators( Qtx::makeEnvVarSubst( data, Qtx::Always ) );
+      QFileInfo impFInfo( impFile );
       if ( impFInfo.isRelative() )
-	impFInfo.setFile( aFinfo.absoluteDir(), data );
+	      impFInfo.setFile( aFinfo.absoluteDir(), impFile );
     
       QMap<QString, Section> impMap;
       if ( !load( impFInfo.absoluteFilePath(), impMap, importHistory ) )
@@ -591,34 +592,34 @@ bool QtxResourceMgr::IniFormat::load( const QString& fname, QMap<QString, Sectio
       }
       else 
       {
-	QMap<QString, Section>::const_iterator it = impMap.constBegin();
-	for ( ; it != impMap.constEnd() ; ++it )
-	{ 
-	  if ( !secMap.contains( it.key() ) )
-	  {
-	    // insert full section
-	    secMap.insert( it.key(), it.value() );
-	  }
-	  else
-	  {
-	    // insert all parameters from the section
-	    Section::ConstIterator paramIt = it.value().begin();
-	    for ( ; paramIt != it.value().end() ; ++paramIt )
-	    {
-	      if ( !secMap[it.key()].contains( paramIt.key() ) )
-		secMap[it.key()].insert( paramIt.key(), paramIt.value() );
-	    }
-	  }
-	}
+	      QMap<QString, Section>::const_iterator it = impMap.constBegin();
+	      for ( ; it != impMap.constEnd() ; ++it )
+	      { 
+	         if ( !secMap.contains( it.key() ) )
+	         {
+	            // insert full section
+	            secMap.insert( it.key(), it.value() );
+	         }
+	         else
+	         {
+	            // insert all parameters from the section
+	            Section::ConstIterator paramIt = it.value().begin();
+	            for ( ; paramIt != it.value().end() ; ++paramIt )
+	            {
+	               if ( !secMap[it.key()].contains( paramIt.key() ) )
+		               secMap[it.key()].insert( paramIt.key(), paramIt.value() );
+	            }
+	         }
+	      }
       }
     }
     else
     {
       res = false;
       if ( section.isEmpty() )
-	qWarning() << "QtxResourceMgr: Current section is empty";
+	      qWarning() << "QtxResourceMgr: Current section is empty";
       else
-	qWarning() << "QtxResourceMgr: Error in line:" << line;
+	      qWarning() << "QtxResourceMgr: Error in line:" << line;
     }
   }
 
@@ -804,7 +805,7 @@ bool QtxResourceMgr::XmlFormat::load( const QString& fname, QMap<QString, Sectio
           else
           {
             res = paramNode.isComment();
-            if( !res )
+            if ( !res )
               qDebug() << "QtxResourceMgr: Node is neither element nor comment in file:" << aFName;
           }
 
@@ -813,42 +814,43 @@ bool QtxResourceMgr::XmlFormat::load( const QString& fname, QMap<QString, Sectio
       }
       else if ( sectElem.tagName() == importTag() && sectElem.hasAttribute( nameAttribute() ) )
       {
-	QFileInfo impFInfo( sectElem.attribute( nameAttribute() ) );
-	if ( impFInfo.isRelative() )
-	  impFInfo.setFile( aFinfo.absoluteDir(), sectElem.attribute( nameAttribute() ) );
+         QString impFile = QDir::convertSeparators( Qtx::makeEnvVarSubst( sectElem.attribute( nameAttribute() ), Qtx::Always ) );
+	      QFileInfo impFInfo( impFile );
+	      if ( impFInfo.isRelative() )
+	         impFInfo.setFile( aFinfo.absoluteDir(), impFile );
 
         QMap<QString, Section> impMap;
         if ( !load( impFInfo.absoluteFilePath(), impMap, importHistory ) )
-	{
-          qDebug() << "QtxResourceMgr: Error with importing file:" << sectElem.attribute( nameAttribute() );
-	}
-	else
-	{
-	  QMap<QString, Section>::const_iterator it = impMap.constBegin();
-	  for ( ; it != impMap.constEnd() ; ++it )
-	  {
-	    if ( !secMap.contains( it.key() ) )
-	    {
-	    // insert full section
-	      secMap.insert( it.key(), it.value() );
-	    }
-	    else
-	    {
-	      // insert all parameters from the section
-	      Section::ConstIterator paramIt = it.value().begin();
-	      for ( ; paramIt != it.value().end() ; ++paramIt )
-	      {
-		if ( !secMap[it.key()].contains( paramIt.key() ) )
-		  secMap[it.key()].insert( paramIt.key(), paramIt.value() );
-	      }
-	    }
-	  }
-        }
+	     {
+            qDebug() << "QtxResourceMgr: Error with importing file:" << sectElem.attribute( nameAttribute() );
+	     }
+	     else
+	     {
+	         QMap<QString, Section>::const_iterator it = impMap.constBegin();
+	         for ( ; it != impMap.constEnd() ; ++it )
+	         {
+	            if ( !secMap.contains( it.key() ) )
+	            {
+	               // insert full section
+	               secMap.insert( it.key(), it.value() );
+	            }
+	            else
+	            {
+	               // insert all parameters from the section
+	               Section::ConstIterator paramIt = it.value().begin();
+	               for ( ; paramIt != it.value().end() ; ++paramIt )
+	               {
+		               if ( !secMap[it.key()].contains( paramIt.key() ) )
+		                  secMap[it.key()].insert( paramIt.key(), paramIt.value() );
+	               }
+	            }
+	         }
+         }
       }
       else
       {
-        qDebug() << "QtxResourceMgr: Invalid section in file:" << aFName;
-        res = false;
+         qDebug() << "QtxResourceMgr: Invalid section in file:" << aFName;
+         res = false;
       }
     }
     else