Menu
▾
▴
[Win32forth-cvs] win32forth/apps/SciEdit CommandID.f,1.5,1.6 EdCommand.f,1.5,1.6 EdMenu.f,1.5,1.6 EdVersion.f,1.7,1.8 Main.f,1.13,1.14 ScintillaHyperMDI.f,1.3,1.4 ScintillaMDI.f,1.6,1.7
|
From: Dirk B. <db...@us...> - 2006-01-08 09:25:55
|
Update of /cvsroot/win32forth/win32forth/apps/SciEdit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3744/apps/SciEdit Modified Files: CommandID.f EdCommand.f EdMenu.f EdVersion.f Main.f ScintillaHyperMDI.f ScintillaMDI.f Log Message: SciEdit update: - New "DexH" menu. - Moved "Glossary" command into the DexH menu. - New "Bold" command (ALT+B) that turns the selected text into bold style for DexH. - New "Italic" command (ALT+I) that turns the selected text into italic style for DexH. - and fixed some bugs Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdVersion.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EdVersion.f 8 Dec 2005 17:27:12 -0000 1.7 --- EdVersion.f 8 Jan 2006 09:25:36 -0000 1.8 *************** *** 1,5 **** \ $Id$ ! 10125 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10126 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 60,187 **** \ changes for Version 1.01.02 ! dbu Samstag, August 14 2004 ! - New "View" and "Options" menu ! - New Menu entry "Save all Files before Compile" in the "Options" menu. ! If this option is active all open source files will be saved before ! the compilation of the active file. If this option is inactive only ! the active file will be saved ! - Enhanced toolbar \ changes for Version 1.01.03 ! dbu Sonntag, August 15 2004 ! - New menu Entry "Colorize source" in the "View" menu to turn colorization ! on and off (new w32fScintilla.dll Version 1.6.1.4 is needed). dbu Montag, August 16 2004 ! - New menu Entry "Display Line numers" in the "View" menu (thank's ! Erza to tell me how it works). \ changes for Version 1.01.04 dbu Samstag, August 21 2004 ! - New Menu entry "Customize toolbar..." in the "Options" menu ! - made debug support work ! - "Search..." and "Find text in Files..." now grab the highlighted text \ changes for Version 1.01.05 dbu Sonntag, August 22 2004 ! - New "Close file" and "Close all" buttons in the toolbar ! - enable/disableing of toolbar buttos and menu entries corrected \ changes for Version 1.01.06 dbu Samstag, August 28 2004 ! - New Menu entries "Line cut...", "Line copy", "Line transpose", ! "Line duplicate", "Lowercase" and "Uppercase" in the "Edit" menu. ! - Little enhancement of the debug support \ changes for Version 1.01.07 dbu Sonntag, August 29 2004 ! - Added a recent file list to the File menu (Thank's Rod for the code) \ changes for Version 1.01.08 dbu Samstag, September 04 2004 ! - Fixed some Win98 bug's (I hope) as Rod sugested ! - Deleted some duplicated command id's (thank's Prad) ! - Removed the obsolate Download stuff ! - Changed the "Open Source files" and "The open HTML Files" dialog's ! to allow multiple selection of files ! - Fixed a bug in the recent file list (HTML files were opend for editing ! and not for displaying HTML) ! - Enabled Drag & Drop from windows explorer to open files. ! - Changed to open only one copy of a file. If you try to open a second ! copy the window of first one is activated and it beep's one time. ! - New menu entry "Set Tab options..." in the options menu. It opens ! a dialog were you can set the tab size (between 1 and 8 chars) and ! if you want to insert real tab's or spaces (soft tab's) \ changes for Version 1.01.09 dbu Sonntag, September 05 2004 ! - Fixed a bug in the Class browser; once it was closed it couldn't be ! opend again ! - New entries in the "Options" menu to hide the Toolbar and/or Statusbar ! of the main window dbu Montag, September 06 2004 ! - Added a Statusbar to the Class browser window to tell the user how ! to open the source for a definition ! - In Brwose mode the statusbar of the main window now displays a text ! how to use the browse mode. \ changes for Version 1.01.10 dbu Dienstag, September 07 2004 ! - New menu entry "Open Highlighted File" in "File" menu (it need's some more work) \ changes for Version 1.01.11 dbu Donnerstag, September 09 2004 ! - Fixed the WM_COMMAND handling problems (I hope) ! - Fixed the NewFile: method of the EditorChild class whitch was complety broken \ changes for Version 1.01.12 dbu Samstag, September 11 2004 ! - Accelerator table support rewritten \ changes for Version 1.01.13 dbu Samstag, September 11 2004 ! Sonntag, September 12 2004 ! - WM_COMMAND handling reworked (I hope that it's finaly working now) \ changes for Version 1.01.14 dbu Dienstag, September 14 2004 ! - Fixed the display of the filename in the Titlebar \ changes for Version 1.01.15 dbu Donnerstag, September 16 2004 ! - Fixed loading of files \ changes for Version 1.01.16 dbu Samstag, September 18 2004 ! - Fixed some smal bugs in the colorization support \ changes for Version 1.01.17 dbu Samstag, Oktober 02 2004 ! - SciEditMDI now has it's own Icon's for the Main- and the MDI windows \ changes for Version 1.01.18 dbu Mittwoch, Oktober 06 2004 ! - Changed to use Rod's AcceleratorTables.f instead of my Accel.f \ changes for Version 1.01.19 dbu Montag, November 08 2004 ! - Update w32fScintilla.dll to use the latest Scintilla Version 1.62 ! - File>Exit terminated SciEdit without saving changed files; fixed \ changes for Version 1.01.20 dbu Samstag, Dezember 04 2004 ! - New Button's "Back" and "Forward" added to the toolbar ! used to navigate within HTML documents and for browseing within ! the source files (Hyperlinking) \ changes for Version 1.01.21 dbu Sonntag, Dezember 26 2004 ! - New command "Help for highlighted Win32-API function" added to ! the help menu. The Win32-SDK help file is needed for this command. ! If you don't have a copy you can download it from: ! http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP ! Don't forget to copy the win32.hlp file into the 'doc\hlp' folder of ! your Win32Forth version \ changes for Version 1.01.22 --- 60,187 ---- \ changes for Version 1.01.02 ! dbu Samstag, August 14 2004 ! - New "View" and "Options" menu ! - New Menu entry "Save all Files before Compile" in the "Options" menu. ! If this option is active all open source files will be saved before ! the compilation of the active file. If this option is inactive only ! the active file will be saved ! - Enhanced toolbar \ changes for Version 1.01.03 ! dbu Sonntag, August 15 2004 ! - New menu Entry "Colorize source" in the "View" menu to turn colorization ! on and off (new w32fScintilla.dll Version 1.6.1.4 is needed). dbu Montag, August 16 2004 ! - New menu Entry "Display Line numers" in the "View" menu (thank's ! Erza to tell me how it works). \ changes for Version 1.01.04 dbu Samstag, August 21 2004 ! - New Menu entry "Customize toolbar..." in the "Options" menu ! - made debug support work ! - "Search..." and "Find text in Files..." now grab the highlighted text \ changes for Version 1.01.05 dbu Sonntag, August 22 2004 ! - New "Close file" and "Close all" buttons in the toolbar ! - enable/disableing of toolbar buttos and menu entries corrected \ changes for Version 1.01.06 dbu Samstag, August 28 2004 ! - New Menu entries "Line cut...", "Line copy", "Line transpose", ! "Line duplicate", "Lowercase" and "Uppercase" in the "Edit" menu. ! - Little enhancement of the debug support \ changes for Version 1.01.07 dbu Sonntag, August 29 2004 ! - Added a recent file list to the File menu (Thank's Rod for the code) \ changes for Version 1.01.08 dbu Samstag, September 04 2004 ! - Fixed some Win98 bug's (I hope) as Rod sugested ! - Deleted some duplicated command id's (thank's Prad) ! - Removed the obsolate Download stuff ! - Changed the "Open Source files" and "The open HTML Files" dialog's ! to allow multiple selection of files ! - Fixed a bug in the recent file list (HTML files were opend for editing ! and not for displaying HTML) ! - Enabled Drag & Drop from windows explorer to open files. ! - Changed to open only one copy of a file. If you try to open a second ! copy the window of first one is activated and it beep's one time. ! - New menu entry "Set Tab options..." in the options menu. It opens ! a dialog were you can set the tab size (between 1 and 8 chars) and ! if you want to insert real tab's or spaces (soft tab's) \ changes for Version 1.01.09 dbu Sonntag, September 05 2004 ! - Fixed a bug in the Class browser; once it was closed it couldn't be ! opend again ! - New entries in the "Options" menu to hide the Toolbar and/or Statusbar ! of the main window dbu Montag, September 06 2004 ! - Added a Statusbar to the Class browser window to tell the user how ! to open the source for a definition ! - In Brwose mode the statusbar of the main window now displays a text ! how to use the browse mode. \ changes for Version 1.01.10 dbu Dienstag, September 07 2004 ! - New menu entry "Open Highlighted File" in "File" menu (it need's some more work) \ changes for Version 1.01.11 dbu Donnerstag, September 09 2004 ! - Fixed the WM_COMMAND handling problems (I hope) ! - Fixed the NewFile: method of the EditorChild class whitch was complety broken \ changes for Version 1.01.12 dbu Samstag, September 11 2004 ! - Accelerator table support rewritten \ changes for Version 1.01.13 dbu Samstag, September 11 2004 ! Sonntag, September 12 2004 ! - WM_COMMAND handling reworked (I hope that it's finaly working now) \ changes for Version 1.01.14 dbu Dienstag, September 14 2004 ! - Fixed the display of the filename in the Titlebar \ changes for Version 1.01.15 dbu Donnerstag, September 16 2004 ! - Fixed loading of files \ changes for Version 1.01.16 dbu Samstag, September 18 2004 ! - Fixed some smal bugs in the colorization support \ changes for Version 1.01.17 dbu Samstag, Oktober 02 2004 ! - SciEditMDI now has it's own Icon's for the Main- and the MDI-windows \ changes for Version 1.01.18 dbu Mittwoch, Oktober 06 2004 ! - Changed to use Rod's AcceleratorTables.f instead of my Accel.f \ changes for Version 1.01.19 dbu Montag, November 08 2004 ! - Update w32fScintilla.dll to use the latest Scintilla Version 1.62 ! - File>Exit terminated SciEdit without saving changed files; fixed \ changes for Version 1.01.20 dbu Samstag, Dezember 04 2004 ! - New Button's "Back" and "Forward" added to the toolbar ! used to navigate within HTML documents and for browseing within ! the source files (Hyperlinking) \ changes for Version 1.01.21 dbu Sonntag, Dezember 26 2004 ! - New command "Help for highlighted Win32-API function" added to ! the help menu. The Win32-SDK help file is needed for this command. ! If you don't have a copy you can download it from: ! http://www.borland.com/devsupport/borlandcpp/patches/BC52HLP1.ZIP ! Don't forget to copy the win32.hlp file into the 'doc\hlp' folder of ! your Win32Forth version \ changes for Version 1.01.22 *************** *** 212,213 **** --- 212,221 ---- - New "Glossary" command (ALT+G), that turns the selected lines into a glossary entry (for DexH) + + \ changes for Version 1.01.26 + dbu Sonntag, Januar 08 2006 + - New "DexH" menu. + - Moved "Glossary" command into the DexH menu. + - New "Bold" command (ALT+B) that turns the selected text into bold style for DexH. + - New "Italic" command (ALT+I) that turns the selected text into italic style for DexH. + - Fixed some bugs Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdMenu.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdMenu.f 8 Dec 2005 17:27:12 -0000 1.5 --- EdMenu.f 8 Jan 2006 09:25:36 -0000 1.6 *************** *** 70,75 **** :MenuItem me_lower "&Lowercase\tCtrl+U" IDM_LOWERCASE DoCommand ; :MenuItem me_upper "&Uppercase\tCtrl+Shift+U" IDM_UPPERCASE DoCommand ; ! MenuSeparator :MenuItem me_glossaryblock "&Glossary\tAlt+G" IDM_GLOSSARY_BLOCK DoCommand ; Popup "&View" --- 70,78 ---- :MenuItem me_lower "&Lowercase\tCtrl+U" IDM_LOWERCASE DoCommand ; :MenuItem me_upper "&Uppercase\tCtrl+Shift+U" IDM_UPPERCASE DoCommand ; ! ! Popup "&DexH" :MenuItem me_glossaryblock "&Glossary\tAlt+G" IDM_GLOSSARY_BLOCK DoCommand ; + :MenuItem me_glossarybold "&Bold\tAlt+B" IDM_GLOSSARY_BOLD DoCommand ; + :MenuItem me_glossaryitalic "&Italic\tAlt+I" IDM_GLOSSARY_ITALIC DoCommand ; Popup "&View" *************** *** 130,134 **** EndBar ! 5 constant WINDOW-MENU : GetFileType ( -- n ) --- 133,137 ---- EndBar ! 6 constant WINDOW-MENU : GetFileType ( -- n ) *************** *** 144,152 **** GetFileType FT_HTML = ; : IsAnsWordSelected? ( -- f ) ! pad GetSelText: ActiveChild ! if pad zcount BL skip BL -TRAILCHARS IsAnsWord? ! else false then ; --- 147,169 ---- GetFileType FT_HTML = ; + : NoTextToPad ( -- addr len ) \ copy empty string to PAD + 0 pad ! pad count ; + + : SelTextToPad ( -- addr len ) \ copy the selected text into PAD + \ default no Text + ActiveChild 0<> + 0 GetSelText: ActiveChild MAXSTRING CHARS < and \ check size of selected text + if pad GetSelText: ActiveChild + if pad zcount BL skip -trailing 10 -TRAILCHARS 13 -TRAILCHARS + else NoTextToPad + then + else NoTextToPad + then ; + : IsAnsWordSelected? ( -- f ) ! SelTextToPad ?dup ! if BL skip BL -TRAILCHARS IsAnsWord? ! else drop false then ; *************** *** 181,185 **** --- 198,206 ---- dup Enable: me_linetranspose dup Enable: me_lineduplicate + + \ DexH menu dup Enable: me_glossaryblock + dup Enable: me_glossarybold + dup Enable: me_glossaryitalic \ View menu *************** *** 241,245 **** --- 262,270 ---- GetTextLength: ActiveChild Enable: me_linetranspose GetTextLength: ActiveChild Enable: me_lineduplicate + + \ DexH menu ?Selection: ActiveChild Enable: me_glossaryblock + ?Selection: ActiveChild Enable: me_glossarybold + ?Selection: ActiveChild Enable: me_glossaryitalic \ View menu Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdCommand.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdCommand.f 8 Dec 2005 17:27:12 -0000 1.5 --- EdCommand.f 8 Jan 2006 09:25:36 -0000 1.6 *************** *** 22,38 **** MultiFileOpenDialog HtmlFileOpenDialog "Open HTML Files" "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*" - : NoTextToPad ( -- addr len ) \ copy empty string to PAD - 0 pad ! pad count ; - - : SelTextToPad ( -- addr len ) \ copy the selected text into PAD - \ default no Text - ActiveChild 0<> - if pad GetSelText: ActiveChild - if pad zcount BL skip -trailing 10 -TRAILCHARS 13 -TRAILCHARS - else NoTextToPad - then - else NoTextToPad - then ; - \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ Define the Menu command --- 22,25 ---- *************** *** 44,56 **** 0 value #new : NewSourceFile ( -- ) ! s" New File " temp$ place #new (.) temp$ +place ! 1 +to #new ! NewEditWnd NewFile: ActiveChild ! ; IDM_NEW_SOURCE_FILE SetCommand ! : Close ( -- ) ! GetHandle: ActiveChild CloseChild: Frame ! GetActive: Frame 0= if 0 to ActiveChild then Update ! ; IDM_CLOSE SetCommand : OpenSourceFile ( -- ) --- 31,43 ---- 0 value #new : NewSourceFile ( -- ) ! s" New File " temp$ place #new (.) temp$ +place ! 1 +to #new ! NewEditWnd NewFile: ActiveChild ! ; IDM_NEW_SOURCE_FILE SetCommand ! : Close ( -- ) ! GetHandle: ActiveChild CloseChild: Frame ! GetActive: Frame 0= if 0 to ActiveChild then Update ! ; IDM_CLOSE SetCommand : OpenSourceFile ( -- ) *************** *** 62,83 **** : UpdateFileName ( -- ) ! GetFileName: ActiveChild count 2dup ! temp$ place SetFileName: ActiveChild ; : SaveSourceFile ( -- ) ! IsEditWnd? ! if SaveFile: ActiveChild ! UpdateFileName Update ! else beep ! then ; IDM_SAVE SetCommand : SaveSourceFileAs ( -- ) ! SaveFileAs: ActiveChild ! UpdateFileName Update ! ; IDM_SAVE_AS SetCommand : SaveAllSourceFiles ( -- ) ! 0 0 WM_SAVE SendMessageToAllChildren: Frame ! UpdateFileName Update ; IDM_SAVE_ALL SetCommand : ReloadSourceFile ( -- ) --- 49,70 ---- : UpdateFileName ( -- ) ! GetFileName: ActiveChild count 2dup ! temp$ place SetFileName: ActiveChild ; : SaveSourceFile ( -- ) ! IsEditWnd? ! if SaveFile: ActiveChild ! UpdateFileName Update ! else beep ! then ; IDM_SAVE SetCommand : SaveSourceFileAs ( -- ) ! SaveFileAs: ActiveChild ! UpdateFileName Update ! ; IDM_SAVE_AS SetCommand : SaveAllSourceFiles ( -- ) ! 0 0 WM_SAVE SendMessageToAllChildren: Frame ! UpdateFileName Update ; IDM_SAVE_ALL SetCommand : ReloadSourceFile ( -- ) *************** *** 85,109 **** : OpenHtmlFile ( -- ) ! Gethandle: Frame Start: HtmlFileOpenDialog c@ ! if #SelectedFiles: HtmlFileOpenDialog 0 ! do i GetFile: HtmlFileOpenDialog (OpenHtmlFile) ! loop ! then ; IDM_OPEN_HTML_FILE SetCommand ! : ExitApp ( -- ) ! 0 0 WM_CLOSE Gethandle: Frame call SendMessage ! 0= if call PostQuitMessage drop then ; IDM_EXIT SetCommand : OpenRecentFile ( File$ -- ) ! count 2dup IsHtmlFile? ! if (OpenHtmlFile) ! else (OpenSourceFile) ! then ; IDM_OPEN_RECENT_FILE SetCommand : OpenHighlightedFile ( -- ) ! IsEditWnd? ! if OpenHighlightedFile: ActiveChild update ! else beep ! then ; IDM_OPEN_HIGHLIGHTED_FILE SetCommand \ -------------------------------------------------------------------------- --- 72,96 ---- : OpenHtmlFile ( -- ) ! Gethandle: Frame Start: HtmlFileOpenDialog c@ ! if #SelectedFiles: HtmlFileOpenDialog 0 ! do i GetFile: HtmlFileOpenDialog (OpenHtmlFile) ! loop ! then ; IDM_OPEN_HTML_FILE SetCommand ! : ExitApp ( -- ) ! 0 0 WM_CLOSE Gethandle: Frame call SendMessage ! 0= if call PostQuitMessage drop then ; IDM_EXIT SetCommand : OpenRecentFile ( File$ -- ) ! count 2dup IsHtmlFile? ! if (OpenHtmlFile) ! else (OpenSourceFile) ! then ; IDM_OPEN_RECENT_FILE SetCommand : OpenHighlightedFile ( -- ) ! IsEditWnd? ! if OpenHighlightedFile: ActiveChild update ! else beep ! then ; IDM_OPEN_HIGHLIGHTED_FILE SetCommand \ -------------------------------------------------------------------------- *************** *** 147,151 **** \ move selected text into find-buf ! ActiveChild 0<> if SelTextToPad ?dup if Find-buf place --- 134,138 ---- \ move selected text into find-buf ! IsEditWnd? if SelTextToPad ?dup if Find-buf place *************** *** 182,188 **** UnCommentBlock: ActiveChild Update ; IDM_UNCOMMENT_BLOCK SetCommand - : GlossaryBlock ( -- ) - GlossaryBlock: ActiveChild Update ; IDM_GLOSSARY_BLOCK SetCommand - : mcLowercase ( -- ) SCI_LOWERCASE KeyCommand: CurrentWindow Update ; IDM_LOWERCASE SetCommand --- 169,172 ---- *************** *** 198,208 **** : LineCopy ( -- ) ! SCI_LINECOPY KeyCommand: CurrentWindow Update ; IDM_LINECOPY SetCommand : LineTranspose ( -- ) ! SCI_LINETRANSPOSE KeyCommand: CurrentWindow Update ; IDM_LINETRANSPOSE SetCommand : LineDuplicate ( -- ) ! SCI_LINEDUPLICATE KeyCommand: CurrentWindow Update ; IDM_LINEDUPLICATE SetCommand \ -------------------------------------------------------------------------- --- 182,205 ---- : LineCopy ( -- ) ! SCI_LINECOPY KeyCommand: CurrentWindow Update ; IDM_LINECOPY SetCommand : LineTranspose ( -- ) ! SCI_LINETRANSPOSE KeyCommand: CurrentWindow Update ; IDM_LINETRANSPOSE SetCommand : LineDuplicate ( -- ) ! SCI_LINEDUPLICATE KeyCommand: CurrentWindow Update ; IDM_LINEDUPLICATE SetCommand ! ! \ -------------------------------------------------------------------------- ! \ DexH menu ! \ -------------------------------------------------------------------------- ! ! : GlossaryBlock ( -- ) ! GlossaryBlock: ActiveChild Update ; IDM_GLOSSARY_BLOCK SetCommand ! ! : GlossaryBold ( -- ) ! GlossaryBold: ActiveChild Update ; IDM_GLOSSARY_BOLD SetCommand ! ! : GlossaryItalic ( -- ) ! GlossaryItalic: ActiveChild Update ; IDM_GLOSSARY_ITALIC SetCommand \ -------------------------------------------------------------------------- Index: ScintillaHyperMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaHyperMDI.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ScintillaHyperMDI.f 31 Aug 2005 17:03:19 -0000 1.3 --- ScintillaHyperMDI.f 8 Jan 2006 09:25:36 -0000 1.4 *************** *** 140,144 **** :M Hyper>: { \ SelBuf$ -- } \ Hyperlink to selected word ! 2048 LocalAlloc: SelBuf$ SelBuf$ GetSelText: ChildWindow if SelBuf$ HyperWord --- 140,144 ---- :M Hyper>: { \ SelBuf$ -- } \ Hyperlink to selected word ! 0 GetSelText: ChildWindow LocalAlloc: SelBuf$ SelBuf$ GetSelText: ChildWindow if SelBuf$ HyperWord Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/Main.f,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Main.f 8 Dec 2005 17:27:12 -0000 1.13 --- Main.f 8 Jan 2006 09:25:36 -0000 1.14 *************** *** 461,480 **** max-path 2 + bytes FileName ! :M Start: ( parent -- ) ! New> HtmlDisplayControl to ChildWindow ! self to ChildParent ! 0 FileName ! ! Start: super ! ;M :M On_Close: ( -- ) On_Close: super self ActiveChild = if 0 to ActiveChild then ! UpdateStatusBar ! EnableToolbar ;M :M GetFileName: ( -- addr ) ! FileName ;M :M SetWindowTitle: ( -- ) --- 461,484 ---- max-path 2 + bytes FileName ! :M Start: ( parent -- ) ! New> HtmlDisplayControl to ChildWindow ! self to ChildParent ! 0 FileName ! ! Start: super ! ;M :M On_Close: ( -- ) On_Close: super self ActiveChild = if 0 to ActiveChild then ! UpdateStatusBar ! EnableToolbar ! ;M ! ! :M SetFileName: ( addr len -- ) ! FileName place FileName +null ;M :M GetFileName: ( -- addr ) ! FileName ;M :M SetWindowTitle: ( -- ) *************** *** 482,503 **** :M SetURL: ( zUrl -- ) ! dup zcount FileName place FileName +null ! SetURL: ChildWindow ! SetWindowTitle: self ;M ! :M ?Modified: ( -- f ) ! false ;M ! :M GetFileType: ( -- n ) ! FT_HTML ;M ! :M Update: ( -- ) ! ;M :M GoBack: ( -- ) ! GoBack: ChildWindow ;M :M GoForward: ( -- ) ! GoForward: ChildWindow ;M ;Class --- 486,507 ---- :M SetURL: ( zUrl -- ) ! dup zcount SetFileName: self ! SetURL: ChildWindow ! SetWindowTitle: self ;M ! :M ?Modified: ( -- f ) ! false ;M ! :M GetFileType: ( -- n ) ! FT_HTML ;M ! :M Update: ( -- ) ! ;M :M GoBack: ( -- ) ! GoBack: ChildWindow ;M :M GoForward: ( -- ) ! GoForward: ChildWindow ;M ;Class *************** *** 616,620 **** --- 620,628 ---- FALT 'C' IDM_COMMENT_BLOCK ACCELENTRY FALT 'U' IDM_UNCOMMENT_BLOCK ACCELENTRY + + \ DexH menu FALT 'G' IDM_GLOSSARY_BLOCK ACCELENTRY + FALT 'B' IDM_GLOSSARY_BOLD ACCELENTRY + FALT 'I' IDM_GLOSSARY_ITALIC ACCELENTRY \ Properties menu Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/CommandID.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CommandID.f 8 Dec 2005 17:27:12 -0000 1.5 --- CommandID.f 8 Jan 2006 09:25:36 -0000 1.6 *************** *** 48,52 **** NewID IDM_COMMENT_BLOCK NewID IDM_UNCOMMENT_BLOCK - NewID IDM_GLOSSARY_BLOCK NewID IDM_LOWERCASE NewID IDM_UPPERCASE --- 48,51 ---- *************** *** 57,60 **** --- 56,64 ---- NewID IDM_LINEDUPLICATE + \ DexH menu + NewID IDM_GLOSSARY_BLOCK + NewID IDM_GLOSSARY_BOLD + NewID IDM_GLOSSARY_ITALIC + \ View menu NewID IDM_VIEW_EOL Index: ScintillaMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ScintillaMDI.f 8 Dec 2005 17:27:12 -0000 1.6 --- ScintillaMDI.f 8 Jan 2006 09:25:36 -0000 1.7 *************** *** 118,122 **** GetTextLength: ChildWindow ;M - :M Delete: ( -- ) \ delete the selected text 0 PAD ! PAD ReplaceSel: ChildWindow ;M --- 118,121 ---- *************** *** 131,139 **** FindText$ c@ 0<> ;M ! :M FindText: ( -- ) ! \ move selected text into find-buf ! pad GetSelText: ChildWindow ! if pad zcount BL skip -trailing 10 -TRAILCHARS 13 -TRAILCHARS ?dup if FindText$ place else drop then then --- 130,138 ---- FindText$ c@ 0<> ;M ! :M FindText: { \ SelBuf$ -- } \ move selected text into find-buf ! 0 GetSelText: ChildWindow LocalAlloc: SelBuf$ ! SelBuf$ GetSelText: ChildWindow ! if SelBuf$ zcount BL skip -trailing 10 -TRAILCHARS 13 -TRAILCHARS ?dup if FindText$ place else drop then then *************** *** 223,244 **** then ;M - :M GlossaryBlock: { \ FirstLine? -- } \ Turn a block of lines into a glossary entry - ?Selection: self - if true to FirstLine? - BeginUndoAction: ChildWindow - SelBounds - ?do i Comment? - if \ remove current comment " \ " first - i PositionFromLine: ChildWindow - dup 2 + SetSel: ChildWindow Delete: self - then - i PositionFromLine: ChildWindow - FirstLine? - if z" \ *G " false to FirstLine? - else z" \ ** " - then InsertText: ChildWindow - loop EndUndoAction: ChildWindow - then ;M - :M GotoColumn: ( n -- ) GetCurrentPos: ChildWindow --- 222,225 ---- *************** *** 304,307 **** --- 285,292 ---- :M GetSelText: ( addr -- n ) + \ *G Copy the selected text to the memory pointed by \i addr \d + \ ** and return the length of the selected text (including terminating + \ ** 0 byte. If \i addr \d is NULL no text is copied and only the + \ ** length is returned. GetSelText: ChildWindow ;M *************** *** 487,490 **** --- 472,514 ---- \ ---------------------------------------------------------------------------- + \ DexH support + \ ---------------------------------------------------------------------------- + + :M GlossaryBlock: { \ FirstLine? -- } \ Turn a block of lines into a glossary entry + ?Selection: self + if true to FirstLine? + BeginUndoAction: ChildWindow + SelBounds + ?do i Comment? + if \ remove current comment " \ " first + i PositionFromLine: ChildWindow + dup 2 + SetSel: ChildWindow Delete: self + then + i PositionFromLine: ChildWindow + FirstLine? + if z" \ *G " false to FirstLine? + else z" \ ** " + then InsertText: ChildWindow + loop EndUndoAction: ChildWindow + then ;M + + : GlossaryStyle { addr len \ slen $buf1 $buf2 -- } + 0 GetSelText: ChildWindow dup to slen + if slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow + if slen 16 + LocalAlloc: $buf2 + addr len $buf2 lplace $buf1 slen 1- $buf2 +lplace s" \d" $buf2 +lplace + 0 $buf2 lcount + c! + $buf2 lcount drop ReplaceSel: ChildWindow + then + then ; + + :M GlossaryBold: ( -- ) + s" \b " GlossaryStyle ;M + + :M GlossaryItalic: ( -- ) + s" \i " GlossaryStyle ;M + + \ ---------------------------------------------------------------------------- + \ ---------------------------------------------------------------------------- :M Compile: ( -- ) \ compile this File *************** *** 495,498 **** --- 519,524 ---- \ ---------------------------------------------------------------------------- + \ ---------------------------------------------------------------------------- + : OpenFile ( adr -- f ) \ f=false = file is opend dup count FILE-STATUS nip 0= *************** *** 502,508 **** :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- } ! GetSelectionEnd: ChildWindow GetSelectionStart: ChildWindow - ! ?dup ! if MAXSTRING max LocalAlloc: buf$ buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c! --- 528,533 ---- :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- } ! 0 GetSelText: ChildWindow MAXSTRING CHARS < ! if MAXSTRING CHARS 1+ LocalAlloc: buf$ buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c! *************** *** 527,531 **** then then ! else beep then ;M --- 552,556 ---- then then ! else drop beep then ;M |
