Menu
▾
▴
[Win32forth-cvs] win32forth/apps/Win32ForthIDE EdMenu.f, 1.3, 1.4 EdTabControl.f, 1.4, 1.5 Main.f, 1.5, 1.6 ProjectTree.f, 1.3, 1.4
|
From: Dirk B. <db...@us...> - 2006-06-08 17:13:56
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14965/apps/Win32ForthIDE Modified Files: EdMenu.f EdTabControl.f Main.f ProjectTree.f Log Message: Made some of the Project commands work (from the menu only). Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Main.f 7 Jun 2006 16:04:21 -0000 1.5 --- Main.f 8 Jun 2006 17:13:47 -0000 1.6 *************** *** 72,76 **** defer Update ' noop is Update defer OnSelect ' drop is OnSelect \ called when item is selected in the file listview - defer ResetProject ' noop is ResetProject AcceleratorTable AccelTable \ create the Accelerator-Key-Table --- 72,75 ---- *************** *** 114,121 **** ;Object - :noname ( -- ) - \ Reset the project window (close the current project; and open a new empty one) - ResetProject cTabWindow ; is ResetProject - \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\ Splitter window \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 113,116 ---- Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProjectTree.f 7 Jun 2006 15:39:34 -0000 1.3 --- ProjectTree.f 8 Jun 2006 17:13:47 -0000 1.4 *************** *** 11,28 **** s" apps\ProMgr\res" "fpath+ ! [undefined] name-only? [if] ! true value name-only? ! true value no-duplicates? ! 0 value #addedfiles ! 0 value SelectedItem ! 0 value ThisList \ temp pointer to list being used ! 0 value ThisItem \ temp pointer to new item ! 0 value TheProject ! 0 value TheStatusBar ! 0 value dirty? ! 0 value Modified ! Create FileExt 16 allot ! [then] \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 11,28 ---- s" apps\ProMgr\res" "fpath+ ! true value name-only? ! true value no-duplicates? ! 0 value #addedfiles ! \ 0 value #linecount ! \ 0 value total-size ! 0 value SelectedItem ! 0 value ThisList \ temp pointer to list being used ! 0 value ThisItem \ temp pointer to new item ! 0 value TheProject ! 0 value TheStatusBar ! 0 value dirty? ! 0 value Modified ! create FileExt 16 allot \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 395,401 **** 32 min 0max projectname place ;m ! :m ProjectName: ( -- addr ) projectname count ;m : .buildfile ( -- ) \ mainfile c@ dup --- 395,404 ---- 32 min 0max projectname place ;m ! :m ProjectName: ( -- addr cnt ) projectname count ;m + :m &ProjectName: ( -- addr ) + projectname ;m + : .buildfile ( -- ) \ mainfile c@ dup *************** *** 698,701 **** --- 701,717 ---- )) + : SetProjectTitle ( -- ) + \ s" Forth Project Manager - " pad place + \ GetProjectFileName: TheProject dup 0= + \ if 2drop s" untitled.fpj" + \ then pad +place pad count SetText: TheProjectWindow + ; + + : reset-results ( -- ) + 0 to #addedfiles + \ 0 to #linecount + \ 0 to total-size + ; + : (open-project) ( a1 n1 -- ) \ clear-status-bar *************** *** 705,710 **** "path-only" 2dup SetDir: OpenProjectDialog 2dup SetDir: SaveFileDialog SetDir: GetFilesDialog - \ Close: TheProject Leftpane Start: TheProject - \ ResetProject \ Reset the project window (close the current project; and open a new empty one) Clear: TheProject --- 721,724 ---- *************** *** 712,717 **** Rename: TheProject SetFocus: TheProject ! \ SetProjectTitle ! \ reset-results ReleaseBuffer: viewerfile --- 726,731 ---- Rename: TheProject SetFocus: TheProject ! SetProjectTitle ! reset-results ReleaseBuffer: viewerfile *************** *** 719,726 **** ; ! : new-project ( -- ) ! \ SaveIfModified 0= ?exit ! s" Project" SetProjectName: TheProject ! pad 0 SetBuildFile: TheProject pad 0 (open-project) ! ; IDM_NEW_PRJ SetCommand --- 733,801 ---- ; ! : ?SaveMessage ( -- n ) ! \ IDYES, IDNO or IDCANCEL ! s" Do you want to save " pad place ! GetProjectFileName: TheProject ?dup ! IF "to-pathend" ! ELSE drop ProjectName: TheProject ! THEN pad +place ! s" ?" pad +place pad +NULL ! pad 1+ z" Project Manager" ! [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal ! NULL MessageBox ; ! ! : SaveIfModified ( -- f ) ! \ true if not cancelled or not modified ! true ! Modified ! IF ?SaveMessage ! Case ! IDCANCEL Of drop false Endof ! IDYES Of SaveProject: TheProject Endof ! ( otherwise IDNO ) false to Modified ! EndCase ! THEN ; ! ! : GetProjectName ( -- f1 ) ! &ProjectName: TheProject MainWindow Start: GetProjectNameDlg ; ! ! : (rename-project) ( -- ) ! ProjectName: TheProject nip 0= ! if s" Project" SetProjectName: TheProject ! then Rename: TheProject ; ! ! : new-project ( -- ) ! SaveIfModified 0= ?exit ! ! GetProjectName 0= ?exit ! (rename-project) ! ! pad 0 SetBuildFile: TheProject pad 0 (open-project) ! ; IDM_NEW_PRJ SetCommand ! ! : open-project ( -- ) ! SaveIfModified 0= ?exit ! OpenProjectFile count ?dup ! if (open-project) ! else drop ! then ; IDM_OPEN_PRJ SetCommand ! ! : save-project ( -- ) ! SaveProject: TheProject ! SetProjectTitle ; IDM_SAVE_PRJ SetCommand ! ! : save-as ( -- ) ! GetProjectFileName: TheProject \ save filename on stack ! s" " SetProjectFileName: TheProject ! SaveProject: TheProject ! GetProjectFileName: TheProject nip ! IF 2drop SetProjectTitle \ if not cancelled set new title ! ELSE SetProjectFileName: TheProject \ else restore filename ! THEN ; IDM_SAVE_AS_PRJ SetCommand ! ! : rename-project ( -- ) ! GetProjectName 0= ?exit ! (rename-project) ! true to Modified ! ; IDM_RENAME_PRJ SetCommand Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdMenu.f 7 Jun 2006 15:39:34 -0000 1.3 --- EdMenu.f 8 Jun 2006 17:13:47 -0000 1.4 *************** *** 75,95 **** Popup "&Project" ! MenuItem "&New... \tCtrl+N" IDM_NEW_PRJ DoCommand ; ! MenuItem "&Open... \tCtrl+O" IDM_OPEN_PRJ DoCommand ; ! MenuItem "&Save \tCtrl+S" IDM_SAVE_PRJ DoCommand ; ! MenuItem "Save &As..." IDM_SAVE_AS_PRJ DoCommand ; ! MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; ! MenuSeparator ! MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; ! MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; MenuSeparator ! MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; MenuSeparator ! MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! MenuItem "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" --- 75,97 ---- Popup "&Project" ! MenuItem "&New project... \tCtrl+N" IDM_NEW_PRJ DoCommand ; MenuSeparator ! MenuItem "&Open project... \tCtrl+O" IDM_OPEN_PRJ DoCommand ; ! MenuItem "&Save project\tCtrl+S" IDM_SAVE_PRJ DoCommand ; ! MenuItem "Save project &as..." IDM_SAVE_AS_PRJ DoCommand ; MenuSeparator ! MenuItem "&Rename...\tCtrl+R" IDM_RENAME_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Build \tCtrl+B" IDM_BUILD_PRJ DoCommand ; ! \ MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Compile \tF12" IDM_COMPILE_PRJ DoCommand ; ! \ MenuItem "&Set Forth Name..." IDM_SET_FORTH_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&New Module... \tCtrl+M" IDM_NEW_MODULE_PRJ DoCommand ; ! \ MenuSeparator ! \ MenuItem "&Add files to project... \tCtrl+A" IDM_ADD_PRJ DoCommand ; ! \ MenuItem "&Delete from project \tCtrl+D" IDM_DELETE_PRJ DoCommand ; ! \ MenuItem "Add open &forms \tCtrl+F" IDM_ADD_FORMS_PRJ DoCommand ; \ MenuSeparator \ SubMenu "Copy/&Zip files" Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdTabControl.f 7 Jun 2006 21:55:03 -0000 1.4 --- EdTabControl.f 8 Jun 2006 17:13:47 -0000 1.5 *************** *** 274,284 **** self Start: cTab \ must be started last - \ TEST ONLY... - s" proj\Win32ForthIDE.fpj" Prepend<home>\ - SetProjectFileName: cProjectTree - OpenProject: cProjectTree - \ ExpandAll - \ ... - \ ------------------------------------------------------------------------ --- 274,277 ---- |
