[Win32forth-cvs] win32forth/apps/SciEdit CommandID.f,1.6,1.7 EdCommand.f,1.6,1.7 EdMenu.f,1.6,1.7 Ed

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/win32forth/win32forth/apps/SciEdit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14799/apps/SciEdit

Modified Files:
	CommandID.f EdCommand.f EdMenu.f EdVersion.f Main.f 
	ScintillaMDI.f 
Log Message:
Some more commands added to the DexH menu.

Index: EdVersion.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdVersion.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EdVersion.f	8 Jan 2006 09:25:36 -0000	1.8
--- EdVersion.f	21 Jan 2006 08:59:41 -0000	1.9
***************
*** 1,5 ****
  \ $Id$

! 10126 value sciedit_version#

  \ Version numbers: v.ww.rr
--- 1,5 ----
  \ $Id$

! 10127 value sciedit_version#

  \ Version numbers: v.ww.rr
***************
*** 217,221 ****
          - 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
--- 217,232 ----
          - 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.
! 
! \ changes for Version 1.01.27
! dbu     Samstag, Januar 21 2006
!         - New "Paragraph" command (ALT+P), that turns the selected lines into
!           a paragraph (for DexH)
!         - New "Code paragraph" command (CTRL+ALT+C), that turns the selected lines
! 	  into a paragraph that is a code example (for DexH).
!         - New "Typewriter" command (CTRL+ALT+T) that turns the selected text into
! 	  typwriter style for DexH.

Index: EdMenu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdMenu.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EdMenu.f	8 Jan 2006 09:25:36 -0000	1.6
--- EdMenu.f	21 Jan 2006 08:59:41 -0000	1.7
***************
*** 72,78 ****

          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"
--- 72,82 ----

          Popup "&DexH"
!                 :MenuItem me_dexGlossary      "&Glossary\tAlt+G"	    IDM_DEX_GLOSSARY	   DoCommand ;
!                 :MenuItem me_dexParagraph     "&Paragraph\tAlt+P"	    IDM_DEX_PARAGRAPH	   DoCommand ;
!                 :MenuItem me_dexCodeParagraph "&Code paragraph\tCtrl+Alt+C" IDM_DEX_CODE_PARAGRAPH DoCommand ;
!                 MenuSeparator
!                 :MenuItem me_dexStyleBold       "&Bold\tAlt+B"	           IDM_DEX_STYLE_BOLD	    DoCommand ;
!                 :MenuItem me_dexStyleItalic     "&Italic\tAlt+I"	   IDM_DEX_STYLE_ITALIC	    DoCommand ;
!                 :MenuItem me_dexStyleTypewriter "&Typewriter\tCtrl+Alt+T"  IDM_DEX_STYLE_TYPEWRITER DoCommand ;

          Popup "&View"
***************
*** 200,206 ****

                  \ DexH menu
!                 dup Enable: me_glossaryblock
!                 dup Enable: me_glossarybold
!                 dup Enable: me_glossaryitalic

                  \ View menu
--- 204,213 ----

                  \ DexH menu
!                 dup Enable: me_dexGlossary
!                 dup Enable: me_dexParagraph
!                 dup Enable: me_dexCodeParagraph
! 		dup Enable: me_dexStyleBold
! 		dup Enable: me_dexStyleItalic
! 		dup Enable: me_dexStyleTypewriter

                  \ View menu
***************
*** 264,270 ****

   			\ DexH menu
!  			?Selection:    ActiveChild Enable: me_glossaryblock
!  			?Selection:    ActiveChild Enable: me_glossarybold
!  			?Selection:    ActiveChild Enable: me_glossaryitalic

   			\ View menu
--- 271,280 ----

   			\ DexH menu
!  			?Selection:    ActiveChild Enable: me_dexGlossary
!  			?Selection:    ActiveChild Enable: me_dexParagraph
!  			?Selection:    ActiveChild Enable: me_dexCodeParagraph
!  			?Selection:    ActiveChild Enable: me_dexStyleBold
!  			?Selection:    ActiveChild Enable: me_dexStyleItalic
!  			?Selection:    ActiveChild Enable: me_dexStyleTypewriter

   			\ View menu

Index: EdCommand.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdCommand.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EdCommand.f	8 Jan 2006 09:25:36 -0000	1.6
--- EdCommand.f	21 Jan 2006 08:59:41 -0000	1.7
***************
*** 193,205 ****
  \ 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

  \ --------------------------------------------------------------------------
--- 193,213 ----
  \ DexH menu
  \ --------------------------------------------------------------------------
+ : DexGlossary 	( -- )
+                 DexGlossary: ActiveChild Update ; IDM_DEX_GLOSSARY SetCommand

! : DexParagraph 	( -- )
!                 DexParagraph: ActiveChild Update ; IDM_DEX_PARAGRAPH SetCommand

! : DexCodeParagraph ( -- )
!                 DexCodeParagraph: ActiveChild Update ; IDM_DEX_CODE_PARAGRAPH SetCommand

! : DexStyleBold 	( -- )
!                 DexStyleBold: ActiveChild Update ; IDM_DEX_STYLE_BOLD SetCommand
! 
! : DexStyleItalic ( -- )
!                 DexStyleItalic: ActiveChild Update ; IDM_DEX_STYLE_ITALIC SetCommand
! 
! : DexStyleTypewriter ( -- )
!                 DexStyleTypewriter: ActiveChild Update ; IDM_DEX_STYLE_TYPEWRITER SetCommand

  \ --------------------------------------------------------------------------

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/Main.f,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Main.f	11 Jan 2006 17:45:19 -0000	1.15
--- Main.f	21 Jan 2006 08:59:41 -0000	1.16
***************
*** 622,628 ****

  	\ DexH menu
! 	FALT     		'G'	IDM_GLOSSARY_BLOCK	ACCELENTRY
! 	FALT     		'B'	IDM_GLOSSARY_BOLD	ACCELENTRY
! 	FALT     		'I'	IDM_GLOSSARY_ITALIC	ACCELENTRY

  	\ Properties menu
--- 622,631 ----

  	\ DexH menu
! 	FALT     		'G'	IDM_DEX_GLOSSARY	 ACCELENTRY
! 	FALT     		'P'	IDM_DEX_PARAGRAPH	 ACCELENTRY
! 	FALT FCONTROL or	'C'	IDM_DEX_CODE_PARAGRAPH	 ACCELENTRY
! 	FALT     		'B'	IDM_DEX_STYLE_BOLD	 ACCELENTRY
! 	FALT     		'I'	IDM_DEX_STYLE_ITALIC	 ACCELENTRY
! 	FALT FCONTROL or	'T'	IDM_DEX_STYLE_TYPEWRITER ACCELENTRY

  	\ Properties menu

Index: CommandID.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/CommandID.f,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandID.f	8 Jan 2006 09:25:36 -0000	1.6
--- CommandID.f	21 Jan 2006 08:59:41 -0000	1.7
***************
*** 57,63 ****

  \ DexH menu
! NewID IDM_GLOSSARY_BLOCK
! NewID IDM_GLOSSARY_BOLD
! NewID IDM_GLOSSARY_ITALIC

  \ View menu
--- 57,66 ----

  \ DexH menu
! NewID IDM_DEX_GLOSSARY
! NewID IDM_DEX_PARAGRAPH
! NewID IDM_DEX_CODE_PARAGRAPH
! NewID IDM_DEX_STYLE_BOLD
! NewID IDM_DEX_STYLE_ITALIC
! NewID IDM_DEX_STYLE_TYPEWRITER

  \ View menu

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ScintillaMDI.f	8 Jan 2006 09:25:36 -0000	1.7
--- ScintillaMDI.f	21 Jan 2006 08:59:41 -0000	1.8
***************
*** 475,479 ****
  \ ----------------------------------------------------------------------------

! :M GlossaryBlock: { \ FirstLine? -- } \ Turn a block of lines into a glossary entry
                  ?Selection: self
                  if   true to FirstLine?
--- 475,479 ----
  \ ----------------------------------------------------------------------------

! : DexBlock 	{ addr \ FirstLine? -- }
                  ?Selection: self
                  if   true to FirstLine?
***************
*** 487,497 ****
                            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
--- 487,509 ----
                            i PositionFromLine: ChildWindow
                            FirstLine?
!                           if   addr false to FirstLine?
                            else z" \ ** "
                            then InsertText: ChildWindow
                       loop EndUndoAction: ChildWindow
!                 then ;

! :M DexGlossary:	( -- )
! \ *G Turn a block of lines into a Glossary entry.
! 		z" \ *G " DexBlock ;M
! 
! :M DexParagraph: ( -- )
! \ *G Turn a block of lines into a Paragraph.
! 		z" \ *P " DexBlock ;M
! 
! :M DexCodeParagraph: ( -- )
! \ *G Turn a block of lines into a Paragraph which is a code example.
! 		z" \ *E " DexBlock ;M
! 
! : DexStyle	{ addr len \ slen $buf1 $buf2 -- }
                  0 GetSelText: ChildWindow dup to slen
                  if   slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow
***************
*** 503,511 ****
                  then ;

! :M GlossaryBold: ( -- )
!                 s" \b " GlossaryStyle ;M

! :M GlossaryItalic: ( -- )
!                 s" \i " GlossaryStyle ;M

  \ ----------------------------------------------------------------------------
--- 515,529 ----
                  then ;

! :M DexStyleBold: ( -- )
! \ *G Set \b bold \d text style for the selected text.
!                 s" \b " DexStyle ;M

! :M DexStyleItalic: ( -- )
! \ *G Set \i italic \d text style for the selected text.
!                 s" \i " DexStyle ;M
! 
! :M DexStyleTypewriter: ( -- )
! \ *G Set \t typewriter \d text style for the selected text.
!                 s" \t " DexStyle ;M

  \ ----------------------------------------------------------------------------

[Win32forth-cvs] win32forth/apps/SciEdit CommandID.f,1.6,1.7 EdCommand.f,1.6,1.7 EdMenu.f,1.6,1.7 Ed

[Win32forth-cvs] win32forth/apps/SciEdit CommandID.f,1.6,1.7 EdCommand.f,1.6,1.7 EdMenu.f,1.6,1.7 EdVersion.f,1.8,1.9 Main.f,1.15,1.16 ScintillaMDI.f,1.7,1.8