X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEGUI%2FQAD_ObjectBrowser.cxx;h=35bcde863156c1a9db2eca81243e4f6a026fc850;hb=e2926da4bf6c85b85058a717ecd523a03ccea90d;hp=9ed2eb23bd21ffaa92748c6de4083acb681a4435;hpb=4655b0b0eb5345da6a86852021014b0cbae2ad30;p=modules%2Fkernel.git

diff --git a/src/SALOMEGUI/QAD_ObjectBrowser.cxx b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
index 9ed2eb23b..35bcde863 100644
--- a/src/SALOMEGUI/QAD_ObjectBrowser.cxx
+++ b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
@@ -1,13 +1,32 @@
-using namespace std;
-//  File      : QAD_ObjectBrowser.cxx
-//  Created   : Thu Jun 14 15:42:10 2001
-//  Author    : Nicolas REJNERI
-//  Project   : SALOME
-//  Module    : SALOMEGUI
-//  Copyright : Open CASCADE
+//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  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. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : QAD_ObjectBrowser.cxx
+//  Author : Nicolas REJNERI
+//  Module : SALOME
 //  $Header$
 
-
+using namespace std;
 #include "QAD_ObjectBrowserItem.h"
 #include "QAD_ObjectBrowser.h"
 #include "QAD_Application.h"
@@ -646,15 +665,15 @@ void QAD_ObjectBrowser::Update( SALOMEDS::SObject_ptr SO,
 	// TextColor
         if ( CSO->FindAttribute(anAttr, "AttributeTextColor") ) {
           aTextColor = SALOMEDS::AttributeTextColor::_narrow(anAttr);
-	  QColor aColor(aTextColor->TextColor().R, aTextColor->TextColor().G, aTextColor->TextColor().B) ;
+	  QColor aColor((int)(aTextColor->TextColor().R), (int)(aTextColor->TextColor().G), (int)(aTextColor->TextColor().B)) ;
           Item->setTextColor(aColor);
         }
 	// TextHighlightColor
         if ( CSO->FindAttribute(anAttr, "AttributeTextHighlightColor") ) {
           aTextHighlightColor = SALOMEDS::AttributeTextHighlightColor::_narrow(anAttr);
-	  QColor aColor(aTextHighlightColor->TextHighlightColor().R, 
-			aTextHighlightColor->TextHighlightColor().G, 
-			aTextHighlightColor->TextHighlightColor().B) ;
+	  QColor aColor((int)(aTextHighlightColor->TextHighlightColor().R), 
+			(int)(aTextHighlightColor->TextHighlightColor().G), 
+			(int)(aTextHighlightColor->TextHighlightColor().B)) ;
           Item->setTextHighlightColor(aColor);
         }
 	// Pixmap
@@ -669,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 );
 		}
@@ -783,15 +802,15 @@ void QAD_ObjectBrowser::Update()
       // TextColor
       if ( SC->FindAttribute(anAttr, "AttributeTextColor") ) {
 	aTextColor = SALOMEDS::AttributeTextColor::_narrow(anAttr);
-	QColor aColor(aTextColor->TextColor().R, aTextColor->TextColor().G, aTextColor->TextColor().B) ;
+	QColor aColor((int)(aTextColor->TextColor().R), (int)(aTextColor->TextColor().G), (int)(aTextColor->TextColor().B)) ;
 	Item->setTextColor(aColor);
       }
       // TextHighlightColor
       if ( SC->FindAttribute(anAttr, "AttributeTextHighlightColor") ) {
 	aTextHighlightColor = SALOMEDS::AttributeTextHighlightColor::_narrow(anAttr);
-	QColor aColor(aTextHighlightColor->TextHighlightColor().R, 
-		      aTextHighlightColor->TextHighlightColor().G, 
-		      aTextHighlightColor->TextHighlightColor().B) ;
+	QColor aColor((int)(aTextHighlightColor->TextHighlightColor().R), 
+		      (int)(aTextHighlightColor->TextHighlightColor().G), 
+		      (int)(aTextHighlightColor->TextHighlightColor().B)) ;
 	Item->setTextHighlightColor(aColor);
       }
       
@@ -804,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 );
 	    }
@@ -1006,17 +1025,17 @@ void QAD_ObjectBrowser::UpdateUCItem( SALOMEDS::SObject_var UCObject, QAD_Object
 // TextColor
       if ( UCObject->FindAttribute(anAttr, "AttributeTextColor" ) ) {
 	aTextColor = SALOMEDS::AttributeTextColor::_narrow( anAttr );
-	QColor aColor( aTextColor->TextColor().R, 
-		       aTextColor->TextColor().G, 
-		       aTextColor->TextColor().B );
+	QColor aColor( (int)(aTextColor->TextColor().R), 
+		       (int)(aTextColor->TextColor().G), 
+		       (int)(aTextColor->TextColor().B) );
 	UCSubItem->setTextColor( aColor );
       }
       // TextHighlightColor
       if ( UCObject->FindAttribute( anAttr, "AttributeTextHighlightColor" ) ) {
 	aTextHighlightColor = SALOMEDS::AttributeTextHighlightColor::_narrow( anAttr );
-	QColor aColor( aTextHighlightColor->TextHighlightColor().R, 
-		       aTextHighlightColor->TextHighlightColor().G, 
-		       aTextHighlightColor->TextHighlightColor().B );
+	QColor aColor( (int)(aTextHighlightColor->TextHighlightColor().R), 
+		       (int)(aTextHighlightColor->TextHighlightColor().G), 
+		       (int)(aTextHighlightColor->TextHighlightColor().B) );
 	UCSubItem->setTextHighlightColor( aColor );
       }
       // Pixmap
@@ -1030,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 );
 	      }