[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowserPropertyPage.cpp,1.45,1.46 AggregateContextMenu.cpp,1.23,1.24 AggregateContextMenu.h,1.6,1.7 GMEActiveBrowser.odl,1.5,1.6 GMEActiveBrowser.rc,1.13,1.14 GMEActiveBrowserCtl.cpp,1.14,1.15 GMEActiveBrowserCtl.h,1.6,1.7 resource.h,1.9,1.10

Tue Feb 14 18:50:17 CST 2006

Update of /project/gme-repository/GMESRC/GME/GMEActiveBrowser
In directory escher:/tmp/cvs-serv17159

Modified Files:
	ActiveBrowserPropertyPage.cpp AggregateContextMenu.cpp 
	AggregateContextMenu.h GMEActiveBrowser.odl 
	GMEActiveBrowser.rc GMEActiveBrowserCtl.cpp 
	GMEActiveBrowserCtl.h resource.h 
Log Message:
ShowInParentMgaObject event added to dispinterface _DGMEActiveBrowserEvents

Show in Parent menu added

If Shift is pressed while DoubleClick/Enter on a treeitem ShowInParentMgaObject will be fired instead of DblClickMgaObject,
and the object is shown within its parent (if parent is a model).
If parent is not a model, GMEDoc will detect it while trying to QueryInterface it to IMgaModel.

CVS User: Zoltan Molnar, ISIS (zolmol)

Index: AggregateContextMenu.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/AggregateContextMenu.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** AggregateContextMenu.cpp	31 Aug 2005 19:24:11 -0000	1.23
--- AggregateContextMenu.cpp	14 Feb 2006 18:50:15 -0000	1.24
***************
*** 112,115 ****
--- 112,116 ----
  			case ID_POPUP_DISPLAYOPTIONS: OnOptions();break;
  			case ID_POPUP_HELP:			OnHelp();break;
+ 			case ID_POPUP_SHOWINPARENT: OnShowInParent();break;

***************
*** 682,685 ****
--- 683,690 ----
  					pPopup->DeleteMenu(ID_POPUP_INSERTIONS,MF_BYCOMMAND);
  				}
+ 				
+ 				// a folder can't be viewed in its parent
+ 				// EnableMenuItem(ID_POPUP_SHOWINPARENT,MF_GRAYED); 
+ 				pPopup->DeleteMenu( ID_POPUP_SHOWINPARENT, MF_BYCOMMAND);

  			}break;
***************
*** 717,720 ****
--- 722,734 ----
  				}
  		}
+ 
+ 		// determining whether to enable/disable the 'ShowInParent' menuitem
+ 		if( OBJTYPE_FOLDER != MgaObjectProxy.m_TypeInfo) // for folders we already deleted the feature
+ 		{
+ 			HTREEITEM hItemsParent = m_pParent->m_TreeAggregate.GetParentItem( hItem);
+ 			CMgaObjectProxy MgaParentProxy; // if parent is a model, then enable
+ 			if(m_pParent->m_TreeAggregate.m_MgaMap.LookupObjectProxy(hItemsParent,MgaParentProxy))
+ 				EnableMenuItem( ID_POPUP_SHOWINPARENT, OBJTYPE_MODEL == MgaParentProxy.m_TypeInfo?MF_ENABLED:MF_GRAYED);
+ 		}
  	}
  }
***************
*** 1089,1090 ****
--- 1103,1119 ----
  }

+ // ShowInParentMgaObject event fired also when Shift is pressed while DoubleClick or Enter
+ void CAggregateContextMenu::OnShowInParent()
+ {
+ 	HTREEITEM hItem=m_pParent->m_TreeAggregate.GetSelectedItem();
+ 	LPUNKNOWN pUnknown=NULL;
+ 
+ 	if(m_pParent->m_TreeAggregate.m_MgaMap.LookupObjectUnknown(hItem,pUnknown))
+ 	{
+ 		TRACE(m_pParent->m_TreeAggregate.GetItemText(hItem));
+ 
+ 		// Firing the event
+ 		CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
+ 		pApp->GetCtrl()->FireShowInParentMgaObject( pUnknown);
+ 	}
+ }

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ActiveBrowserPropertyPage.cpp	31 Aug 2005 19:24:11 -0000	1.45
--- ActiveBrowserPropertyPage.cpp	14 Feb 2006 18:50:15 -0000	1.46
***************
*** 1382,1386 ****
  		// Firing the event
  		CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 		pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  	}

--- 1382,1389 ----
  		// Firing the event
  		CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 		if( ::GetKeyState( VK_SHIFT) < 0)
! 			pApp->GetCtrl()->FireShowInParentMgaObject(pUnknown);
! 		else
! 			pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  	}

***************
*** 2166,2170 ****
  					// Firing the event
  					CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 					pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  					m_TreeAggregate.SetFocus();
  				}
--- 2169,2176 ----
  					// Firing the event
  					CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 					if( ::GetKeyState( VK_SHIFT) < 0)
! 						pApp->GetCtrl()->FireShowInParentMgaObject(pUnknown);
! 					else
! 						pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  					m_TreeAggregate.SetFocus();
  				}
***************
*** 2536,2540 ****
  					// Firing the event
  					CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 					pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  					m_TreeInheritance.SetFocus();
  				}
--- 2542,2549 ----
  					// Firing the event
  					CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 					if( ::GetKeyState( VK_SHIFT) < 0)
! 						pApp->GetCtrl()->FireShowInParentMgaObject(pUnknown);
! 					else
! 						pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  					m_TreeInheritance.SetFocus();
  				}
***************
*** 2856,2860 ****
  		// Firing the event
  		CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 		pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  	}

--- 2865,2872 ----
  		// Firing the event
  		CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 		if( ::GetKeyState( VK_SHIFT) < 0)
! 			pApp->GetCtrl()->FireShowInParentMgaObject(pUnknown);
! 		else
! 			pApp->GetCtrl()->FireDblClickMgaObject(pUnknown);
  	}

Index: GMEActiveBrowserCtl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GMEActiveBrowserCtl.cpp	18 May 2005 22:37:20 -0000	1.14
--- GMEActiveBrowserCtl.cpp	14 Feb 2006 18:50:15 -0000	1.15
***************
*** 65,68 ****
--- 65,69 ----
  	EVENT_CUSTOM("ShowProperties", FireShowProperties, VTS_NONE)
  	EVENT_CUSTOM("ClickMgaObject", FireClickMgaObject, VTS_UNKNOWN)
+ 	EVENT_CUSTOM("ShowInParentMgaObject", FireShowInParentMgaObject, VTS_UNKNOWN)
  	//}}AFX_EVENT_MAP
  END_EVENT_MAP()

Index: AggregateContextMenu.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/AggregateContextMenu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AggregateContextMenu.h	19 Jul 2005 17:42:11 -0000	1.6
--- AggregateContextMenu.h	14 Feb 2006 18:50:15 -0000	1.7
***************
*** 37,40 ****
--- 37,41 ----
  	void CreateForSingleItem();
  	void OnHelp();
+ 	void OnShowInParent();
  	void OnRegistry();
  	void OnPreferences();

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/resource.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** resource.h	19 Jul 2005 17:42:11 -0000	1.9
--- resource.h	14 Feb 2006 18:50:15 -0000	1.10
***************
*** 75,78 ****
--- 75,79 ----
  #define ID_EDIT_PASTESPECIAL_SMART_MERGE 32801
  #define ID_EDIT_PASTESPECIAL_SMART_ADDITIVE 32802
+ #define ID_POPUP_SHOWINPARENT               32803

  // Next default values for new objects

Index: GMEActiveBrowserCtl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserCtl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GMEActiveBrowserCtl.h	12 Jan 2005 17:54:00 -0000	1.6
--- GMEActiveBrowserCtl.h	14 Feb 2006 18:50:15 -0000	1.7
***************
*** 52,55 ****
--- 52,57 ----
  	void FireClickMgaObject(LPUNKNOWN pMgaObject)
  		{FireEvent(eventidClickMgaObject,EVENT_PARAM(VTS_UNKNOWN), pMgaObject);}
+ 	void FireShowInParentMgaObject(LPUNKNOWN pMgaObject)
+ 		{FireEvent(eventidShowInParentMgaObject,EVENT_PARAM(VTS_UNKNOWN), pMgaObject);}
  	//}}AFX_EVENT
  	DECLARE_EVENT_MAP()
***************
*** 122,125 ****
--- 124,128 ----
  	eventidShowProperties = 4L,
  	eventidClickMgaObject = 5L,
+ 	eventidShowInParentMgaObject = 6L,
  	//}}AFX_DISP_ID
  	};

Index: GMEActiveBrowser.odl
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowser.odl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GMEActiveBrowser.odl	12 Jan 2005 17:54:00 -0000	1.5
--- GMEActiveBrowser.odl	14 Feb 2006 18:50:15 -0000	1.6
***************
*** 73,76 ****
--- 73,77 ----
  			[id(4)] void ShowProperties();
  			[id(5)] void ClickMgaObject(IUnknown* pMgaObject);
+ 			[id(6)] void ShowInParentMgaObject(IUnknown* pMgaObject);
  			//}}AFX_ODL_EVENT
  	};

Index: GMEActiveBrowser.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowser.rc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GMEActiveBrowser.rc	19 Jul 2005 17:42:11 -0000	1.13
--- GMEActiveBrowser.rc	14 Feb 2006 18:50:15 -0000	1.14
***************
*** 345,348 ****
--- 345,349 ----
          MENUITEM "&Preferences",                ID_POPUP_PREFERENCES
          MENUITEM "&Registry...",                ID_POPUP_REGISTRY
+         MENUITEM "Show in Parent",              ID_POPUP_SHOWINPARENT
          MENUITEM "Attach Library...",           ID_POPUP_ATTACH_LIBRARY
          MENUITEM "Refresh Library",             ID_POPUP_REFRESH_LIBRARY