[GME-commit] GMESRC/GME/Gme GME.rc,1.151,1.152 GMEView.cpp,1.185,1.186 GMEView.h,1.71,1.72

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv21566

Modified Files:
	GME.rc GMEView.cpp GMEView.h 
Log Message:
Undo/Redo commands caught by the View, so that shortcuts (^Z, ^U) work repeatedly.
Taborder corrected in ProjectProperties window.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** GMEView.cpp	5 Oct 2006 16:15:51 -0000	1.185
--- GMEView.cpp	9 Oct 2006 15:30:50 -0000	1.186
***************
*** 271,274 ****
--- 271,276 ----
  	ON_COMMAND(ID_CNTX_PROPERTIES, OnContextProperties)
  	ON_COMMAND(ID_CNTX_ATTRIBUTES, OnCntxAttributes)
+ 	ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
+ 	ON_COMMAND(ID_EDIT_REDO, OnEditRedo)
  	ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
  	ON_COMMAND(ID_EDIT_COPYCLOSURE, OnEditCopyClosure)
***************
*** 4899,4902 ****
--- 4901,4918 ----
  	}
  	pCmdUI->Enable(enable);
+ }
+ 
+ void CGMEView::OnEditUndo() 
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditUndo\r\n");
+ 	theApp.mgaProject->Undo();
+ 	this->SetFocus();
+ }
+ 
+ void CGMEView::OnEditRedo() 
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditRedo\r\n");
+ 	theApp.mgaProject->Redo();
+ 	this->SetFocus();
  }
  

Index: GMEView.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** GMEView.h	15 Nov 2005 20:06:54 -0000	1.71
--- GMEView.h	9 Oct 2006 15:30:50 -0000	1.72
***************
*** 311,314 ****
--- 311,316 ----
  	afx_msg void OnContextProperties();
  	afx_msg void OnCntxAttributes();
+ 	afx_msg void OnEditUndo();
+ 	afx_msg void OnEditRedo();
  	afx_msg void OnEditCopy();
  	afx_msg void OnUpdateEditCopy(CCmdUI* pCmdUI);

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** GME.rc	1 May 2006 17:20:11 -0000	1.151
--- GME.rc	9 Oct 2006 15:30:50 -0000	1.152
***************
*** 191,195 ****
          MENUITEM "Clear Undo Queue",            ID_EDIT_CLEARUNDO
          MENUITEM SEPARATOR
!         MENUITEM "Find...\tCtrl-F",             ID_EDIT_SEARCH
          MENUITEM SEPARATOR
          MENUITEM "&Project Properties",         ID_EDIT_PROJECTPROPERTIES
--- 191,195 ----
          MENUITEM "Clear Undo Queue",            ID_EDIT_CLEARUNDO
          MENUITEM SEPARATOR
!         MENUITEM "Find...\tCtrl+F",             ID_EDIT_SEARCH
          MENUITEM SEPARATOR
          MENUITEM "&Project Properties",         ID_EDIT_PROJECTPROPERTIES
***************
*** 262,266 ****
          MENUITEM "Clear Undo Queue",            ID_EDIT_CLEARUNDO
          MENUITEM SEPARATOR
!         MENUITEM "Find...\tCtrl-F",             ID_EDIT_SEARCH
          MENUITEM SEPARATOR
          MENUITEM "Show Parent",                 ID_VIEW_PARENT
--- 262,266 ----
          MENUITEM "Clear Undo Queue",            ID_EDIT_CLEARUNDO
          MENUITEM SEPARATOR
!         MENUITEM "Find...\tCtrl+F",             ID_EDIT_SEARCH
          MENUITEM SEPARATOR
          MENUITEM "Show Parent",                 ID_VIEW_PARENT
***************
*** 713,720 ****
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOG  0, 0, 193, 271
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
! FONT 8, "MS Sans Serif"
  BEGIN
      DEFPUSHBUTTON   "OK",IDOK,25,251,50,14
--- 713,720 ----
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOGEX 0, 0, 193, 271
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
      DEFPUSHBUTTON   "OK",IDOK,25,251,50,14
***************
*** 724,727 ****
--- 724,729 ----
      EDITTEXT        IDC_PROJECT_AUTHOR,50,25,136,14,ES_AUTOHSCROLL
      LTEXT           "Author:",IDC_STATIC,9,28,29,8
+     EDITTEXT        IDC_PROJECT_VERSION,50,44,136,14,ES_AUTOHSCROLL
+     LTEXT           "Version:",IDC_STATIC,9,47,26,8
      EDITTEXT        IDC_PROJECT_CREATED,50,62,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
***************
*** 733,736 ****
--- 735,741 ----
                      ES_AUTOHSCROLL | ES_WANTRETURN
      LTEXT           "Comment:",IDC_STATIC,9,101,31,8
+     EDITTEXT        IDC_PROJECT_GUID,51,155,136,14,ES_AUTOHSCROLL | 
+                     ES_READONLY
+     LTEXT           "GUID:",IDC_STATIC,10,158,36,8
      EDITTEXT        IDC_PROJECT_PARADIGM,51,175,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
***************
*** 742,751 ****
                      ES_READONLY
      LTEXT           "Par.GUID:",IDC_STATIC,10,214,37,8
-     EDITTEXT        IDC_PROJECT_VERSION,50,44,136,14,ES_AUTOHSCROLL
-     LTEXT           "Version:",IDC_STATIC,9,47,26,8
      PUSHBUTTON      "Paradigm...",IDC_BUTTON_PARADIGM,135,230,50,14
-     EDITTEXT        IDC_PROJECT_GUID,51,155,136,14,ES_AUTOHSCROLL | 
-                     ES_READONLY
-     LTEXT           "GUID:",IDC_STATIC,10,158,36,8
  END
  
--- 747,751 ----
***************
*** 794,798 ****
  END
  
! IDD_SEARCH_DIALOG DIALOGEX 200, 100, 243, 236
  STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
  CAPTION "Search"
--- 794,798 ----
  END
  
! IDD_SEARCH_DIALOG DIALOGEX 200, 100, 244, 236
  STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
  CAPTION "Search"
***************
*** 1156,1160 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 239
          TOPMARGIN, 7
          BOTTOMMARGIN, 229
--- 1156,1160 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 240
          TOPMARGIN, 7
          BOTTOMMARGIN, 229