|
@@ -120,6 +120,7 @@ type
|
|
function GetUndoActionCount: sw_integer; virtual;
|
|
function GetUndoActionCount: sw_integer; virtual;
|
|
function GetRedoActionCount: sw_integer; virtual;
|
|
function GetRedoActionCount: sw_integer; virtual;
|
|
private
|
|
private
|
|
|
|
+ OnDiskLoadTime : longint;
|
|
procedure LinesInsert(Idx: sw_integer; Line: PLine);
|
|
procedure LinesInsert(Idx: sw_integer; Line: PLine);
|
|
end;
|
|
end;
|
|
|
|
|
|
@@ -220,8 +221,6 @@ type
|
|
function GetFold(Index: sw_integer): PFold; virtual;
|
|
function GetFold(Index: sw_integer): PFold; virtual;
|
|
procedure RegisterFold(AFold: PFold); virtual;
|
|
procedure RegisterFold(AFold: PFold); virtual;
|
|
procedure UnRegisterFold(AFold: PFold); virtual;
|
|
procedure UnRegisterFold(AFold: PFold); virtual;
|
|
- private
|
|
|
|
- OnDiskLoadTime : longint;
|
|
|
|
end;
|
|
end;
|
|
|
|
|
|
PFileEditor = ^TFileEditor;
|
|
PFileEditor = ^TFileEditor;
|
|
@@ -379,6 +378,7 @@ begin
|
|
New(Lines, Init(500,1000));
|
|
New(Lines, Init(500,1000));
|
|
TabSize:=DefaultTabSize;
|
|
TabSize:=DefaultTabSize;
|
|
IndentSize:=DefaultIndentSize;
|
|
IndentSize:=DefaultIndentSize;
|
|
|
|
+ OnDiskLoadTime:=-1;
|
|
end;
|
|
end;
|
|
|
|
|
|
procedure TCodeEditorCore.ChangeLinesTo(ALines : PLineCollection);
|
|
procedure TCodeEditorCore.ChangeLinesTo(ALines : PLineCollection);
|
|
@@ -881,7 +881,6 @@ begin
|
|
Indicator^.CodeOwner:=@Self;
|
|
Indicator^.CodeOwner:=@Self;
|
|
UpdateIndicator;
|
|
UpdateIndicator;
|
|
LimitsChanged;
|
|
LimitsChanged;
|
|
- OnDiskLoadTime:=-1;
|
|
|
|
end;
|
|
end;
|
|
|
|
|
|
function TCodeEditor.GetFlags: longint;
|
|
function TCodeEditor.GetFlags: longint;
|
|
@@ -1432,7 +1431,7 @@ begin
|
|
(Core^.UndoList^.At(0)^.Action=eaMoveCursor)) then
|
|
(Core^.UndoList^.At(0)^.Action=eaMoveCursor)) then
|
|
begin
|
|
begin
|
|
SetCmdState(UndoCmd,false);
|
|
SetCmdState(UndoCmd,false);
|
|
- if (UndoTime>OnDiskLoadTime) or (OnDiskLoadTime=-1) then
|
|
|
|
|
|
+ if (UndoTime>Core^.OnDiskLoadTime) or (Core^.OnDiskLoadTime=-1) then
|
|
SetModified(false);
|
|
SetModified(false);
|
|
end;
|
|
end;
|
|
SetCmdState(RedoCmd,true);
|
|
SetCmdState(RedoCmd,true);
|
|
@@ -1780,13 +1779,14 @@ begin
|
|
longint(PA[2]):=Core^.GetChangedLine;
|
|
longint(PA[2]):=Core^.GetChangedLine;
|
|
EditorDialog(edChangedOnloading,@PA);
|
|
EditorDialog(edChangedOnloading,@PA);
|
|
end;
|
|
end;
|
|
- OnDiskLoadTime:=GetFileTime(FileName);
|
|
|
|
|
|
+ Core^.OnDiskLoadTime:=GetFileTime(FileName);
|
|
LoadFile:=OK;
|
|
LoadFile:=OK;
|
|
end;
|
|
end;
|
|
|
|
|
|
function TFileEditor.IsChangedOnDisk : boolean;
|
|
function TFileEditor.IsChangedOnDisk : boolean;
|
|
begin
|
|
begin
|
|
- IsChangedOnDisk:=(OnDiskLoadTime<>GetFileTime(FileName)) and (OnDiskLoadTime<>-1);
|
|
|
|
|
|
+ IsChangedOnDisk:=(Core^.OnDiskLoadTime<>GetFileTime(FileName)) and
|
|
|
|
+ (Core^.OnDiskLoadTime<>-1);
|
|
end;
|
|
end;
|
|
|
|
|
|
function TFileEditor.SaveFile: boolean;
|
|
function TFileEditor.SaveFile: boolean;
|
|
@@ -1828,7 +1828,7 @@ begin
|
|
end;
|
|
end;
|
|
{ don't forget to update the OnDiskLoadTime value }
|
|
{ don't forget to update the OnDiskLoadTime value }
|
|
if OK then
|
|
if OK then
|
|
- OnDiskLoadTime:=GetFileTime(FileName);
|
|
|
|
|
|
+ Core^.OnDiskLoadTime:=GetFileTime(FileName);
|
|
if not OK then
|
|
if not OK then
|
|
EditorDialog(edSaveError,@FileName);
|
|
EditorDialog(edSaveError,@FileName);
|
|
SaveFile:=OK;
|
|
SaveFile:=OK;
|
|
@@ -1863,7 +1863,7 @@ begin
|
|
SetModified(false);
|
|
SetModified(false);
|
|
ClearUndoList;
|
|
ClearUndoList;
|
|
{ don't forget to update the OnDiskLoadTime value }
|
|
{ don't forget to update the OnDiskLoadTime value }
|
|
- OnDiskLoadTime:=GetFileTime(FileName);
|
|
|
|
|
|
+ Core^.OnDiskLoadTime:=GetFileTime(FileName);
|
|
DrawView;
|
|
DrawView;
|
|
end
|
|
end
|
|
else
|
|
else
|
|
@@ -1893,13 +1893,13 @@ var
|
|
begin
|
|
begin
|
|
SaveAs := False;
|
|
SaveAs := False;
|
|
SavedName:=FileName;
|
|
SavedName:=FileName;
|
|
- SavedDiskLoadTime:=OnDiskLoadTime;
|
|
|
|
|
|
+ SavedDiskLoadTime:=Core^.OnDiskLoadTime;
|
|
if EditorDialog(edSaveAs, @FileName) <> cmCancel then
|
|
if EditorDialog(edSaveAs, @FileName) <> cmCancel then
|
|
begin
|
|
begin
|
|
FileName:=FExpand(FileName);
|
|
FileName:=FExpand(FileName);
|
|
Message(Owner, evBroadcast, cmUpdateTitle, @Self);
|
|
Message(Owner, evBroadcast, cmUpdateTitle, @Self);
|
|
{ if we rename the file the OnDiskLoadTime is wrong so we reset it }
|
|
{ if we rename the file the OnDiskLoadTime is wrong so we reset it }
|
|
- OnDiskLoadTime:=-1;
|
|
|
|
|
|
+ Core^.OnDiskLoadTime:=-1;
|
|
if SaveFile then
|
|
if SaveFile then
|
|
begin
|
|
begin
|
|
SaveAs := true;
|
|
SaveAs := true;
|
|
@@ -1907,7 +1907,7 @@ begin
|
|
else
|
|
else
|
|
begin
|
|
begin
|
|
FileName:=SavedName;
|
|
FileName:=SavedName;
|
|
- OnDiskLoadTime:=SavedDiskLoadTime;
|
|
|
|
|
|
+ Core^.OnDiskLoadTime:=SavedDiskLoadTime;
|
|
Message(Owner, evBroadcast, cmUpdateTitle, @Self);
|
|
Message(Owner, evBroadcast, cmUpdateTitle, @Self);
|
|
end;
|
|
end;
|
|
if IsClipboard then FileName := '';
|
|
if IsClipboard then FileName := '';
|
|
@@ -2062,7 +2062,10 @@ end;
|
|
END.
|
|
END.
|
|
{
|
|
{
|
|
$Log$
|
|
$Log$
|
|
- Revision 1.15 2002-09-12 22:09:07 pierre
|
|
|
|
|
|
+ Revision 1.16 2002-12-16 15:14:44 pierre
|
|
|
|
+ * moved OnDiskLoadTime to Core
|
|
|
|
+
|
|
|
|
+ Revision 1.15 2002/09/12 22:09:07 pierre
|
|
* reset modified flag, web bug 1262
|
|
* reset modified flag, web bug 1262
|
|
|
|
|
|
Revision 1.14 2002/09/09 06:58:28 pierre
|
|
Revision 1.14 2002/09/09 06:58:28 pierre
|