[GME-commit] GMESRC/GME/Gme GME.rc, 1.154, 1.155 resource.h, 1.70,
1.71
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Mar 7 17:40:01 CST 2007
Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv24299
Modified Files:
GME.rc resource.h
Log Message:
Taborder in ChildFrmWnd.
History.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** resource.h 7 Dec 2006 19:07:40 -0000 1.70
--- resource.h 7 Mar 2007 23:39:59 -0000 1.71
***************
*** 76,79 ****
--- 76,80 ----
#define IDR_TOOLBAR_WINS 211
#define IDR_MYTOOLBARS_MENU 212
+ #define IDR_TOOLBAR_NAVIG 213
#define IDC_NAME 1000
#define IDC_TYPENAME 1001
***************
*** 371,378 ****
--- 372,395 ----
#define ID_FOCUS_BROWSER 33015
#define ID_FOCUS_INSPECTOR 33016
+ #define ID_VIEW_CYCLEASPECTKEY 33017
+ #define ID_VIEW_HISTORYBACKKEY 33018
+ #define ID_VIEW_HISTORYFORWKEY 33019
+ #define ID_BUTTON33020 33020
+ #define ID_BUTTON33021 33021
+ #define ID_BUTTON33022 33022
+ #define ID_VIEW_CYCLEALLASPECTS 33023
+ #define ID_FOCUS_CONSOLE 33024
+ #define ID_BUTTON33027 33027
+ #define ID_BUTTON33028 33028
+ #define ID_BUTTON33033 33033
+ #define ID_BUTTON33035 33035
+ #define ID_BUTTON33037 33037
+ #define ID_KEY_CONNECT 33042
+ #define ID_BUTTON33044 33044
#define IDW_TOOLBAR_MAIN 0xE820
#define IDW_TOOLBAR_WINS 0xE821
#define IDW_TOOLBAR_DUMMY 0xE822
#define IDW_TOOLBAR_MODE 0xE823
+ #define IDW_TOOLBAR_NAVIG 0xE824
// Next default values for new objects
***************
*** 381,386 ****
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
! #define _APS_NEXT_RESOURCE_VALUE 213
! #define _APS_NEXT_COMMAND_VALUE 33017
#define _APS_NEXT_CONTROL_VALUE 1111
#define _APS_NEXT_SYMED_VALUE 115
--- 398,403 ----
#ifndef APSTUDIO_READONLY_SYMBOLS
#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
Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** GME.rc 7 Dec 2006 19:07:40 -0000 1.154
--- GME.rc 7 Mar 2007 23:39:59 -0000 1.155
***************
*** 89,92 ****
--- 89,93 ----
IDB_ABOUT BITMAP "aboutpic.bmp"
IDR_TOOLBAR_DUMMY BITMAP "res\\dummybar.bmp"
+ IDR_TOOLBAR_NAVIG BITMAP "res\\ToolbarNavig.bmp"
/////////////////////////////////////////////////////////////////////////////
***************
*** 152,155 ****
--- 153,169 ----
END
+ IDR_TOOLBAR_NAVIG TOOLBAR 16, 15
+ BEGIN
+ BUTTON ID_BUTTON33020
+ BUTTON ID_BUTTON33021
+ BUTTON ID_BUTTON33022
+ BUTTON ID_BUTTON33035
+ BUTTON ID_BUTTON33037
+ BUTTON ID_BUTTON33027
+ BUTTON ID_BUTTON33028
+ BUTTON ID_BUTTON33033
+ BUTTON ID_BUTTON33044
+ END
+
/////////////////////////////////////////////////////////////////////////////
***************
*** 202,205 ****
--- 216,220 ----
MENUITEM "&Windows", IDW_TOOLBAR_WINS
MENUITEM "&Component", IDW_TOOLBAR_DUMMY
+ MENUITEM "&Navigator", IDW_TOOLBAR_NAVIG
END
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR
***************
*** 311,314 ****
--- 326,330 ----
MENUITEM "&Component", IDW_TOOLBAR_DUMMY
MENUITEM "&Mode", IDW_TOOLBAR_MODE
+ MENUITEM "&Navigator", IDW_TOOLBAR_NAVIG
END
MENUITEM "&Status Bar", ID_VIEW_STATUS_BAR
***************
*** 326,330 ****
BEGIN
MENUITEM "&Cascade", ID_WINDOW_CASCADE
! MENUITEM "&Tile", ID_WINDOW_TILE_HORZ
MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE
END
--- 342,347 ----
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
END
***************
*** 561,564 ****
--- 578,582 ----
MENUITEM "&Windows", IDW_TOOLBAR_WINS
MENUITEM "&Components", IDW_TOOLBAR_DUMMY
+ MENUITEM "&Navigator", IDW_TOOLBAR_NAVIG
END
END
***************
*** 572,575 ****
--- 590,595 ----
IDR_MAINFRAME ACCELERATORS
BEGIN
+ VK_LEFT, ID_BUTTON33020, VIRTKEY, ALT, NOINVERT
+ VK_RIGHT, ID_BUTTON33021, VIRTKEY, ALT, NOINVERT
"Y", ID_EDIT_REDO, VIRTKEY, CONTROL, NOINVERT
"F", ID_EDIT_SEARCH, VIRTKEY, CONTROL, NOINVERT
***************
*** 603,606 ****
--- 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
***************
*** 616,621 ****
--- 637,648 ----
"P", ID_FILE_PRINT, VIRTKEY, CONTROL, NOINVERT
VK_F1, ID_HELP_HELP, VIRTKEY, NOINVERT
+ "`", ID_VIEW_CYCLEALLASPECTS, ASCII, NOINVERT
+ VK_TAB, ID_VIEW_CYCLEASPECTKEY, VIRTKEY, NOINVERT
+ "B", ID_VIEW_FOCUSBROWSER, VIRTKEY, NOINVERT
"B", ID_VIEW_FOCUSBROWSER, VIRTKEY, CONTROL, NOINVERT
+ "L", ID_VIEW_FOCUSBROWSER, VIRTKEY, NOINVERT
"I", ID_VIEW_FOCUSINSPECTOR, VIRTKEY, CONTROL, NOINVERT
+ "Z", ID_VIEW_HISTORYBACKKEY, VIRTKEY, NOINVERT
+ "X", ID_VIEW_HISTORYFORWKEY, VIRTKEY, NOINVERT
VK_BACK, ID_VIEW_PARENT, VIRTKEY, NOINVERT
VK_RETURN, ID_VIEW_SHOWSELMODEL, VIRTKEY, NOINVERT
***************
*** 646,668 ****
END
! CG_IDD_MODELPROPERTIESBAR DIALOG 0, 0, 467, 16
STYLE DS_SETFONT | WS_CHILD
! FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Name:",IDC_STATIC,15,4,21,8
EDITTEXT IDC_NAME,37,2,68,12,ES_AUTOHSCROLL
! EDITTEXT IDC_TYPENAME,292,2,68,12,ES_AUTOHSCROLL | ES_READONLY
! ICON IDI_INSTANCEMARK_ICON,IDC_INSTANCEMARK,0,0,20,20,
! SS_REALSIZEIMAGE | NOT WS_VISIBLE
! EDITTEXT IDC_KINDNAME,107,2,68,12,ES_AUTOHSCROLL | ES_READONLY
! RTEXT "Base:",IDC_BASETYPE_LABEL,268,4,21,8
! LTEXT "Aspect:",IDC_STATIC,179,4,24,8
COMBOBOX IDC_ASPECT,203,2,65,272,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
! ICON IDI_TYPEMARK_ICON,IDC_TYPEMARK,0,0,20,20,
! SS_REALSIZEIMAGE
! LTEXT "Zoom:",IDC_STATIC,364,4,22,8
COMBOBOX IDC_ZOOMS,386,2,41,272,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
END
--- 673,697 ----
END
! CG_IDD_MODELPROPERTIESBAR DIALOGEX 0, 0, 467, 16
STYLE DS_SETFONT | WS_CHILD
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
EDITTEXT IDC_NAME,37,2,68,12,ES_AUTOHSCROLL
! EDITTEXT IDC_KINDNAME,107,2,68,12,ES_AUTOHSCROLL | ES_READONLY |
! NOT WS_TABSTOP
COMBOBOX IDC_ASPECT,203,2,65,272,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP
! EDITTEXT IDC_TYPENAME,292,2,68,12,ES_AUTOHSCROLL | ES_READONLY |
! NOT WS_TABSTOP
COMBOBOX IDC_ZOOMS,386,2,41,272,CBS_DROPDOWN | WS_VSCROLL |
WS_TABSTOP
+ ICON IDI_INSTANCEMARK_ICON,IDC_INSTANCEMARK,0,0,20,20,
+ SS_REALSIZEIMAGE | NOT WS_VISIBLE
+ LTEXT "Name:",IDC_STATIC,15,4,21,8
+ LTEXT "Aspect:",IDC_STATIC,177,4,24,8
+ RTEXT "Base:",IDC_BASETYPE_LABEL,270,4,19,8
+ LTEXT "Zoom:",IDC_STATIC,364,4,22,8
+ ICON IDI_TYPEMARK_ICON,IDC_TYPEMARK,0,0,20,20,
+ SS_REALSIZEIMAGE
END
***************
*** 1405,1408 ****
--- 1434,1438 ----
IDW_TOOLBAR_DUMMY "Show or hide the component toolbar\nToggle Components ToolBar"
IDW_TOOLBAR_MODE "Show or hide the mode toolbar\nToggle Mode ToolBar"
+ IDW_TOOLBAR_NAVIG "Show or hide the navigator toolbar\nToggle Navigator ToolBar"
END
***************
*** 1544,1547 ****
--- 1574,1598 ----
ID_MODE_SHORTCONNECT "Non-Sticky Connect Mode\nNon-Sticky Connect Mode"
ID_MODE_SHORTDISCONNECT "Non-Sticky Disconnect Mode\nNon-Sticky Disconnect Mode"
+ END
+
+ STRINGTABLE
+ BEGIN
+ ID_BUTTON33020 "Back\nBack"
+ ID_BUTTON33021 "Forward\nForward"
+ ID_BUTTON33022 "Home\nHome"
+ END
+
+ STRINGTABLE
+ BEGIN
+ ID_BUTTON33027 "Close Model\nClose Model"
+ ID_BUTTON33028 "Close All Models\nClose All Models"
+ ID_BUTTON33033 "Close All But Active Model\nClose All But Active Model"
+ ID_BUTTON33035 "Cycle Aspects\nCycle Aspects"
+ ID_BUTTON33037 "Cycle Aspects For All Open Models\nCycle Aspects For All Open Models"
+ END
+
+ STRINGTABLE
+ BEGIN
+ ID_BUTTON33044 "Next Window\nNext Window"
END
More information about the GME-commit
mailing list