From: Ezra B. <ezr...@us...> - 2010-12-02 05:21:07
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10700 Modified Files: CommandID.f EdFilePane.f EdMenu.f Log Message: Minor mods. EAB Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CommandID.f 11 Jul 2010 02:45:17 -0000 1.23 --- CommandID.f 2 Dec 2010 05:20:58 -0000 1.24 *************** *** 93,96 **** --- 93,97 ---- NewID IDM_SAVEDEFAULT_SESSION NewID IDM_LOADDEFAULT_SESSION + NewID IDM_SAVEDEFAULTS \ Win32Forth menu Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** EdMenu.f 11 Jul 2010 02:46:44 -0000 1.32 --- EdMenu.f 2 Dec 2010 05:20:58 -0000 1.33 *************** *** 175,178 **** --- 175,179 ---- MenuItem "IDE &Preferences" IDM_PREFERENCES DoCommand ; MenuSeparator + MenuItem "Save Defaults now" IDM_SAVEDEFAULTS DoCommand ; MenuItem "Save Default Session" IDM_SAVEDEFAULT_SESSION DoCommand ; MenuItem "Reload Default Session" IDM_LOADDEFAULT_SESSION DoCommand ; Index: EdFilePane.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdFilePane.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdFilePane.f 10 Apr 2009 16:37:04 -0000 1.5 --- EdFilePane.f 2 Dec 2010 05:20:58 -0000 1.6 *************** *** 3,7 **** needs filewindow.frm ! NewEditDialog AddFilterDialog "Add Filter" "Enter filter e.g Forth Files (*.f;*.frm):" "&Ok" "Cancel" "" NewEditDialog DupeFileDialog "Duplicate File" "Enter new file name:" "&Duplicate" "&Cancel" "" NewEditDialog RenameFileDialog "Rename File" "Enter new name:" "&Rename" "&Cancel" "" --- 3,7 ---- needs filewindow.frm ! NewEditDialog AddFilterDialog "Add/Edit Filter" "Enter filter e.g Forth Files (*.f;*.frm):" "&Ok" "Cancel" "" NewEditDialog DupeFileDialog "Duplicate File" "Enter new file name:" "&Duplicate" "&Cancel" "" NewEditDialog RenameFileDialog "Rename File" "Enter new name:" "&Rename" "&Cancel" "" *************** *** 21,24 **** --- 21,25 ---- load-bitmap dupebmp "dupe.bmp" + string: tmp-buf : AdjustWindowSize { width height winhndl -- } SWP_SHOWWINDOW SWP_NOZORDER or SWP_NOMOVE or *************** *** 40,47 **** then ; ! : add-filter ( -- ) ! here dup off frmfileWindow Start: AddFilterDialog ! if here count 2dup parse-filters nip 0= abort" Error in filter string!" ! asciiz AddStringto: cmblstFilters then ; --- 41,61 ---- then ; ! : update-dir ( -- ) ! GetSelectedString: cmblstFilters parse-filters SetSpecs: TheDirectory ! UpDateFiles: TheDirectory ; ! ! : add-filter { \ editing? -- } ! control-key? dup to editing? ! if GetSelectedString: cmblstFilters tmp-buf place ! else tmp-buf off ! then tmp-buf frmfileWindow Start: AddFilterDialog ! if tmp-buf count 2dup parse-filters nip 0= abort" Error in filter string!" ! asciiz editing? ! if GetCurrent: cmblstFilters dup DeleteString: cmblstFilters \ remove old ! tuck InsertStringAt: cmblstFilters \ add new ! SetSelection: cmblstFilters \ and select it ! update-dir \ refresh ! else AddStringto: cmblstFilters \ just add new ! then then ; *************** *** 58,67 **** #Files: TheDirectory 0= ?exit get-file ?dup ! if here dup off frmfileWindow Start: DupefileDialog if 2dup "to-pathend" ! here count istr= abort" Can't duplicate file to itself!" 2dup "path-only" pad place pad ?+\ ! here count pad +place pad +NULL drop 0 pad 1+ rot Call CopyFile --- 72,81 ---- #Files: TheDirectory 0= ?exit get-file ?dup ! if tmp-buf dup off frmfileWindow Start: DupefileDialog if 2dup "to-pathend" ! tmp-buf count istr= abort" Can't duplicate file to itself!" 2dup "path-only" pad place pad ?+\ ! tmp-buf count pad +place pad +NULL drop 0 pad 1+ rot Call CopyFile *************** *** 81,88 **** pad frmfileWindow Start: RenameFileDialog if pad c@ 0= abort" No name specified!" ! r@ count "path-only" here place ! here ?+\ ! pad count here +place ! r@ count here count rename-file abort" File rename failed!" Updatefiles: TheDirectory then r>drop ; --- 95,102 ---- pad frmfileWindow Start: RenameFileDialog if pad c@ 0= abort" No name specified!" ! r@ count "path-only" tmp-buf place ! tmp-buf ?+\ ! pad count tmp-buf +place ! r@ count tmp-buf count rename-file abort" File rename failed!" Updatefiles: TheDirectory then r>drop ; *************** *** 113,117 **** then ; ! : delete_file { \ cnt flag -- } #Files: TheDirectory 0= ?exit DeleteFile: TheDirectory ; --- 127,131 ---- then ; ! : delete_file ( -- ) #Files: TheDirectory 0= ?exit DeleteFile: TheDirectory ; *************** *** 121,127 **** case GetId: cmblstfilters of over HIWORD CBN_SELCHANGE = ! if GetCurrent: cmblstFilters GetStringAt: cmblstFilters ! parse-filters SetSpecs: TheDirectory ! UpdateFiles: TheDirectory then endof --- 135,139 ---- case GetId: cmblstfilters of over HIWORD CBN_SELCHANGE = ! if update-dir then endof *************** *** 134,140 **** GetId: cmblstPathPicker of over HIWORD CBN_SELCHANGE = ! if GetCurrent: cmblstPathPicker GetStringAt: cmblstPathPicker ! SetPath: TheDirectory ! UpdateFiles: TheDirectory then endof --- 146,151 ---- GetId: cmblstPathPicker of over HIWORD CBN_SELCHANGE = ! if GetSelectedString: cmblstPathPicker ! Update: TheDirectory then endof *************** *** 168,177 **** WS_CLIPSIBLINGS +Style: imgDrvButton ! \ allow user specified filespecs, N.B. changes lost when program exited specsbmp usebitmap map-3dcolors frmFileWindow Start: imgspecsbutton imgButton2X imgButton2Y imgButton2W imgButton2H move: imgSpecsButton specsbmp SetImage: imgSpecsButton ! s" Add file specification string e.g (*.f;*.4th)" Binfo: imgSpecsButton place WS_CLIPSIBLINGS +Style: imgSpecsButton --- 179,188 ---- WS_CLIPSIBLINGS +Style: imgDrvButton ! \ allow user specified filespecs, N.B. changes lost when program exited specsbmp usebitmap map-3dcolors frmFileWindow Start: imgspecsbutton imgButton2X imgButton2Y imgButton2W imgButton2H move: imgSpecsButton specsbmp SetImage: imgSpecsButton ! s" Add (press ctrl key to edit) file specification string e.g (*.f;*.4th)" Binfo: imgSpecsButton place WS_CLIPSIBLINGS +Style: imgSpecsButton *************** *** 200,214 **** \ add default filters, see definition of parse-filters for note on format ! z" All Files (*.*)" AddstringTo: cmblstFilters ! z" Forth Files (*.f;*.frm;*.seq;*.4th)" Addstringto: cmblstfilters ! z" C Source (*.c;*.h;*.cpp)" AddStringto: cmblstFilters ! z" Html Files (*.htm)" Addstringto: cmblstfilters ! z" Text Files (*.txt;*.bat;*.ini;*.cfg)" Addstringto: cmblstfilters ! \ z" ForthForm Files (*.ff)" AddStringto: cmblstfilters 1 SetSelection: cmblstFilters \ default to Forth files ! GetCurrent: cmblstFilters GetStringAt: cmblstFilters ! parse-filters SetSpecs: TheDirectory ! UpDateFiles: TheDirectory ;M --- 211,224 ---- \ add default filters, see definition of parse-filters for note on format ! z" All Files (*.*)" AddstringTo: cmblstFilters ! z" Forth Files (*.f;*.frm;*.seq;*.4th;*.fs)" Addstringto: cmblstfilters ! z" C Source (*.c;*.h;*.cpp)" AddStringto: cmblstFilters ! z" Basic Source (*.bas;*.inc)" Addstringto: cmblstfilters ! z" Html Files (*.html;*.htm)" Addstringto: cmblstfilters ! z" Text Files (*.txt;*.bat;*.ini;*.cfg)" Addstringto: cmblstfilters ! z" ForthForm Files (*.ff)" AddStringto: cmblstfilters 1 SetSelection: cmblstFilters \ default to Forth files ! update-dir ;M |