[GME-commit] GMESRC/GME/Gme resource.h, 1.72, 1.73 GME.rc, 1.156, 1.157

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Thu May 3 13:48:11 CDT 2007


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

Modified Files:
	resource.h GME.rc 
Log Message:
Attribute cycling accelerators, Project Properties and Paradigm Properties dialog readjusted.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** resource.h	13 Mar 2007 18:53:06 -0000	1.72
--- resource.h	3 May 2007 18:48:09 -0000	1.73
***************
*** 382,385 ****
--- 382,387 ----
  #define ID_BUTTON33027                  33027
  #define ID_BUTTON33028                  33028
+ #define ID_KEY_ZOOMIN                   33029
+ #define ID_KEY_ZOOMOUT                  33030
  #define ID_BUTTON33033                  33033
  #define ID_BUTTON33035                  33035
***************
*** 387,392 ****
  #define ID_KEY_CONNECT                  33042
  #define ID_BUTTON33044                  33044
! #define ID_KEY_ZOOMIN                   33029
! #define ID_KEY_ZOOMOUT                  33030
  #define IDW_TOOLBAR_MAIN                0xE820
  #define IDW_TOOLBAR_WINS                0xE821
--- 389,394 ----
  #define ID_KEY_CONNECT                  33042
  #define ID_BUTTON33044                  33044
! #define ID_KEY_CYCLEOBJINSPFRWD         33052
! #define ID_KEY_CYCLEOBJINSPBKWD         33053
  #define IDW_TOOLBAR_MAIN                0xE820
  #define IDW_TOOLBAR_WINS                0xE821
***************
*** 401,405 ****
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        214
! #define _APS_NEXT_COMMAND_VALUE         33045
  #define _APS_NEXT_CONTROL_VALUE         1111
  #define _APS_NEXT_SYMED_VALUE           115
--- 403,407 ----
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        214
! #define _APS_NEXT_COMMAND_VALUE         33054
  #define _APS_NEXT_CONTROL_VALUE         1111
  #define _APS_NEXT_SYMED_VALUE           115

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** GME.rc	13 Mar 2007 18:53:06 -0000	1.156
--- GME.rc	3 May 2007 18:48:09 -0000	1.157
***************
*** 342,346 ****
      BEGIN
          MENUITEM "&Cascade",                    ID_WINDOW_CASCADE
!         MENUITEM "&Tile Horizontal",            ID_WINDOW_TILE_HORZ
          MENUITEM "Tile &Vertical",              ID_WINDOW_TILE_VERT
          MENUITEM "&Arrange Icons",              ID_WINDOW_ARRANGE
--- 342,346 ----
      BEGIN
          MENUITEM "&Cascade",                    ID_WINDOW_CASCADE
!         MENUITEM "Tile &Horizontal",            ID_WINDOW_TILE_HORZ
          MENUITEM "Tile &Vertical",              ID_WINDOW_TILE_VERT
          MENUITEM "&Arrange Icons",              ID_WINDOW_ARRANGE
***************
*** 623,627 ****
  IDR_GMEVIEW ACCELERATORS 
  BEGIN
-     "C",            ID_KEY_CONNECT,         VIRTKEY, NOINVERT
      VK_ESCAPE,      ID_EDIT_CANCEL,         VIRTKEY, NOINVERT
      "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL, NOINVERT
--- 623,626 ----
***************
*** 637,640 ****
--- 636,642 ----
      "P",            ID_FILE_PRINT,          VIRTKEY, CONTROL, NOINVERT
      VK_F1,          ID_HELP_HELP,           VIRTKEY, NOINVERT
+     "C",            ID_KEY_CONNECT,         VIRTKEY, NOINVERT
+     "A",            ID_KEY_CYCLEOBJINSPBKWD, ASCII, NOINVERT
+     "a",            ID_KEY_CYCLEOBJINSPFRWD, ASCII, NOINVERT
      VK_ADD,         ID_KEY_ZOOMIN,          VIRTKEY, NOINVERT
      VK_SUBTRACT,    ID_KEY_ZOOMOUT,         VIRTKEY, NOINVERT
***************
*** 649,652 ****
--- 651,656 ----
      VK_BACK,        ID_VIEW_PARENT,         VIRTKEY, NOINVERT
      VK_RETURN,      ID_VIEW_SHOWSELMODEL,   VIRTKEY, NOINVERT
+     "A",            ID_KEY_CYCLEOBJINSPBKWD, VIRTKEY, SHIFT, ALT, NOINVERT
+     "A",            ID_KEY_CYCLEOBJINSPFRWD, VIRTKEY, ALT, NOINVERT
  END
  
***************
*** 750,754 ****
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOGEX 0, 0, 193, 271
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
--- 754,758 ----
  END
  
! IDD_PROJECTPROPERTIES_DIALOG DIALOGEX 0, 0, 216, 271
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Project Properties"
***************
*** 757,788 ****
      DEFPUSHBUTTON   "OK",IDOK,25,251,50,14
      PUSHBUTTON      "Cancel",IDCANCEL,108,251,50,14
!     EDITTEXT        IDC_PROJECT_NAME,50,7,136,14,ES_AUTOHSCROLL
      LTEXT           "Name:",IDC_STATIC,9,10,21,8
!     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
      LTEXT           "Created:",IDC_STATIC,9,65,27,8
!     EDITTEXT        IDC_PROJECT_MODIFIED,50,80,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Modified:",IDC_STATIC,9,83,29,8
!     EDITTEXT        IDC_PROJECT_COMMENT,50,98,136,52,ES_MULTILINE | 
                      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
      LTEXT           "Paradigm:",IDC_STATIC,10,178,36,8
!     EDITTEXT        IDC_PROJECT_PARVERSION,51,193,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Par.Version:",IDC_STATIC,10,196,37,8
!     EDITTEXT        IDC_PROJECT_PARGUID,51,212,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Par.GUID:",IDC_STATIC,10,214,37,8
!     PUSHBUTTON      "Paradigm...",IDC_BUTTON_PARADIGM,135,230,50,14
  END
  
--- 761,792 ----
      DEFPUSHBUTTON   "OK",IDOK,25,251,50,14
      PUSHBUTTON      "Cancel",IDCANCEL,108,251,50,14
!     EDITTEXT        IDC_PROJECT_NAME,50,7,159,14,ES_AUTOHSCROLL
      LTEXT           "Name:",IDC_STATIC,9,10,21,8
!     EDITTEXT        IDC_PROJECT_AUTHOR,50,25,159,14,ES_AUTOHSCROLL
      LTEXT           "Author:",IDC_STATIC,9,28,29,8
!     EDITTEXT        IDC_PROJECT_VERSION,50,44,159,14,ES_AUTOHSCROLL
      LTEXT           "Version:",IDC_STATIC,9,47,26,8
!     EDITTEXT        IDC_PROJECT_CREATED,50,62,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Created:",IDC_STATIC,9,65,27,8
!     EDITTEXT        IDC_PROJECT_MODIFIED,50,80,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Modified:",IDC_STATIC,9,83,29,8
!     EDITTEXT        IDC_PROJECT_COMMENT,50,98,159,52,ES_MULTILINE | 
                      ES_AUTOHSCROLL | ES_WANTRETURN
      LTEXT           "Comment:",IDC_STATIC,9,101,31,8
!     EDITTEXT        IDC_PROJECT_GUID,50,155,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "GUID:",IDC_STATIC,10,158,36,8
!     EDITTEXT        IDC_PROJECT_PARADIGM,50,175,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Paradigm:",IDC_STATIC,10,178,36,8
!     EDITTEXT        IDC_PROJECT_PARVERSION,50,193,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Par.Version:",IDC_STATIC,10,196,37,8
!     EDITTEXT        IDC_PROJECT_PARGUID,50,212,159,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Par.GUID:",IDC_STATIC,10,214,37,8
!     PUSHBUTTON      "Paradigm...",IDC_BUTTON_PARADIGM,148,230,50,14
  END
  
***************
*** 1015,1044 ****
  END
  
! IDD_PARADIGMPROPERTIES_DIALOG DIALOG  0, 0, 193, 201
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Paradigm Properties"
! FONT 8, "MS Sans Serif"
  BEGIN
!     DEFPUSHBUTTON   "Close",IDOK,136,180,50,14
!     EDITTEXT        IDC_PARADIGM_NAME,50,7,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     LTEXT           "Name:",-1,9,10,21,8
!     EDITTEXT        IDC_PARADIGM_AUTHOR,50,25,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     LTEXT           "Author:",-1,9,28,29,8
!     EDITTEXT        IDC_PARADIGM_CREATED,50,62,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     LTEXT           "Created:",-1,9,65,27,8
!     EDITTEXT        IDC_PARADIGM_MODIFIED,50,80,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     LTEXT           "Modified:",-1,9,83,29,8
!     EDITTEXT        IDC_PARADIGM_COMMENT,50,98,136,52,ES_MULTILINE | 
!                     ES_AUTOHSCROLL | ES_READONLY
!     LTEXT           "Comment:",-1,9,101,31,8
!     EDITTEXT        IDC_PARADIGM_GUID,51,155,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     LTEXT           "GUID:",-1,10,158,37,8
!     EDITTEXT        IDC_PARADIGM_VERSION,50,44,136,14,ES_AUTOHSCROLL | 
                      ES_READONLY
      LTEXT           "Version:",-1,9,47,26,8
  END
--- 1019,1048 ----
  END
  
! IDD_PARADIGMPROPERTIES_DIALOG DIALOGEX 0, 0, 211, 202
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Paradigm Properties"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     DEFPUSHBUTTON   "Close",IDOK,154,181,50,14
!     EDITTEXT        IDC_PARADIGM_NAME,43,7,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     EDITTEXT        IDC_PARADIGM_AUTHOR,43,25,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     EDITTEXT        IDC_PARADIGM_VERSION,43,44,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     EDITTEXT        IDC_PARADIGM_CREATED,43,62,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     EDITTEXT        IDC_PARADIGM_MODIFIED,43,80,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
!     EDITTEXT        IDC_PARADIGM_COMMENT,43,98,161,52,ES_MULTILINE | 
!                     ES_AUTOHSCROLL | ES_READONLY
!     EDITTEXT        IDC_PARADIGM_GUID,43,155,161,14,ES_AUTOHSCROLL | 
                      ES_READONLY
+     LTEXT           "Name:",-1,9,10,21,8
+     LTEXT           "Author:",-1,9,28,29,8
+     LTEXT           "Created:",-1,9,65,27,8
+     LTEXT           "Modified:",-1,9,83,29,8
+     LTEXT           "Comment:",-1,9,101,31,8
+     LTEXT           "GUID:",-1,10,158,30,8
      LTEXT           "Version:",-1,9,47,26,8
  END
***************
*** 1161,1165 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 186
          TOPMARGIN, 7
          BOTTOMMARGIN, 264
--- 1165,1169 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 209
          TOPMARGIN, 7
          BOTTOMMARGIN, 264
***************
*** 1251,1257 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 186
          TOPMARGIN, 7
!         BOTTOMMARGIN, 194
      END
  
--- 1255,1261 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 204
          TOPMARGIN, 7
!         BOTTOMMARGIN, 195
      END
  



More information about the GME-commit mailing list