From: Ezra B. <ezr...@us...> - 2010-02-01 01:41:57
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18139 Modified Files: CommandID.f EdFORTHFORM.F EdPreferences.f Log Message: Updates.EAB Index: EdFORTHFORM.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFORTHFORM.F,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EdFORTHFORM.F 10 May 2009 03:50:51 -0000 1.8 --- EdFORTHFORM.F 1 Feb 2010 01:41:48 -0000 1.9 *************** *** 308,311 **** --- 308,312 ---- needs SplitterWindow.frm needs TabPropertyWindow.frm + needs ChooseIcon.frm \ more sources needs formcontrols.f \ subclassed control object *************** *** 389,392 **** --- 390,404 ---- SaveAs: ActiveForm ; IDM_FORM_SAVEAS SetCommand + : TurnkeyForm ( -- ) \ compile form to executable file + Activeform 0= ?exit \ shouldn't happen but just in case + GetSuperClass: ActiveForm DIALOG-CLASS <> dup \ dialog only! + s" Only forms of class dialog window can be turnkeyed!" ?MessageBox + ?exit + GetHandle: MainWindow SetParentWindow: frmGetIconFile + Start: frmGetIconFile \ is an iconfile needed? + continue? \ if yes + if Turnkey: ActiveForm \ then go ahead and compile + then ; IDM_TURNKEY_FORM SetCommand + : CompileForm ( -- ) \ compile to disk ActiveForm *************** *** 470,474 **** ActiveCoder ?dup if GetHandle: [ ] CloseChild: MainWindow ! then FormList Dispose 0 to FormList ActiveChild 0= \ no other file opened --- 482,486 ---- ActiveCoder ?dup if GetHandle: [ ] CloseChild: MainWindow ! then Close: CodePreviewWindow FormList Dispose 0 to FormList ActiveChild 0= \ no other file opened *************** *** 602,631 **** : write-openfiles { \ flag ThisChild -- f } false to flag ! GetTabCount: OpenFilesTab dup 0> ! if 1+ 0 ! do TCIF_PARAM IsMask: OpenFilesTab ! i GetTabInfo: OpenFilesTab ! Lparam: OpenFilesTab dup to ThisChild ! if GetFileName: ThisChild dup ! count "TO-PATHEND" s" <Untitled>" istr= not ! if s" File= " append ! count append ! GetFileType: ThisChild FT_SOURCE = ! if ',' cappend ! ChildWindow: ThisChild ! GetCurrentPos: [ ] (.) append ! ',' cappend ! ?BrowseMode: ThisChild ! if s" BROWSING" ! else s" EDITING" ! THEN append&crlf ! else +crlf ! then ! else drop then then ! loop ! else drop ! then ; : (SaveSession) ( filename$ -- ) --- 614,638 ---- : write-openfiles { \ flag ThisChild -- f } false to flag ! TabFile? 0 ! ?do i GetFileTabChild dup to ThisChild ! if GetFileName: ThisChild dup ! count "TO-PATHEND" s" <Untitled>" istr= not ! if s" File= " append ! count append ! GetFileType: ThisChild FT_SOURCE = ! if ',' cappend ! ChildWindow: ThisChild ! GetCurrentPos: [ ] (.) append ! ',' cappend ! ?BrowseMode: ThisChild ! if s" BROWSING" ! else s" EDITING" ! THEN append&crlf ! else +crlf then + else drop then ! then ! loop ; : (SaveSession) ( filename$ -- ) Index: EdPreferences.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdPreferences.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EdPreferences.f 10 May 2009 03:50:51 -0000 1.7 --- EdPreferences.f 1 Feb 2010 01:41:48 -0000 1.8 *************** *** 35,61 **** colorobject browsefore colorobject browseback ! : savecolors ( -- ) ! color: fore to fore-color ! color: back to back-color ! color: curr to caret-backcolor ! color: selfore to select-forecolor ! color: selback to select-backcolor ! color: browsefore to browse-forecolor ! color: browseback to browse-backcolor ! detached? >r \ save it for a moment ! IsButtonChecked?: chkAutoIndent to autoindent? ! IsButtonChecked?: chkShowTabs to with-tabs? ! IsButtonChecked?: chkIncludeLibs to include-libs? ! IsButtonChecked?: chkAutoProperty to AutoProperty? ! IsButtonChecked?: chkSingleControl to SingleControl? ! IsButtonChecked?: chkDetached to detached? ! detached? r> <> \ if this status changed ! if IDM_SHOW_FORMTAB DoCommand ! then Update ! Resize: MainWindow ! ; : command-func ( id obj -- ) --- 35,99 ---- colorobject browsefore colorobject browseback + Font Pfont \ font to actually modify, if not cancelled will copy to editorfont + 0 value fore-color-save + 0 value back-color-save + 0 value caret-backcolor-save + 0 value select-forecolor-save + 0 value select-backcolor-save + 0 value browse-forecolor-save + 0 value browse-backcolor-save + : backup-colors ( -- ) + fore-color to fore-color-save + back-color to back-color-save + caret-backcolor to caret-backcolor-save + select-forecolor to select-forecolor-save + select-backcolor to select-backcolor-save + browse-forecolor to browse-forecolor-save + browse-backcolor to browse-backcolor-save ; ! : restore-colors ( -- ) ! fore-color-save to fore-color ! back-color-save to back-color ! caret-backcolor-save to caret-backcolor ! select-forecolor-save to select-forecolor ! select-backcolor-save to select-backcolor ! browse-forecolor-save to browse-forecolor ! browse-backcolor-save to browse-backcolor ; ! : set-colors ( -- ) ! color: fore to fore-color ! color: back to back-color ! color: curr to caret-backcolor ! color: selfore to select-forecolor ! color: selback to select-backcolor ! color: browsefore to browse-forecolor ! color: browseback to browse-backcolor ; ! ! : savecolors ( -- ) ! set-colors ! GetLogFont: PFont GetLogFont: DefaultEditorFont [ LF_FACESIZE 28 + ] LITERAL cmove ! DefaultEditorFont to EditorFont ! ! detached? >r \ save it for a moment ! IsButtonChecked?: chkAutoIndent to autoindent? ! IsButtonChecked?: chkShowTabs to with-tabs? ! IsButtonChecked?: chkIncludeLibs to include-libs? ! IsButtonChecked?: chkAutoProperty to AutoProperty? ! IsButtonChecked?: chkSingleControl to SingleControl? ! IsButtonChecked?: chkDetached to detached? ! detached? r> <> \ if this status changed ! if IDM_SHOW_FORMTAB DoCommand ! then Update ! Resize: MainWindow ; ! ! : DisplayFontName ( -- ) ! s" Text Font: " pad place GetFaceName: PFont pad +place ! pad count SetText: btnFont ; ! ! : SetPFont ( -- ) ! GetLogFont: DefaultEditorFont GetLogFont: PFont [ LF_FACESIZE 28 + ] LITERAL cmove ! DisplayFontName ! pFont to EditorFont ; : command-func ( id obj -- ) *************** *** 69,73 **** getid: btnBrowseBack of choose: browseback if color: browseback paint: browse-backwindow then endof getid: btnBrowseFore of choose: browsefore if color: browsefore paint: browse-forewindow then endof ! getid: btncancel of close: self endof getid: btnok of savecolors close: self endof endcase ; --- 107,113 ---- getid: btnBrowseBack of choose: browseback if color: browseback paint: browse-backwindow then endof getid: btnBrowseFore of choose: browsefore if color: browsefore paint: browse-forewindow then endof ! getid: btnPreview of set-colors Update endof ! getid: btnFont of choose: pfont if DisplayFontName Update then endof ! getid: btncancel of DefaultEditorFont to EditorFont restore-colors Update close: self endof getid: btnok of savecolors close: self endof endcase ; *************** *** 84,88 **** SingleControl? Check: chkSingleControl detached? Check: chkDetached ! ['] command-func setcommand: self --- 124,129 ---- SingleControl? Check: chkSingleControl detached? Check: chkDetached ! SetPFont ! backup-colors ['] command-func setcommand: self Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** CommandID.f 8 Sep 2008 03:03:59 -0000 1.21 --- CommandID.f 1 Feb 2010 01:41:48 -0000 1.22 *************** *** 146,149 **** --- 146,150 ---- NewID IDM_SHOWPROJECT_TAB NewID IDM_CLOSE_PRJ + NewID IDM_ADD_OPEN_PRJ \ Form Designer *************** *** 193,196 **** --- 194,198 ---- NewID IDM_FORM_AddToProject NewID IDM_FORM_ADDCODE + NewID IDM_TURNKEY_FORM IdCounter constant IDM_LAST |