[GME-commit]
GMESRC/GME/MgaUtil GmeDlg.cpp,1.13,1.14 GmeDlg.h,1.11,1.12
MgaRegistrar.cpp,1.43,1.44 MgaRegistrar.h,1.21,1.22
MgaUtil.rc,1.51,1.52 resource.h,1.32,1.33
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Thu Jan 12 22:43:56 CST 2006
Update of /project/gme-repository/GMESRC/GME/MgaUtil
In directory escher:/tmp/cvs-serv15164
Modified Files:
GmeDlg.cpp GmeDlg.h MgaRegistrar.cpp MgaRegistrar.h MgaUtil.rc
resource.h
Log Message:
Console TimeStamping option added.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: MgaUtil.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/MgaUtil.rc,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** MgaUtil.rc 15 Nov 2005 20:10:51 -0000 1.51
--- MgaUtil.rc 12 Jan 2006 22:43:54 -0000 1.52
***************
*** 118,121 ****
--- 118,123 ----
GROUPBOX "Misc",IDC_STATIC,7,321,233,59
LTEXT "Double attribute format:",IDC_STATIC,12,343,75,8
+ CONTROL "Console Timestamping",IDC_TIMESTAMPING,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,143,369,87,10
END
Index: GmeDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/GmeDlg.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GmeDlg.cpp 15 Nov 2005 20:10:51 -0000 1.13
--- GmeDlg.cpp 12 Jan 2006 22:43:54 -0000 1.14
***************
*** 49,52 ****
--- 49,53 ----
m_labelavoidance = FALSE;
m_sendOverObj = FALSE;
+ m_timeStamps = FALSE;
//}}AFX_DATA_INIT
m_scriptEngine = _T("JScript");
***************
*** 71,74 ****
--- 72,76 ----
DDX_Check(pDX, IDC_LABELAVOIDANCE, m_labelavoidance);
DDX_Check(pDX, IDC_SENDOVEROBJECT, m_sendOverObj);
+ DDX_Check(pDX, IDC_TIMESTAMPING, m_timeStamps);
//}}AFX_DATA_MAP
}
***************
*** 323,326 ****
--- 325,333 ----
// format string pref
fillFmtStrComboBox();
+
+ // Console Timestamping
+ VARIANT_BOOL console_timestamps;
+ COMTHROW( registrar->GetTimeStamping( REGACCESS_USER, &console_timestamps));
+ m_timeStamps = ( console_timestamps == VARIANT_FALSE) ? FALSE : TRUE;
}
MSGCATCH("Error while initializing GmeDlg",;)
***************
*** 395,398 ****
--- 402,409 ----
CString fmt_sel = getFmtStrValue();
COMTHROW( registrar->SetRealNmbFmtStr(REGACCESS_USER, PutInBstr(fmt_sel)));
+
+ // console timestamping
+ VARIANT_BOOL console_timestamping = ( m_timeStamps == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
+ COMTHROW( registrar->SetTimeStamping( REGACCESS_USER, console_timestamping) );
}
Index: MgaRegistrar.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/MgaRegistrar.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** MgaRegistrar.cpp 15 Nov 2005 20:10:51 -0000 1.43
--- MgaRegistrar.cpp 12 Jan 2006 22:43:54 -0000 1.44
***************
*** 756,759 ****
--- 756,808 ----
}
+ STDMETHODIMP CMgaRegistrar::GetTimeStamping(regaccessmode_enum p_mode, VARIANT_BOOL *p_enabled)
+ {
+ COMTRY
+ {
+ LONG res;
+ CString str;
+ if(p_mode & RM_USER) {
+ CRegKey mga;
+ res = mga.Open(HKEY_CURRENT_USER, rootreg, KEY_READ);
+ if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
+ if(res == ERROR_SUCCESS) {
+ str = QueryValue(mga, "TimeStamping");
+ if(!str.IsEmpty()) {
+ REVOKE_SYS2(p_mode);
+ }
+ }
+ }
+ if(p_mode & (RM_SYSDOREAD)) {
+ CRegKey mga;
+ res = mga.Open(HKEY_LOCAL_MACHINE, rootreg, KEY_READ);
+ if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
+ if(res == ERROR_SUCCESS) {
+ str = QueryValue(mga, "TimeStamping");
+ }
+ }
+ *p_enabled = (str == "1") ? VARIANT_TRUE : VARIANT_FALSE; // Default value: false
+ }
+ COMCATCH(;)
+ }
+
+ STDMETHODIMP CMgaRegistrar::SetTimeStamping(regaccessmode_enum p_mode, VARIANT_BOOL p_enabled)
+ {
+ COMTRY
+ {
+ CString str = (p_enabled == VARIANT_FALSE) ? "0" : "1";
+ if(p_mode & RM_USER) {
+ CRegKey mga;
+ ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
+ ERRTHROW( mga.SetStringValue( "TimeStamping", str));
+ }
+ if(p_mode & (RM_SYS | RM_TEST)) {
+ CRegKey mga;
+ ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
+ if(p_mode & RM_SYS) ERRTHROW( mga.SetStringValue( "TimeStamping", str));
+ }
+ }
+ COMCATCH(;)
+ }
+
STDMETHODIMP CMgaRegistrar::get_Paradigms(regaccessmode_enum mode, VARIANT *names)
{
Index: MgaRegistrar.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/MgaRegistrar.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MgaRegistrar.h 28 Nov 2005 22:12:23 -0000 1.21
--- MgaRegistrar.h 12 Jan 2006 22:43:54 -0000 1.22
***************
*** 77,80 ****
--- 77,82 ----
STDMETHOD(GetRealNmbFmtStr)(regaccessmode_enum mode, BSTR *fmtStr);
STDMETHOD(SetRealNmbFmtStr)(regaccessmode_enum mode, BSTR fmtStr);
+ STDMETHOD(GetTimeStamping)(regaccessmode_enum mode, VARIANT_BOOL *enabled);
+ STDMETHOD(SetTimeStamping)(regaccessmode_enum mode, VARIANT_BOOL enabled);
STDMETHOD(get_Paradigms)(regaccessmode_enum mode, VARIANT *names);
Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/resource.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** resource.h 15 Nov 2005 20:10:51 -0000 1.32
--- resource.h 12 Jan 2006 22:43:54 -0000 1.33
***************
*** 203,206 ****
--- 203,207 ----
#define IDC_SENDOVEROBJECT 2266
#define IDC_CMBFMTSTRS 2268
+ #define IDC_TIMESTAMPING 2269
#define ID_CNTX_ADDNODE 32774
#define ID_CNTX_CLEARNODE 32775
***************
*** 214,218 ****
#define _APS_NEXT_RESOURCE_VALUE 2071
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2269
#define _APS_NEXT_SYMED_VALUE 2091
#endif
--- 215,219 ----
#define _APS_NEXT_RESOURCE_VALUE 2071
#define _APS_NEXT_COMMAND_VALUE 32778
! #define _APS_NEXT_CONTROL_VALUE 2270
#define _APS_NEXT_SYMED_VALUE 2091
#endif
Index: GmeDlg.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/MgaUtil/GmeDlg.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GmeDlg.h 15 Nov 2005 20:10:51 -0000 1.11
--- GmeDlg.h 12 Jan 2006 22:43:54 -0000 1.12
***************
*** 45,48 ****
--- 45,49 ----
BOOL m_labelavoidance;
BOOL m_sendOverObj;
+ BOOL m_timeStamps;
//}}AFX_DATA
More information about the GME-commit
mailing list