Menu
▾
▴
[Win32forth-cvs] win32forth/apps/SciEdit CommandID.f,1.4,1.5 EdCommand.f,1.4,1.5 EdMenu.f,1.4,1.5 EdVersion.f,1.6,1.7 Main.f,1.12,1.13 ScintillaMDI.f,1.5,1.6
|
From: Dirk B. <db...@us...> - 2005-12-08 17:27:21
|
Update of /cvsroot/win32forth/win32forth/apps/SciEdit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3776/apps/SciEdit Modified Files: CommandID.f EdCommand.f EdMenu.f EdVersion.f Main.f ScintillaMDI.f Log Message: New "Glossary" command (ALT+G), that turns the selected lines into a glossary entry (for DexH). Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdVersion.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EdVersion.f 31 Aug 2005 17:03:19 -0000 1.6 --- EdVersion.f 8 Dec 2005 17:27:12 -0000 1.7 *************** *** 1,5 **** \ $Id$ ! 10124 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10125 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 207,208 **** --- 207,213 ---- dbu Mittwoch, August 31 2005 - New options "Remove trailing white space" and "Ensure final line ending" + + \ changes for Version 1.01.25 + dbu Donnerstag, Dezember 08 2005 + - New "Glossary" command (ALT+G), that turns the selected lines into + a glossary entry (for DexH) Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdMenu.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdMenu.f 31 Aug 2005 17:03:19 -0000 1.4 --- EdMenu.f 8 Dec 2005 17:27:12 -0000 1.5 *************** *** 70,73 **** --- 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" *************** *** 107,117 **** :MenuItem mp_browser "Class and &Vocabulary browser..." IDM_VOC_BROWSER DoCommand ; ! POPUP "W&indow" ! :MenuItem mf_tile_hor "Tile &horizontally" IDM_TILE_HORIZONTAL DoCommand ; ! :MenuItem mf_tile_ver "Tile &vertically" IDM_TILE_VERTICAL DoCommand ; ! :MenuItem mf_arrange "&Arrange" IDM_ARRANGE DoCommand ; ! :MenuItem mf_cascade "Ca&scade" IDM_CASCADE DoCommand ; MenuSeparator ! :MenuItem mf_close_all "&Close all" IDM_CLOSE_ALL DoCommand ; Popup "&Help" --- 109,119 ---- :MenuItem mp_browser "Class and &Vocabulary browser..." IDM_VOC_BROWSER DoCommand ; ! POPUP "W&indow" ! :MenuItem mf_tile_hor "Tile &horizontally" IDM_TILE_HORIZONTAL DoCommand ; ! :MenuItem mf_tile_ver "Tile &vertically" IDM_TILE_VERTICAL DoCommand ; ! :MenuItem mf_arrange "&Arrange" IDM_ARRANGE DoCommand ; ! :MenuItem mf_cascade "Ca&scade" IDM_CASCADE DoCommand ; MenuSeparator ! :MenuItem mf_close_all "&Close all" IDM_CLOSE_ALL DoCommand ; Popup "&Help" *************** *** 150,209 **** : EnableEdit ( f -- ) ! \ File menu ! dup Enable: mf_save ! dup Enable: mf_saveas ! \ dup Enable: mf_reload ! dup Enable: mf_openhl ! \ Edit menu ! dup Enable: me_undo ! dup Enable: me_redo ! dup Enable: me_cut ! dup Enable: me_copy ! dup Enable: me_paste ! dup Enable: me_delete ! dup Enable: me_selectall ! dup Enable: me_removesel ! dup Enable: me_find ! dup Enable: me_findnext ! \ dup Enable: me_findprev ! dup Enable: me_date ! dup Enable: me_date&time ! dup Enable: me_commentblock ! dup Enable: me_uncommentblock ! dup Enable: me_lower ! dup Enable: me_upper ! dup Enable: me_linecut ! dup Enable: me_linedelete ! dup Enable: me_linecopy ! dup Enable: me_linetranspose ! dup Enable: me_lineduplicate ! \ View menu ! dup Enable: mp_vieweol ! dup Enable: mp_viewws ! dup Enable: mp_viewln ! dup Enable: mp_colorize ! dup Enable: mp_browse ! \ Options menu ! dup Enable: mf_windows ! dup Enable: mf_unix ! dup Enable: mf_mac ! dup Enable: mp_backup ! dup Enable: mp_sabcompile ! dup Enable: mp_tabs dup Enable: mp_rtwh dup Enable: mp_efle ! \ Win32Forth menu ! dup Enable: mp_compile ! dup Enable: mp_debug \ dup Enable: mp_HandleW32FMsg ! \ Help menu ! dup Enable: mp_anshelp ! dup Enable: mp_apihelp ! drop ; : EnableMenuBar ( -- ) \ enable/disable the menu items --- 152,212 ---- : EnableEdit ( f -- ) ! \ File menu ! dup Enable: mf_save ! dup Enable: mf_saveas ! \ dup Enable: mf_reload ! dup Enable: mf_openhl ! \ Edit menu ! dup Enable: me_undo ! dup Enable: me_redo ! dup Enable: me_cut ! dup Enable: me_copy ! dup Enable: me_paste ! dup Enable: me_delete ! dup Enable: me_selectall ! dup Enable: me_removesel ! dup Enable: me_find ! dup Enable: me_findnext ! \ dup Enable: me_findprev ! dup Enable: me_date ! dup Enable: me_date&time ! dup Enable: me_commentblock ! dup Enable: me_uncommentblock ! dup Enable: me_lower ! dup Enable: me_upper ! dup Enable: me_linecut ! dup Enable: me_linedelete ! dup Enable: me_linecopy ! dup Enable: me_linetranspose ! dup Enable: me_lineduplicate ! dup Enable: me_glossaryblock ! \ View menu ! dup Enable: mp_vieweol ! dup Enable: mp_viewws ! dup Enable: mp_viewln ! dup Enable: mp_colorize ! dup Enable: mp_browse ! \ Options menu ! dup Enable: mf_windows ! dup Enable: mf_unix ! dup Enable: mf_mac ! dup Enable: mp_backup ! dup Enable: mp_sabcompile ! dup Enable: mp_tabs dup Enable: mp_rtwh dup Enable: mp_efle ! \ Win32Forth menu ! dup Enable: mp_compile ! dup Enable: mp_debug \ dup Enable: mp_HandleW32FMsg ! \ Help menu ! dup Enable: mp_anshelp ! dup Enable: mp_apihelp ! drop ; : EnableMenuBar ( -- ) \ enable/disable the menu items *************** *** 238,241 **** --- 241,245 ---- GetTextLength: ActiveChild Enable: me_linetranspose GetTextLength: ActiveChild Enable: me_lineduplicate + ?Selection: ActiveChild Enable: me_glossaryblock \ View menu Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdCommand.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EdCommand.f 31 Aug 2005 17:03:19 -0000 1.4 --- EdCommand.f 8 Dec 2005 17:27:12 -0000 1.5 *************** *** 171,196 **** : InsertDate ( -- ) ! InsertDate: ActiveChild Update ; IDM_INSERT_DATE SetCommand : InsertDate&Time ( -- ) ! InsertDate&Time: ActiveChild Update ; IDM_INSERT_DATE&TIME SetCommand : CommentBlock ( -- ) ! CommentBlock: ActiveChild Update ; IDM_COMMENT_BLOCK SetCommand : UnCommentBlock ( -- ) ! UnCommentBlock: ActiveChild Update ; IDM_UNCOMMENT_BLOCK SetCommand : mcLowercase ( -- ) ! SCI_LOWERCASE KeyCommand: CurrentWindow Update ; IDM_LOWERCASE SetCommand : mcUppercase ( -- ) ! SCI_UPPERCASE KeyCommand: CurrentWindow Update ; IDM_UPPERCASE SetCommand : LineCut ( -- ) ! SCI_LINECUT KeyCommand: CurrentWindow Update ; IDM_LINECUT SetCommand : LineDelete ( -- ) ! SCI_LINEDELETE KeyCommand: CurrentWindow Update ; IDM_LINEDELETE SetCommand : LineCopy ( -- ) --- 171,199 ---- : InsertDate ( -- ) ! InsertDate: ActiveChild Update ; IDM_INSERT_DATE SetCommand : InsertDate&Time ( -- ) ! InsertDate&Time: ActiveChild Update ; IDM_INSERT_DATE&TIME SetCommand : CommentBlock ( -- ) ! CommentBlock: ActiveChild Update ; IDM_COMMENT_BLOCK SetCommand : UnCommentBlock ( -- ) ! UnCommentBlock: ActiveChild Update ; IDM_UNCOMMENT_BLOCK SetCommand ! ! : GlossaryBlock ( -- ) ! GlossaryBlock: ActiveChild Update ; IDM_GLOSSARY_BLOCK SetCommand : mcLowercase ( -- ) ! SCI_LOWERCASE KeyCommand: CurrentWindow Update ; IDM_LOWERCASE SetCommand : mcUppercase ( -- ) ! SCI_UPPERCASE KeyCommand: CurrentWindow Update ; IDM_UPPERCASE SetCommand : LineCut ( -- ) ! SCI_LINECUT KeyCommand: CurrentWindow Update ; IDM_LINECUT SetCommand : LineDelete ( -- ) ! SCI_LINEDELETE KeyCommand: CurrentWindow Update ; IDM_LINEDELETE SetCommand : LineCopy ( -- ) Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/Main.f,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Main.f 6 Nov 2005 07:36:40 -0000 1.12 --- Main.f 8 Dec 2005 17:27:12 -0000 1.13 *************** *** 616,619 **** --- 616,620 ---- FALT 'C' IDM_COMMENT_BLOCK ACCELENTRY FALT 'U' IDM_UNCOMMENT_BLOCK ACCELENTRY + FALT 'G' IDM_GLOSSARY_BLOCK ACCELENTRY \ Properties menu Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/CommandID.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CommandID.f 31 Aug 2005 17:03:19 -0000 1.4 --- CommandID.f 8 Dec 2005 17:27:12 -0000 1.5 *************** *** 48,51 **** --- 48,52 ---- NewID IDM_COMMENT_BLOCK NewID IDM_UNCOMMENT_BLOCK + NewID IDM_GLOSSARY_BLOCK NewID IDM_LOWERCASE NewID IDM_UPPERCASE Index: ScintillaMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ScintillaMDI.f 19 Sep 2005 15:32:36 -0000 1.5 --- ScintillaMDI.f 8 Dec 2005 17:27:12 -0000 1.6 *************** *** 196,200 **** GetSelectionStart: ChildWindow LineFromPosition: ChildWindow ; ! : Comment? ( #line -- ) \ check if line starts with a comment PositionFromLine: ChildWindow dup GetCharAt: ChildWindow [char] \ = swap --- 196,200 ---- GetSelectionStart: ChildWindow LineFromPosition: ChildWindow ; ! : Comment? ( #line -- f ) \ check if line starts with a comment PositionFromLine: ChildWindow dup GetCharAt: ChildWindow [char] \ = swap *************** *** 223,226 **** --- 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 |
