[GME-commit] GMESRC/GME/GMEActiveBrowser ActiveBrowsePropertySheet.cpp,1.2,1.3 ActiveBrowsePropertySheet.h,1.2,1.3 ActiveBrowserPropertyFrame.cpp,1.1,1.2 ActiveBrowserPropertyPage.h,1.16,1.17 ActiveBrowserPropertyPage.cpp,1.55,1.56 GMEActiveBrowserCtl.cpp,1.16,1.17 GMEActiveBrowserCtl.h,1.8,1.9 AutoComboBox.cpp,1.1,1.2

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Dec 6 22:01:02 CST 2006 

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

Modified Files:
	ActiveBrowsePropertySheet.cpp ActiveBrowsePropertySheet.h 
	ActiveBrowserPropertyFrame.cpp ActiveBrowserPropertyPage.h 
	ActiveBrowserPropertyPage.cpp GMEActiveBrowserCtl.cpp 
	GMEActiveBrowserCtl.h AutoComboBox.cpp 
Log Message:
Key navigations made possible.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: AutoComboBox.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/AutoComboBox.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AutoComboBox.cpp	1 Mar 2002 21:52:00 -0000	1.1
--- AutoComboBox.cpp	6 Dec 2006 22:00:59 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
  #include "gmeactivebrowser.h"
  #include "AutoComboBox.h"
+ #include "ActiveBrowsePropertySheet.h"
  
  #ifdef _DEBUG
***************
*** 46,50 ****
  		case VK_DELETE:;break;
  		case VK_BACK:;break;
! 		case VK_ESCAPE:;break;				
  	}
  
--- 47,60 ----
  		case VK_DELETE:;break;
  		case VK_BACK:;break;
! 		case VK_ESCAPE:;break;
! 		case VK_TAB: 
! 			{
! 				if( ::GetKeyState( VK_CONTROL) < 0) {
! 					CActiveBrowserPropertySheet *p = (CActiveBrowserPropertySheet *)m_pTreeCtrl->GetParent()->GetParent();
! 					if( p) p->nextTab( ::GetKeyState( VK_SHIFT) >= 0);
! 				} else {
! 					m_pTreeCtrl->SetFocus();
! 				}
! 			}break;
  	}
  

Index: GMEActiveBrowserCtl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserCtl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** GMEActiveBrowserCtl.cpp	6 Dec 2006 21:26:41 -0000	1.16
--- GMEActiveBrowserCtl.cpp	6 Dec 2006 22:00:59 -0000	1.17
***************
*** 67,70 ****
--- 67,72 ----
  	EVENT_CUSTOM("ShowInParentMgaObject", FireShowInParentMgaObject, VTS_UNKNOWN)
  	EVENT_CUSTOM("RootFolderNameChanged", FireRootFolderNameChanged, VTS_NONE)
+ 	EVENT_CUSTOM("ShowFindDlg", FireShowFindDlg, VTS_NONE)
+ 	EVENT_CUSTOM("ShowObjInspDlg", FireShowObjInspDlg, VTS_NONE)
  	//}}AFX_EVENT_MAP
  END_EVENT_MAP()
***************
*** 418,421 ****
--- 420,424 ----
  void CGMEActiveBrowserCtrl::FocusItem(BSTR Id) 
  {
+ 	m_pPropFrame->m_pModelessPropSheet->SetActivePage(0);
  	m_pPropFrame->m_pModelessPropSheet->m_PageAggregate.GotoIUnk(Id);
  }

Index: GMEActiveBrowserCtl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowserCtl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GMEActiveBrowserCtl.h	6 Dec 2006 21:26:41 -0000	1.8
--- GMEActiveBrowserCtl.h	6 Dec 2006 22:00:59 -0000	1.9
***************
*** 56,59 ****
--- 56,63 ----
  	void FireRootFolderNameChanged()
  		{FireEvent(eventidRootFolderNameChanged, EVENT_PARAM(VTS_NONE)); }
+ 	void FireShowFindDlg()
+ 		{FireEvent(eventidShowFindDlg, EVENT_PARAM(VTS_NONE)); }
+ 	void FireShowObjInspDlg()
+ 		{FireEvent(eventidShowObjInspDlg, EVENT_PARAM(VTS_NONE)); }
  	//}}AFX_EVENT
  	DECLARE_EVENT_MAP()
***************
*** 128,131 ****
--- 132,137 ----
  	eventidShowInParentMgaObject = 6L,
  	eventidRootFolderNameChanged = 7L,
+ 	eventidShowFindDlg = 8L,
+ 	eventidShowObjInspDlg = 9L
  	//}}AFX_DISP_ID
  	};

Index: ActiveBrowsePropertySheet.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowsePropertySheet.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActiveBrowsePropertySheet.cpp	6 Dec 2006 19:23:06 -0000	1.2
--- ActiveBrowsePropertySheet.cpp	6 Dec 2006 22:00:59 -0000	1.3
***************
*** 29,32 ****
--- 29,35 ----
  	AddPage(&m_PageInheritance);
  	AddPage(&m_PageMeta);
+ 	m_PageAggregate.m_parent = this;
+ 	m_PageInheritance.m_parent = this;
+ 	m_PageMeta.m_parent = this;
  }
  
***************
*** 97,102 ****
  {
  	// TODO: Add your specialized code here and/or call the base class
! 	
  	return CPropertySheet::PreTranslateMessage(pMsg);
  }
  
--- 100,110 ----
  {
  	// TODO: Add your specialized code here and/or call the base class
! 
  	return CPropertySheet::PreTranslateMessage(pMsg);
+ }
+ 
+ void CActiveBrowserPropertySheet::nextTab( bool pOrder)
+ {
+ 	SetActivePage( ( GetActiveIndex() + ( pOrder? 1:( GetPageCount() -1))) % GetPageCount());
  }
  

Index: ActiveBrowserPropertyPage.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ActiveBrowserPropertyPage.h	6 Dec 2006 20:47:52 -0000	1.16
--- ActiveBrowserPropertyPage.h	6 Dec 2006 22:00:59 -0000	1.17
***************
*** 17,21 ****
  #include "MetaConnectionDlg.h"
  
! 
  
  
--- 17,21 ----
  #include "MetaConnectionDlg.h"
  
! class CActiveBrowserPropertySheet;
  
  
***************
*** 52,55 ****
--- 52,56 ----
  	// Called on opening the project
  	void OpenProject();
+ 	void SetFoc();
  	// Called on closing the project
  	void CloseProject();
***************
*** 57,60 ****
--- 58,63 ----
  	BOOL reqHasDisplayedChild(IMgaObject* pIMgaObject, int nDepthLevel=-1);
  	
+ 	CActiveBrowserPropertySheet* m_parent;
+ 		   
  	CAggregatePropertyPage();
  	~CAggregatePropertyPage();
***************
*** 151,154 ****
--- 154,159 ----
  	void PrepareStateImageList();
  
+ 	CActiveBrowserPropertySheet* m_parent;
+ 
  // Dialog Data
  	//{{AFX_DATA(CInheritancePropertyPage)
***************
*** 226,229 ****
--- 231,236 ----
  	~CMetaPropertyPage();
  
+ 	CActiveBrowserPropertySheet* m_parent;
+ 
  // Dialog Data
  	//{{AFX_DATA(CMetaPropertyPage)
***************
*** 251,254 ****
--- 258,262 ----
  	afx_msg void OnSelChangedTreeMeta(NMHDR* pNMHDR, LRESULT* pResult);
  	afx_msg void OnItemExpandingTreeMeta(NMHDR* pNMHDR, LRESULT* pResult);
+ 	afx_msg void OnKeyDownTreeMeta(NMHDR* pNMHDR, LRESULT* pResult);
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()

Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** ActiveBrowserPropertyPage.cpp	6 Dec 2006 21:26:41 -0000	1.55
--- ActiveBrowserPropertyPage.cpp	6 Dec 2006 22:00:59 -0000	1.56
***************
*** 88,91 ****
--- 88,92 ----
  	ON_WM_KILLFOCUS()
  	//}}AFX_MSG_MAP
+ 	ON_WM_KEYDOWN()
  END_MESSAGE_MAP()
  
***************
*** 745,749 ****
  	AfxGetApp()->LoadStandardCursor(IDC_ARROW);
  	
! 	
  
  
--- 746,750 ----
  	AfxGetApp()->LoadStandardCursor(IDC_ARROW);
  	
! 
  
  
***************
*** 753,756 ****
--- 754,763 ----
  
  }
+ 
+ void CAggregatePropertyPage::SetFoc()
+ {
+ 	m_TreeAggregate.SetFocus();
+ }
+ 
  void CAggregatePropertyPage::CloseProject()
  {
***************
*** 2240,2245 ****
  				}
  		}break;
! 	}
  
  	
  	*pResult = 0;
--- 2247,2339 ----
  				}
  		}break;
! 	case VK_TAB:
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				m_parent->nextTab( ::GetKeyState( VK_SHIFT) >= 0);
! 			}
! 			else {
! 				m_ComboEditCtrl.SetFocus();
! 			}
! 		}break;
! 	case VK_LEFT:
! 	case VK_RIGHT:
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				m_parent->nextTab( pTVKeyDown->wVKey == VK_RIGHT);
! 			}
! 		}break;
! 	case 0x43: //VK_C
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				this->DoCopy();
! 			}
! 		}break;
! 	case 0x55: //VK_U
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 				CMgaContext* pMgaContext=&pApp->m_CurrentProject.m_MgaContext;
! 				
! 				short nRedoSize,nUndoSize;
! 				pMgaContext->m_ccpProject->UndoRedoSize(&nUndoSize,&nRedoSize);
! 
! 				if( nRedoSize > 0)
! 				{
! 					COMTHROW(pMgaContext->m_ccpProject->Redo());
! 					m_TreeAggregate.SetFocus();
! 				}
! 			}
! 		}break;
! 	case 0x5A: // VK_Z
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
! 				CMgaContext* pMgaContext=&pApp->m_CurrentProject.m_MgaContext;
! 				
! 				short nRedoSize,nUndoSize;
! 				pMgaContext->m_ccpProject->UndoRedoSize(&nUndoSize,&nRedoSize);
! 
! 				if( nUndoSize > 0)
! 				{
! 					COMTHROW(pMgaContext->m_ccpProject->Undo());
! 					m_TreeAggregate.SetFocus();
! 				}
! 			}
! 		}break;
! 	case 0x56: //VK_V
! 		{
! 			if( ::GetKeyState( VK_CONTROL) < 0) {
! 				COleDataObject OleDataObject;
! 				CString msg;
! 				if( OleDataObject.AttachClipboard()) {
! 					if( m_TreeAggregate.DoDrop( DRAGOP_COPY, &OleDataObject, CPoint( 0, 0))) {
! 						// what about set focus back
! 						m_TreeAggregate.SetFocus();
! 					} else msg = "Cannot paste data from the clipboard. Please select valid target item.";
! 				} else msg = "Cannot recover data from the clipboard.";
  
+ 				if( !msg.IsEmpty()) MessageBox( msg, "Paste Error", MB_ICONERROR);
+ 			}
+ 		}break;
+ 	case 0x46: //VK_F:
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) { // launch Find Box
+ 				CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
+ 				pApp->GetCtrl()->FireShowFindDlg();
+ 			}
+ 		}break;
+ 	case 0x49: // VK_I
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) { // launch ObjectInspector Box
+ 				CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
+ 				pApp->GetCtrl()->FireShowObjInspDlg();
+ 			}
+ 		}break;
+ 	case VK_F2: // rename
+ 		{
+ 				HTREEITEM hItem=m_TreeAggregate.GetSelectedItem();
+ 				m_TreeAggregate.EditLabel(hItem);
+ 		}break;
+ 	}
  	
  	*pResult = 0;
***************
*** 2613,2616 ****
--- 2707,2726 ----
  				}
  		}break;
+ 	case VK_TAB:
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) {
+ 				m_parent->nextTab( ::GetKeyState( VK_SHIFT) >= 0);
+ 			}
+ 			else {
+ 				m_ComboEditCtrl.SetFocus();
+ 			}
+ 		}break;
+ 	case VK_LEFT:
+ 	case VK_RIGHT:
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) {
+ 				m_parent->nextTab( pTVKeyDown->wVKey == VK_RIGHT);
+ 			}
+ 		}break;
  	}
  
***************
*** 2996,2999 ****
--- 3106,3110 ----
  	ON_NOTIFY(TVN_SELCHANGED, IDC_TREE_META, OnSelChangedTreeMeta)
  	ON_NOTIFY(TVN_ITEMEXPANDING, IDC_TREE_META, OnItemExpandingTreeMeta)
+ 	ON_NOTIFY(TVN_KEYDOWN, IDC_TREE_META, OnKeyDownTreeMeta)
  	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
***************
*** 3471,3475 ****
--- 3582,3611 ----
  
  
+ void CMetaPropertyPage::OnKeyDownTreeMeta(NMHDR* pNMHDR, LRESULT* pResult)
+ {
+ 	TV_KEYDOWN* pTVKeyDown = (TV_KEYDOWN*)pNMHDR;
+ 	switch(pTVKeyDown->wVKey)
+ 	{
+ 	case VK_TAB:
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) {
+ 				m_parent->nextTab( ::GetKeyState( VK_SHIFT) >= 0);
+ 			}
+ 			else {
+ 				m_ComboEditCtrl.SetFocus();
+ 			}
+ 		}break;
+ 	case VK_LEFT:
+ 	case VK_RIGHT:
+ 		{
+ 			if( ::GetKeyState( VK_CONTROL) < 0) {
+ 				m_parent->nextTab( pTVKeyDown->wVKey == VK_RIGHT);
+ 			}
+ 		}break;
+ 	}
  
+ 	
+ 	*pResult = 0;
+ }
  
  

Index: ActiveBrowsePropertySheet.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowsePropertySheet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActiveBrowsePropertySheet.h	6 Dec 2006 19:23:06 -0000	1.2
--- ActiveBrowsePropertySheet.h	6 Dec 2006 22:00:59 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
  	virtual ~CActiveBrowserPropertySheet();
  	 virtual void PostNcDestroy();
+ 	void nextTab( bool);
  
  // Generated message map functions

Index: ActiveBrowserPropertyFrame.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyFrame.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActiveBrowserPropertyFrame.cpp	1 Mar 2002 21:52:00 -0000	1.1
--- ActiveBrowserPropertyFrame.cpp	6 Dec 2006 22:00:59 -0000	1.2
***************
*** 131,134 ****
--- 131,135 ----
  	m_pModelessPropSheet->m_PageInheritance.OpenProject();
  	m_pModelessPropSheet->m_PageMeta.OpenProject();
+ 	m_pModelessPropSheet->m_PageAggregate.SetFoc();
  
  }

More information about the GME-commit mailing list