[GME-commit]
GMESRC/GME/Search Search.odl,1.2,1.3 Search.rc,1.10,1.11
SearchCtl.cpp,1.2,1.3 SearchCtl.h,1.3,1.4 SearchDlg.cpp,1.17,1.18
SearchDlg.h,1.9,1.10 resource.h,1.8,1.9
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Tue May 2 23:06:01 CDT 2006
Update of /project/gme-repository/GMESRC/GME/Search
In directory escher:/tmp/cvs-serv18168
Modified Files:
Search.odl Search.rc SearchCtl.cpp SearchCtl.h SearchDlg.cpp
SearchDlg.h resource.h
Log Message:
Searchbox can show found objects in the Browser.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: SearchCtl.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/SearchCtl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SearchCtl.h 12 Dec 2002 22:33:00 -0000 1.3
--- SearchCtl.h 2 May 2006 22:05:59 -0000 1.4
***************
*** 44,47 ****
--- 44,48 ----
void DblClickOnObject(CComPtr<IMgaObject> object);
void WantToBeClosed();
+ void LocateMgaObject(CComPtr<IMgaObject> object);
***************
*** 87,90 ****
--- 88,95 ----
void FireWantToBeClosed()
{FireEvent(eventidWantToBeClosed,EVENT_PARAM(VTS_NONE));}
+ void FireLocateMgaObject(LPCTSTR mgaObjectId)
+ {FireEvent(eventidLocateMgaObject, EVENT_PARAM(VTS_BSTR), mgaObjectId);}
+
+
//}}AFX_EVENT
DECLARE_EVENT_MAP()
***************
*** 100,104 ****
// Dispatch and event IDs
public:
! enum {
//{{AFX_DISP_ID(CSearchCtrl)
dispidMgaProject = 1L,
--- 105,109 ----
// Dispatch and event IDs
public:
! enum {
//{{AFX_DISP_ID(CSearchCtrl)
dispidMgaProject = 1L,
***************
*** 107,110 ****
--- 112,116 ----
eventidDblClickMgaObject = 2L,
eventidWantToBeClosed = 3L,
+ eventidLocateMgaObject = 4L,
//}}AFX_DISP_ID
};
***************
*** 114,118 ****
int m_transactionCnt;
bool m_inEventTransactionMode;
-
};
--- 120,123 ----
Index: SearchDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/SearchDlg.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SearchDlg.cpp 17 Mar 2006 15:48:47 -0000 1.17
--- SearchDlg.cpp 2 May 2006 22:05:59 -0000 1.18
***************
*** 36,39 ****
--- 36,41 ----
m_chkSet = TRUE;
m_chkSplSearch = FALSE;
+ m_chkLocate = FALSE;
+ m_chkMatchCase = TRUE;
m_stcRef = _T("");
//}}AFX_DATA_INIT
***************
*** 70,73 ****
--- 72,77 ----
DDX_Check(pDX, IDC_CHECKSET, m_chkSet);
DDX_Check(pDX, IDC_CHECKSPLSEARCH, m_chkSplSearch);
+ DDX_Check(pDX, IDC_CHECK_LOCATE, m_chkLocate);
+ DDX_Check(pDX, IDC_CHECK_CASESENS, m_chkMatchCase);
DDX_Text(pDX, IDC_STATICREF, m_stcRef);
//}}AFX_DATA_MAP
***************
*** 458,462 ****
CComQIPtr<IMgaObject> selectedObject( selectedFCO);
TheCtrl->CommitTransaction();
! if( selectedObject) TheCtrl->DblClickOnObject(selectedObject);
}
catch(...)
--- 462,471 ----
CComQIPtr<IMgaObject> selectedObject( selectedFCO);
TheCtrl->CommitTransaction();
! if( selectedObject)
! {
! if( m_chkLocate) TheCtrl->LocateMgaObject(selectedObject);
! else TheCtrl->DblClickOnObject(selectedObject);
! }
!
}
catch(...)
Index: Search.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/Search.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Search.rc 2 May 2006 15:55:03 -0000 1.10
--- Search.rc 2 May 2006 22:05:59 -0000 1.11
***************
*** 134,155 ****
LTEXT "Name:",IDC_STATICNAME,29,18,22,8
EDITTEXT IDC_EDITNAME,55,16,78,14,ES_AUTOHSCROLL
! PUSHBUTTON "&Search",IDC_BUTTON_GO,33,102,50,14
! CONTROL "List1",IDC_LISTRESULTS,"SysListView32",LVS_REPORT |
! WS_BORDER | WS_TABSTOP,7,126,223,100
! GROUPBOX "Search Criteria",IDC_STATICCRIT,7,7,223,58
! LTEXT "Role Name:",IDC_STATICROLE,13,32,41,9
! LTEXT "Kind Name:",IDC_STATICKIND,13,47,40,9
EDITTEXT IDC_EDITROLE,55,31,77,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDITKIND,55,45,77,14,ES_AUTOHSCROLL
- LTEXT "Attribute:",IDC_STATICATTRNAME,141,18,30,9
- LTEXT "Type:",IDC_STATICATTRTYPE,150,33,20,9
- LTEXT "Value:",IDC_STATICATTRVALU,148,49,21,9
EDITTEXT IDC_EDITATTRNAME,172,15,52,13,ES_AUTOHSCROLL
COMBOBOX IDC_COMBOTYPE,171,30,51,112,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_EDITATTRVALU,171,47,52,14,ES_AUTOHSCROLL
- CONTROL "Match Whole Word Only",IDC_CHECKFULLWORD,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,105,103,101,14
- GROUPBOX "Search For",IDC_STATICFOR,7,65,223,35
CONTROL "Model",IDC_CHECKMOD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,21,75,43,9
--- 134,144 ----
LTEXT "Name:",IDC_STATICNAME,29,18,22,8
EDITTEXT IDC_EDITNAME,55,16,78,14,ES_AUTOHSCROLL
! PUSHBUTTON "&Search",IDC_BUTTON_GO,10,107,50,14
EDITTEXT IDC_EDITROLE,55,31,77,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDITKIND,55,45,77,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDITATTRNAME,172,15,52,13,ES_AUTOHSCROLL
COMBOBOX IDC_COMBOTYPE,171,30,51,112,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_EDITATTRVALU,171,47,52,14,ES_AUTOHSCROLL
CONTROL "Model",IDC_CHECKMOD,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,21,75,43,9
***************
*** 162,168 ****
CONTROL "Special:",IDC_CHECKSPLSEARCH,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,77,87,39,11
CONTROL "Progress1",IDC_PROGRESSSEARCH,"msctls_progress32",NOT
WS_VISIBLE | WS_BORDER,16,162,199,20
- LTEXT "NULL References",IDC_STATICREF,117,88,111,8
END
--- 151,172 ----
CONTROL "Special:",IDC_CHECKSPLSEARCH,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,77,87,39,11
+ LTEXT "NULL References",IDC_STATICREF,117,88,111,8
+ CONTROL "Match Whole Word Only",IDC_CHECKFULLWORD,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,65,104,94,10
+ CONTROL "Match Case",IDC_CHECK_CASESENS,"Button",BS_AUTOCHECKBOX |
+ NOT WS_VISIBLE | WS_TABSTOP,161,104,54,10
+ CONTROL "Locate in Browser",IDC_CHECK_LOCATE,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,65,115,96,10
+ CONTROL "List1",IDC_LISTRESULTS,"SysListView32",LVS_REPORT |
+ WS_BORDER | WS_TABSTOP,7,126,223,100
+ GROUPBOX "Search Criteria",IDC_STATICCRIT,7,7,223,58
+ LTEXT "Role Name:",IDC_STATICROLE,13,32,41,9
+ LTEXT "Kind Name:",IDC_STATICKIND,13,47,40,9
+ LTEXT "Attribute:",IDC_STATICATTRNAME,141,18,30,9
+ LTEXT "Type:",IDC_STATICATTRTYPE,150,33,20,9
+ LTEXT "Value:",IDC_STATICATTRVALU,148,49,21,9
+ GROUPBOX "Search For",IDC_STATICFOR,7,65,223,35
CONTROL "Progress1",IDC_PROGRESSSEARCH,"msctls_progress32",NOT
WS_VISIBLE | WS_BORDER,16,162,199,20
END
Index: Search.odl
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/Search.odl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Search.odl 7 Dec 2002 02:28:00 -0000 1.2
--- Search.odl 2 May 2006 22:05:59 -0000 1.3
***************
*** 57,60 ****
--- 57,61 ----
[id(3)] void WantToBeClosed();
//}}AFX_ODL_EVENT
+ [id(4)] void LocateMgaObject(BSTR mgaObjectId);
};
Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/resource.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** resource.h 26 Jan 2005 17:31:00 -0000 1.8
--- resource.h 2 May 2006 22:05:59 -0000 1.9
***************
*** 38,41 ****
--- 38,43 ----
#define IDC_STATICREF 228
#define IDC_STATICREF2 229
+ #define IDC_CHECK_LOCATE 229
+ #define IDC_CHECK_CASESENS 230
// Next default values for new objects
***************
*** 45,49 ****
#define _APS_NEXT_RESOURCE_VALUE 204
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 229
#define _APS_NEXT_SYMED_VALUE 101
#endif
--- 47,51 ----
#define _APS_NEXT_RESOURCE_VALUE 204
#define _APS_NEXT_COMMAND_VALUE 32768
! #define _APS_NEXT_CONTROL_VALUE 231
#define _APS_NEXT_SYMED_VALUE 101
#endif
Index: SearchDlg.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/SearchDlg.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SearchDlg.h 17 Mar 2006 15:48:47 -0000 1.9
--- SearchDlg.h 2 May 2006 22:05:59 -0000 1.10
***************
*** 54,57 ****
--- 54,59 ----
BOOL m_chkSet;
BOOL m_chkSplSearch;
+ BOOL m_chkLocate;
+ BOOL m_chkMatchCase;
CString m_stcRef;
//}}AFX_DATA
Index: SearchCtl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Search/SearchCtl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SearchCtl.cpp 7 Dec 2002 02:28:00 -0000 1.2
--- SearchCtl.cpp 2 May 2006 22:05:59 -0000 1.3
***************
*** 14,18 ****
#endif
-
IMPLEMENT_DYNCREATE(CSearchCtrl, COleControl)
--- 14,17 ----
***************
*** 50,53 ****
--- 49,53 ----
EVENT_CUSTOM("WantToBeClosed", FireWantToBeClosed, VTS_NONE)
//}}AFX_EVENT_MAP
+ EVENT_CUSTOM_ID("LocateMgaObject", eventidLocateMgaObject, FireLocateMgaObject, VTS_BSTR)
END_EVENT_MAP()
***************
*** 466,468 ****
{
FireWantToBeClosed();
! }
\ No newline at end of file
--- 466,486 ----
{
FireWantToBeClosed();
! }
!
! void CSearchCtrl::LocateMgaObject(CComPtr<IMgaObject> object)
! {
! try
! {
! // obtain object id
! BeginTransaction();
! CBstr bstr_id;
! COMTHROW( object->get_ID( bstr_id));
! CommitTransaction();
!
! // fire event
! FireLocateMgaObject( (LPCTSTR) (CString) bstr_id);
!
! } catch( hresult_exception& ) {
! AbortTransaction();
! }
! }
More information about the GME-commit
mailing list