X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEGUI%2FQAD_ObjectBrowser.cxx;h=35bcde863156c1a9db2eca81243e4f6a026fc850;hb=e2926da4bf6c85b85058a717ecd523a03ccea90d;hp=9d992471aa17fe2ca39a4d3be01764fe0572a41e;hpb=102608ce8b69dd1ea798169e30223b67742ec26d;p=modules%2Fkernel.git diff --git a/src/SALOMEGUI/QAD_ObjectBrowser.cxx b/src/SALOMEGUI/QAD_ObjectBrowser.cxx index 9d992471a..35bcde863 100644 --- a/src/SALOMEGUI/QAD_ObjectBrowser.cxx +++ b/src/SALOMEGUI/QAD_ObjectBrowser.cxx @@ -688,8 +688,8 @@ void QAD_ObjectBrowser::Update( SALOMEDS::SObject_ptr SO, QString msg; QAD_ResourceMgr* resMgr = QAD_Desktop::createResourceManager(); if ( resMgr ) { - if(resMgr->loadResources( QString(aFatherName->Value()) + "GUI", msg )) { - QPixmap icon ( resMgr->loadPixmap( QString(aFatherName->Value()) + "GUI", + if(resMgr->loadResources( QAD_Application::getDesktop()->getComponentName(QString(aFatherName->Value())), msg )) { + QPixmap icon ( resMgr->loadPixmap( QAD_Application::getDesktop()->getComponentName(QString(aFatherName->Value())), tr(aPixmap->GetPixMap()) /*tr( "ICON_OBJBROWSER_" + theComponent )*/ )); Item->setPixmap( 0, icon ); } @@ -823,8 +823,8 @@ void QAD_ObjectBrowser::Update() if ( resMgr ) { MESSAGE ( " Component " << aName->Value() ) MESSAGE ( " Icon " << aPixmap->GetPixMap() ) - if(resMgr->loadResources( QString(aName->Value()) + "GUI", msg )) { - QPixmap icon ( resMgr->loadPixmap( QString(aName->Value()) + "GUI", + if(resMgr->loadResources( QAD_Application::getDesktop()->getComponentName(QString(aName->Value())), msg )) { + QPixmap icon ( resMgr->loadPixmap( QAD_Application::getDesktop()->getComponentName(QString(aName->Value())), tr(aPixmap->GetPixMap()) /*tr( "ICON_OBJBROWSER_" + theComponent )*/ )); Item->setPixmap( 0, icon ); } @@ -1049,8 +1049,8 @@ void QAD_ObjectBrowser::UpdateUCItem( SALOMEDS::SObject_var UCObject, QAD_Object QAD_ResourceMgr* resMgr = QAD_Desktop::getResourceManager(); if ( resMgr ) { QString msg; - if( resMgr->loadResources( QString( aFatherName->Value() ) + "GUI", msg ) ) { - QPixmap icon ( resMgr->loadPixmap( QString( aFatherName->Value() ) + "GUI", + if( resMgr->loadResources( QAD_Application::getDesktop()->getComponentName(QString( aFatherName->Value() )), msg ) ) { + QPixmap icon ( resMgr->loadPixmap( QAD_Application::getDesktop()->getComponentName(QString( aFatherName->Value() )), tr( aPixmap->GetPixMap() ) /*tr( "ICON_OBJBROWSER_" + theComponent )*/ ) ); UCSubItem->setPixmap( 0, icon ); }