[commit] r1528 - in trunk/Paradigms/MetaGME/MetaInterpreter: . Asp
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Tue Sep 13 12:56:17 CDT 2011
Author: ksmyth
Date: Tue Sep 13 12:56:17 2011
New Revision: 1528
Log:
Style issues
Modified:
trunk/Paradigms/MetaGME/MetaInterpreter/Asp/Options.cpp
trunk/Paradigms/MetaGME/MetaInterpreter/Component.rc
Modified: trunk/Paradigms/MetaGME/MetaInterpreter/Asp/Options.cpp
==============================================================================
--- trunk/Paradigms/MetaGME/MetaInterpreter/Asp/Options.cpp Mon Sep 12 11:28:12 2011 (r1527)
+++ trunk/Paradigms/MetaGME/MetaInterpreter/Asp/Options.cpp Tue Sep 13 12:56:17 2011 (r1528)
@@ -285,7 +285,7 @@
void Options::OnDontAskClick()
{
if( ((CButton * ) GetDlgItem( IDC_CHECK1))->GetCheck())
- if( IDCANCEL == MessageBox( CString("If you leave this option checked you can access this dialog later only if you modify the \"") + OptionsRegistrySubNode_str.c_str() + "\" value in the RootFolder's registry to something else than \"" + DontAsk_str.c_str() + "\"!", "Warning!", MB_OKCANCEL | MB_ICONWARNING))
+ if( IDCANCEL == MessageBox( CString("To modify these options at a later time, set the \"") + OptionsRegistrySubNode_str.c_str() + "\" value in the RootFolder's registry to something else than \"" + DontAsk_str.c_str() + "\".", "MetaInterpreter - Options", MB_OKCANCEL))
((CButton *) GetDlgItem( IDC_CHECK1))->SetCheck( 0);
}
Modified: trunk/Paradigms/MetaGME/MetaInterpreter/Component.rc
==============================================================================
--- trunk/Paradigms/MetaGME/MetaInterpreter/Component.rc Mon Sep 12 11:28:12 2011 (r1527)
+++ trunk/Paradigms/MetaGME/MetaInterpreter/Component.rc Tue Sep 13 12:56:17 2011 (r1528)
@@ -13,13 +13,11 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
-#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -69,12 +67,12 @@
BEGIN
BLOCK "040904B0"
BEGIN
- VALUE "FileDescription", "Interpreter Module"
+ VALUE "FileDescription", "MetaInterpreter"
VALUE "FileVersion", "1, 0, 0, 1"
- VALUE "InternalName", "Interpreter"
- VALUE "LegalCopyright", "Copyright 2000"
- VALUE "OriginalFilename", "Interpreter.DLL"
- VALUE "ProductName", "Interpreter Module"
+ VALUE "InternalName", "MetaInterpreter"
+ VALUE "LegalCopyright", "Copyright 2000-2011 ISIS, Vanderbilt University"
+ VALUE "OriginalFilename", "MetaInterpreter.DLL"
+ VALUE "ProductName", "MetaInterpreter"
VALUE "ProductVersion", "1, 0, 0, 1"
END
END
@@ -102,7 +100,7 @@
//
#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
+GUIDELINES DESIGNINFO
BEGIN
IDD_ASPECT_PAGE, DIALOG
BEGIN
@@ -117,7 +115,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 162
TOPMARGIN, 7
- BOTTOMMARGIN, 139
+ BOTTOMMARGIN, 186
END
IDD_EQUIVDIALOG, DIALOG
@@ -131,9 +129,9 @@
IDD_OPTIONS, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 237
+ RIGHTMARGIN, 227
TOPMARGIN, 7
- BOTTOMMARGIN, 144
+ BOTTOMMARGIN, 140
END
IDD_EVENTSDLG, DIALOG
@@ -152,26 +150,23 @@
// Dialog
//
-IDD_ASPECT_PAGE DIALOG 0, 0, 307, 239
+IDD_ASPECT_PAGE DIALOG 0, 0, 307, 239
STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
FONT 8, "MS Sans Serif"
BEGIN
END
-IDD_ASPECTORDER_DLG DIALOGEX 0, 0, 169, 146
+IDD_ASPECTORDER_DLG DIALOGEX 0, 0, 169, 193
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Global Aspect Order Dialogue"
+CAPTION "Aspect Order"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,15,120,50,14
- PUSHBUTTON "Use metamodel defaults",IDCANCEL,75,120,82,14
- LISTBOX IDC_LIST3,16,20,110,85,LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
- WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "Move Up",IDC_BUTTON1,137,36,16,13,BS_ICON | BS_CENTER |
- BS_VCENTER,WS_EX_TRANSPARENT
- PUSHBUTTON "Move Down",IDC_BUTTON2,137,75,16,13,BS_ICON | BS_CENTER |
- BS_VCENTER,WS_EX_TRANSPARENT
- LTEXT "Global aspect order",IDC_STATIC,16,10,94,8
+ DEFPUSHBUTTON "OK",IDOK,27,172,50,14
+ PUSHBUTTON "Use metamodel defaults",IDCANCEL,81,172,82,14
+ LISTBOX IDC_LIST3,6,18,124,148,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "Move Up",IDC_BUTTON1,137,64,16,13,BS_ICON | BS_CENTER | BS_VCENTER,WS_EX_TRANSPARENT
+ PUSHBUTTON "Move Down",IDC_BUTTON2,137,103,16,13,BS_ICON | BS_CENTER | BS_VCENTER,WS_EX_TRANSPARENT
+ LTEXT "Global aspect order",IDC_STATIC,6,7,94,8
END
IDD_EQUIVDIALOG DIALOGEX 0, 0, 331, 226
@@ -179,79 +174,58 @@
CAPTION "Name selection for equivalent objects"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- DEFPUSHBUTTON "OK",IDOK,74,205,50,14
- PUSHBUTTON "Use metamodel defaults",IDCANCEL,173,205,89,14
- CONTROL "Select the desired names and displayed names by clicking in the first or second column",
- IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,7,3,303,
- 8
+ DEFPUSHBUTTON "OK",IDOK,181,205,50,14
+ PUSHBUTTON "Use metamodel defaults",IDCANCEL,235,205,89,14
+ CONTROL "Select the desired names and displayed names by clicking in the first or second column",IDC_STATIC,
+ "Static",SS_LEFTNOWORDWRAP | WS_GROUP,7,3,303,8
END
-IDD_OPTIONS DIALOG 0, 0, 244, 151
+IDD_OPTIONS DIALOGEX 0, 0, 234, 147
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Options"
-FONT 8, "MS Sans Serif"
+CAPTION "MetaInterpreter - Options"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- GROUPBOX "Options for constraints generated from cardinalities",
- IDC_STATIC,12,10,221,97
- LTEXT "Check Containment On:",IDC_STATIC,21,27,94,8
- EDITTEXT IDC_EDIT1,123,25,52,12,ES_AUTOHSCROLL
- PUSHBUTTON "Events",IDC_BUTTON1,185,25,38,13
- LTEXT "Check Folder Containment On:",IDC_STATIC,21,48,98,8
- EDITTEXT IDC_EDIT2,123,46,52,12,ES_AUTOHSCROLL
- PUSHBUTTON "Events",IDC_BUTTON2,185,46,37,13
- LTEXT "Check Connections On:",IDC_STATIC,21,69,94,8
- EDITTEXT IDC_EDIT3,123,67,52,12,ES_AUTOHSCROLL
- PUSHBUTTON "Events",IDC_BUTTON3,185,67,38,13
- LTEXT "Priority",IDC_STATIC,21,89,91,11
- EDITTEXT IDC_EDIT4,123,87,30,12,ES_AUTOHSCROLL
- CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT |
- UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,159,87,11,
- 12
- CONTROL "Do not ask these any more",IDC_CHECK1,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,21,112,111,10
- DEFPUSHBUTTON "OK",IDOK,53,129,50,14
- PUSHBUTTON "Cancel",IDCANCEL,142,129,50,14
+ GROUPBOX "Options for constraints generated from cardinalities",IDC_STATIC,6,7,221,95
+ LTEXT "Check Containment On:",IDC_STATIC,15,24,94,8
+ EDITTEXT IDC_EDIT1,117,22,58,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events...",IDC_BUTTON1,179,22,38,13
+ LTEXT "Check Folder Containment On:",IDC_STATIC,15,45,98,8
+ EDITTEXT IDC_EDIT2,117,43,58,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events...",IDC_BUTTON2,179,43,37,13
+ LTEXT "Check Connections On:",IDC_STATIC,15,66,94,8
+ EDITTEXT IDC_EDIT3,117,64,58,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Events...",IDC_BUTTON3,179,64,38,13
+ LTEXT "Priority",IDC_STATIC,15,86,91,11
+ EDITTEXT IDC_EDIT4,117,84,30,12,ES_AUTOHSCROLL
+ CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,153,84,11,12
+ CONTROL "Don't show these options again",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,111,10
+ DEFPUSHBUTTON "OK",IDOK,123,126,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,177,126,50,14
END
-IDD_EVENTSDLG DIALOG 0, 0, 302, 158
+IDD_EVENTSDLG DIALOGEX 0, 0, 302, 158
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Events"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
- CONTROL "On create",IDC_CHECK1,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,9,123,10
- CONTROL "On close model",IDC_CHECK15,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,168,9,123,10
- CONTROL "On new child",IDC_CHECK5,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,24,123,10
- CONTROL "On lost child",IDC_CHECK12,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,168,24,123,10
- CONTROL "On delete",IDC_CHECK2,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,39,123,10
- CONTROL "On move",IDC_CHECK11,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,168,39,123,10
- CONTROL "On refer",IDC_CHECK13,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,54,123,10
- CONTROL "On unreferred",IDC_CHECK18,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,168,54,123,10
- CONTROL "On include in set",IDC_CHECK16,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,69,123,10
- CONTROL "On exclude from set",IDC_CHECK19,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,168,69,123,10
- CONTROL "On connect",IDC_CHECK14,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,84,123,10
- CONTROL "On disconnect",IDC_CHECK17,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,168,84,123,10
- CONTROL "On derive",IDC_CHECK8,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,99,123,10
- CONTROL "On change association",IDC_CHECK6,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,168,99,123,10
- CONTROL "On change property",IDC_CHECK7,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,9,114,123,10
- CONTROL "On change attribute",IDC_CHECK3,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,168,114,123,10
- DEFPUSHBUTTON "OK",IDOK,85,135,50,14
- PUSHBUTTON "Cancel",IDCANCEL,162,135,50,14
+ CONTROL "On create",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,9,123,10
+ CONTROL "On close model",IDC_CHECK15,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,9,123,10
+ CONTROL "On new child",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,24,123,10
+ CONTROL "On lost child",IDC_CHECK12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,24,123,10
+ CONTROL "On delete",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,39,123,10
+ CONTROL "On move",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,39,123,10
+ CONTROL "On refer",IDC_CHECK13,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,54,123,10
+ CONTROL "On unreferred",IDC_CHECK18,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,54,123,10
+ CONTROL "On include in set",IDC_CHECK16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,69,123,10
+ CONTROL "On exclude from set",IDC_CHECK19,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,69,123,10
+ CONTROL "On connect",IDC_CHECK14,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,84,123,10
+ CONTROL "On disconnect",IDC_CHECK17,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,84,123,10
+ CONTROL "On derive",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,99,123,10
+ CONTROL "On change association",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,99,123,10
+ CONTROL "On change property",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,114,123,10
+ CONTROL "On change attribute",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,114,123,10
+ DEFPUSHBUTTON "OK",IDOK,191,137,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,245,137,50,14
END
@@ -260,12 +234,12 @@
// String Table
//
-STRINGTABLE
+STRINGTABLE
BEGIN
IDS_PROJNAME "Component"
END
-#endif // English (U.S.) resources
+#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////
More information about the gme-commit
mailing list