X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=a201b3e6320de970b369cc2cc1e73644199a524c;hb=141b5c32908e3f89f9d5cfaa46872274397d6b9d;hp=c35afa88d6f5bd148351adeed4d8934185efdcda;hpb=9268f399e1312840117ab008a3232bd7fae34979;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index c35afa88..a201b3e6 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -24,6 +24,9 @@
 
 #include <SUIT_DataObject.h>
 #include <TDF_Tool.hxx>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <QPixmap>
 
 HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent, 
                                           Handle(HYDROData_Entity) theData,
@@ -65,7 +68,10 @@ QFont HYDROGUI_DataObject::font( const int theId ) const
   {
     Handle(HYDROData_Entity) aDataObject = modelObject();
     if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+    {
       aFont.setItalic( true );
+      aFont.setBold( true );
+    }
   }
   return aFont;
 }
@@ -80,11 +86,11 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
       case Text:
       case Foreground:
       case Highlight:
-        aColor = QColor( 255, 0, 0 ); // red
+        aColor = Qt::red; // red
       break;
       case HighlightedText:
         // text color for the highlighted item
-        aColor = QColor( 255, 255, 255 );   // white
+        aColor = Qt::white;   // white
       break;
 
       default:
@@ -92,6 +98,29 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
     }
   }
 
+  if ( !aColor.isValid() )
+  {
+    Handle(HYDROData_Entity) aDataObject = modelObject();
+    if( !aDataObject.IsNull() && aDataObject->IsMustBeUpdated() )
+    {
+      switch ( theRole )
+      {
+        case Text:
+        case Foreground:
+        case Highlight:
+          aColor = Qt::blue;    // color for objects which need updating
+        break;
+        case HighlightedText:
+          // text color for the highlighted item
+          aColor = Qt::white;   // white
+        break;
+
+        default:
+          break;
+      }
+    }
+  }
+
   if ( !aColor.isValid() ) {
     aColor = LightApp_DataObject::color( theRole, theId );
   }
@@ -99,6 +128,32 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
   return aColor;
 }
 
+QPixmap HYDROGUI_DataObject::icon( const int theId ) const
+{
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  if ( theId == NameId )
+  {
+    QString anIcon;
+    Handle(HYDROData_Entity) aDataObject = modelObject();
+    if( aDataObject.IsNull() )
+    {
+      anIcon = QObject::tr( "HYDRO_TYPE0_ICO" ); // KIND_UNKNOWN
+    }
+    else
+    {
+      QString aNeedUpdate = "";
+      if ( aDataObject->IsMustBeUpdated() )
+      {
+        aNeedUpdate = "M_";
+      }
+      anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( (int)aDataObject->GetKind() ).toAscii() );
+    }
+
+    return aResMgr->loadPixmap( "HYDRO", anIcon );
+  }
+  return LightApp_DataObject::icon( theId );
+}
+
 QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
                                               const bool theWithPrefix )
 {
@@ -147,10 +202,19 @@ QString HYDROGUI_NamedObject::name() const
   return myName;
 }
 
+QPixmap HYDROGUI_NamedObject::icon( const int theId ) const
+{
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+  if ( theId == NameId )
+  {
+    return aResMgr->loadPixmap( "HYDRO", QObject::tr( "PARTITION_ICO" ) );
+  }
+  return LightApp_DataObject::icon( theId );
+}
+
 HYDROGUI_DropTargetObject::HYDROGUI_DropTargetObject( SUIT_DataObject* theParent,
                                             const QString&   theName,
                                             const QString&   theParentEntry  )
 : HYDROGUI_NamedObject( theParent, theName, theParentEntry ), CAM_DataObject( theParent )
 {
 }
-