pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Use HTML conversion to enter rich-text in the visual TsCellEdit control

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4271 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-08-14 12:44:22 +00:00
parent 55c0c6c4c4
commit f4cb9c14a7
3 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
components/fpspreadsheet/fpshtmlutils.pas
View File

@ -988,47 +988,54 @@ begin
// NOTE: This is a simple version: every opened tag is closed afterwards!
// In a more advanced version, shared properties should be kept. This is
// what FChangedParams was introduced for!
if [cfFontName, cfFontSize, cfFontColor] * FChangedparams[i] <> [] then
if not SameFont(FBaseFont, FFonts[i]) then
begin
Result := Result + '<font';
if cfFontName in FChangedParams[i] then
Result := Result + ' face="' + FFonts[i].FontName + '"';
if cfFontSize in FChangedParams[i] then
Result := Result + ' size="' + Format('%.gpt', [FFonts[i].Size], FPointSeparatorSettings) + '"';
if cfFontColor in FChangedParams[i] then
Result := Result + ' color="' + ColorToHTMLColorStr(FFonts[i].Color) + '"';
end;
if (cfBold in FChangedParams[i]) then
Result := Result + '<b>';
if (cfItalic in FChangedParams[i]) then
Result := Result + '<i>';
if (cfUnderline in FChangedParams[i]) then
Result := Result + '<u>';
if (cfStrikeout in FChangedParams[i]) then
Result := Result + '<s>';
if (cfFontPosition in FChangedParams[i]) then
begin
if FFonts[i].Position = fpSuperscript then Result := Result + '<sup>';
if FFonts[i].Position = fpSubscript then Result := Result + '<sub>';
if [cfFontName, cfFontSize, cfFontColor] * FChangedparams[i] <> [] then
begin
Result := Result + '<font';
if cfFontName in FChangedParams[i] then
Result := Result + ' face="' + FFonts[i].FontName + '"';
if cfFontSize in FChangedParams[i] then
Result := Result + ' size="' + Format('%.gpt', [FFonts[i].Size], FPointSeparatorSettings) + '"';
if cfFontColor in FChangedParams[i] then
Result := Result + ' color="' + ColorToHTMLColorStr(FFonts[i].Color) + '"';
Result := Result + '>';
end;
if (cfBold in FChangedParams[i]) then
Result := Result + '<b>';
if (cfItalic in FChangedParams[i]) then
Result := Result + '<i>';
if (cfUnderline in FChangedParams[i]) then
Result := Result + '<u>';
if (cfStrikeout in FChangedParams[i]) then
Result := Result + '<s>';
if (cfFontPosition in FChangedParams[i]) then
begin
if FFonts[i].Position = fpSuperscript then Result := Result + '<sup>';
if FFonts[i].Position = fpSubscript then Result := Result + '<sub>';
end;
end;
// Add the node text
Result := Result + GetTextOfRichTextParam(i);
// Add closing tags (reverse order as opening!)
if (cfFontPosition in FChangedParams[i]) then
if not SameFont(FBaseFont, FFonts[i]) then
begin
if FFonts[i].Position = fpSubscript then Result := Result + '</sub>';
if FFonts[i].Position = fpSuperscript then Result := Result + '</sup>';
if (cfFontPosition in FChangedParams[i]) then
begin
if FFonts[i].Position = fpSubscript then Result := Result + '</sub>';
if FFonts[i].Position = fpSuperscript then Result := Result + '</sup>';
end;
if (cfStrikeout in FChangedParams[i]) then
Result := Result + '</s>';
if (cfUnderline in FChangedParams[i]) then
Result := Result + '</u>';
if (cfItalic in FChangedParams[i]) then
Result := Result + '</i>';
if (cfBold in FChangedParams[i]) then
Result := Result + '</b>';
if [cfFontName, cfFontSize, cfFontColor] * FChangedParams[i] <> [] then
Result := Result + '</font>';
end;
if (cfStrikeout in FChangedParams[i]) then
Result := Result + '</s>';
if (cfUnderline in FChangedParams[i]) then
Result := Result + '</u>';
if (cfItalic in FChangedParams[i]) then
Result := Result + '</i>';
if (cfBold in FChangedParams[i]) then
Result := Result + '</b>';
if [cfFontName, cfFontSize, cfFontColor] * FChangedParams[i] <> [] then
Result := Result + '</font';
end;
end;

5
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -4183,6 +4183,8 @@ var
numFmtParams: TsNumFormatParams;
maxDig: Integer;
isMixed: Boolean;
rtParams: TsRichTextParams;
plain: String;
begin
if ACell = nil then
exit;
@ -4252,7 +4254,8 @@ begin
exit;
end;
WriteUTF8Text(ACell, AValue);
HTMLToRichText(FWorkbook, ReadcellFont(ACell), AValue, plain, rtParams);
WriteUTF8Text(ACell, plain, rtParams);
end;
{@@ ----------------------------------------------------------------------------

13
components/fpspreadsheet/fpspreadsheetctrls.pas
View File

@ -212,6 +212,7 @@ type
TsCellEdit = class(TMemo, IsSpreadsheetControl)
private
FWorkbookSource: TsWorkbookSource;
FShowHTMLText: Boolean;
function GetSelectedCell: PCell;
function GetWorkbook: TsWorkbook;
function GetWorksheet: TsWorksheet;
@ -234,6 +235,7 @@ type
{@@ Refers to the underlying worksheet to which the edited cell belongs. }
property Worksheet: TsWorksheet read GetWorksheet;
published
property ShowHTMLText: Boolean read FShowHTMLText write FShowHTMLText default true;
{@@ Link to the WorkbookSource which provides the workbook and worksheet. }
property WorkbookSource: TsWorkbookSource read FWorkbookSource write SetWorkbookSource;
end;
@ -462,7 +464,7 @@ implementation
uses
Types, Math, TypInfo, LCLType, LCLProc, Dialogs, Forms,
fpsStrings, fpsUtils, fpsNumFormat;
fpsStrings, fpsUtils, fpsNumFormat, fpsHTMLUtils;
{@@ ----------------------------------------------------------------------------
Registers the spreadsheet components in the Lazarus component palette,
@ -1577,6 +1579,7 @@ end;
constructor TsCellEdit.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
FShowHTMLText := True;
WantReturns := false;
WantTabs := false;
AutoSize := true;
@ -1748,6 +1751,14 @@ begin
Lines.Text := FormatDateTime('ddddd', ACell^.DateTimevalue)
else // both
Lines.Text := FormatDateTime('c', ACell^.DateTimeValue);
cctUTF8String:
if FShowHTMLText then
begin
RichTextToHTML(Workbook, Worksheet.ReadCellFont(ACell),
ACell^.UTF8StringValue, ACell^.RichTextParams, s);
Lines.Text := s;
end else
Lines.Text := ACell^.UTF8StringValue;
else
Lines.Text := Worksheet.ReadAsUTF8Text(ACell);
end;