[commit] r1778 - in trunk/GME: GMEActiveBrowser Gme MgaUtil
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Jan 6 11:48:58 CST 2012
Author: ksmyth
Date: Fri Jan 6 11:48:58 2012
New Revision: 1778
Log:
Remove old unused "Properties Dialog"s
Deleted:
trunk/GME/MgaUtil/ConnPropertiesDlg.cpp
trunk/GME/MgaUtil/ConnPropertiesDlg.h
trunk/GME/MgaUtil/FolderPropertiesDlg.cpp
trunk/GME/MgaUtil/FolderPropertiesDlg.h
trunk/GME/MgaUtil/PropertiesDlg.cpp
Modified:
trunk/GME/GMEActiveBrowser/AggregateContextMenu.cpp
trunk/GME/Gme/GMEBrowser.cpp
trunk/GME/Gme/GMEView.cpp
trunk/GME/MgaUtil/MgaLauncher.cpp
trunk/GME/MgaUtil/MgaUtil.rc
trunk/GME/MgaUtil/MgaUtil.vcxproj
trunk/GME/MgaUtil/MgaUtil.vcxproj.filters
trunk/GME/MgaUtil/StdAfx.h
trunk/GME/MgaUtil/resource.h
Modified: trunk/GME/GMEActiveBrowser/AggregateContextMenu.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/AggregateContextMenu.cpp Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/GMEActiveBrowser/AggregateContextMenu.cpp Fri Jan 6 11:48:58 2012 (r1778)
@@ -498,30 +498,9 @@
if(m_pParent->m_TreeAggregate.m_MgaMap.LookupObjectUnknown(hItem,pUnknown))
{
-#ifdef OLD_ATTRIBUTE_PANEL
- CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
- if(ccpMgaObject!=NULL)
- {
- // Creating launcher
- CComObjPtr<IMgaLauncher> ccpMgaLauncher;
- COMTHROW( ccpMgaLauncher.CoCreateInstance(L"Mga.MgaLauncher") );
-
- CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
- CMgaContext* pMgaContext=&pApp->m_CurrentProject.m_MgaContext;
-
- // Starting transaction
- pMgaContext->BeginTransaction(false);
- COMTHROW( ccpMgaLauncher->PropDlg(ccpMgaObject));
- // Ending transaction
- pMgaContext->CommitTransaction();
- }
-#else
// Firing the event
CGMEActiveBrowserApp* pApp=(CGMEActiveBrowserApp*)AfxGetApp();
pApp->GetCtrl()->FireShowProperties();
-
-#endif
-
}
}
Modified: trunk/GME/Gme/GMEBrowser.cpp
==============================================================================
--- trunk/GME/Gme/GMEBrowser.cpp Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/Gme/GMEBrowser.cpp Fri Jan 6 11:48:58 2012 (r1778)
@@ -216,65 +216,6 @@
CComPtr<IUnknown> sunk = selected;
-#ifdef GME_OLD_ATTRIBUTE_PANEL
-
- CGuiMetaFco *guiMeta = NULL;
- if(sunk == 0)
- return;
-
- CComPtr<IMgaFCO> fco;
-
- if (!theApp.mgaProject)
- return;
-
-
- if (SUCCEEDED(sunk.QueryInterface(&fco))) {
- long status;
- COMTHROW(theApp.mgaProject->get_ProjectStatus(&status));
- bool inTrans = (status & 0x08L) != 0;
- CComPtr<IMgaTerritory> terr;
- if (!inTrans) {
- try {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
- COMTHROW(theApp.mgaProject->BeginTransaction(terr));
- }
- catch (hresult_exception e) {
- return;
- }
- }
-
- try {
- CComPtr<IMgaMetaFCO> metaFco;
- COMTHROW(fco->get_Meta(&metaFco));
- VERIFY(metaFco);
- metaref_type metaref;
- COMTHROW(metaFco->get_MetaRef(&metaref));
- guiMeta = CGuiMetaProject::theInstance->GetGuiMetaFco(metaref);
-
-
- }
- catch (hresult_exception e) {
- if (!inTrans) {
- theApp.mgaProject->AbortTransaction();
- }
- }
- if (!inTrans) {
- theApp.mgaProject->CommitTransaction();
- }
-
- }
- if (guiMeta) {
- CMainFrame::theInstance->GetPreferencePanel().SetFco(fco,&(guiMeta->attrs));
- if (isAttr) {
- CMainFrame::theInstance->GetAttributePanel().ShowAttrDlg();
- }
- else {
- CMainFrame::theInstance->GetPreferencePanel().ShowPrefDlg();
- }
- }
-
-#else
-// Tih at mer Object Inspector /////////////////////////////////////////////////////////
/* Converting single selection to multiple
CComPtr<IMgaObjects> ccpSelectedObjects;
COMTHROW(ccpSelectedObjects.CoCreateInstance(L"Mga.MgaObjects"));
@@ -286,13 +227,6 @@
SetCurrObject(selected);
CGMEObjectInspector::theInstance->ShowPanel(!isAttr);
-
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-
}
void CGMEBrowser::SetCurrObject(LPUNKNOWN pMgaObject)
Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/Gme/GMEView.cpp Fri Jan 6 11:48:58 2012 (r1778)
@@ -6483,28 +6483,6 @@
ShowProperties();
contextSelection = 0;
contextPort = 0;
-
- /*CComPtr<IMgaFCO> fco;
- try {
- BeginTransaction();
- if (contextSelection)
- fco = contextSelection->mgaFco;
- else
- COMTHROW(currentModel.QueryInterface(&fco));
-
- VERIFY(fco);
- CComObjPtr<IMgaLauncher> launcher;
- COMTHROW(launcher.CoCreateInstance(L"Mga.MgaLauncher") );
-
- launcher->PropDlg(fco);
- CommitTransaction();
- }
- catch(hresult_exception e) {
- AbortTransaction(e.hr);
- AfxMessageBox("Internal Program Error in CGMEView::OnContextProperties()");
- contextSelection = 0;
- return;
- }*/
}
void CGMEView::AttributepanelPage(long page)
Modified: trunk/GME/MgaUtil/MgaLauncher.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaLauncher.cpp Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/MgaLauncher.cpp Fri Jan 6 11:48:58 2012 (r1778)
@@ -183,274 +183,8 @@
STDMETHODIMP CMgaLauncher::PropDlg(IMgaObject * obj)
{
AFX_MANAGE_STATE(AfxGetStaticModuleState());
-
- COMTRY
- {
-
- CComPtr<IMgaFCO> fco;
- CComPtr<IMgaFolder> folder;
-
- if ( SUCCEEDED( obj->QueryInterface(&fco) )) {
-
- objtype_enum obj_type;
-
- COMTHROW( fco->get_ObjType(&obj_type));
-
- if (obj_type == OBJTYPE_CONNECTION) {
-
- CComPtr<IMgaSimpleConnection> imsc;
-
- if (SUCCEEDED(fco.QueryInterface(&imsc))) {
-
-// CConnPropertiesDlg dlg(
-// conn->src->name,
-// conn->srcPort ? conn->srcPort->name : "-",
-// conn->dst->name,
-// conn->dstPort ? conn->dstPort->name : "-",
-// conn->roleName,
-// iden,
-// conn->name,
-// isType);
-
- CString src_name, srcPort_name, dst_name, dstPort_name, roleName, iden, conn_name,
- metaid, kind, aspect;
- bool isType;
-
- CComPtr<IMgaObject> obj_par_src;
- CComPtr<IMgaObject> obj_par_dst;
- CComPtr<IMgaFCO> fco_tmp;
- CComBSTR bstr_tmp;
- objtype_enum obj_type;
- VARIANT_BOOL equal_pars = VARIANT_FALSE;
-
- COMTHROW( imsc->get_Name(&bstr_tmp) );
- conn_name = CString(bstr_tmp);
-
- long relid;
- COMTHROW( imsc->get_RelID(&relid) );
-
- bstr_tmp.Empty();
- fco_tmp = NULL;
-
- COMTHROW( imsc->get_Src(&fco_tmp) );
- ASSERT(fco_tmp != NULL);
- COMTHROW( fco_tmp->get_Name(&bstr_tmp) );
- COMTHROW( fco_tmp->GetParent(&obj_par_src, &obj_type) );
- ASSERT( obj_par_src != NULL );
- src_name = CString(bstr_tmp);
-
- bstr_tmp.Empty();
- fco_tmp = NULL;
-
- COMTHROW( imsc->get_Dst(&fco_tmp) );
- ASSERT(fco_tmp != NULL);
- COMTHROW( fco_tmp->get_Name(&bstr_tmp) );
- COMTHROW( fco_tmp->GetParent(&obj_par_dst, &obj_type) );
- ASSERT( obj_par_dst != NULL );
- dst_name = CString(bstr_tmp);
-
- bstr_tmp.Empty();
- fco_tmp = NULL;
-
- COMTHROW( imsc->get_ID(&bstr_tmp) );
- iden = CString(bstr_tmp);
-
- bstr_tmp.Empty();
- fco_tmp = NULL;
-
- CComPtr<IMgaMetaRole> immr;
- COMTHROW( imsc->get_MetaRole(&immr) );
- ASSERT(immr != NULL);
- COMTHROW( immr->get_Name(&bstr_tmp) );
- roleName = CString(bstr_tmp);
-
-
- VARIANT_BOOL inst;
- COMTHROW(imsc->get_IsInstance(&inst));
- isType = (inst == VARIANT_FALSE);
-
- COMTHROW( obj_par_src->get_IsEqual(obj_par_dst, &equal_pars) );
-
- if (equal_pars != VARIANT_FALSE) {
-
- srcPort_name = CString("-");
- dstPort_name = CString("-");
- } else {
-
- bstr_tmp.Empty();
- COMTHROW( obj_par_src->get_Name(&bstr_tmp) );
- srcPort_name = CString(bstr_tmp);
-
- bstr_tmp.Empty();
- COMTHROW( obj_par_dst->get_Name(&bstr_tmp) );
- dstPort_name = CString(bstr_tmp);
- }
-
- {
- CComPtr<IMgaMetaFCO> metaFco;
- COMTHROW(fco->get_Meta(&metaFco));
- CString txt = "N/A";
- if(metaFco != 0) {
- CComBSTR bstr;
- COMTHROW(metaFco->get_DisplayedName(&bstr));
- CopyTo(bstr,kind);
- }
-// kind.SetWindowText(txt);
- metaref_type mid = 0;
- COMTHROW(metaFco->get_MetaRef(&mid));
- metaid.Format(_T("%ld"),(long)mid);
- }
-
-
- { // aspects: multiple possible and one may be primary
-
- bool first = true;
-
- aspect = _T("-");
- CComPtr<IMgaParts> parts;
- COMTHROW(fco->get_Parts(&parts));
-
- CComPtr<IMgaPart> impart_ix;
-
- if(parts != NULL) {
-
- aspect = _T("");
-
- MGACOLL_ITERATE(IMgaPart,parts) {
-
- impart_ix = MGACOLL_ITER;
-
- ASSERT(impart_ix != NULL);
-
- CComPtr<IMgaMetaAspect> asp;
- CComBSTR aspname;
- COMTHROW( impart_ix->get_MetaAspect(&asp) );
- COMTHROW( asp->get_Name(&aspname) );
-
- if (!first) { aspect += _T("; "); }
- else { first = false; }
-
- aspect += CString(aspname);
-
-#pragma bookmark ( simplify here when IMgaPart::get_AccessMask() is available )
-
- CComPtr<IMgaMetaPart> mpart;
- COMTHROW( impart_ix->get_Meta(&mpart) );
- ASSERT( mpart != NULL );
-
- VARIANT_BOOL vb_pri_asp = VARIANT_FALSE;
- COMTHROW( mpart->get_IsPrimary(&vb_pri_asp) );
-
- if (vb_pri_asp != VARIANT_FALSE) {
-
- aspect += _T(" (primary)");
- }
- }
- MGACOLL_ITERATE_END;
-
- }
- }
-
- CConnPropertiesDlg ccpd( src_name, srcPort_name,
- dst_name, dstPort_name,
- roleName,
- iden,
- conn_name,
- isType,
- metaid,
- kind,
- aspect,
- relid
- );
-
-
- if (ccpd.DoModal() == IDOK) {
-
- // check to see if a name change occurred
-
- if (ccpd.m_sz_pre_edit_name != ccpd.name) {
-
- COMTHROW( fco->put_Name( CComBSTR(ccpd.name)) );
- }
- long rl = _tcstol(ccpd.m_relid,NULL,0);
- if(rl != relid) {
- if(rl <= 0) AfxMessageBox(_T("Invalid RelID value, ignored"));
- else if(IDOK ==AfxMessageBox(_T("Setting Relative ID-s")
- _T(" is a dangerous operation.\nProceed?"),
- MB_OKCANCEL)) {
-
- COMTHROW( fco->put_RelID( rl) );
-
- }
- }
- }
-
- } else {
-
- AfxMessageBox(_T("Non-simple connections currently unsupported object type for Properties."));
- }
-
-// AfxMessageBox(_T("Connections currently unsupported object type for Properties."));
-
- } else {
-
- CPropertiesDlg cpd(fco);
-
- if (cpd.DoModal() == IDOK) {
-
- // check to see if a name change occurred
-
- if (cpd.m_sz_pre_edit_name != cpd.name) {
- COMTHROW( fco->put_Name( CComBSTR(cpd.name)) );
- }
- long rl = _tcstol(cpd.m_relid,NULL,0);
- if(rl != cpd.relid) {
- if(rl <= 0) AfxMessageBox(_T("Invalid RelID value, ignored"));
- else if(IDOK ==AfxMessageBox(_T("Setting Relative ID-s")
- _T(" is a dangerous operation.\nProceed?"),
- MB_OKCANCEL)) {
- COMTHROW( fco->put_RelID( rl) );
- }
- }
- }
-
- }
- }
- else if ( SUCCEEDED( obj->QueryInterface(&folder) )) {
-
- CFolderPropertiesDlg cpd(folder);
-
- if (cpd.DoModal() == IDOK) {
-
- // check to see if a name change occurred
-
- if (cpd.m_sz_pre_edit_name != cpd.name) {
-
- COMTHROW( folder->put_Name( CComBSTR(cpd.name)) );
- }
- long rl = _tcstol(cpd.m_relid,NULL,0);
- if(rl != cpd.relid) {
- if(rl <= 0) AfxMessageBox(_T("Invalid RelID value, ignored"));
- else if(IDOK ==AfxMessageBox(_T("Setting Relative ID-s")
- _T(" is a dangerous operation.\nProceed?"),
- MB_OKCANCEL)) {
- COMTHROW( folder->put_RelID( rl) );
- }
- }
- }
-
- }
- else {
-
- AfxMessageBox(_T("Unsupported object type for Properties."));
-
- }
-
-// AfxMessageBox(_T("dummy PropDlg() implementation"));
-
- }
- COMCATCH(;)
+ return E_NOTIMPL;
}
STDMETHODIMP CMgaLauncher::AttrDlg(IMgaObject * obj)
Modified: trunk/GME/MgaUtil/MgaUtil.rc
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.rc Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/MgaUtil.rc Fri Jan 6 11:48:58 2012 (r1778)
@@ -117,41 +117,11 @@
CONTROL "For user only",IDC_RADIOUSER,"Button",BS_AUTORADIOBUTTON,127,201,56,10
CONTROL "Both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,127,211,31,10
LTEXT "Show components:",IDC_SHOWCOMPONENTSSTATIC,7,6,62,8
- CONTROL "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_GROUP | WS_TABSTOP,70,3,48,14
+ CONTROL "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | WS_GROUP | WS_TABSTOP,70,3,48,14
CONTROL "Active && Inactive",IDC_ACTIVE_INACTIVE,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,117,3,69,14
CONTROL "All",IDC_ALLCOMPS,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE,186,3,29,14
END
-IDD_PROPERTIES_DIALOG DIALOG 0, 0, 157, 258
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Model Properties"
-FONT 8, "MS Sans Serif"
-BEGIN
- EDITTEXT IDC_NAME,58,9,92,14,ES_AUTOHSCROLL
- LTEXT "Name:",IDC_STATIC,7,13,30,8
- DEFPUSHBUTTON "OK",IDOK,12,237,50,14
- PUSHBUTTON "Cancel",IDCANCEL,80,237,50,14
- EDITTEXT IDC_TYPE,58,29,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_KIND,58,49,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_ASPECT,58,89,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_OBJECTID,58,109,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_MODELETC,58,167,92,33,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Type:",IDC_STATIC,7,30,19,8
- LTEXT "Kind:",IDC_STATIC,7,49,16,8
- LTEXT "Aspect:",IDC_STATIC,7,92,24,8
- LTEXT "Object ID:",IDC_STATIC,7,111,40,9
- LTEXT "Refers:",IDC_STATIC,7,170,23,8
- EDITTEXT IDC_ROLENAME,58,69,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Role:",IDC_STATIC,7,71,17,8
- EDITTEXT IDC_METAID,58,128,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Meta ID:",IDC_STATIC,7,129,49,12
- EDITTEXT IDC_DEPENDENCY,58,147,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Depends:",IDC_STATIC,7,149,31,8
- EDITTEXT IDC_RELID,58,207,55,14,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
- LTEXT "Rel ID:",IDC_STATIC,7,208,49,12
- PUSHBUTTON "Change...",IDC_SETRELID,117,207,33,14
-END
-
5100 DIALOGEX 0, 0, 49, 73
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
FONT 8, "MS Sans Serif", 0, 0, 0x1
@@ -179,38 +149,6 @@
PUSHBUTTON "Other...",5121,1,60,47,11
END
-IDD_CONNPROPERTIES_DIALOG DIALOGEX 0, 0, 157, 255
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Connection Properties"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,13,234,50,14
- PUSHBUTTON "Cancel",IDCANCEL,93,234,50,14
- EDITTEXT IDC_CONNSRC,64,26,86,14,ES_AUTOHSCROLL | ES_READONLY
- EDITTEXT IDC_CONNSRCPORT,64,45,86,14,ES_AUTOHSCROLL | ES_READONLY
- EDITTEXT IDC_CONNOBJID,64,159,86,14,ES_AUTOHSCROLL | ES_READONLY
- LTEXT "Source:",IDC_STATIC,6,24,24,17,SS_CENTERIMAGE,WS_EX_TRANSPARENT
- LTEXT "Source Port:",IDC_STATIC,6,48,49,10,0,WS_EX_TRANSPARENT
- LTEXT "Object ID:",IDC_STATIC,6,162,48,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_CONNTYPE,64,102,86,14,ES_AUTOHSCROLL | ES_READONLY
- LTEXT "Kind:",IDC_STATIC,6,104,16,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_CONNDST,64,64,86,14,ES_AUTOHSCROLL | ES_READONLY
- EDITTEXT IDC_CONNDSTPORT,64,83,86,14,ES_AUTOHSCROLL | ES_READONLY
- LTEXT "Destination:",IDC_STATIC,6,67,42,8,0,WS_EX_TRANSPARENT
- LTEXT "Destination Port:",IDC_STATIC,6,82,47,18,0,WS_EX_TRANSPARENT
- LTEXT "Name:",IDC_STATIC,6,9,21,8,SS_CENTERIMAGE,WS_EX_TRANSPARENT
- EDITTEXT IDC_CONNNAME,64,7,86,14,ES_AUTOHSCROLL
- EDITTEXT IDC_CONNROLE,64,121,86,14,ES_AUTOHSCROLL | ES_READONLY
- LTEXT "Role:",IDC_STATIC,6,123,16,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_METAID,64,178,86,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Meta ID:",IDC_STATIC,6,181,49,12,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_ASPECT,64,140,86,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Aspect:",IDC_STATIC,7,143,24,8,0,WS_EX_TRANSPARENT
- EDITTEXT IDC_RELID,64,199,48,14,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
- LTEXT "Rel ID:",IDC_STATIC,6,200,49,12
- PUSHBUTTON "Change...",IDC_SETRELID,116,199,33,14
-END
-
IDD_PROGRESSDLG DIALOGEX 0, 0, 244, 45
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
@@ -281,30 +219,6 @@
COMBOBOX IDC_ENGINECOMBO,80,71,125,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
-IDD_FOLDERPROPERTIES_DIALOG DIALOG 0, 0, 157, 175
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Folder Properties"
-FONT 8, "MS Sans Serif"
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,23,154,50,14
- PUSHBUTTON "Cancel",IDCANCEL,79,154,50,14
- EDITTEXT IDC_NAME,58,7,92,14,ES_AUTOHSCROLL
- LTEXT "Name:",IDC_STATIC,7,11,30,8
- EDITTEXT IDC_TYPE,58,27,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_KIND,58,47,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- EDITTEXT IDC_OBJECTID,58,84,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Type:",IDC_STATIC,7,28,19,8
- LTEXT "Kind:",IDC_STATIC,7,47,16,8
- LTEXT "Object ID:",IDC_STATIC,7,89,40,9
- EDITTEXT IDC_METAID,58,66,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Meta ID:",IDC_STATIC,7,70,49,12
- EDITTEXT IDC_RELID,58,127,55,14,ES_AUTOHSCROLL | WS_DISABLED | NOT WS_TABSTOP
- LTEXT "Rel ID:",IDC_STATIC,7,128,49,12
- PUSHBUTTON "Change...",IDC_SETRELID,117,127,33,14
- EDITTEXT IDC_LIBRARY,58,104,92,14,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- LTEXT "Library ref:",IDC_STATIC,7,109,40,9
-END
-
IDD_ANNOTATION_BROWSER DIALOGEX 0, 0, 406, 373
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_THICKFRAME
FONT 8, "MS Sans Serif", 0, 0, 0x1
@@ -623,24 +537,6 @@
BOTTOMMARGIN, 232
END
- IDD_PROPERTIES_DIALOG, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 150
- TOPMARGIN, 7
- BOTTOMMARGIN, 251
- END
-
- IDD_CONNPROPERTIES_DIALOG, DIALOG
- BEGIN
- LEFTMARGIN, 6
- RIGHTMARGIN, 150
- VERTGUIDE, 64
- TOPMARGIN, 7
- BOTTOMMARGIN, 248
- HORZGUIDE, 39
- END
-
IDD_PROGRESSDLG, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -672,14 +568,6 @@
BOTTOMMARGIN, 125
END
- IDD_FOLDERPROPERTIES_DIALOG, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 150
- TOPMARGIN, 7
- BOTTOMMARGIN, 168
- END
-
IDD_ANNOTATION_BROWSER, DIALOG
BEGIN
LEFTMARGIN, 7
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj Fri Jan 6 11:48:58 2012 (r1778)
@@ -291,10 +291,8 @@
<ClCompile Include="CompDlg.cpp" />
<ClCompile Include="CompInfoDlg.cpp" />
<ClCompile Include="ComponentProxy.cpp" />
- <ClCompile Include="ConnPropertiesDlg.cpp" />
<ClCompile Include="DialogList.cpp" />
<ClCompile Include="DirDialog.cpp" />
- <ClCompile Include="FolderPropertiesDlg.cpp" />
<ClCompile Include="GmeDlg.cpp" />
<ClCompile Include="GUIDCreate.cpp" />
<ClCompile Include="MakeClosure.cpp" />
@@ -309,7 +307,6 @@
<ClCompile Include="MgaRegistrar.cpp" />
<ClCompile Include="MgaResolver.cpp" />
<ClCompile Include="MgaUtilApp.cpp" />
- <ClCompile Include="PropertiesDlg.cpp" />
<ClCompile Include="RegBrwNode.cpp" />
<ClCompile Include="RegistryBrowserDlg.cpp" />
<ClCompile Include="RegistryPanel.cpp" />
@@ -375,10 +372,8 @@
<ClInclude Include="CompDlg.h" />
<ClInclude Include="CompInfoDlg.h" />
<ClInclude Include="ComponentProxy.h" />
- <ClInclude Include="ConnPropertiesDlg.h" />
<ClInclude Include="DialogList.h" />
<ClInclude Include="DirDialog.h" />
- <ClInclude Include="FolderPropertiesDlg.h" />
<ClInclude Include="GmeDlg.h" />
<ClInclude Include="GUIDCreate.h" />
<ClInclude Include="MakeClosure.h" />
@@ -393,7 +388,6 @@
<ClInclude Include="MgaRegistrar.h" />
<ClInclude Include="MgaResolver.h" />
<ClInclude Include="MgaUtilApp.h" />
- <ClInclude Include="PropertiesDlg.h" />
<ClInclude Include="RegBrwNode.h" />
<ClInclude Include="RegistryBrowserDlg.h" />
<ClInclude Include="RegistryPanel.h" />
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj.filters
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj.filters Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj.filters Fri Jan 6 11:48:58 2012 (r1778)
@@ -75,18 +75,12 @@
<ClCompile Include="ComponentProxy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ConnPropertiesDlg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="DialogList.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="DirDialog.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="FolderPropertiesDlg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="GmeDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -129,9 +123,6 @@
<ClCompile Include="MgaUtilApp.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="PropertiesDlg.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="RegBrwNode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -273,18 +264,12 @@
<ClInclude Include="ComponentProxy.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ConnPropertiesDlg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="DialogList.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="DirDialog.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="FolderPropertiesDlg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="GmeDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -327,9 +312,6 @@
<ClInclude Include="MgaUtilApp.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="PropertiesDlg.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="RegBrwNode.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/GME/MgaUtil/StdAfx.h
==============================================================================
--- trunk/GME/MgaUtil/StdAfx.h Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/StdAfx.h Fri Jan 6 11:48:58 2012 (r1778)
@@ -105,9 +105,6 @@
#endif
#include "Resource.h"
-#include "PropertiesDlg.h"
-#include "ConnPropertiesDlg.h"
-#include "FolderPropertiesDlg.h"
regaccessmode_enum regacc_translate(int x);
//{{AFX_INSERT_LOCATION}}
Modified: trunk/GME/MgaUtil/resource.h
==============================================================================
--- trunk/GME/MgaUtil/resource.h Thu Jan 5 10:50:15 2012 (r1777)
+++ trunk/GME/MgaUtil/resource.h Fri Jan 6 11:48:58 2012 (r1778)
@@ -3,20 +3,9 @@
// Used by MgaUtil.rc
//
#define IDD_CLOSUREPROPPAGE 107
-#define IDD_PROPERTIES_DIALOG 141
-#define IDD_CONNPROPERTIES_DIALOG 157
#define IDD_REGISTRY_BROWSER 169
#define IDC_ZOOMS 1008
#define IDC_UNDOSIZE 1009
-#define IDC_OBJECTID 1016
-#define IDC_LIBRARY 1017
-#define IDC_MODELETC 1018
-#define IDC_CONNDST 1019
-#define IDC_ROLENAME 1020
-#define IDC_CONNDSTPORT 1022
-#define IDC_METAID 1023
-#define IDC_RELID 1024
-#define IDC_DEPENDENCY 1025
#define IDC_RADIO1 1026
#define IDC_DELFILES 1026
#define IDC_RADIOSYS 1026
@@ -30,20 +19,14 @@
#define IDC_WRAPAUTO 1028
#define IDC_ACTIVEDISP 1029
#define IDC_OUTPUTTOCLIPBOARD 1029
-#define IDC_CONNSRC 1030
#define IDC_ACTIVE_INACTIVE 1031
#define IDC_OUTPUTTOFILE 1031
-#define IDC_CONNSRCPORT 1032
#define IDC_ALLCOMPS 1033
#define IDC_DIRECTIONUP 1033
#define IDC_DIRECTIONDN 1034
-#define IDC_CONNTYPE 1035
#define IDC_LIBR1 1036
-#define IDC_CONNROLE 1037
#define IDC_LIBR2 1037
#define IDC_CONNID 1038
-#define IDC_CONNOBJID 1038
-#define IDC_CONNNAME 1044
#define IDR_MGAUTIL 2000
#define IDD_DIALOG_LIST 2001
#define IDC_LIST 2002
@@ -74,7 +57,6 @@
#define IDB_BITMAP1 2054
#define IDB_BITMAP2 2055
#define IDD_COMPINFODLG 2056
-#define IDD_FOLDERPROPERTIES_DIALOG 2057
#define IDD_ANNOTATION_BROWSER 2058
#define IDD_XSLTDIAL 2059
#define IDD_CLOSUREDLG 2063
@@ -119,10 +101,6 @@
#define IDC_VERSION 2181
#define IDC_FILENAME 2182
#define IDC_ENGINECOMBO 2185
-#define IDC_SETRELID 2186
-#define IDC_KIND 2187
-#define IDC_TYPE 2188
-#define IDC_ASPECT 2189
#define IDC_MODELNAME 2190
#define IDC_MODELKIND 2191
#define IDC_MODELROLE 2192
More information about the gme-commit
mailing list