Thread: [Win32forth-cvs] win32forth/apps/Win32ForthIDE EdHtmlPreview.f, NONE, 1.1 CommandID.f, 1.5, 1.6 EdM

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

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19112

Modified Files:
	CommandID.f EdMenu.f EdTabControl.f Main.f ScintillaHyperMDI.f 
Added Files:
	EdHtmlPreview.f 
Log Message:
Better handling of multiple toolbars, window for previewing html source. EAB

Index: EdTabControl.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EdTabControl.f	14 Jun 2006 06:02:56 -0000	1.10
--- EdTabControl.f	29 Jun 2006 04:18:47 -0000	1.11
***************
*** 174,177 ****
--- 174,178 ----
  
  :M Start:	( Parent -- )
+ 	TCS_BUTTONS AddStyle: self
  	Start: super
  	DEFAULT_GUI_FONT call GetStockObject SetFont: self
***************
*** 313,317 ****
  	z" Directory" IsPszText: cTab
  	3 InsertTab: cTab
! 	
  	TCIF_TEXT IsMask: cTab
  	z" Vocabularies" IsPszText: cTab
--- 314,318 ----
  	z" Directory" IsPszText: cTab
  	3 InsertTab: cTab
! 
  	TCIF_TEXT IsMask: cTab
  	z" Vocabularies" IsPszText: cTab
***************
*** 353,355 ****
--- 354,359 ----
          UpdateFileName: cFileList ;M
  
+ :M FindFile:	( addr -- f )
+ 		FindFile: cFileList ;M
+ 
  ;class

Index: EdMenu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EdMenu.f	11 Jun 2006 18:04:10 -0000	1.9
--- EdMenu.f	29 Jun 2006 04:18:47 -0000	1.10
***************
*** 33,37 ****
                  MenuSeparator
                  MENUITEM  "Open &HTML File..."			IDM_OPEN_HTML_FILE	DoCommand ;
! 
                  MenuSeparator
                  :MenuItem mf_print "&Print...\tCtrl+P" 		IDM_PRINT		DoCommand ;
--- 33,37 ----
                  MenuSeparator
                  MENUITEM  "Open &HTML File..."			IDM_OPEN_HTML_FILE	DoCommand ;
! 		MENUITEM  "New Html Source File"		IDM_NEW_HTML_SOURCE_FILE DoCommand ;
                  MenuSeparator
                  :MenuItem mf_print "&Print...\tCtrl+P" 		IDM_PRINT		DoCommand ;
***************
*** 124,127 ****
--- 124,128 ----
                  MenuSeparator
                  :MenuItem mp_browse "&Browse\tF7"		IDM_BROWSE		DoCommand ;
+ 		:MenuItem mp_viewhtml "&PreView As HTML\tF10"            IDM_HTML_PREVIEW	DoCommand ;
  
          Popup "&Options"
***************
*** 268,271 ****
--- 269,273 ----
                  dup Enable: mp_colorize
                  dup Enable: mp_browse
+ 		dup Enable: mp_viewhtml
  
                  \ Options menu

--- NEW FILE: EdHtmlPreview.f ---
\ EdHtmlPreview.f
\ Edit Html source and preview in an Html window
/*
0 value PreviewChild		\ create preview object

: HtmlPreview	{ \ child -- }
		ActiveChild 0= ?exit
		GetFileType: ActiveChild FT_SOURCE <> ?exit
		SaveFile: ActiveChild 	\ save edit first
		GetFileName: ActiveChild c@ 0= ?exit   \ saving was cancelled
		ActiveChild to Child
		PreviewChild 0=
		if	NewHtmlWnd ActiveChild to PreviewChild
		then	GetHandle: PreviewChild Activate: Frame
		GetFileName: Child count asciiz SetURL: PreviewChild
		Update ; IDM_HTML_PREVIEW SetCommand
*/

needs HtmlDisplayWindow.f

HtmlDisplayWindow PreviewWindow

: HtmlPreview	{ \ child -- }
		ActiveChild 0= ?exit
		GetFileType: ActiveChild FT_SOURCE <> ?exit
		SaveFile: ActiveChild 	\ save edit first
		GetFileName: ActiveChild c@ 0= ?exit   \ saving was cancelled
		GetHandle: MainWindow SetParentWindow: PreviewWindow
		Start: PreviewWindow
		GetFileName: ActiveChild count over SetUrl: PreviewWindow
		s" HtmlPreview - " pad place pad +place
		pad count SetText: PreviewWindow ; IDM_HTML_PREVIEW SetCommand

create HtmlDefaultSource ," <html>\n<head>\n    <title>Untitled</title>\n</head>\n\n<body>\n\n</body>\n</html>" 32 allot

: NewHtmlFile	( -- )
		NewEditWnd	\ start a new window
		HtmlDefaultSource count SetTextZ: ActiveChild ; IDM_NEW_HTML_SOURCE_FILE SetCommand
\s


Index: ScintillaHyperMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaHyperMDI.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScintillaHyperMDI.f	5 Jun 2006 09:19:00 -0000	1.1
--- ScintillaHyperMDI.f	29 Jun 2006 04:18:47 -0000	1.2
***************
*** 93,97 ****
                  over + 0 swap c! \ 0-terminate
                  false SetReadOnly: ChildWindow
!                 SetText: self
                  Browse? SetReadOnly: ChildWindow ;M
  
--- 93,97 ----
                  over + 0 swap c! \ 0-terminate
                  false SetReadOnly: ChildWindow
!                 SetText: ChildWindow
                  Browse? SetReadOnly: ChildWindow ;M
  

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Main.f	15 Jun 2006 20:57:10 -0000	1.15
--- Main.f	29 Jun 2006 04:18:47 -0000	1.16
***************
*** 485,490 ****
                                                    \ must NOT resize rebar on RBN_AUTOSIZE
                  if    Resize: self
!                 then  h m w l Handle_Notify: pToolBar      \ must be first for some reason
!                 h m w l Handle_Notify: ControlToolbar
                  ;M
  
--- 485,495 ----
                                                    \ must NOT resize rebar on RBN_AUTOSIZE
                  if    Resize: self
!                 then  l GetNotifyWnd dup>r GetHandle: pToolBar = ToolTipHandle: pToolBar r@ = or
! 		if	w l Handle_Notify: pToolBar
! 		else	r@ GetHandle: ControlToolBar = ToolTipHandle: ControlToolBar r@ = or
! 			if	w l Handle_Notify: ControlToolbar
! 			else	false
! 			then
! 		then	r>drop
                  ;M
  
***************
*** 814,818 ****
  \       the Win32Forth console interface support
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
! 
  fload EdDebug.f
  fload EdRemote.f
--- 819,823 ----
  \       the Win32Forth console interface support
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
! fload EdHtmlPreview.f
  fload EdDebug.f
  fload EdRemote.f
***************
*** 877,880 ****
--- 882,886 ----
          0        		VK_F12	IDM_COMPILE		ACCELENTRY
          0        		VK_F11	IDM_DEBUG		ACCELENTRY
+ 	0			VK_F10  IDM_HTML_PREVIEW        ACCELENTRY
  
  	\ Help menu

Index: CommandID.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CommandID.f	14 Jun 2006 06:02:56 -0000	1.5
--- CommandID.f	29 Jun 2006 04:18:47 -0000	1.6
***************
*** 34,37 ****
--- 34,38 ----
  NewID IDM_OPEN_RECENT_FILE
  NewID IDM_OPEN_HIGHLIGHTED_FILE
+ NewID IDM_NEW_HTML_SOURCE_FILE
  
  \ Edit menu
***************
*** 74,77 ****
--- 75,79 ----
  NewID IDM_COLORIZE
  NewID IDM_BROWSE
+ NewID IDM_HTML_PREVIEW
  
  \ Options menu

Thread: [Win32forth-cvs] win32forth/apps/Win32ForthIDE EdHtmlPreview.f, NONE, 1.1 CommandID.f, 1.5, 1.6 EdM

win32forth-cvs