[commit] r1433 - trunk/GME/MgaUtil
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Jul 25 17:58:20 CDT 2011
Author: ksmyth
Date: Mon Jul 25 17:58:20 2011
New Revision: 1433
Log:
Remove paradigm "Add from DB". Remove Select Paradigm User/System: always use User. Relayout Select Paradigm controls
Modified:
trunk/GME/MgaUtil/MetaDlg.cpp
trunk/GME/MgaUtil/MetaDlg.h
trunk/GME/MgaUtil/MgaUtil.rc
trunk/GME/MgaUtil/StdAfx.h
trunk/GME/MgaUtil/resource.h
Modified: trunk/GME/MgaUtil/MetaDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/MetaDlg.cpp Mon Jul 25 16:05:13 2011 (r1432)
+++ trunk/GME/MgaUtil/MetaDlg.cpp Mon Jul 25 17:58:20 2011 (r1433)
@@ -21,7 +21,6 @@
: CDialog(CMetaDlg::IDD, pParent)
{
//{{AFX_DATA_INIT(CMetaDlg)
- m_accessmode = 1;
//}}AFX_DATA_INIT
}
@@ -33,7 +32,6 @@
DDX_Control(pDX, IDC_PURGE, m_purge);
DDX_Control(pDX, IDC_REMOVE, m_remove);
DDX_Control(pDX, IDC_LIST, m_list);
- DDX_Radio(pDX, IDC_RADIOSYS, m_accessmode);
//}}AFX_DATA_MAP
}
@@ -42,7 +40,6 @@
//{{AFX_MSG_MAP(CMetaDlg)
ON_BN_CLICKED(IDC_ADDFILE, OnAddfile)
ON_BN_CLICKED(IDC_REMOVE, OnRemove)
- ON_BN_CLICKED(IDC_ADDDB, OnAddDB)
ON_BN_CLICKED(IDC_PURGE, OnPurge)
//}}AFX_MSG_MAP
ON_WM_SIZE()
@@ -78,15 +75,6 @@
GetDlgItem(IDOK)->SetWindowText(_T("Create New"));
}
- {
- CRegKey accessTest;
- if (accessTest.Open(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\GME"), KEY_READ | KEY_WRITE) == ERROR_ACCESS_DENIED) {
- GetDlgItem(IDC_RADIOSYS)->EnableWindow(false);
- GetDlgItem(IDC_RADIOUSER)->EnableWindow(false);
- GetDlgItem(IDC_RADIOBOTH)->EnableWindow(false);
- }
- }
-
LV_COLUMN lvc;
lvc.mask = LVCF_WIDTH | LVCF_TEXT;
@@ -255,7 +243,7 @@
CComBSTR newname;
- COMTHROW(registrar->RegisterParadigmFromData(PutInBstr(conn), &newname, regacc_translate(m_accessmode)));
+ COMTHROW(registrar->RegisterParadigmFromData(PutInBstr(conn), &newname, REGACCESS_USER));
to_select = newname;
ResetItems();
@@ -274,21 +262,10 @@
CString name = m_list.GetItemText(m_list.GetNextSelectedItem(pos), 0);
ASSERT( registrar != NULL );
- COMTHROW( registrar->UnregisterParadigm(PutInBstr(name), regacc_translate(m_accessmode)) );
+ COMTHROW( registrar->UnregisterParadigm(PutInBstr(name), REGACCESS_USER) );
- CComBSTR dummyc;
- CComVariant dummyg;
- switch(regacc_translate(m_accessmode)) {
- case REGACCESS_USER:
- if(S_OK == registrar->QueryParadigm(PutInBstr(name), &dummyc, &dummyg, REGACCESS_SYSTEM)) {
- AfxMessageBox(_T("Warning: Paradigm is still present in system registry"));
- }
- break;
- case REGACCESS_SYSTEM:
- if(S_OK == registrar->QueryParadigm(PutInBstr(name), &dummyc, &dummyg, REGACCESS_USER)) {
- AfxMessageBox(_T("Warning: Paradigm is still present in user registry"));
- }
- break;
+ if (S_OK == registrar->QueryParadigm(PutInBstr(name), _bstr_t().GetAddress(), _variant_t().GetAddress(), REGACCESS_SYSTEM)) {
+ AfxMessageBox(_T("Warning: Paradigm is still present in system registry"));
}
ResetItems();
}
@@ -296,48 +273,6 @@
MSGCATCH(_T("Error while removing paradigm"),;)
}
-void CMetaDlg::OnAddDB()
-{
- UpdateData();
- MSGTRY
- {
- CDatabase db;
- if( db.OpenEx(NULL) )
- {
- CString conn = CMgaLauncher::PruneConnectionString(db.GetConnect());
-
- CComObjPtr<IMgaMetaProject> paradigm;
- COMTHROW( paradigm.CoCreateInstance(OLESTR("MGA.MgaMetaProject")) );
- ASSERT( paradigm != NULL );
-
- COMTHROW( paradigm->Open(PutInBstr(conn)) );
-
- CComBstrObj name;
- COMTHROW( paradigm->get_Name(PutOut(name)) );
-
- CComBstrObj version;
- COMTHROW( paradigm->get_Version(PutOut(version)) );
-
- CComVariant guid;
- COMTHROW( paradigm->get_GUID(PutOut(guid)) );
-
- COMTHROW( paradigm->Close() );
-
- ASSERT( registrar != NULL );
- COMTHROW( registrar->RegisterParadigm(name, PutInBstr(conn), PutInBstr(version), guid, regacc_translate(m_accessmode)) );
-
- to_select = PutInBstr(name);
- ResetItems();
- }
- db.Close();
- }
- MSGCATCH(_T("Error while registering paradigm"),;)
- catch(...)
- {
- DisplayError(_T("Error while registering paradigm"), E_EXCEPTION);
- }
-}
-
BOOL CMetaDlg::OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult)
{
if( wParam == IDC_LIST && ((NMHDR*)lParam)->code == LVN_ITEMCHANGED )
Modified: trunk/GME/MgaUtil/MetaDlg.h
==============================================================================
--- trunk/GME/MgaUtil/MetaDlg.h Mon Jul 25 16:05:13 2011 (r1432)
+++ trunk/GME/MgaUtil/MetaDlg.h Mon Jul 25 17:58:20 2011 (r1433)
@@ -22,7 +22,6 @@
CButton m_purge;
CButton m_remove;
CListCtrl m_list;
- int m_accessmode;
//}}AFX_DATA
@@ -42,7 +41,6 @@
virtual BOOL OnInitDialog();
afx_msg void OnAddfile();
afx_msg void OnRemove();
- afx_msg void OnAddDB();
virtual void OnOK();
afx_msg void OnPurge();
//}}AFX_MSG
Modified: trunk/GME/MgaUtil/MgaUtil.rc
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.rc Mon Jul 25 16:05:13 2011 (r1432)
+++ trunk/GME/MgaUtil/MgaUtil.rc Mon Jul 25 17:58:20 2011 (r1433)
@@ -34,23 +34,17 @@
CONTROL "",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_MULTILINE | WS_GROUP | WS_TABSTOP,7,87,218,12,WS_EX_TRANSPARENT
END
-IDD_METADLG DIALOGEX 0, 0, 302, 230
+IDD_METADLG DIALOGEX 0, 0, 400, 233
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
CAPTION "Select Paradigm"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "Create New...",IDOK,15,201,55,15,WS_DISABLED
- PUSHBUTTON "Close",IDCANCEL,79,201,55,15
- PUSHBUTTON "Purge/Select...",IDC_PURGE,145,202,55,15,WS_DISABLED
- PUSHBUTTON "Add from File...",IDC_ADDFILE,15,180,54,15
- PUSHBUTTON "Add from DB...",IDC_ADDDB,80,180,55,15
- PUSHBUTTON "Remove",IDC_REMOVE,145,180,55,15,WS_DISABLED
- LTEXT "Please select a Paradigm from the following list. You can also register new Paradigms on your local machine or from a database. To parse an XML file containing your paradigm select ""Add File..."" and then the ""XML Files"" file type.",IDC_INFO,5,5,255,30
- CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,5,35,290,135
- LTEXT "Register:",IDC_STATIC,210,179,69,10
- CONTROL "Systemwide",IDC_RADIOSYS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,210,189,53,10
- CONTROL "For user only",IDC_RADIOUSER,"Button",BS_AUTORADIOBUTTON,210,199,56,10
- CONTROL "For both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,210,209,42,10
+ DEFPUSHBUTTON "Create New...",IDOK,7,211,55,15,WS_DISABLED
+ PUSHBUTTON "Purge/Select...",IDC_PURGE,66,211,55,15,WS_DISABLED
+ PUSHBUTTON "Add from file...",IDC_ADDFILE,7,192,55,15
+ PUSHBUTTON "Remove",IDC_REMOVE,66,192,55,15,WS_DISABLED
+ LTEXT "Please select a Paradigm from the following list. You can also register new Paradigms on your local machine. To parse an XML file containing your paradigm select ""Add File..."" and then the ""XML Files"" file type.",IDC_INFO,7,7,255,40
+ CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOLABELWRAP | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,7,33,386,155
END
IDD_GMEDLG DIALOGEX 0, 0, 247, 451
Modified: trunk/GME/MgaUtil/StdAfx.h
==============================================================================
--- trunk/GME/MgaUtil/StdAfx.h Mon Jul 25 16:05:13 2011 (r1432)
+++ trunk/GME/MgaUtil/StdAfx.h Mon Jul 25 17:58:20 2011 (r1433)
@@ -37,10 +37,6 @@
#endif // _AFX_NO_OLE_SUPPORT
-#ifndef _AFX_NO_DB_SUPPORT
-#include <afxdb.h> // MFC ODBC database classes
-#endif // _AFX_NO_DB_SUPPORT
-
#ifndef _AFX_NO_DAO_SUPPORT
#include <afxdao.h> // MFC DAO database classes
#endif // _AFX_NO_DAO_SUPPORT
Modified: trunk/GME/MgaUtil/resource.h
==============================================================================
--- trunk/GME/MgaUtil/resource.h Mon Jul 25 16:05:13 2011 (r1432)
+++ trunk/GME/MgaUtil/resource.h Mon Jul 25 17:58:20 2011 (r1433)
@@ -57,7 +57,6 @@
#define IDD_COMPDLG 2009
#define IDC_ADDFILE 2010
#define IDC_MYHELP 2011
-#define IDC_ADDDB 2012
#define IDC_REMOVE 2013
#define IDC_INFO 2014
#define IDC_ICONPATH 2015
More information about the gme-commit
mailing list