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

IDE: Remove SynEdit dependency from Project unit.

Browse Source 
git-svn-id: trunk@53726 -
This commit is contained in:
juha 2016-12-20 00:08:59 +00:00
parent af3f20163d
commit 8f632960a6
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/srceditorintf.pas
View File

@ -120,6 +120,8 @@ type
out Action: TSrcEditReplaceAction); virtual; abstract;
procedure CopyToClipboard; virtual; abstract;
procedure CutToClipboard; virtual; abstract;
function GetBookMark(BookMark: Integer; out X, Y: Integer): Boolean; virtual; abstract;
procedure SetBookMark(BookMark: Integer; X, Y: Integer); virtual; abstract;
// screen and text position mapping
function LineCount: Integer; virtual; abstract;

34
ide/project.pp
View File

@ -56,8 +56,6 @@ uses
// IDEIntf
PropEdits, CompOptsIntf, ProjectIntf, MacroIntf, MacroDefIntf, UnitResources,
PackageIntf, SrcEditorIntf, IDEOptionsIntf, IDEDialogs, LazIDEIntf, ProjPackIntf,
// SynEdit
SynEdit,
// IDE
CompOptsModes, ProjectResources, LazConf, W32Manifest, ProjectIcon,
IDECmdLine, LazarusIDEStrConsts, CompilerOptions,
@ -80,7 +78,7 @@ type
TOnChangeProjectInfoFile = procedure(TheProject: TProject) of object;
TOnSaveUnitSessionInfoInfo = procedure(AUnitInfo: TUnitInfo) of object;
TUnitInfoList = (
uilPartOfProject,
uilWithEditorIndex,
@ -1721,6 +1719,7 @@ var
AFilename: String;
i, X, Y: Integer;
s: String;
BM: TFileBookmark;
begin
// global data
AFilename:=Filename;
@ -1765,15 +1764,16 @@ begin
XMLConfig.SetDeleteValue(Path+'UsageCount/Value',RoundToInt(fUsageCount),-1);
if OpenEditorInfoCount > 0 then
for i := Bookmarks.Count - 1 downto 0 do begin
if (Project.Bookmarks.BookmarkWithID(Bookmarks[i].ID) = nil) or
(Project.Bookmarks.BookmarkWithID(Bookmarks[i].ID).UnitInfo <> self)
for i := Bookmarks.Count - 1 downto 0 do
begin
BM := Bookmarks[i];
if (Project.Bookmarks.BookmarkWithID(BM.ID) = nil) or
(Project.Bookmarks.BookmarkWithID(BM.ID).UnitInfo <> self)
then
Bookmarks.Delete(i)
else
if TSynEdit(OpenEditorInfo[0].EditorComponent.EditorControl).GetBookMark(Bookmarks[i].ID, X{%H-}, Y{%H-})
then
Bookmarks[i].CursorPos := Point(X, Y);
if OpenEditorInfo[0].EditorComponent.GetBookMark(BM.ID, X, Y) then
BM.CursorPos := Point(X, Y);
end;
FBookmarks.SaveToXMLConfig(XMLConfig,Path+'Bookmarks/');
XMLConfig.SetDeleteValue(Path+'Loaded/Value',fLoaded,false);
@ -1941,7 +1941,8 @@ end;
procedure TUnitInfo.UpdatePageIndex;
var
HasPageIndex: Boolean;
BookmarkID, i, j: integer;
i, j: integer;
BM: TFileBookmark;
begin
HasPageIndex := False;
i := FEditorInfoList.Count - 1;
@ -1952,17 +1953,18 @@ begin
end;
UpdateList(uilWithEditorIndex, HasPageIndex);
if assigned(Project1) and assigned(Project1.Bookmarks) then begin
if Assigned(Project1) and Assigned(Project1.Bookmarks) then
begin
if OpenEditorInfoCount > 0 then begin
inc(FSetBookmarLock);
try
// Adjust bookmarks
for i := Bookmarks.Count - 1 downto 0 do begin
BookmarkID := Bookmarks[i].ID;
j := Project1.Bookmarks.IndexOfID(BookmarkID);
for i := Bookmarks.Count-1 downto 0 do
begin
BM := Bookmarks[i];
j := Project1.Bookmarks.IndexOfID(BM.ID);
if (j < 0) then
TSynEdit(OpenEditorInfo[0].EditorComponent.EditorControl).SetBookMark(BookmarkID,
Bookmarks[i].CursorPos.X, Bookmarks[i].CursorPos.Y);
OpenEditorInfo[0].EditorComponent.SetBookMark(BM.ID, BM.CursorPos.X, BM.CursorPos.Y);
end;
finally
dec(FSetBookmarLock);

13
ide/sourceeditor.pp
View File

@ -425,6 +425,8 @@ type
procedure SetSelection(const AValue: string); override;
procedure CopyToClipboard; override;
procedure CutToClipboard; override;
function GetBookMark(BookMark: Integer; out X, Y: Integer): Boolean; override;
procedure SetBookMark(BookMark: Integer; X, Y: Integer); override;
procedure ExportAsHtml(AFileName: String);
@ -4552,6 +4554,17 @@ begin
FEditor.CutToClipboard;
end;
function TSourceEditor.GetBookMark(BookMark: Integer; out X, Y: Integer): Boolean;
begin
X := 0; Y := 0;
Result := FEditor.GetBookMark(BookMark, X, Y);
end;
procedure TSourceEditor.SetBookMark(BookMark: Integer; X, Y: Integer);
begin
FEditor.SetBookMark(BookMark, X, Y);
end;
procedure TSourceEditor.ExportAsHtml(AFileName: String);
var
Html: TSynExporterHTML;