fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-03-07 14:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/xhb/tframe.prg
    ! Using IS*() macros instead of NIL checks.
    % Using IS*() macros instead ValType() calls.
    % Several minor optimizations.
    * Changed to use standard class declaration syntax.

  * contrib/xhb/tframe.prg
  * contrib/hbide/ideharbourhelp.prg
  * contrib/hbide/idehome.prg
    ! Fixed to generate lowercase HTML code. This is basic requirement
      for HTML to validate with any newer than legacy HTML standard (f.e. XHTML).
      Should be fixed in other places in Harbour.

  * contrib/xhb/tframe.prg
  * contrib/xhb/cgi.ch
    * Formatting.
This commit is contained in:
Viktor Szakats
2010-03-07 13:56:54 +00:00
parent 75ea8020d9
commit 57cb7dd3cc
5 changed files with 187 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,24 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-03-07 14:56 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/xhb/tframe.prg
! Using IS*() macros instead of NIL checks.
% Using IS*() macros instead ValType() calls.
% Several minor optimizations.
* Changed to use standard class declaration syntax.
* contrib/xhb/tframe.prg
* contrib/hbide/ideharbourhelp.prg
* contrib/hbide/idehome.prg
! Fixed to generate lowercase HTML code. This is basic requirement
for HTML to validate with any newer than legacy HTML standard (f.e. XHTML).
Should be fixed in other places in Harbour.
* contrib/xhb/tframe.prg
* contrib/xhb/cgi.ch
* Formatting.
2010-03-07 14:30 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* doc/Makefile
! Fixed 'en-EN' - 'en'.

91
harbour/contrib/hbide/ideharbourhelp.prg
View File

@@ -935,16 +935,16 @@ METHOD IdeHarbourHelp:updateViewer( aHtm )
METHOD IdeHarbourHelp:populateRootInfo()
LOCAL aHtm := {}
aadd( aHtm, "<HTML>" )
aadd( aHtm, ' <BODY ALIGN=center VALIGN=center>' )
aadd( aHtm, ' <H1><FONT color=green>' + "Welcome" + '</FONT></H1>' )
aadd( aHtm, ' <BR>' + '&nbsp;' + '</BR>' )
aadd( aHtm, ' <H2><FONT color=blue>' + ::cPathInstall + '</FONT></H2>' )
aadd( aHtm, ' <BR>&nbsp;</BR>' )
aadd( aHtm, ' <BR>&nbsp;</BR>' )
aadd( aHtm, ' <IMG src="' + 'resources/harbour.png' + '" width="300" height="200"</IMG></BR>' )
aadd( aHtm, " </BODY>" )
aadd( aHtm, "</HTML>" )
aadd( aHtm, "<html>" )
aadd( aHtm, ' <body align=center valign=center>' )
aadd( aHtm, ' <h1><font color=green>' + "Welcome" + '</font></h1>' )
aadd( aHtm, ' <br>' + '&nbsp;' + '</br>' )
aadd( aHtm, ' <h2><font color=blue>' + ::cPathInstall + '</font></h2>' )
aadd( aHtm, ' <br>&nbsp;</br>' )
aadd( aHtm, ' <br>&nbsp;</br>' )
aadd( aHtm, ' <img src="' + 'resources/harbour.png' + '" width="300" height="200"</img></br>' )
aadd( aHtm, " </body>" )
aadd( aHtm, "</html>" )
::updateViewer( aHtm )
@@ -955,11 +955,11 @@ METHOD IdeHarbourHelp:populateRootInfo()
METHOD IdeHarbourHelp:populatePathInfo( cPath )
LOCAL aHtm := {}
aadd( aHtm, "<HTML>" )
aadd( aHtm, " <BODY ALIGN=center VALIGN=center>" )
aadd( aHtm, ' <H2><FONT color=blue>' + cPath + '</FONT></H2>' )
aadd( aHtm, " </BODY>" )
aadd( aHtm, "</HTML>" )
aadd( aHtm, "<html>" )
aadd( aHtm, " <body align=center valign=center>" )
aadd( aHtm, ' <h2><font color=blue>' + cPath + '</font></h2>' )
aadd( aHtm, " </body>" )
aadd( aHtm, "</html>" )
::updateViewer( aHtm )
@@ -973,24 +973,24 @@ METHOD IdeHarbourHelp:populateTextFile( cTextFile )
/* Build HTML */
aHtm := {}
aadd( aHtm, "<HTML>" )
aadd( aHtm, " <BODY>" )
aadd( aHtm, ' <H3 align=center><FONT color=blue>' + cTextFile + '</FONT></H3>' )
aadd( aHtm, ' <BR>' + '&nbsp; <HR></HR></BR>' )
aadd( aHtm, "<html>" )
aadd( aHtm, " <body>" )
aadd( aHtm, ' <h3 align=center><font color=blue>' + cTextFile + '</font></h3>' )
aadd( aHtm, ' <br>' + '&nbsp; <hr></hr></br>' )
IF nParsed > 0
aFn := ::aFuncByFile[ nParsed, 2 ]
IF len( aFn ) > 0
FOR EACH oFunc IN aFn
IF hb_isObject( oFunc )
aadd( aHtm, ' <BR>' + oFunc:cName + '</BR>' )
aadd( aHtm, ' <br>' + oFunc:cName + '</br>' )
ENDIF
NEXT
ELSE
aadd( aHtm, ' <BR><PRE>' + hb_memoread( cTextFile ) + '</PRE></BR>' )
aadd( aHtm, ' <br><pre>' + hb_memoread( cTextFile ) + '</pre></br>' )
ENDIF
ENDIF
aadd( aHtm, " </BODY>" )
aadd( aHtm, "</HTML>" )
aadd( aHtm, " </body>" )
aadd( aHtm, "</html>" )
::updateViewer( aHtm )
@@ -1035,7 +1035,7 @@ METHOD IdeHarbourHelp:buildView( oFunc )
LOCAL s, x, y, v, w, z, n, s1, a_, cTxt
LOCAL aHtm := {}
aadd( aHtm, "<HTML>" )
aadd( aHtm, "<html>" )
aadd( aHtm, '<head> ' )
aadd( aHtm, ' <meta name="Author" CONTENT=Pritpal Bedi [pritpal@vouchcac.com]">' )
@@ -1070,10 +1070,10 @@ METHOD IdeHarbourHelp:buildView( oFunc )
aadd( aHtm, ' </style> ' )
aadd( aHtm, '</head> ' )
aadd( aHtm, ' <BODY>' )
aadd( aHtm, ' <CENTER>' )
aadd( ahtm, ' <body>' )
aadd( ahtm, ' <center>' )
s := ' <TABLE ' +;
s := ' <table ' +;
'Border=' + '0 ' +;
'Frame=' + 'ALL ' +;
'CellPadding=' + '0 ' +;
@@ -1083,30 +1083,30 @@ METHOD IdeHarbourHelp:buildView( oFunc )
' >'
aadd( aHtm, s )
aadd( aHtm, '<CAPTION align=TOP><FONT SIZE="6"><B>' + oFunc:cName + '</B></FONT></CAPTION>' )
//aadd( aHtm, '<BR><FONT color="#6699ff"><B>' + oFunc:cOneLiner + '</B></FONT></BR>' )
aadd( aHtm, '<BR><FONT color="#FF4719"><B>' + oFunc:cOneLiner + '</B></FONT></BR>' )
aadd( aHtm, '<caption align=top><font size="6"><b>' + oFunc:cName + '</b></font></caption>' )
//aadd( aHtm, '<br><font color="#6699ff"><b>' + oFunc:cOneLiner + '</b></font></br>' )
aadd( aHtm, '<br><font color="#FF4719"><b>' + oFunc:cOneLiner + '</b></font></br>' )
cTxt := " "
IF !empty( oFunc:cCategory )
cTxt += "Category: <B>" + oFunc:cCategory + "</B> "
cTxt += "Category: <b>" + oFunc:cCategory + "</b> "
ENDIF
IF !empty( oFunc:cSubCategory )
cTxt += "Sub: <B>" + oFunc:cSubCategory + "</B> "
cTxt += "Sub: <b>" + oFunc:cSubCategory + "</b> "
ENDIF
IF !empty( oFunc:cVersion )
cTxt += "Version: <B>" + oFunc:cVersion + "</B> "
cTxt += "Version: <b>" + oFunc:cVersion + "</b> "
ENDIF
IF !empty( cTxt )
aadd( aHtm, "<BR>" + "[" + cTxt + "]" + "</BR>" )
aadd( aHtm, "<br>" + "[" + cTxt + "]" + "</br>" )
ENDIF
IF !empty( s1 := oFunc:cExternalLink )
aadd( aHtm, '<BR><a href="' + s1 + '">' + "<B>" + s1 + "</B>" + "</a></BR>" )
aadd( aHtm, '<br><a href="' + s1 + '">' + "<b>" + s1 + "</b>" + "</a></br>" )
ENDIF
aadd( aHtm, '<HR color="#6699ff" size="5"></HR>' )
aadd( aHtm, '<hr color="#6699ff" size="5"></hr>' )
x := '<TR><TD align=LEFT><font size="5" color="#FF4719">' ; y := "</font></TD></TR>"
v := '<TR><TD margin-left: 20px><pre>' ; w := "</pre></TD></TR>"
z := "<TR><TD>&nbsp;</TD></TR>"
x := '<tr><td align=left><font size="5" color="#FF4719">' ; y := "</font></td></tr>"
v := '<tr><td margin-left: 20px><pre>' ; w := "</pre></td></tr>"
z := "<tr><td>&nbsp;</td></tr>"
IF !empty( oFunc:cInherits )
aadd( aHtm, x + "Inherits" + y )
@@ -1164,7 +1164,7 @@ METHOD IdeHarbourHelp:buildView( oFunc )
a_:= hb_atokens( oFunc:cSeaAlso, "," )
IF !empty( a_ )
aadd( aHtm, x + "SeeAlso" + y )
aadd( aHtm, "<TR><TD>" )
aadd( aHtm, "<tr><td>" )
FOR EACH s IN a_
s := alltrim( s )
@@ -1176,7 +1176,7 @@ METHOD IdeHarbourHelp:buildView( oFunc )
aadd( aHtm, '<a href="' + s1 + '">' + s + "</a>" + ;
iif( s:__enumIndex() == len( a_ ), "", ",&nbsp;" ) )
NEXT
aadd( aHtm, "</TD></TR>" )
aadd( aHtm, "</td></tr>" )
aadd( aHtm, z )
ENDIF
IF !empty( oFunc:cPlatforms )
@@ -1190,10 +1190,10 @@ METHOD IdeHarbourHelp:buildView( oFunc )
aadd( aHtm, z )
ENDIF
aadd( aHtm, " </TABLE>" )
aadd( aHtm, " </CENTER>" )
aadd( aHtm, " </BODY>" )
aadd( aHtm, "</HTML>" )
aadd( aHtm, " </table>" )
aadd( aHtm, " </center>" )
aadd( aHtm, " </body>" )
aadd( aHtm, "</html>" )
::updateViewer( aHtm )
@@ -1239,4 +1239,3 @@ METHOD IdeHarbourHelp:paintRequested( pPrinter )
RETURN Self
/*----------------------------------------------------------------------*/

145
harbour/contrib/hbide/idehome.prg
View File

@@ -294,30 +294,30 @@ METHOD IdeHome:buildWelcomeTab()
METHOD IdeHome:refresh()
LOCAL aHtm := {}
aadd( aHtm, '<HTML>' )
aadd( aHtm, ' <BODY align=center valign=center>' )
aadd( aHtm, ' <TABLE cols="7" width="95%">' )
aadd( aHtm, ' <TR>' )
aadd( aHtm, ' <TD align="left" valign="center" colspan="5">' )
aadd( aHtm, ' <IMG src="resources/project.png"' + '</IMG>' + '&nbsp;' + '&nbsp;' + '&nbsp;' )
aadd( aHtm, ' <FONT face="Times New Roman" color="#FF4719" size="7"><B><U>Projects</U></B></FONT>' )
aadd( aHtm, '<html>' )
aadd( aHtm, ' <body align=center valign=center>' )
aadd( aHtm, ' <table cols="7" width="95%">' )
aadd( aHtm, ' <tr>' )
aadd( aHtm, ' <td align="left" valign="center" colspan="5">' )
aadd( aHtm, ' <img src="resources/project.png"' + '</img>' + '&nbsp;' + '&nbsp;' + '&nbsp;' )
aadd( aHtm, ' <font face="Times New Roman" color="#FF4719" size="7"><b><U>Projects</u></b></font>' )
aadd( aHtm, ' &nbsp;' + '&nbsp;' + '&nbsp;' )
aadd( aHtm, ' <FONT face="Times New Roman" size="5">' + '( ' + ::oIde:cProjIni + ' )' + '</FONT>' )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' </TR>' )
aadd( aHtm, ' <TR bgcolor="#F0F0F5">' )
aadd( aHtm, ' <TH width="150" >Title </TH>' )
aadd( aHtm, ' <TH width="50" >Type </TH>' )
aadd( aHtm, ' <TH width="75" >Sources </TH>' )
aadd( aHtm, ' <TH width="150" >Last Modified </TH>' )
aadd( aHtm, ' <TH >Location </TH>' )
AADD( aHtm, ' </TR>' )
aadd( aHtm, ' <font face="Times New Roman" size="5">' + '( ' + ::oIde:cProjIni + ' )' + '</font>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' </tr>' )
aadd( aHtm, ' <tr bgcolor="#F0F0F5">' )
aadd( aHtm, ' <th width="150" >Title </th>' )
aadd( aHtm, ' <th width="50" >Type </th>' )
aadd( aHtm, ' <th width="75" >Sources </th>' )
aadd( aHtm, ' <th width="150" >Last Modified </th>' )
aadd( aHtm, ' <th >Location </th>' )
AADD( aHtm, ' </tr>' )
//
::addProjectsInfo( @aHtm )
//
aadd( aHtm, ' </TABLE>' )
aadd( aHtm, ' </BODY>' )
aadd( aHtm, '</HTML>' )
aadd( aHtm, ' </table>' )
aadd( aHtm, ' </body>' )
aadd( aHtm, '</html>' )
//
::qWelcomeBrowser:clear()
//
@@ -331,11 +331,11 @@ METHOD IdeHome:addProjectsInfo( aHtm )
LOCAL a_, prp_, src_, dir_, cIcon
IF empty( ::aProjects )
aadd( aHtm, ' <TR>' )
aadd( aHtm, ' <TD>' )
aadd( aHtm, ' <tr>' )
aadd( aHtm, ' <td>' )
aadd( aHtm, ' ' + 'None' )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TR>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <tr>' )
ELSE
FOR EACH a_ IN ::aProjects
prp_ := a_[ 3, PRJ_PRP_PROPERTIES, 1 ]
@@ -343,24 +343,24 @@ METHOD IdeHome:addProjectsInfo( aHtm )
dir_ := directory( a_[ 1 ] )
cIcon := hbide_imageForProjectType( prp_[ PRJ_PRP_TYPE ] )
aadd( aHtm, ' <TR>' )
aadd( aHtm, ' <TD><B>' )
aadd( aHtm, ' <tr>' )
aadd( aHtm, ' <td><b>' )
aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'prj-' + prp_[ PRJ_PRP_TITLE ], 'resources/' + cIcon + '.png' ) + '&nbsp;' )
aadd( aHtm, ' ' + hbide_htmlAnchor( 'prj-' + prp_[ PRJ_PRP_TITLE ], prp_[ PRJ_PRP_TITLE ], a_[ 1 ] ) )
aadd( aHtm, ' </B></TD>' )
aadd( aHtm, ' <TD align=left>' )
aadd( aHtm, ' </b></td>' )
aadd( aHtm, ' <td align=left>' )
aadd( aHtm, ' ' + left( prp_[ PRJ_PRP_TYPE ], 3 ) )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=right>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=right>' )
aadd( aHtm, ' ' + hb_ntos( len( src_ ) ) )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=center>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=center>' )
aadd( aHtm, ' ' + dtoc( dir_[ 1,3 ] ) + " " + dir_[ 1,4 ] )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=right>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=right>' )
aadd( aHtm, ' ' + hbide_pathNormalized( a_[ 1 ] ) )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' </TR>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' </tr>' )
NEXT
ENDIF
RETURN Self
@@ -402,28 +402,28 @@ METHOD IdeHome:buildSourcesInfo( cProjectTitle, aSrcInfo )
LOCAL aHtm := {}, aSrc
LOCAL cIcon := hbide_imageForProjectType( ::oPM:getProjectTypeFromTitle( cProjectTitle ) )
aadd( aHtm, '<HTML>' )
aadd( aHtm, ' <BODY ALIGN=center VALIGN=center>' )
aadd( aHtm, ' <TABLE COLS="7" WIDTH="95%">' )
aadd( aHtm, ' <TR><TD align=left>' )
aadd( aHtm, ' <IMG src="' + 'resources/' + cIcon + '.png' + '"' + '</IMG>' + '&nbsp;' + '&nbsp;' + '&nbsp;' )
aadd( aHtm, ' <FONT color="#FF4719" size=5><U>' + cProjectTitle + '</U></FONT>' )
aadd( aHtm, ' </TD>' )
aadd( aHtm, '<html>' )
aadd( aHtm, ' <body align=center valign=center>' )
aadd( aHtm, ' <table cols="7" width="95%">' )
aadd( aHtm, ' <tr><td align=left>' )
aadd( aHtm, ' <img src="' + 'resources/' + cIcon + '.png' + '"' + '</img>' + '&nbsp;' + '&nbsp;' + '&nbsp;' )
aadd( aHtm, ' <font color="#FF4719" size=5><u>' + cProjectTitle + '</u></font>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <TR bgcolor="#F0F0F5">' )
aadd( aHtm, ' <TH width="150" >Source</TH>' )
aadd( aHtm, ' <TH width="50" >Type</TH>' )
aadd( aHtm, ' <TH width="60" >Size</TH>' )
aadd( aHtm, ' <TH width="150" >Last Modified</TH>' )
aadd( aHtm, ' <TH >Location</TH>' )
AADD( aHtm, ' </TR>' )
AADD( aHtm, ' </tr>' )
//
FOR EACH aSrc IN aSrcInfo
::formatSourceInfo( @aHtm, aSrc )
NEXT
//
aadd( aHtm, ' </TABLE>' )
aadd( aHtm, ' </BODY>' )
aadd( aHtm, '</HTML>' )
aadd( aHtm, ' </table>' )
aadd( aHtm, ' </body>' )
aadd( aHtm, '</html>' )
//
::qWelcomeBrowser:clear()
//
@@ -435,24 +435,24 @@ METHOD IdeHome:buildSourcesInfo( cProjectTitle, aSrcInfo )
METHOD IdeHome:formatSourceInfo( aHtm, aSrc )
aadd( aHtm, ' <TR>' )
aadd( aHtm, ' <TD><B>' )
aadd( aHtm, ' <tr>' )
aadd( aHtm, ' <td><b>' )
aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'fle-' + aSrc[ 1 ], 'resources/' + aSrc[ 5 ] + '.png' ) + '&nbsp;' )
aadd( aHtm, ' ' + hbide_htmlAnchor( 'fle-' + aSrc[ 1 ], aSrc[ 3 ], aSrc[ 1 ] ) )
aadd( aHtm, ' </B></TD>' )
aadd( aHtm, ' <TD>' )
aadd( aHtm, ' </b></td>' )
aadd( aHtm, ' <td>' )
aadd( aHtm, ' ' + aSrc[ 4 ] )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=right>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=right>' )
aadd( aHtm, ' ' + hb_ntos( aSrc[ 6 ] ) )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=center>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=center>' )
aadd( aHtm, ' ' + dtoc( aSrc[ 7 ] ) + " " + aSrc[ 8 ] )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' <TD align=right>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' <td align=right>' )
aadd( aHtm, ' ' + aSrc[ 2 ] )
aadd( aHtm, ' </TD>' )
aadd( aHtm, ' </TR>' )
aadd( aHtm, ' </td>' )
aadd( aHtm, ' </tr>' )
RETURN Self
@@ -483,21 +483,21 @@ METHOD IdeHome:buildFaqTab()
aFaq := hbide_getFaqs() ; a_:= aFaq[ 1 ]; b_:= aFaq[ 2 ]
aHtm := {}
aadd( aHtm, '<HTML>' )
aadd( aHtm, ' <BODY ALIGN=center VALIGN=center>' )
aadd( aHtm, ' <TABLE COLS="7" WIDTH="95%">' )
aadd( aHtm, '<html>' )
aadd( aHtm, ' <body align=center valign=center>' )
aadd( aHtm, ' <table cols="7" width="95%">' )
FOR EACH s IN a_
aadd( aHtm, ' <TR><TD></TD></TR>' )
aadd( aHtm, ' <TR><TD>' )
aadd( aHtm, ' <FONT color="red" size=4>' + s + '</FONT>' )
aadd( aHtm, ' </TD></TR>' )
aadd( aHtm, ' <TR><TD>' )
aadd( aHtm, ' <FONT color="black" size=3>' + b_[ s:__enumIndex() ] + '</FONT>' )
aadd( aHtm, ' </TD></TR>' )
aadd( aHtm, ' <tr><td></td></tr>' )
aadd( aHtm, ' <tr><td>' )
aadd( aHtm, ' <font color="red" size=4>' + s + '</font>' )
aadd( aHtm, ' </td></tr>' )
aadd( aHtm, ' <tr><td>' )
aadd( aHtm, ' <font color="black" size=3>' + b_[ s:__enumIndex() ] + '</font>' )
aadd( aHtm, ' </td></tr>' )
NEXT
aadd( aHtm, ' </TABLE>' )
aadd( aHtm, ' </BODY>' )
aadd( aHtm, '</HTML>' )
aadd( aHtm, ' </table>' )
aadd( aHtm, ' </body>' )
aadd( aHtm, '</html>' )
//
::qFaqBrowser:clear()
//
@@ -525,4 +525,3 @@ STATIC FUNCTION hbide_getFaqs()
RETURN { a_, b_ }
/*----------------------------------------------------------------------*/

8
harbour/contrib/xhb/cgi.ch
View File

@@ -43,10 +43,10 @@
*
*/
#xTranslate DEFAULT( <p>, <v> ) => <p> := IIF( <p> == NIL, <v>, <p> )
#xTranslate HTMLSpace( <n> ) => replicate( "&nbsp;", <n> ) //"&#32;"
#xTranslate DEFAULT( <p>, <v> ) => <p> := iif( <p> == NIL, <v>, <p> )
#xTranslate HTMLSpace( <n> ) => Replicate( "&nbsp;", <n> ) //"&#32;"
#xTranslate NTRIM(<n>) => hb_ntos( <n> )
#xTranslate CRLF() => chr(13)+chr(10)
#xTranslate CRLF() => Chr( 13 ) + Chr( 10 )
#define STD_IN 0
#define STD_OUT 1
@@ -76,7 +76,7 @@
"A:hover {text-decoration:none;color:white;background:black;} "+;
" -->"
#define _HTML_SPACE chr(38)+"nbsp;"
#define _HTML_SPACE Chr( 38 ) + "nbsp;"
#define CLR_LIGHT_YELLOW "#fffffc0"
#define CLR_DARK_YELLOW "#fffffcc"

98
harbour/contrib/xhb/tframe.prg
View File

@@ -49,13 +49,13 @@
#include "cgi.ch"
CLASS THtmlFrameSet
CREATE CLASS THtmlFrameSet
DATA nH
DATA FName
Data cStr INIT ""
VAR nH
VAR FName
VAR cStr INIT ""
DATA TITLE INIT "FrameSet01"
VAR TITLE INIT "FrameSet01"
METHOD New( cFName, cTitle )
@@ -73,39 +73,38 @@ ENDCLASS
METHOD New( cFName, cTitle ) CLASS THtmlFrameSet
LOCAL cStr := ""
LOCAL cStr
DEFAULT cTitle TO ""
::FName := cFName
::Title := cTitle
IF ::FName == NIL
cStr += "Content-Type: text/html" + CRLF() + CRLF()
// cStr := ""
::nH := STD_OUT
ELSE
IF ISCHARACTER( ::FName )
cStr := ""
::nH := Fcreate( ::FName )
::nH := FCreate( ::FName )
ELSE
cStr := "Content-Type: text/html" + CRLF() + CRLF()
::nH := STD_OUT
ENDIF
cStr += "<HTML>" + CRLF() + ;
" <HEAD>" + CRLF() + ;
" <TITLE>" + ::Title + "</TITLE>" + CRLF() + ;
" </HEAD>" + CRLF()
cStr += "<html>" + CRLF() + ;
" <head>" + CRLF() + ;
" <title>" + ::Title + "</title>" + CRLF() + ;
" </head>" + CRLF()
::cStr += cStr
::cStr += cStr
RETURN Self
RETURN Self
METHOD StartSet( aRows, aCols, onLoad, onUnload ) CLASS THtmlFrameSet
LOCAL cStr := ""
LOCAL cStr
LOCAL cItem
cStr += CRLF() + " <FRAMESET "
cStr := CRLF() + " <frameset "
IF aRows != NIL .AND. Valtype( aRows ) == "A" .AND. !Empty( aRows )
IF ISARRAY( aRows ) .AND. !Empty( aRows )
cStr += ' rows="'
@@ -119,7 +118,7 @@ METHOD StartSet( aRows, aCols, onLoad, onUnload ) CLASS THtmlFrameSet
cStr += '"'
ENDIF
IF aCols != NIL .AND. Valtype( aCols ) == "A" .AND. !Empty( aCols )
IF ISARRAY( aCols ) .AND. !Empty( aCols )
cStr += ' cols="'
@@ -133,38 +132,39 @@ METHOD StartSet( aRows, aCols, onLoad, onUnload ) CLASS THtmlFrameSet
cStr += '"'
ENDIF
IF onLoad != NIL
IF ISCHARACTER( onLoad )
cStr += Space( 7 ) + ' onLoad="' + onLoad + '"'
ENDIF
IF onUnLoad != NIL
IF ISCHARACTER( onUnLoad )
cStr += Space( 5 ) + ' onUnLoad="' + onUnLoad + '"'
ENDIF
cStr += " >" + CRLF()
::cStr += cStr
::cStr += cStr
RETURN Self
RETURN Self
METHOD Endset() CLASS THtmlFrameSet
::cStr += " </FRAMESET>" + CRLF()
::cStr += " </frameset>" + CRLF()
RETURN Self
RETURN Self
METHOD END () CLASS THtmlFrameSet
::cStr += "</HTML>" + CRLF()
::cStr += "</html>" + CRLF()
FWrite( ::nH, ::cStr )
IF ::FName != NIL
Fclose( ::nH )
FClose( ::nH )
ENDIF
RETURN Self
RETURN Self
METHOD Frame( cName, cURL, lBorder, lResize, lScrolling, ;
@@ -178,52 +178,50 @@ METHOD Frame( cName, cURL, lBorder, lResize, lScrolling, ;
DEFAULT cScrolling TO "AUTO"
DEFAULT cTarget TO "_self"
cStr := " <FRAME "
cStr := " <frame "
IF cName != NIL
IF ISCHARACTER( cName )
cStr += ' name="' + cName + '"'
ENDIF
IF cUrl != NIL
IF ISCHARACTER( cUrl )
cStr += ' src="' + cURL + '"'
ENDIF
IF cTarget != NIL
cStr += ' TARGET="' + cTarget + '"'
IF ISCHARACTER( cTarget )
cStr += ' target="' + cTarget + '"'
ENDIF
IF !lBorder
IF ! lBorder
cStr += ' frameborder="0"'
ELSE
cStr += ' frameborder="1"'
ENDIF
IF !lResize
cStr += " NORESIZE"
IF ! lResize
cStr += " noresize"
ENDIF
IF cScrolling != NIL
cStr += ' SCROLLING="' + cScrolling + '"'
IF ISCHARACTER( cScrolling )
cStr += ' scrolling="' + cScrolling + '"'
ELSE
IF lScrolling != NIL
cStr += ' SCROLLING=' + IF( lScrolling, '"yes"', '"no"' )
cStr += ' scrolling=' + iif( lScrolling, '"yes"', '"no"' )
ELSE
cStr += ' SCROLLING="auto"'
cStr += ' scrolling="auto"'
ENDIF
ENDIF
IF marginwidth != NIL
cStr += " MARGINWIDTH= " + NTRIM( marginwidth )
IF ISNUMBER( marginwidth )
cStr += " marginwidth= " + hb_ntos( marginwidth )
ENDIF
IF marginheight != NIL
cStr += " MARGINHEIGHT= " + NTRIM( marginheight )
IF ISNUMBER( marginheight )
cStr += " marginheight= " + hb_ntos( marginheight )
ENDIF
cStr += ">" + CRLF()
::cStr += cStr
::cStr += cStr
RETURN Self