summaryrefslogtreecommitdiff
path: root/docview
diff options
context:
space:
mode:
authorGraeme Geldenhuys <graeme@mastermaths.co.za>2012-11-26 15:11:38 +0000
committerGraeme Geldenhuys <graeme@mastermaths.co.za>2012-11-26 15:11:38 +0000
commitce5ed6ba646163e37d589c84394127d0590aadcb (patch)
tree0f07b8e7dcedc10017f9738d3ee773769c3b4c93 /docview
parent79d9e448d8880386c5ae5ccbac5f3382bcb2d780 (diff)
downloadfpGUI-ce5ed6ba646163e37d589c84394127d0590aadcb.tar.xz
docview: Improved the IPF-to-RichTextView generated tags for colored text.
Diffstat (limited to 'docview')
-rw-r--r--docview/src/HelpTopic.pas14
-rw-r--r--docview/src/frm_main.pas4
2 files changed, 9 insertions, 9 deletions
diff --git a/docview/src/HelpTopic.pas b/docview/src/HelpTopic.pas
index b6ba186d..3af43e6a 100644
--- a/docview/src/HelpTopic.pas
+++ b/docview/src/HelpTopic.pas
@@ -815,7 +815,7 @@ begin
end;
// It's a URL. Insert link at start of URL
- T := '<blue><link ' + PARAM_LINK_URL + ' "';
+ T := '<color blue><link ' + PARAM_LINK_URL + ' "';
T := T + State.TextBlock;
T := T + '">';
Insert(T, Text, State.StartOfTextBlock);
@@ -939,7 +939,7 @@ begin
// then put code in to show it.
if not TInternalHelpLink(Link).Automatic then
begin
- OutputString := '<blue>'
+ OutputString := '<color blue>'
+ GetBeginLink( State.LinkIndex );
end;
@@ -955,7 +955,7 @@ begin
State.FootnoteLink := TFootnoteHelpLink(FootnoteLink);
end;
- OutputString := '<blue>' + GetBeginLink( State.LinkIndex );
+ OutputString := '<color blue>' + GetBeginLink( State.LinkIndex );
inc( State.LinkIndex );
end;
@@ -973,7 +973,7 @@ begin
end;
end;
- OutputString := '<blue>' + GetBeginLink( State.LinkIndex );
+ OutputString := '<color blue>' + GetBeginLink( State.LinkIndex );
inc( State.LinkIndex );
end;
@@ -984,7 +984,7 @@ begin
// :link reftype=hd refid=... database=<filename>
ExternalLinkFileIndex := ( pData + 2 )^;
ExternalLinkTopicID := StrNPas( pchar(pData + 4), (pData + 3)^ );
- OutputString := '<blue><link ' + PARAM_LINK_EXTERNAL + ' '
+ OutputString := '<color blue><link ' + PARAM_LINK_EXTERNAL + ' '
+ IntToStr( ExternalLinkFileIndex )
+ ' '
+ ExternalLinkTopicID
@@ -1010,7 +1010,7 @@ begin
or StrStartsWithIgnoringCase(ProgramFilename, PRGM_FIREFOX)
then
begin
- OutputString := '<blue><link ' + PARAM_LINK_URL + ' '
+ OutputString := '<color blue><link ' + PARAM_LINK_URL + ' '
+ FullDoubleQuote( ProgramLink )
+ '>';
end
@@ -1019,7 +1019,7 @@ begin
ProgramInfo := TSerializableStringList.create;
ProgramInfo.add(ProgramPath);
ProgramInfo.add(ProgramLink);
- OutputString := '<blue><link ' + PARAM_LINK_PROGRAM + ' '
+ OutputString := '<color blue><link ' + PARAM_LINK_PROGRAM + ' '
+ ProgramInfo.getSerializedString
+ '>';
ProgramInfo.destroy;
diff --git a/docview/src/frm_main.pas b/docview/src/frm_main.pas
index 21cca257..d22d88fb 100644
--- a/docview/src/frm_main.pas
+++ b/docview/src/frm_main.pas
@@ -648,7 +648,7 @@ begin
sl.Clear;
with sl do
begin
- Add('<b><u>Filename:</u></b> <blue>' + f.Filename + '<black>');
+ Add('<b><u>Filename:</u></b> <blue>' + f.Filename + '</blue>');
Add('<b>Title:</b> ' + f.Title);
Add('<b>File size:</b> ' + IntToStr(fpgFileSize(f.Filename)) + ' bytes');
Add('<b>INF/HLP file version</b> ' + f.FormatVersion);
@@ -2146,7 +2146,7 @@ begin
+ IntToHex( Settings.Colors[ NotesTextColorIndex ], 6 )
+ '><link note' + IntToStr( NoteIndex ) + '>';
InsertText := InsertText + Text;
- InsertText := InsertText + '</color></link>';
+ InsertText := InsertText + '</link></color>';
end;
end;