From: Dirk B. <db...@us...> - 2005-09-15 16:36:17
|
Update of /cvsroot/win32forth/win32forth/apps/ProMgr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16338/apps/ProMgr Modified Files: ProjectManager.f Log Message: Replaced our Html display control (w32fHtmlDisplay.dll) with Tom's ActiveX control. So the file w32fHtmlDisplay.dll isn't needed any more. Index: ProjectManager.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ProMgr/ProjectManager.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ProjectManager.f 5 Sep 2005 19:58:34 -0000 1.9 --- ProjectManager.f 15 Sep 2005 16:36:08 -0000 1.10 *************** *** 113,117 **** needs RegistrySupport.f needs RecentFiles.f ! needs PMMenu.f \ Menu and command IDs in separate file needs AcceleratorTables.f --- 113,117 ---- needs RegistrySupport.f needs RecentFiles.f ! needs PMMenu.f \ Menu and command IDs in separate file needs AcceleratorTables.f *************** *** 165,171 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! PROGREG-SET-BASE-PATH create RegPath$ max-path allot ! ProgReg count RegPath$ place s" ProjectManager" RegPath$ +place RegPath$ count RegistrySet ProjectManager RegPath$ count pad place s" \Window" pad +place pad count RegistrySet WindowSettings --- 165,171 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! PROGREG-SET-BASE-PATH create RegPath$ max-path allot ! ProgReg count RegPath$ place s" ProjectManager" RegPath$ +place RegPath$ count RegistrySet ProjectManager RegPath$ count pad place s" \Window" pad +place pad count RegistrySet WindowSettings *************** *** 176,180 **** RecentFilesList s" File1" 10 1 DO ! 2dup + 1- i 48 + swap c! 2dup i GetRecentFile: RecentFiles count 2swap REG_SZ SetRegistryValue --- 176,180 ---- RecentFilesList s" File1" 10 1 DO ! 2dup + 1- i 48 + swap c! 2dup i GetRecentFile: RecentFiles count 2swap REG_SZ SetRegistryValue *************** *** 439,443 **** :M Expand: ( hItem f -- ) TVM_EXPAND SendMessageDrop ;M \ :M ToggleExpandItem: ( hItem -- ) TVE_TOGGLE Expand: self ;M ! :M CollapseReset: ( hItem -- ) TVE_COLLAPSERESET TVE_COLLAPSE or Expand: self ;M :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage ;M :M SelectItem: ( hItem -- ) TVGN_CARET TVM_SELECTITEM SendMessageDrop ;M --- 439,443 ---- :M Expand: ( hItem f -- ) TVM_EXPAND SendMessageDrop ;M \ :M ToggleExpandItem: ( hItem -- ) TVE_TOGGLE Expand: self ;M ! :M CollapseReset: ( hItem -- ) TVE_COLLAPSERESET TVE_COLLAPSE or Expand: self ;M :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage ;M :M SelectItem: ( hItem -- ) TVGN_CARET TVM_SELECTITEM SendMessageDrop ;M *************** *** 468,472 **** GetNext: self Repeat drop drop ! MaxWidth ;M --- 468,472 ---- GetNext: self Repeat drop drop ! MaxWidth ;M *************** *** 787,791 **** MessageBox: parent IDNO = if SetFocus: self exitm then handle: SelectedItem \ save handle of selected item on stack ! SelectedItem ParentItem: SelectedItem to SelectedItem DeleteItem: SelectedItem #items: SelectedItem \ SelectedItem is now ParentItem SelectedItem MainList = or \ don't reset main list --- 787,791 ---- MessageBox: parent IDNO = if SetFocus: self exitm then handle: SelectedItem \ save handle of selected item on stack ! SelectedItem ParentItem: SelectedItem to SelectedItem DeleteItem: SelectedItem #items: SelectedItem \ SelectedItem is now ParentItem SelectedItem MainList = or \ don't reset main list *************** *** 793,797 **** ELSE drop handle: SelectedItem dup SelectItem: self CollapseReset: self THEN ! true to Modified ;M --- 793,797 ---- ELSE drop handle: SelectedItem dup SelectItem: self CollapseReset: self THEN ! true to Modified ;M *************** *** 1139,1143 **** IF "to-pathend" ELSE drop ProjectName: TheProject ! THEN pad +place s" ?" pad +place pad +NULL pad 1+ z" Project Manager" --- 1139,1143 ---- IF "to-pathend" ELSE drop ProjectName: TheProject ! THEN pad +place s" ?" pad +place pad +NULL pad 1+ z" Project Manager" *************** *** 1213,1217 **** THEN ;M ! :M Classinit: ( -- ) ClassInit: super \ init super class --- 1213,1217 ---- THEN ;M ! :M Classinit: ( -- ) ClassInit: super \ init super class *************** *** 1224,1228 **** \ ['] On_DblClick SetDblClickFunc: self \ set later, SetSplitter ;M ! :M WindowHasMenu: ( -- f ) true ;M --- 1224,1228 ---- \ ['] On_DblClick SetDblClickFunc: self \ set later, SetSplitter ;M ! :M WindowHasMenu: ( -- f ) true ;M *************** *** 1233,1237 **** :M On_Size: ( -- ) ! dup to WindowState \ get WindowState, don't save size of maximised or minimised window AutoSize: TheToolBar Redraw: ProjectStatusBar --- 1233,1237 ---- :M On_Size: ( -- ) ! dup to WindowState \ get WindowState, don't save size of maximised or minimised window AutoSize: TheToolBar Redraw: ProjectStatusBar *************** *** 1272,1276 **** s" " SetProjectFileName: TheProject LeftPane Start: TheProject - InitHtmlControl ;M --- 1272,1275 ---- *************** *** 1289,1293 **** Options SaveSettings ProjectManager SaveSettings ! SaveRecentFiles MenuHandle: CurrentMenu ?dup if Call DestroyMenu ?win-error \ discard the menubar --- 1288,1292 ---- Options SaveSettings ProjectManager SaveSettings ! SaveRecentFiles MenuHandle: CurrentMenu ?dup if Call DestroyMenu ?win-error \ discard the menubar *************** *** 1295,1299 **** then ExitScintillaControl \ Dienstag, August 03 2004 dbu - ExitHtmlControl PMAccelerators DisableAccelerators \ free the accelerator table \+ sysgen 0 Call PostQuitMessage --- 1294,1297 ---- *************** *** 1307,1317 **** :M WM_CLOSE ( h m w l -- res ) SaveIfModified ! IF GetProjectFileName: TheProject pad place pad Insert: RecentFiles WM_CLOSE WM: Super \ close window ! ELSE 0 \ abandon the close THEN ;M ! :M WindowTitle: ( -- zstring ) z" Project Manager" ;M --- 1305,1315 ---- :M WM_CLOSE ( h m w l -- res ) SaveIfModified ! IF GetProjectFileName: TheProject pad place pad Insert: RecentFiles WM_CLOSE WM: Super \ close window ! ELSE 0 \ abandon the close THEN ;M ! :M WindowTitle: ( -- zstring ) z" Project Manager" ;M *************** *** 1400,1404 **** else drop then ; IDM_OPEN SetCommand ! : save-project ( -- ) SaveProject: TheProject --- 1398,1402 ---- else drop then ; IDM_OPEN SetCommand ! : save-project ( -- ) SaveProject: TheProject *************** *** 1450,1454 **** : Expand/Collapse ( a f -- ) swap to ThisList Handle: ThisList swap Expand: TheProject ; ! : Expand ( a -- ) TVE_EXPAND Expand/Collapse ; : Collapse ( a -- ) TVE_COLLAPSE Expand/Collapse ; --- 1448,1452 ---- : Expand/Collapse ( a f -- ) swap to ThisList Handle: ThisList swap Expand: TheProject ; ! : Expand ( a -- ) TVE_EXPAND Expand/Collapse ; : Collapse ( a -- ) TVE_COLLAPSE Expand/Collapse ; *************** *** 1464,1468 **** ModuleList: TheProject to ThisList Handle: ThisList SelectItem: TheProject SetSplitter ; IDM_EXPAND_ALL SetCommand ! : CollapseAll ( -- ) ModuleList: TheProject collapse --- 1462,1466 ---- ModuleList: TheProject to ThisList Handle: ThisList SelectItem: TheProject SetSplitter ; IDM_EXPAND_ALL SetCommand ! : CollapseAll ( -- ) ModuleList: TheProject collapse *************** *** 1475,1479 **** MainList: TheProject to ThisList Handle: ThisList SelectItem: TheProject ; IDM_COLLAPSE_ALL SetCommand ! \ Project Menu Commands \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 1473,1477 ---- MainList: TheProject to ThisList Handle: ThisList SelectItem: TheProject ; IDM_COLLAPSE_ALL SetCommand ! \ Project Menu Commands \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 1531,1536 **** DOC keep this for adding files like docs ENDDOC ! : +Comment ( n -- ) comment? IF drop ELSE comment? or to comment? THEN ; ! : -Comment ( n -- ) invert comment? and to comment? ; : \Comment ( -- ) comment? 0= IF source nip >in ! THEN ; \ ignore till end of line --- 1529,1534 ---- DOC keep this for adding files like docs ENDDOC ! : +Comment ( n -- ) comment? IF drop ELSE comment? or to comment? THEN ; ! : -Comment ( n -- ) invert comment? and to comment? ; : \Comment ( -- ) comment? 0= IF source nip >in ! THEN ; \ ignore till end of line *************** *** 1543,1547 **** bl word count '"' -TrailChars pad place bl word count fpathplus count caps-compare 0= ! IF pad count "fpath+ drop ELSE >in ! THEN ; --- 1541,1545 ---- bl word count '"' -TrailChars pad place bl word count fpathplus count caps-compare 0= ! IF pad count "fpath+ drop ELSE >in ! THEN ; *************** *** 1616,1620 **** IF 2drop false \ missing-file ELSE true ! THEN ELSE drop false THEN ; --- 1614,1618 ---- IF 2drop false \ missing-file ELSE true ! THEN ELSE drop false THEN ; *************** *** 1648,1657 **** pad count addfile 2dup asciiz 0 SetText: ProjectStatusBar ! THEN skip-recurse? ! if 2drop else comment? -rot recurse to comment? \ save comment? on stack ! then ! then then ( false to skip-recurse? ) repeat source-id close-file drop --- 1646,1655 ---- pad count addfile 2dup asciiz 0 SetText: ProjectStatusBar ! THEN skip-recurse? ! if 2drop else comment? -rot recurse to comment? \ save comment? on stack ! then ! then then ( false to skip-recurse? ) repeat source-id close-file drop *************** *** 1756,1760 **** temp$ 1+ 1 SetText: TheStatusBar true to dirty? else drop ! then THEN >NextLink: ThisList loop --- 1754,1758 ---- temp$ 1+ 1 SetText: TheStatusBar true to dirty? else drop ! then THEN >NextLink: ThisList loop *************** *** 1765,1769 **** : CopyNonLib ( -- ) true to NoLibFiles copy-files ; IDM_COPY SetCommand ! : cancel-zip? ( addr cnt -- 0 ) 2drop key? --- 1763,1767 ---- : CopyNonLib ( -- ) true to NoLibFiles copy-files ; IDM_COPY SetCommand ! : cancel-zip? ( addr cnt -- 0 ) 2drop key? *************** *** 2003,2008 **** s" doc\promgr\prjProjectWindow.gif" needed-file **** these are not found with spaces in filenames! s" doc\promgr\prjFileMenu.gif" needed-file **** e.g. "prjFile Menu.gif" ! s" doc\promgr\prjViewMenu.gif" needed-file ! s" doc\promgr\prjProjectMenu.gif" needed-file ! s" doc\promgr\prjHelpMenu.gif" needed-file ENDDOC --- 2001,2006 ---- s" doc\promgr\prjProjectWindow.gif" needed-file **** these are not found with spaces in filenames! s" doc\promgr\prjFileMenu.gif" needed-file **** e.g. "prjFile Menu.gif" ! s" doc\promgr\prjViewMenu.gif" needed-file ! s" doc\promgr\prjProjectMenu.gif" needed-file ! s" doc\promgr\prjHelpMenu.gif" needed-file ENDDOC |