paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 00:29:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fpdoceditor: fixed synedit keys, bug #32386

Browse Source 
git-svn-id: trunk@55801 -
This commit is contained in:
mattias 2017-09-08 17:35:52 +00:00
parent 59f97ca1b5
commit 6059f5a7dd
3 changed files with 2209 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2260
ide/fpdoceditwindow.lfm
View File

File diff suppressed because it is too large Load Diff

123
ide/fpdoceditwindow.pas
View File

@ -74,16 +74,16 @@ type
DescrShortEdit: TEdit; DescrShortEdit: TEdit;
SynXMLSyn1: TSynXMLSyn; SynXMLSyn1: TSynXMLSyn;
TopicShort: TEdit; TopicShort: TEdit;
TopicDescr: TSynEdit; TopicDescrSynEdit: TSynEdit;
Panel3: TPanel; Panel3: TPanel;
TopicListBox: TListBox; TopicListBox: TListBox;
NewTopicNameEdit: TEdit; NewTopicNameEdit: TEdit;
NewTopicButton: TButton; NewTopicButton: TButton;
CopyFromInheritedButton: TButton; CopyFromInheritedButton: TButton;
CreateButton: TButton; CreateButton: TButton;
DescrMemo: TSynEdit; DescrSynEdit: TSynEdit;
DescrTabSheet: TTabSheet; DescrTabSheet: TTabSheet;
ErrorsMemo: TSynEdit; ErrorsSynEdit: TSynEdit;
ErrorsTabSheet: TTabSheet; ErrorsTabSheet: TTabSheet;
ExampleEdit: TEdit; ExampleEdit: TEdit;
ExampleTabSheet: TTabSheet; ExampleTabSheet: TTabSheet;
@ -102,7 +102,7 @@ type
Panel1: TPanel; Panel1: TPanel;
Panel2: TPanel; Panel2: TPanel;
SaveButton: TSpeedButton; SaveButton: TSpeedButton;
SeeAlsoMemo: TSynEdit; SeeAlsoSynEdit: TSynEdit;
MoveToInheritedButton: TButton; MoveToInheritedButton: TButton;
OpenDialog: TOpenDialog; OpenDialog: TOpenDialog;
PageControl: TPageControl; PageControl: TPageControl;
@ -120,8 +120,8 @@ type
procedure CopyFromInheritedButtonClick(Sender: TObject); procedure CopyFromInheritedButtonClick(Sender: TObject);
procedure CopyShortToDescrMenuItemClick(Sender: TObject); procedure CopyShortToDescrMenuItemClick(Sender: TObject);
procedure CreateButtonClick(Sender: TObject); procedure CreateButtonClick(Sender: TObject);
procedure DescrMemoChange(Sender: TObject); procedure DescrSynEditChange(Sender: TObject);
procedure ErrorsMemoChange(Sender: TObject); procedure ErrorsSynEditChange(Sender: TObject);
procedure ExampleEditChange(Sender: TObject); procedure ExampleEditChange(Sender: TObject);
procedure FormatButtonClick(Sender: TObject); procedure FormatButtonClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
@ -135,10 +135,10 @@ type
procedure OpenXMLButtonClick(Sender: TObject); procedure OpenXMLButtonClick(Sender: TObject);
procedure PageControlChange(Sender: TObject); procedure PageControlChange(Sender: TObject);
procedure SaveButtonClick(Sender: TObject); procedure SaveButtonClick(Sender: TObject);
procedure SeeAlsoMemoChange(Sender: TObject); procedure SeeAlsoSynEditChange(Sender: TObject);
procedure ShortEditChange(Sender: TObject); procedure ShortEditChange(Sender: TObject);
procedure TopicControlEnter(Sender: TObject); procedure TopicControlEnter(Sender: TObject);
procedure TopicDescrChange(Sender: TObject); procedure TopicDescrSynEditChange(Sender: TObject);
procedure TopicListBoxClick(Sender: TObject); procedure TopicListBoxClick(Sender: TObject);
private private
FCaretXY: TPoint; FCaretXY: TPoint;
@ -194,6 +194,7 @@ type
procedure UpdateTopic; procedure UpdateTopic;
protected protected
procedure UpdateShowing; override; procedure UpdateShowing; override;
procedure Loaded; override;
public public
procedure Reset; procedure Reset;
procedure InvalidateChain; procedure InvalidateChain;
@ -344,14 +345,14 @@ procedure TFPDocEditor.FormatButtonClick(Sender: TObject);
ShortEdit.SelText := StartTag + ShortEdit.SelText + EndTag; ShortEdit.SelText := StartTag + ShortEdit.SelText + EndTag;
DescrShortEdit.Text:=ShortEdit.Text; DescrShortEdit.Text:=ShortEdit.Text;
end else if PageControl.ActivePage = DescrTabSheet then end else if PageControl.ActivePage = DescrTabSheet then
DescrMemo.SelText := StartTag + DescrMemo.SelText + EndTag DescrSynEdit.SelText := StartTag + DescrSynEdit.SelText + EndTag
else if PageControl.ActivePage = ErrorsTabSheet then else if PageControl.ActivePage = ErrorsTabSheet then
ErrorsMemo.SelText := StartTag + ErrorsMemo.SelText + EndTag ErrorsSynEdit.SelText := StartTag + ErrorsSynEdit.SelText + EndTag
else if PageControl.ActivePage = TopicSheet then begin else if PageControl.ActivePage = TopicSheet then begin
if (FLastTopicControl = TopicShort) then if (FLastTopicControl = TopicShort) then
TopicShort.SelText := StartTag + TopicShort.SelText + EndTag; TopicShort.SelText := StartTag + TopicShort.SelText + EndTag;
if (FLastTopicControl = TopicDescr) then if (FLastTopicControl = TopicDescrSynEdit) then
TopicDescr.SelText := StartTag + TopicDescr.SelText + EndTag; TopicDescrSynEdit.SelText := StartTag + TopicDescrSynEdit.SelText + EndTag;
end end
else else
exit; exit;
@ -410,16 +411,16 @@ begin
DescrShortEdit.Text := ShortEdit.Text; DescrShortEdit.Text := ShortEdit.Text;
end; end;
if PageControl.ActivePage = DescrTabSheet then if PageControl.ActivePage = DescrTabSheet then
DescrMemo.SelText := LinkSrc; DescrSynEdit.SelText := LinkSrc;
if PageControl.ActivePage = SeeAlsoTabSheet then if PageControl.ActivePage = SeeAlsoTabSheet then
SeeAlsoMemo.SelText := LinkSrc; SeeAlsoSynEdit.SelText := LinkSrc;
if PageControl.ActivePage = ErrorsTabSheet then if PageControl.ActivePage = ErrorsTabSheet then
ErrorsMemo.SelText := LinkSrc; ErrorsSynEdit.SelText := LinkSrc;
if PageControl.ActivePage = TopicSheet then begin if PageControl.ActivePage = TopicSheet then begin
if (FLastTopicControl = TopicShort) then if (FLastTopicControl = TopicShort) then
TopicShort.SelText := LinkSrc; TopicShort.SelText := LinkSrc;
if (FLastTopicControl = TopicDescr) then if (FLastTopicControl = TopicDescrSynEdit) then
TopicDescr.SelText := LinkSrc; TopicDescrSynEdit.SelText := LinkSrc;
end; end;
Modified:=true; Modified:=true;
@ -564,10 +565,10 @@ begin
UpdateValueControls; UpdateValueControls;
end; end;
procedure TFPDocEditor.SeeAlsoMemoChange(Sender: TObject); procedure TFPDocEditor.SeeAlsoSynEditChange(Sender: TObject);
begin begin
if fpdefReading in FFlags then exit; if fpdefReading in FFlags then exit;
if SeeAlsoMemo.Text<>FOldVisualValues[fpdiSeeAlso] then if SeeAlsoSynEdit.Text<>FOldVisualValues[fpdiSeeAlso] then
Modified:=true; Modified:=true;
end; end;
@ -596,7 +597,7 @@ begin
FLastTopicControl := TControl(Sender); FLastTopicControl := TControl(Sender);
end; end;
procedure TFPDocEditor.TopicDescrChange(Sender: TObject); procedure TFPDocEditor.TopicDescrSynEditChange(Sender: TObject);
begin begin
if fpdefReading in FFlags then exit; if fpdefReading in FFlags then exit;
if fpdefTopicSettingUp in FFlags then exit; if fpdefTopicSettingUp in FFlags then exit;
@ -635,9 +636,9 @@ begin
Include(FFlags, fpdefTopicSettingUp); Include(FFlags, fpdefTopicSettingUp);
try try
TopicShort.Clear; TopicShort.Clear;
TopicDescr.Clear; TopicDescrSynEdit.Clear;
TopicShort.Enabled := False; TopicShort.Enabled := False;
TopicDescr.Enabled := False; TopicDescrSynEdit.Enabled := False;
finally finally
if not OldSettingUp then if not OldSettingUp then
Exclude(FFlags, fpdefTopicSettingUp); Exclude(FFlags, fpdefTopicSettingUp);
@ -871,18 +872,18 @@ begin
DescrShortEdit.Text := ShortEdit.Text; DescrShortEdit.Text := ShortEdit.Text;
//debugln(['TFPDocEditor.LoadGUIValues "',ShortEdit.Text,'" "',FOldVisualValues[fpdiShort],'"']); //debugln(['TFPDocEditor.LoadGUIValues "',ShortEdit.Text,'" "',FOldVisualValues[fpdiShort],'"']);
LinkEdit.Text := FOldVisualValues[fpdiElementLink]; LinkEdit.Text := FOldVisualValues[fpdiElementLink];
DescrMemo.Lines.Text := FOldVisualValues[fpdiDescription]; DescrSynEdit.Lines.Text := FOldVisualValues[fpdiDescription];
//debugln(['TFPDocEditor.LoadGUIValues DescrMemo="',dbgstr(DescrMemo.Lines.Text),'" Descr="',dbgstr(FOldVisualValues[fpdiDescription]),'"']); //debugln(['TFPDocEditor.LoadGUIValues DescrMemo="',dbgstr(DescrSynEdit.Lines.Text),'" Descr="',dbgstr(FOldVisualValues[fpdiDescription]),'"']);
SeeAlsoMemo.Text := FOldVisualValues[fpdiSeeAlso]; SeeAlsoSynEdit.Text := FOldVisualValues[fpdiSeeAlso];
ErrorsMemo.Lines.Text := FOldVisualValues[fpdiErrors]; ErrorsSynEdit.Lines.Text := FOldVisualValues[fpdiErrors];
ExampleEdit.Text := FOldVisualValues[fpdiExample]; ExampleEdit.Text := FOldVisualValues[fpdiExample];
ShortEdit.Enabled := EnabledState; ShortEdit.Enabled := EnabledState;
DescrShortEdit.Enabled := ShortEdit.Enabled; DescrShortEdit.Enabled := ShortEdit.Enabled;
LinkEdit.Enabled := EnabledState; LinkEdit.Enabled := EnabledState;
DescrMemo.Enabled := EnabledState; DescrSynEdit.Enabled := EnabledState;
SeeAlsoMemo.Enabled := EnabledState; SeeAlsoSynEdit.Enabled := EnabledState;
ErrorsMemo.Enabled := EnabledState; ErrorsSynEdit.Enabled := EnabledState;
ExampleEdit.Enabled := EnabledState; ExampleEdit.Enabled := EnabledState;
BrowseExampleButton.Enabled := EnabledState; BrowseExampleButton.Enabled := EnabledState;
@ -1003,7 +1004,7 @@ begin
fpdiDescription: fpdiDescription:
begin begin
PageControl.ActivePage:=DescrTabSheet; PageControl.ActivePage:=DescrTabSheet;
DescrMemo.CaretXY:=LineCol; DescrSynEdit.CaretXY:=LineCol;
end; end;
fpdiErrors: PageControl.ActivePage:=ErrorsTabSheet; fpdiErrors: PageControl.ActivePage:=ErrorsTabSheet;
fpdiSeeAlso: PageControl.ActivePage:=SeeAlsoTabSheet; fpdiSeeAlso: PageControl.ActivePage:=SeeAlsoTabSheet;
@ -1028,21 +1029,21 @@ begin
if fpdefReading in FFlags then exit(false); if fpdefReading in FFlags then exit(false);
Result:=(ShortEdit.Text<>FOldVisualValues[fpdiShort]) Result:=(ShortEdit.Text<>FOldVisualValues[fpdiShort])
or (LinkEdit.Text<>FOldVisualValues[fpdiElementLink]) or (LinkEdit.Text<>FOldVisualValues[fpdiElementLink])
or (DescrMemo.Text<>FOldVisualValues[fpdiDescription]) or (DescrSynEdit.Text<>FOldVisualValues[fpdiDescription])
or (SeeAlsoMemo.Text<>FOldVisualValues[fpdiSeeAlso]) or (SeeAlsoSynEdit.Text<>FOldVisualValues[fpdiSeeAlso])
or (ErrorsMemo.Text<>FOldVisualValues[fpdiErrors]) or (ErrorsSynEdit.Text<>FOldVisualValues[fpdiErrors])
or (ExampleEdit.Text<>FOldVisualValues[fpdiExample]); or (ExampleEdit.Text<>FOldVisualValues[fpdiExample]);
if Result then begin if Result then begin
if (ShortEdit.Text<>FOldVisualValues[fpdiShort]) then if (ShortEdit.Text<>FOldVisualValues[fpdiShort]) then
debugln(['TFPDocEditor.GUIModified Short ',dbgstr(ShortEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiShort])]); debugln(['TFPDocEditor.GUIModified Short ',dbgstr(ShortEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiShort])]);
if (LinkEdit.Text<>FOldVisualValues[fpdiElementLink]) then if (LinkEdit.Text<>FOldVisualValues[fpdiElementLink]) then
debugln(['TFPDocEditor.GUIModified link ',dbgstr(LinkEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiElementLink])]); debugln(['TFPDocEditor.GUIModified link ',dbgstr(LinkEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiElementLink])]);
if (DescrMemo.Text<>FOldVisualValues[fpdiDescription]) then if (DescrSynEdit.Text<>FOldVisualValues[fpdiDescription]) then
debugln(['TFPDocEditor.GUIModified Descr ',dbgstr(DescrMemo.Text),' <> ',dbgstr(FOldVisualValues[fpdiDescription])]); debugln(['TFPDocEditor.GUIModified Descr ',dbgstr(DescrSynEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiDescription])]);
if (SeeAlsoMemo.Text<>FOldVisualValues[fpdiSeeAlso]) then if (SeeAlsoSynEdit.Text<>FOldVisualValues[fpdiSeeAlso]) then
debugln(['TFPDocEditor.GUIModified SeeAlso ',dbgstr(SeeAlsoMemo.Text),' <> ',dbgstr(FOldVisualValues[fpdiSeeAlso])]); debugln(['TFPDocEditor.GUIModified SeeAlso ',dbgstr(SeeAlsoSynEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiSeeAlso])]);
if (ErrorsMemo.Text<>FOldVisualValues[fpdiErrors]) then if (ErrorsSynEdit.Text<>FOldVisualValues[fpdiErrors]) then
debugln(['TFPDocEditor.GUIModified Errors ',dbgstr(ErrorsMemo.Text),' <> ',dbgstr(FOldVisualValues[fpdiErrors])]); debugln(['TFPDocEditor.GUIModified Errors ',dbgstr(ErrorsSynEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiErrors])]);
if (ExampleEdit.Text<>FOldVisualValues[fpdiExample]) then if (ExampleEdit.Text<>FOldVisualValues[fpdiExample]) then
debugln(['TFPDocEditor.GUIModified Example ',dbgstr(ExampleEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiExample])]); debugln(['TFPDocEditor.GUIModified Example ',dbgstr(ExampleEdit.Text),' <> ',dbgstr(FOldVisualValues[fpdiExample])]);
end; end;
@ -1128,9 +1129,9 @@ begin
ShortEdit.Clear; ShortEdit.Clear;
DescrShortEdit.Clear; DescrShortEdit.Clear;
LinkEdit.Clear; LinkEdit.Clear;
DescrMemo.Clear; DescrSynEdit.Clear;
SeeAlsoMemo.Clear; SeeAlsoSynEdit.Clear;
ErrorsMemo.Clear; ErrorsSynEdit.Clear;
ExampleEdit.Clear; ExampleEdit.Clear;
ClearTopicControls; ClearTopicControls;
for i:=Low(TFPDocItem) to high(TFPDocItem) do for i:=Low(TFPDocItem) to high(TFPDocItem) do
@ -1209,9 +1210,9 @@ begin
Modified:=true; Modified:=true;
ShortEdit.Text:=''; ShortEdit.Text:='';
DescrShortEdit.Text:=ShortEdit.Text; DescrShortEdit.Text:=ShortEdit.Text;
DescrMemo.Text:=''; DescrSynEdit.Text:='';
SeeAlsoMemo.Text:=''; SeeAlsoSynEdit.Text:='';
ErrorsMemo.Text:=''; ErrorsSynEdit.Text:='';
ExampleEdit.Text:=''; ExampleEdit.Text:='';
if DoSave then Save; if DoSave then Save;
end; end;
@ -1256,9 +1257,9 @@ begin
end; end;
Child := Node.FindNode('descr'); Child := Node.FindNode('descr');
if (Child = nil) if (Child = nil)
or (TopicDocFile.GetChildValuesAsString(Child)<>TopicDescr.Text) or (TopicDocFile.GetChildValuesAsString(Child)<>TopicDescrSynEdit.Text)
then begin then begin
TopicDocFile.SetChildValue(Node, 'descr', TopicDescr.Text); TopicDocFile.SetChildValue(Node, 'descr', TopicDescrSynEdit.Text);
TopicChanged:=true; TopicChanged:=true;
end; end;
end; end;
@ -1299,9 +1300,9 @@ var
i: TFPDocItem; i: TFPDocItem;
begin begin
Result[fpdiShort]:=ShortEdit.Text; Result[fpdiShort]:=ShortEdit.Text;
Result[fpdiDescription]:=DescrMemo.Text; Result[fpdiDescription]:=DescrSynEdit.Text;
Result[fpdiErrors]:=ErrorsMemo.Text; Result[fpdiErrors]:=ErrorsSynEdit.Text;
Result[fpdiSeeAlso]:=SeeAlsoMemo.Text; Result[fpdiSeeAlso]:=SeeAlsoSynEdit.Text;
Result[fpdiExample]:=ExampleEdit.Text; Result[fpdiExample]:=ExampleEdit.Text;
Result[fpdiElementLink]:=LinkEdit.Text; Result[fpdiElementLink]:=LinkEdit.Text;
for i:=Low(TFPDocItem) to High(TFPDocItem) do for i:=Low(TFPDocItem) to High(TFPDocItem) do
@ -1340,9 +1341,9 @@ begin
TopicShort.Text := DFile.GetChildValuesAsString(Child); TopicShort.Text := DFile.GetChildValuesAsString(Child);
Child := Node.FindNode('descr'); Child := Node.FindNode('descr');
if Child <> nil then if Child <> nil then
TopicDescr.Text := DFile.GetChildValuesAsString(Child); TopicDescrSynEdit.Text := DFile.GetChildValuesAsString(Child);
TopicShort.Enabled := True; TopicShort.Enabled := True;
TopicDescr.Enabled := True; TopicDescrSynEdit.Enabled := True;
if TopicShort.IsVisible then if TopicShort.IsVisible then
TopicShort.SetFocus; TopicShort.SetFocus;
finally finally
@ -1363,6 +1364,12 @@ begin
end; end;
end; end;
procedure TFPDocEditor.Loaded;
begin
inherited Loaded;
DescrSynEdit.ControlStyle:=DescrSynEdit.ControlStyle+[];
end;
function TFPDocEditor.WriteNode(Element: TCodeHelpElement; function TFPDocEditor.WriteNode(Element: TCodeHelpElement;
Values: TFPDocElementValues; Interactive: Boolean): Boolean; Values: TFPDocElementValues; Interactive: Boolean): Boolean;
var var
@ -1376,7 +1383,7 @@ var
begin begin
Result:=Test; Result:=Test;
if not Test then exit; if not Test then exit;
DebugLn(['TFPDocEditor.WriteNode ERROR ',Msg]); DebugLn(['TFPDocEditor.WriteNode ERROR ',Msg]);
if Interactive then begin; if Interactive then begin;
if Element.FPDocFile<>nil then if Element.FPDocFile<>nil then
CurName:=Element.FPDocFile.Filename CurName:=Element.FPDocFile.Filename
@ -1467,10 +1474,10 @@ begin
LazarusIDE.SaveSourceEditorChangesToCodeCache(nil); LazarusIDE.SaveSourceEditorChangesToCodeCache(nil);
end; end;
procedure TFPDocEditor.ErrorsMemoChange(Sender: TObject); procedure TFPDocEditor.ErrorsSynEditChange(Sender: TObject);
begin begin
if fpdefReading in FFlags then exit; if fpdefReading in FFlags then exit;
if ErrorsMemo.Text<>FOldVisualValues[fpdiErrors] then if ErrorsSynEdit.Text<>FOldVisualValues[fpdiErrors] then
Modified:=true; Modified:=true;
end; end;
@ -1558,7 +1565,7 @@ end;
procedure TFPDocEditor.CopyShortToDescrMenuItemClick(Sender: TObject); procedure TFPDocEditor.CopyShortToDescrMenuItemClick(Sender: TObject);
begin begin
DescrMemo.Append(ShortEdit.Text); DescrSynEdit.Append(ShortEdit.Text);
Modified:=true; Modified:=true;
end; end;
@ -1573,10 +1580,10 @@ begin
CreateElement(fChain[0]); CreateElement(fChain[0]);
end; end;
procedure TFPDocEditor.DescrMemoChange(Sender: TObject); procedure TFPDocEditor.DescrSynEditChange(Sender: TObject);
begin begin
if fpdefReading in FFlags then exit; if fpdefReading in FFlags then exit;
if DescrMemo.Text<>FOldVisualValues[fpdiDescription] then if DescrSynEdit.Text<>FOldVisualValues[fpdiDescription] then
Modified:=true; Modified:=true;
end; end;

2
ide/frames/compiler_other_options.lfm
View File

@ -26,7 +26,7 @@ object CompilerOtherOptionsFrame: TCompilerOtherOptionsFrame
Width = 517 Width = 517
Align = alClient Align = alClient
Font.Height = 9 Font.Height = 9
Font.Name = '-misc-dejavu sans mono-*-*-*-*-*-*-*-*-*-*-iso10646-1' Font.Name = 'Courier New'
Font.Pitch = fpFixed Font.Pitch = fpFixed
Font.Quality = fqNonAntialiased Font.Quality = fqNonAntialiased
ParentColor = False ParentColor = False