Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15974/apps/Win32ForthIDE Modified Files: CommandID.f EdCommand.f EdMenu.f EdRemote.f EdTabControl.f EdToolbar.f EdVersion.f Main.f Log Message: - Made the "Project" tab be the first in the tab window. - Removed CCS_ADJUSTABLE flag from the toolbar. - Added a "Reset" command to the "Win32Forth" menu. This command will reset the remote I/O. After executuing this command it should always be possible to compile. Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** EdTabControl.f 17 Jul 2006 12:02:21 -0000 1.15 --- EdTabControl.f 23 Jul 2006 09:36:40 -0000 1.16 *************** *** 25,28 **** --- 25,35 ---- 2 cells + @ ; + 0 constant PROJECT_TAB + 1 constant FILE_TAB + 2 constant FOLDER_TAB + 3 constant VOC_TAB + 4 constant CLASS_TAB + + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ the File Listview control *************** *** 205,209 **** 4dup Move: cProjectTree 4dup Move: cClassTree ! 4dup Move: cVocTree Move: TheFolderView ;M --- 212,216 ---- 4dup Move: cProjectTree 4dup Move: cClassTree ! 4dup Move: cVocTree Move: TheFolderView ;M *************** *** 246,254 **** : ShowFolderView ( -- ) SW_HIDE Show: cClassTree SW_HIDE Show: cFileList SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree - SW_SHOW Show: TheFolderView ; --- 253,261 ---- : ShowFolderView ( -- ) + SW_SHOW Show: TheFolderView SW_HIDE Show: cClassTree SW_HIDE Show: cFileList SW_HIDE Show: cProjectTree SW_HIDE Show: cVocTree ; *************** *** 266,274 **** \ Show the control for the currently selected tab. GetSelectedTab: cTab ! case 0 of ShowFiles endof ! 1 of ShowProject endof ! 2 of ShowFolderView endof ! 3 of ShowVocs endof ! 4 of ShowClasses endof endcase ;M --- 273,281 ---- \ Show the control for the currently selected tab. GetSelectedTab: cTab ! case PROJECT_TAB of ShowProject endof ! FILE_TAB of ShowFiles endof ! FOLDER_TAB of ShowFolderView endof ! VOC_TAB of ShowVocs endof ! CLASS_TAB of ShowClasses endof endcase ;M *************** *** 315,323 **** TCIF_TEXT IsMask: cTab ! z" Files" IsPszText: cTab 1 InsertTab: cTab TCIF_TEXT IsMask: cTab ! z" Project" IsPszText: cTab 2 InsertTab: cTab --- 322,330 ---- TCIF_TEXT IsMask: cTab ! z" Project" IsPszText: cTab 1 InsertTab: cTab TCIF_TEXT IsMask: cTab ! z" Files" IsPszText: cTab 2 InsertTab: cTab *************** *** 342,366 **** :M AddFile: ( addr -- ) \ Add a file to the file list view. - cr ." AddFile: " dup h. AddFile: cFileList ;M :M RemoveFile: ( addr -- ) \ Remove a file from the file list view. - cr ." RemoveFile: " dup h. RemoveFile: cFileList ;M :M DeSelectFile: ( addr -- ) \ DeSelect a file in the file list view. - cr ." DeSelectFile: " dup h. 0 swap SetFileState: cFileList ;M :M SelectFile: ( addr -- ) \ Select a file in the file list view. - cr ." SelectFile: " dup h. LVIS_SELECTED swap SetFileState: cFileList ;M :M UpdateFileName: ( addr -- ) \ Update the filename in the file list view. - \ cr ." UpdateFileName: " dup h. UpdateFileName: cFileList ;M --- 349,368 ---- Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdVersion.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdVersion.f 16 Jul 2006 11:54:34 -0000 1.2 --- EdVersion.f 23 Jul 2006 09:36:40 -0000 1.3 *************** *** 1,5 **** \ $Id$ ! 10201 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10202 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 60,63 **** --- 60,67 ---- \ --------------------------------------------------------------------------- + \ --------------------------------------------------------------------------- + \ SciEdit changes + \ --------------------------------------------------------------------------- + \ changes for Version 1.01.02 dbu Samstag, August 14 2004 *************** *** 236,237 **** --- 240,255 ---- Rod Saturday, May 06 2006 - Added Print and PageSetup + + \ --------------------------------------------------------------------------- + \ Win32Forth IDE changes + \ --------------------------------------------------------------------------- + + \ changes for Version 1.02.02 + dbu Samstag, Juli 22 2006 + - Made the "Project" tab be the first in the tab window. + - Removed CCS_ADJUSTABLE flag from the toolbar. + + dbu Sonntag, Juli 23 2006 + - Added a "Reset" command to the "Win32Forth" menu. This command + will reset the remote I/O. After executuing this command it + should always be possible to compile. Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** EdMenu.f 16 Jul 2006 11:54:34 -0000 1.11 --- EdMenu.f 23 Jul 2006 09:36:40 -0000 1.12 *************** *** 143,150 **** :MenuItem mp_showsb "&Show Statusbar" IDM_SHOW_STATUSBAR DoCommand ; :MenuItem mp_showtb "&Show Toolbar" IDM_SHOW_TOOLBAR DoCommand ; ! :MenuItem mp_customizetb "&Customize toolbar" Customize: ControlToolbar ; Popup "&Win32Forth" :MenuItem mp_compile "&Compile\tF12" IDM_COMPILE DoCommand ; MenuSeparator :MenuItem mp_debug "&Debug...\tF11" IDM_DEBUG DoCommand ; --- 143,151 ---- :MenuItem mp_showsb "&Show Statusbar" IDM_SHOW_STATUSBAR DoCommand ; :MenuItem mp_showtb "&Show Toolbar" IDM_SHOW_TOOLBAR DoCommand ; ! \ :MenuItem mp_customizetb "&Customize toolbar" Customize: ControlToolbar ; Popup "&Win32Forth" :MenuItem mp_compile "&Compile\tF12" IDM_COMPILE DoCommand ; + :MenuItem mp_reset "&Reset" IDM_RESET_CON_IO DoCommand ; MenuSeparator :MenuItem mp_debug "&Debug...\tF11" IDM_DEBUG DoCommand ; *************** *** 354,361 **** ShowToolbar? Check: mp_showtb ShowStatusbar? Check: mp_showsb ! ShowToolbar? Enable: mp_customizetb ForthForm? Enable: me_addforms CompileProject? Check: mp_compileproject Compile? Enable: mp_compile ActiveChild 0<> dup Enable: mf_saveall --- 355,363 ---- ShowToolbar? Check: mp_showtb ShowStatusbar? Check: mp_showsb ! \ ShowToolbar? Enable: mp_customizetb ForthForm? Enable: me_addforms CompileProject? Check: mp_compileproject Compile? Enable: mp_compile + true Enable: mp_reset ActiveChild 0<> dup Enable: mf_saveall Index: EdToolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdToolbar.f 16 Jul 2006 11:54:34 -0000 1.5 --- EdToolbar.f 23 Jul 2006 09:36:40 -0000 1.6 *************** *** 166,170 **** :M WindowStyle: ( -- style ) WindowStyle: super ! [ TBSTYLE_TOOLTIPS TBSTYLE_WRAPABLE or CCS_ADJUSTABLE or nostack1 CCS_NOPARENTALIGN or CCS_NORESIZE or CCS_NODIVIDER or ] LITERAL or FlatToolBar? --- 166,170 ---- :M WindowStyle: ( -- style ) WindowStyle: super ! [ TBSTYLE_TOOLTIPS TBSTYLE_WRAPABLE or ( CCS_ADJUSTABLE or ) nostack1 CCS_NOPARENTALIGN or CCS_NORESIZE or CCS_NODIVIDER or ] LITERAL or FlatToolBar? Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCommand.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EdCommand.f 30 Jun 2006 04:17:13 -0000 1.6 --- EdCommand.f 23 Jul 2006 09:36:40 -0000 1.7 *************** *** 323,326 **** --- 323,333 ---- HandleW32FMsg? 0= to HandleW32FMsg? ; IDM_HANDLEW32FMSG SetCommand + + : mcResetConIo ( -- ) + \ Reset the console I/O. + uninit-shared-type + init-shared-type + false to ConsoleReady? ; IDM_RESET_CON_IO SetCommand + \ -------------------------------------------------------------------------- \ Window menu Index: EdRemote.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdRemote.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EdRemote.f 5 Jun 2006 09:19:00 -0000 1.1 --- EdRemote.f 23 Jul 2006 09:36:40 -0000 1.2 *************** *** 34,38 **** HandleW32FMsg? if dup ! CASE ED_OPEN_EDIT OF dup remote-open r>drop false >r ENDOF ED_OPEN_BROWSE OF dup remote-open r>drop false >r ENDOF --- 34,38 ---- HandleW32FMsg? if dup ! CASE ED_OPEN_EDIT OF dup remote-open r>drop false >r ENDOF ED_OPEN_BROWSE OF dup remote-open r>drop false >r ENDOF *************** *** 48,52 **** \ returns true if the message wasn't handled true >r ! CASE ED_ALIVE OF true to ConsoleReady? r>drop false >r ENDOF ED_SHUTDOWN OF false to ConsoleReady? r>drop false >r ENDOF --- 48,52 ---- \ returns true if the message wasn't handled true >r ! CASE ED_ALIVE OF true to ConsoleReady? r>drop false >r ENDOF ED_SHUTDOWN OF false to ConsoleReady? r>drop false >r ENDOF *************** *** 56,60 **** \ returns true if the message wasn't handled true >r ! CASE FF_PASTE of FFPasteSource r>drop false >r endof \ August 20, 2005 - EAB endcase r> ; --- 56,60 ---- \ returns true if the message wasn't handled true >r ! CASE FF_PASTE of FFPasteSource r>drop false >r endof \ August 20, 2005 - EAB endcase r> ; *************** *** 71,81 **** :noname ( -- ) - \ cr ." init-shared-type 1: ed-ptr = " ed-ptr . ." ed-window = " ed-window @ . ed-ptr 0= ?EXIT \ leave if shared memory not inited ed-window @ call IsWindow dup ! 0<> to second-copy? 0= if GetHandle: Frame ed-window ! \ set our window handle then - \ cr ." init-shared-type 2: second-copy? = " second-copy? . ." ed-window = " ed-window @ . ; is init-shared-type --- 71,79 ---- :noname ( -- ) ed-ptr 0= ?EXIT \ leave if shared memory not inited ed-window @ call IsWindow dup ! 0<> to second-copy? 0= if GetHandle: Frame ed-window ! \ set our window handle then ; is init-shared-type *************** *** 115,119 **** wParam ED_OPEN_BROWSE = SetBrowseMode: ActiveRemote \ browsing? then ! then THEN Update ; is remote-open --- 113,117 ---- wParam ED_OPEN_BROWSE = SetBrowseMode: ActiveRemote \ browsing? then ! then THEN Update ; is remote-open Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Main.f 17 Jul 2006 12:02:21 -0000 1.23 --- Main.f 23 Jul 2006 09:36:40 -0000 1.24 *************** *** 95,108 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ - \ Define the left part of the splitter window. In this window a - \ Tab Control will be used to show the open files the Class Browser and - \ the Project. \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ - TabWindow cTabWindow - - : show-project-tab ( -- ) - 1 ShowTab: cTabWindow ; IDM_SHOWPROJECT_TAB SetCommand - Needs Task.f --- 95,100 ---- *************** *** 110,122 **** 2 proc SetThreadPriority ! : Below ( -- ) THREAD_PRIORITY_BELOW_NORMAL GetCurrentThread SetThreadPriority drop ; ! : Above ( -- ) THREAD_PRIORITY_ABOVE_NORMAL GetCurrentThread SetThreadPriority drop ; ! 0 :NoName ( -- ) Below InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask ! 0 :NoName ( -- ) Below InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask ! : InitClassBrowsers ( -- ) ! VocInitTask run-task 0= abort" Failed to start background Task" ! ClassInitTask run-task 0= abort" Failed to start background Task" ; :Object LeftPane <Super Child-Window --- 102,115 ---- 2 proc SetThreadPriority ! : Below ( -- ) THREAD_PRIORITY_BELOW_NORMAL GetCurrentThread SetThreadPriority drop ; ! : Above ( -- ) THREAD_PRIORITY_ABOVE_NORMAL GetCurrentThread SetThreadPriority drop ; ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ Define the left part of the splitter window. In this window a ! \ Tab Control will be used to show the open files the Class Browser and ! \ the Project. ! \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! TabWindow cTabWindow :Object LeftPane <Super Child-Window *************** *** 130,134 **** :M On_Init: ( -- ) On_Init: super ! self Start: cTabWindow ;M :M WndClassStyle: ( -- style ) --- 123,128 ---- :M On_Init: ( -- ) On_Init: super ! self Start: cTabWindow ! ;M :M WndClassStyle: ( -- style ) *************** *** 138,141 **** --- 132,145 ---- ;Object + : show-project-tab ( -- ) + PROJECT_TAB ShowTab: cTabWindow ; IDM_SHOWPROJECT_TAB SetCommand + + 0 :NoName ( -- ) Below InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask + 0 :NoName ( -- ) Below InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask + + : InitClassBrowsers ( -- ) + VocInitTask run-task 0= abort" Failed to start background Task" + ClassInitTask run-task 0= abort" Failed to start background Task" ; + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ \\\\\ Splitter window \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 180,191 **** : ClientHeight ( -- n ) Height StatusBarHeight - ToolBarHeight - ; ! (( ! : AdjustWindowSize { width height win -- } ! [ SWP_SHOWWINDOW SWP_NOZORDER or SWP_NOMOVE or ] literal ! height width ! 0 0 \ ignore position ! 0 \ ignore z-order ! win Call SetWindowPos drop ; ! )) :M ReSize: ( -- ) ShowToolbar? if Height: TheRebar else 0 then to ToolBarHeight --- 184,188 ---- : ClientHeight ( -- n ) Height StatusBarHeight - ToolBarHeight - ; ! :M ReSize: ( -- ) ShowToolbar? if Height: TheRebar else 0 then to ToolBarHeight *************** *** 199,204 **** LeftWidth ToolBarHeight thickness ClientHeight Move: Splitter ! \ ShowToolbar? if Width Height: TheRebar GetHandle: TheRebar AdjustWindowSize then ! ShowToolbar? if AutoSize: TheRebar then ShowStatusbar? if Redraw: ScintillaStatusbar then ;M --- 196,200 ---- LeftWidth ToolBarHeight thickness ClientHeight Move: Splitter ! ShowToolbar? if AutoSize: TheRebar then ShowStatusbar? if Redraw: ScintillaStatusbar then ;M *************** *** 389,394 **** SaveRecentProjectFiles ! SetRegistryKey: ControlToolBar ! true SaveRestore: ControlToolBar r> base ! --- 385,390 ---- SaveRecentProjectFiles ! \ SetRegistryKey: ControlToolBar ! \ true SaveRestore: ControlToolBar r> base ! *************** *** 429,434 **** RestoreRecentProjectFiles ! SetRegistryKey: ControlToolBar ! false SaveRestore: ControlToolBar r> base ! ; --- 425,430 ---- RestoreRecentProjectFiles ! \ SetRegistryKey: ControlToolBar ! \ false SaveRestore: ControlToolBar r> base ! ; *************** *** 969,974 **** [defined] sysgen [IF] ! : InitDir current-dir$ count SetDir: SourceFileOpenDialog ; ! Initialization-chain Chain-add InitDir --- 965,970 ---- [defined] sysgen [IF] ! : InitDir current-dir$ ( -- ) ! count SetDir: SourceFileOpenDialog ; Initialization-chain Chain-add InitDir *************** *** 978,982 **** then exception@ if bye then ! default-application ; ' my-hello is default-hello --- 974,979 ---- then exception@ if bye then ! default-application ! ; ' my-hello is default-hello *************** *** 988,997 **** s" src\res\SciEditMDI.ico" s" Win32ForthIde.exe" AddAppIcon 1 pause-seconds bye [else] s" src\res\SciEditMDI.ico" s" Win32ForthIde.exe" AddAppIcon - - debug breaker - Main [then] --- 985,993 ---- s" src\res\SciEditMDI.ico" s" Win32ForthIde.exe" AddAppIcon + \ make shure that the remote I/O will still work after the IDE was compiled + also hidden ' uninit-shared-forth is uninit-shared-type previous 1 pause-seconds bye [else] s" src\res\SciEditMDI.ico" s" Win32ForthIde.exe" AddAppIcon Main [then] Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CommandID.f 30 Jun 2006 04:17:13 -0000 1.7 --- CommandID.f 23 Jul 2006 09:36:40 -0000 1.8 *************** *** 94,97 **** --- 94,98 ---- NewID IDM_DEBUG NewID IDM_HANDLEW32FMSG + NewID IDM_RESET_CON_IO \ Window menu |