Subversion Repositories fastphp

Compare Revisions

Regard whitespace Rev 83 → Rev 82

/trunk/EditorMain.dfm
61,6 → 61,10
object HtmlTabSheet: TTabSheet
Caption = 'HTML'
ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object WebBrowser1: TWebBrowser
Left = 0
Top = 0
186,6 → 190,10
object HelpTabsheet: TTabSheet
Caption = 'Help'
ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
object WebBrowser2: TWebBrowser
Left = 0
Top = 0
857,10 → 865,4
Left = 712
Top = 56
end
object FileModTimer: TTimer
Enabled = False
OnTimer = FileModTimerTimer
Left = 356
Top = 276
end
end
/trunk/EditorMain.pas
44,7 → 44,7
Dialogs, StdCtrls, OleCtrls, ComCtrls, ExtCtrls, ToolWin, IniFiles,
SynEditHighlighter, SynHighlighterPHP, SynEdit, ShDocVw, FindReplace,
ActnList, SynEditMiscClasses, SynEditSearch, RunPHP, ImgList, SynUnicode,
System.ImageList, System.Actions, Vcl.Menus, Vcl.Themes, System.UITypes;
System.ImageList, System.Actions, Vcl.Menus, Vcl.Themes;
 
{.$DEFINE OnlineHelp}
 
111,7 → 111,6
BtnLightOff: TImage;
BtnLight: TImage;
StartUpTimer: TTimer;
FileModTimer: TTimer;
procedure Run(Sender: TObject);
procedure RunConsole(Sender: TObject);
procedure FormShow(Sender: TObject);
170,7 → 169,6
IsChildWindow: WordBool; var Cancel: WordBool);
procedure BtnLightClick(Sender: TObject);
procedure StartUpTimerTimer(Sender: TObject);
procedure FileModTimerTimer(Sender: TObject);
private
hMutex: THandle;
CurSearchTerm: string;
179,7 → 177,6
{$IFDEF OnlineHelp}
gOnlineHelpWord: string;
{$ENDIF}
FileModLast: TDateTime;
procedure Help;
function InputRequestCallback(var data: AnsiString): boolean;
function OutputNotifyCallback(const data: AnsiString): boolean;
903,30 → 900,6
SynEdit1.Options := opts;
end;
 
procedure TForm1.FileModTimerTimer(Sender: TObject);
begin
FileModTimer.Enabled := false;
if FileModLast <> FileAge(GetScrapFile) then
begin
FileModLast := FileAge(GetScrapFile);
if SynEdit1.Modified then
begin
if MessageDlg('The file was changed in a different application BUT IT WAS ALSO MODIFIED HERE! Reload file AND LOSE CHANGES HERE?', mtWarning, mbYesNoCancel, 0) = mrYes then
begin
SynEdit1.Lines.LoadFromFile(GetScrapFile);
end;
end
else
begin
if MessageDlg('The file was changed in a different application! Reload file?', mtConfirmation, mbYesNoCancel, 0) = mrYes then
begin
SynEdit1.Lines.LoadFromFile(GetScrapFile);
end;
end;
end;
FileModTimer.Enabled := true;
end;
 
procedure TForm1.FormClose(Sender: TObject; var Action: TCloseAction);
begin
TFastPHPConfig.FontSize := SynEdit1.Font.Size;
963,13 → 936,10
procedure TForm1.FormCreate(Sender: TObject);
var
exeDir: string;
sScrapFile: string;
begin
HlpPrevPageIndex := -1;
CurSearchTerm := '';
sScrapFile := GetScrapFile;
Caption := Caption + ' - ' + sScrapFile;
Application.Title := Format('%s - FastPHP', [ExtractFileName(sScrapFile)]);
Caption := Caption + ' - ' + GetScrapFile;
SrcRep := TSynEditFindReplace.Create(self);
SrcRep.Editor := SynEdit1;
SynEdit1.Gutter.Gradient := HighColorWindows;
979,9 → 949,6
 
exeDir := IncludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
if FileExists(exeDir + 'codeexplorer.bmp') then ImageList1.LoadAndSplitImages(exeDir + 'codeexplorer.bmp');
 
FileModLast := FileAge(sScrapFile);
FileModTimer.Enabled := True;
end;
 
procedure TForm1.FormDestroy(Sender: TObject);
1091,7 → 1058,6
 
FSaveAsFilename := SaveDialog1.FileName;
Caption := Copy(Caption, 1, Pos(' - ', Caption)-1) + ' - ' + FSaveAsFilename;
Application.Title := Format('%s - FastPHP', [ExtractFileName(FSaveAsFilename)]);
Button7.Click;
end;
end;
1104,8 → 1070,6
eolStyle: string;
str: string;
begin
FileModTimer.Enabled := false;
 
ms := TMemoryStream.Create;
ss := TStringStream.Create('');
fs := TFileStream.Create(filename, fmCreate);
1171,9 → 1135,6
FreeAndNil(ss);
FreeAndNil(fs);
end;
 
FileModLast := FileAge(GetScrapFile);
FileModTimer.Enabled := True;
end;
 
procedure TForm1.StartCodeExplorer;
/trunk/FindReplace.pas
35,7 → 35,7
interface
 
uses
Windows, Messages, SysUtils, Classes, Dialogs, SynEdit, System.UITypes;
Windows, Messages, SysUtils, Classes, Dialogs, SynEdit;
 
type
TSynEditFindReplace = class(TComponent)
/trunk/FastPHPUtils.pas
3,8 → 3,7
interface
 
uses
Windows, SysUtils, StrUtils, Dialogs, IniFiles, Classes, Forms, ShellAPI, Functions,
System.UITypes;
Windows, SysUtils, StrUtils, Dialogs, IniFiles, Classes, Forms, ShellAPI, Functions;
 
const
FASTPHP_GOTO_URI_PREFIX = 'fastphp://editor/gotoline/';