[GME-commit]
GMESRC/GME/Gme GME.rc,1.153,1.154 GMEApp.cpp,1.140,1.141
GMEApp.h,1.35,1.36 GMEView.cpp,1.187,1.188 GMEView.h,1.73,1.74
resource.h,1.69,1.70
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Dec 7 19:07:42 CST 2006
Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv15364
Modified Files:
GME.rc GMEApp.cpp GMEApp.h GMEView.cpp GMEView.h resource.h
Log Message:
New commands and accelerators
for GMEView
ID_VIEW_PARENT,: when Backspace is hit
ID_VIEW_SHOWSELMODEL, : when Return is hit on selected models
ID_VIEW_FOCUSBROWSER, : when ctrl+b is hit
ID_VIEW_FOCUSINSPECTOR, : when ctrl+i is hit
for GMEApp
ID_FOCUS_BROWSER,: when ctrl+b is hit
ID_FOCUS_INSPECTOR ,: when ctrl+i is hit
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** GMEView.cpp 17 Oct 2006 23:04:22 -0000 1.187
--- GMEView.cpp 7 Dec 2006 19:07:40 -0000 1.188
***************
*** 420,423 ****
--- 420,426 ----
ON_MESSAGE(WM_USER_PANNREFRESH, OnPannRefresh)
ON_MESSAGE(WM_PANN_SCROLL, OnPannScroll)
+ ON_COMMAND(ID_VIEW_SHOWSELMODEL, OnShowSelectedModel)
+ ON_COMMAND(ID_VIEW_FOCUSBROWSER, OnFocusBrowser)
+ ON_COMMAND(ID_VIEW_FOCUSINSPECTOR, OnFocusInspector)
END_MESSAGE_MAP()
***************
*** 7196,7198 ****
}
return false;
! }
\ No newline at end of file
--- 7199,7250 ----
}
return false;
! }
!
! // called when VK_RETURN pressed on a model in a view
! void CGMEView::OnShowSelectedModel()
! {
! if(selected.GetCount()) {
! GMEEVENTLOG_GUIOBJS(selected);
! CComPtr<IMgaFCOs> coll;
! GetDocument()->CreateFcoList( &selected, coll, this);
!
! long cnt = 0;
! try {
! BeginTransaction(TRANSACTION_READ_ONLY);
! if( coll) COMTHROW( coll->get_Count( &cnt));
! CommitTransaction();
! }
! catch(hresult_exception e) {
! AbortTransaction(e.hr);
! }
!
! for( long i = 1; i <= cnt; ++i) {
! try {
! BeginTransaction(TRANSACTION_READ_ONLY);
! CComPtr<IMgaFCO> fco;
! COMTHROW( coll->get_Item( i, &fco));
! objtype_enum ot = OBJTYPE_ATOM;
! if( fco) COMTHROW( fco->get_ObjType( &ot));
! CommitTransaction();
!
! if( fco && ot == OBJTYPE_MODEL) GetDocument()->ShowObject( CComPtr<IUnknown>(fco));
! }
! catch(hresult_exception e) {
! AbortTransaction(e.hr);
! }
! }
! }
! }
!
! // called when VK_B + CTRL is pressed
! void CGMEView::OnFocusBrowser()
! {
! OnCntxLocate();
! }
!
! // called when VK_I + CTRL is pressed
! void CGMEView::OnFocusInspector()
! {
! HWND hwnd = CGMEObjectInspector::theInstance->GetSafeHwnd();
! if( hwnd) ::SetFocus( hwnd);
! }
Index: GMEApp.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** GMEApp.cpp 3 May 2006 16:50:26 -0000 1.140
--- GMEApp.cpp 7 Dec 2006 19:07:40 -0000 1.141
***************
*** 98,101 ****
--- 98,103 ----
ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_RUNPLUGIN1, ID_FILE_RUNPLUGIN8, OnUpdateFilePluginX)
ON_UPDATE_COMMAND_UI_RANGE( ID_FILE_INTERPRET1, ID_FILE_INTERPRET18, OnUpdateFileInterpretX)
+ ON_COMMAND(ID_FOCUS_BROWSER, OnFocusBrowser)
+ ON_COMMAND(ID_FOCUS_INSPECTOR, OnFocusInspector)
END_MESSAGE_MAP()
***************
*** 2690,2692 ****
--- 2692,2753 ----
if( CMainFrame::theInstance)
CMainFrame::theInstance->UpdateTitle( projectName);
+ }
+
+ void CGMEApp::OnFocusBrowser()
+ {
+ if( !mgaProject) return;
+
+ CComObjPtr<IMgaTerritory> terry;
+ COMTHROW(mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+
+ LPUNKNOWN objs = CGMEObjectInspector::theInstance->GetObjects();
+ CComQIPtr<IMgaObjects> one_obj_coll( objs);
+ long len = 0;
+ if( one_obj_coll) COMTHROW( one_obj_coll->get_Count( &len));
+ if( len >= 1)
+ {
+ MSGTRY
+ {
+ CComPtr<IMgaObject> one_obj, one_obj2;
+ long status = OBJECT_ZOMBIE;
+ CComBSTR id;
+ COMTHROW( one_obj_coll->get_Item( 1, &one_obj));
+ COMTHROW( mgaProject->BeginTransaction(terry,TRANSACTION_READ_ONLY));
+
+ if( one_obj) COMTHROW( terry->OpenObj( one_obj, &one_obj2));
+ if( one_obj2) {
+ COMTHROW( one_obj2->get_Status( &status));
+ COMTHROW( one_obj2->get_ID( &id));
+ }
+
+ COMTHROW( mgaProject->CommitTransaction());
+
+ if( id.Length() > 0 && status == OBJECT_EXISTS)
+ {
+ CGMEBrowser::theInstance->FocusItem( id);
+ return;
+ }
+ }
+ MSGCATCH("Error getting project rootfolder", mgaProject->AbortTransaction())
+ }
+
+ MSGTRY
+ {
+ CComBSTR id;
+ CComPtr<IMgaFolder> rf;
+ COMTHROW(mgaProject->BeginTransaction(terry,TRANSACTION_READ_ONLY));
+ COMTHROW(mgaProject->get_RootFolder( &rf));
+ if( rf) COMTHROW(rf->get_ID(&id));
+ COMTHROW(mgaProject->CommitTransaction());
+
+ if( id.Length() > 0)
+ CGMEBrowser::theInstance->FocusItem( id);
+ }
+ MSGCATCH("Error getting project rootfolder", mgaProject->AbortTransaction())
+ }
+
+ void CGMEApp::OnFocusInspector()
+ {
+ HWND hwnd = CGMEObjectInspector::theInstance->GetSafeHwnd();
+ if( hwnd) ::SetFocus( hwnd);
}
Index: GMEApp.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEApp.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** GMEApp.h 19 Oct 2006 02:18:23 -0000 1.35
--- GMEApp.h 7 Dec 2006 19:07:40 -0000 1.36
***************
*** 206,209 ****
--- 206,211 ----
afx_msg void OnUpdateFileDisplayConstraints(CCmdUI* pCmdUI);
afx_msg void OnUpdateEditUndo(CCmdUI* pCmdUI);
+ afx_msg void OnFocusBrowser();
+ afx_msg void OnFocusInspector();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** resource.h 30 Jan 2006 20:47:54 -0000 1.69
--- resource.h 7 Dec 2006 19:07:40 -0000 1.70
***************
*** 366,369 ****
--- 366,374 ----
#define IDC_AUTOROTATE 33010
#define IDC_REVERSE 33011
+ #define ID_VIEW_SHOWSELMODEL 33012
+ #define ID_VIEW_FOCUSBROWSER 33013
+ #define ID_VIEW_FOCUSINSPECTOR 33014
+ #define ID_FOCUS_BROWSER 33015
+ #define ID_FOCUS_INSPECTOR 33016
#define IDW_TOOLBAR_MAIN 0xE820
#define IDW_TOOLBAR_WINS 0xE821
***************
*** 377,381 ****
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 213
! #define _APS_NEXT_COMMAND_VALUE 33012
#define _APS_NEXT_CONTROL_VALUE 1111
#define _APS_NEXT_SYMED_VALUE 115
--- 382,386 ----
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 213
! #define _APS_NEXT_COMMAND_VALUE 33017
#define _APS_NEXT_CONTROL_VALUE 1111
#define _APS_NEXT_SYMED_VALUE 115
Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** GME.rc 19 Oct 2006 16:44:24 -0000 1.153
--- GME.rc 7 Dec 2006 19:07:40 -0000 1.154
***************
*** 572,589 ****
IDR_MAINFRAME ACCELERATORS
BEGIN
! "1", ID_MODE_EDIT, VIRTKEY, CONTROL, NOINVERT
"2", ID_MODE_AUTOCONNECT, VIRTKEY, CONTROL, NOINVERT
"3", ID_MODE_DISCONNECT, VIRTKEY, CONTROL, NOINVERT
"4", ID_MODE_SET, VIRTKEY, CONTROL, NOINVERT
- "5", ID_MODE_ZOOM, VIRTKEY, CONTROL, NOINVERT
- "6", ID_MODE_VISUALIZE, VIRTKEY, CONTROL, NOINVERT
"7", ID_MODE_SHORTCONNECT, VIRTKEY, CONTROL, NOINVERT
"8", ID_MODE_SHORTDISCONNECT, VIRTKEY, CONTROL, NOINVERT
! "F", ID_EDIT_SEARCH, VIRTKEY, CONTROL, NOINVERT
! "L", ID_FILE_CLEARLOCKS, VIRTKEY, CONTROL, ALT, NOINVERT
! "S", ID_FILE_SAVEPROJECT, VIRTKEY, CONTROL, NOINVERT
! VK_BACK, ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
! "Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
! "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
END
--- 572,591 ----
IDR_MAINFRAME ACCELERATORS
BEGIN
! "Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
! "F", ID_EDIT_SEARCH, VIRTKEY, CONTROL, NOINVERT
! VK_BACK, ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
! "Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
! "L", ID_FILE_CLEARLOCKS, VIRTKEY, CONTROL, ALT, NOINVERT
! "S", ID_FILE_SAVEPROJECT, VIRTKEY, CONTROL, NOINVERT
! "B", ID_FOCUS_BROWSER, VIRTKEY, CONTROL, NOINVERT
! "I", ID_FOCUS_INSPECTOR, VIRTKEY, CONTROL, NOINVERT
"2", ID_MODE_AUTOCONNECT, VIRTKEY, CONTROL, NOINVERT
"3", ID_MODE_DISCONNECT, VIRTKEY, CONTROL, NOINVERT
+ "1", ID_MODE_EDIT, VIRTKEY, CONTROL, NOINVERT
"4", ID_MODE_SET, VIRTKEY, CONTROL, NOINVERT
"7", ID_MODE_SHORTCONNECT, VIRTKEY, CONTROL, NOINVERT
"8", ID_MODE_SHORTDISCONNECT, VIRTKEY, CONTROL, NOINVERT
! "6", ID_MODE_VISUALIZE, VIRTKEY, CONTROL, NOINVERT
! "5", ID_MODE_ZOOM, VIRTKEY, CONTROL, NOINVERT
END
***************
*** 601,618 ****
IDR_GMEVIEW ACCELERATORS
BEGIN
! "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
! "P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
! "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
! VK_BACK, ID_VIEW_PARENT, VIRTKEY, NOINVERT
VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
VK_DOWN, ID_EDIT_NUDGEDOWN, VIRTKEY, NOINVERT
- VK_ESCAPE, ID_EDIT_CANCEL, VIRTKEY, NOINVERT
- VK_F1, ID_HELP_HELP, VIRTKEY, NOINVERT
- VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
- VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT
VK_LEFT, ID_EDIT_NUDGELEFT, VIRTKEY, NOINVERT
VK_RIGHT, ID_EDIT_NUDGERIGHT, VIRTKEY, NOINVERT
VK_UP, ID_EDIT_NUDGEUP, VIRTKEY, NOINVERT
END
--- 603,623 ----
IDR_GMEVIEW ACCELERATORS
BEGIN
! VK_ESCAPE, ID_EDIT_CANCEL, VIRTKEY, NOINVERT
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
! VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT
VK_DOWN, ID_EDIT_NUDGEDOWN, VIRTKEY, NOINVERT
VK_LEFT, ID_EDIT_NUDGELEFT, VIRTKEY, NOINVERT
VK_RIGHT, ID_EDIT_NUDGERIGHT, VIRTKEY, NOINVERT
VK_UP, ID_EDIT_NUDGEUP, VIRTKEY, NOINVERT
+ "V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
+ VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT
+ "A", ID_EDIT_SELECTALL, VIRTKEY, CONTROL, NOINVERT
+ "P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
+ VK_F1, ID_HELP_HELP, VIRTKEY, NOINVERT
+ "B", ID_VIEW_FOCUSBROWSER, VIRTKEY, CONTROL, NOINVERT
+ "I", ID_VIEW_FOCUSINSPECTOR, VIRTKEY, CONTROL, NOINVERT
+ VK_BACK, ID_VIEW_PARENT, VIRTKEY, NOINVERT
+ VK_RETURN, ID_VIEW_SHOWSELMODEL, VIRTKEY, NOINVERT
END
***************
*** 677,684 ****
END
! IDD_BROWSER_DIALOG DIALOG 0, 0, 250, 256
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME Browser"
! FONT 8, "MS Sans Serif"
BEGIN
CONTROL "",IDC_GMEACTIVEBROWSERCTRL1,
--- 682,689 ----
END
! IDD_BROWSER_DIALOG DIALOGEX 0, 0, 250, 256
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME Browser"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
CONTROL "",IDC_GMEACTIVEBROWSERCTRL1,
***************
*** 1239,1243 ****
BEGIN
IDC_GMEACTIVEBROWSERCTRL1, 0x376, 20, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x2688, 0x0000, 0x08c4, 0x0000, 0x0000,
0x0000,
0
--- 1244,1248 ----
BEGIN
IDC_GMEACTIVEBROWSERCTRL1, 0x376, 20, 0
! 0x0000, 0x0000, 0x0000, 0x0001, 0x242c, 0x0000, 0x08e3, 0x0000, 0x0000,
0x0000,
0
Index: GMEView.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** GMEView.h 17 Oct 2006 23:04:22 -0000 1.73
--- GMEView.h 7 Dec 2006 19:07:40 -0000 1.74
***************
*** 444,447 ****
--- 444,450 ----
afx_msg void OnUpdateCntxNamePositionEast( CCmdUI* pCmdUI );
afx_msg void OnUpdateCntxNamePositionWest( CCmdUI* pCmdUI );
+ afx_msg void OnShowSelectedModel();
+ afx_msg void OnFocusBrowser();
+ afx_msg void OnFocusInspector();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
More information about the GME-commit
mailing list