Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SIMAN removal
[modules/gui.git]
/
src
/
Qtx
/
QtxResourceMgr.cxx
diff --git
a/src/Qtx/QtxResourceMgr.cxx
b/src/Qtx/QtxResourceMgr.cxx
index 7b2688844e0fffde3dd04e6eaec553a9ed2e19de..68511cf35c7703a6cada46f0a6917b91bba74f4f 100644
(file)
--- a/
src/Qtx/QtxResourceMgr.cxx
+++ b/
src/Qtx/QtxResourceMgr.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-2697,15
+2697,16
@@
void QtxResourceMgr::loadLanguage( const QString& pref, const QString& l )
if ( pref.isEmpty() && lang != "en" ) {
// load Qt resources
QString qt_translations = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
if ( pref.isEmpty() && lang != "en" ) {
// load Qt resources
QString qt_translations = QLibraryInfo::location( QLibraryInfo::TranslationsPath );
- QString qt_dir_trpath;
- if (
::getenv( "QTDIR"
) )
- qt_dir_trpath =
QString( ::getenv( "QTDIR" )
);
+ QString qt_dir_trpath
= qgetenv( "QT_ROOT_DIR" )
;
+ if (
qt_dir_trpath.isEmpty(
) )
+ qt_dir_trpath =
qgetenv( "QTDIR"
);
if ( !qt_dir_trpath.isEmpty() )
qt_dir_trpath = QDir( qt_dir_trpath ).absoluteFilePath( "translations" );
QTranslator* trans = new QtxTranslator( 0 );
if ( !qt_dir_trpath.isEmpty() )
qt_dir_trpath = QDir( qt_dir_trpath ).absoluteFilePath( "translations" );
QTranslator* trans = new QtxTranslator( 0 );
- if ( trans->load( QString("qt_%1").arg( lang ), qt_translations ) || trans->load( QString("qt_%1").arg( lang ), qt_dir_trpath ) )
- QApplication::instance()->installTranslator( trans );
+ if ( trans->load( QString("qt_%1").arg( lang ), qt_translations ) || trans->load( QString("qt_%1").arg( lang ), qt_dir_trpath ) ) {
+ if ( QApplication::instance() ) QApplication::instance()->installTranslator( trans );
+ }
}
for ( QStringList::ConstIterator iter = prefixList.begin(); iter != prefixList.end(); ++iter )
}
for ( QStringList::ConstIterator iter = prefixList.begin(); iter != prefixList.end(); ++iter )
@@
-2751,7
+2752,7
@@
void QtxResourceMgr::loadTranslators( const QString& prefix, const QStringList&
{
if ( !myTranslator[prefix].contains( trans ) )
myTranslator[prefix].append( trans );
{
if ( !myTranslator[prefix].contains( trans ) )
myTranslator[prefix].append( trans );
- QApplication::instance()->installTranslator( trans );
+
if ( QApplication::instance() )
QApplication::instance()->installTranslator( trans );
}
}
}
}
}
}
@@
-2783,7
+2784,7
@@
void QtxResourceMgr::loadTranslator( const QString& prefix, const QString& name
{
if ( !myTranslator[prefix].contains( trans ) )
myTranslator[prefix].append( trans );
{
if ( !myTranslator[prefix].contains( trans ) )
myTranslator[prefix].append( trans );
- QApplication::instance()->installTranslator( trans );
+
if ( QApplication::instance() )
QApplication::instance()->installTranslator( trans );
}
}
}
}
}
}
@@
-2799,7
+2800,7
@@
void QtxResourceMgr::removeTranslators( const QString& prefix )
for ( TransList::Iterator it = myTranslator[prefix].begin(); it != myTranslator[prefix].end(); ++it )
{
for ( TransList::Iterator it = myTranslator[prefix].begin(); it != myTranslator[prefix].end(); ++it )
{
- QApplication::instance()->removeTranslator( *it );
+
if ( QApplication::instance() )
QApplication::instance()->removeTranslator( *it );
delete *it;
}
delete *it;
}
@@
-2818,8
+2819,10
@@
void QtxResourceMgr::raiseTranslators( const QString& prefix )
for ( TransList::Iterator it = myTranslator[prefix].begin(); it != myTranslator[prefix].end(); ++it )
{
for ( TransList::Iterator it = myTranslator[prefix].begin(); it != myTranslator[prefix].end(); ++it )
{
- QApplication::instance()->removeTranslator( *it );
- QApplication::instance()->installTranslator( *it );
+ if ( QApplication::instance() ) {
+ QApplication::instance()->removeTranslator( *it );
+ QApplication::instance()->installTranslator( *it );
+ }
}
}
}
}