[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowserPropertyPage.cpp,1.36,1.37 ActiveBrowserPropertyPage.h,1.9,1.10

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv1047

Modified Files:
	ActiveBrowserPropertyPage.cpp ActiveBrowserPropertyPage.h 
Log Message:
no message

CVS User: bogyom

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ActiveBrowserPropertyPage.cpp	27 Sep 2004 21:54:46 -0000	1.36
--- ActiveBrowserPropertyPage.cpp	29 Oct 2004 17:33:07 -0000	1.37
***************
*** 205,209 ****
  		m_TreeAggregate.GetItemImage(pNMTreeView->itemNew.hItem,nImage,nSelectedImage);
  
! 		ASSERT(nImage+ICON_NUMBER<2*ICON_NUMBER);
  		m_TreeAggregate.SetItemImage(pNMTreeView->itemNew.hItem,nImage+ICON_NUMBER,nSelectedImage+ICON_NUMBER);
  
--- 205,209 ----
  		m_TreeAggregate.GetItemImage(pNMTreeView->itemNew.hItem,nImage,nSelectedImage);
  
! 		ASSERT(nImage+ICON_NUMBER<6*ICON_NUMBER);
  		m_TreeAggregate.SetItemImage(pNMTreeView->itemNew.hItem,nImage+ICON_NUMBER,nSelectedImage+ICON_NUMBER);
  
***************
*** 257,265 ****
  }
  
  
  
! CString CAggregatePropertyPage::GetDisplayedName(IMgaObject *pIMgaObject)
! {
  
  	CComPtr<IMgaObject>ccpMgaObject(pIMgaObject);
  	
--- 257,304 ----
  }
  
+ int CAggregatePropertyPage::GetSourceControlStateOffset(IMgaObject * obj)
+ {
+     try
+     {
+         CComQIPtr<IMgaFCO> fco(obj);
  
+         if( fco==NULL )
+             return 0;
  
!         long regCount;
!         CComPtr<IMgaRegNodes> regNodes;
!         COMTHROW(fco->get_Registry( 1, &regNodes ));
!         COMTHROW(regNodes->get_Count(&regCount));
!         for( int i=1; i<=regCount; ++i )
!         {
!             CComPtr<IMgaRegNode> reg;
!             COMTHROW(regNodes->get_Item(i,&reg));
  
+             CComBSTR regnodeName;
+             COMTHROW(reg->get_Name( &regnodeName ));
+ 
+             if( regnodeName == "SourceControlInfo" )
+             {
+                 CComBSTR regnodeValue;
+                 COMTHROW(reg->get_Value(&regnodeValue));
+                 if( regnodeValue == "GME_SourceControl_State_local" )
+                     return 4*ICON_NUMBER;
+                 else if( regnodeValue == "GME_SourceControl_State_other" )
+                     return 2*ICON_NUMBER;
+                 else
+                     return 0;
+             }
+         }
+     }
+     catch(...)
+     {
+     }
+ 
+     return 0;
+ }
+ 
+ 
+ CString CAggregatePropertyPage::GetDisplayedName(IMgaObject *pIMgaObject)
+ {    
  	CComPtr<IMgaObject>ccpMgaObject(pIMgaObject);
  	
***************
*** 268,272 ****
  	COMTHROW(ccpMgaObject->get_Name(&pDisplayedName));
  
! 	return pDisplayedName;
  }
  
--- 307,313 ----
  	COMTHROW(ccpMgaObject->get_Name(&pDisplayedName));
  
!     CString ret = pDisplayedName;
! 
! 	return ret;
  }
  

Index: ActiveBrowserPropertyPage.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ActiveBrowserPropertyPage.h	27 Sep 2004 21:54:46 -0000	1.9
--- ActiveBrowserPropertyPage.h	29 Oct 2004 17:33:07 -0000	1.10
***************
*** 37,40 ****
--- 37,42 ----
  	CComboEdit m_ComboEditCtrl;
  
+     int GetSourceControlStateOffset(IMgaObject * obj);
+ 
  	BOOL HasDisplayedChild(HTREEITEM hItem);
  
***************
*** 107,110 ****
--- 109,114 ----
  	// Creates the tree		
  	void SetupTree();
+ 
+     
  	// Gets the Name property of an MgaObject
  	CString GetDisplayedName(IMgaObject *pIMgaObject);