Subversion Repositories fastphp

Compare Revisions

Regard whitespace Rev 59 → Rev 60

/trunk/BrowserMain.dfm
22,6 → 22,7
Align = alClient
TabOrder = 0
OnBeforeNavigate2 = WebBrowser1BeforeNavigate2
OnWindowClosing = WebBrowser1WindowClosing
ExplicitLeft = 80
ExplicitTop = 64
ExplicitWidth = 300
/trunk/BrowserMain.pas
6,8 → 6,9
 
uses
// TODO: "{$IFDEF USE_SHDOCVW_TLB}_TLB{$ENDIF}" does not work with Delphi 10.2
// so you have to change the reference SHDocVw / SHDocVw_TLB yourself
Windows, Messages, SysUtils, Variants, Classes, Graphics,
Controls, Forms, Dialogs, OleCtrls, SHDocVw_TLB, ExtCtrls, StrUtils,
Controls, Forms, Dialogs, OleCtrls, SHDocVw, ExtCtrls, StrUtils,
StdCtrls, activex, UrlMon;
 
type
16,8 → 17,10
Timer1: TTimer;
procedure Timer1Timer(Sender: TObject);
procedure WebBrowser1BeforeNavigate2(ASender: TObject;
const pDisp: IDispatch; {$IFDEF USE_SHDOCVW_TLB}const{$ELSE}var{$ENDIF} URL, Flags, TargetFrameName, PostData,
const pDisp: IDispatch; const URL, Flags, TargetFrameName, PostData,
Headers: OleVariant; var Cancel: WordBool);
procedure WebBrowser1WindowClosing(ASender: TObject;
IsChildWindow: WordBool; var Cancel: WordBool);
strict private
function EmbeddedWBQueryService(const rsid, iid: TGUID; out Obj{: IInterface}): HRESULT;
end;
151,7 → 154,7
end;
 
procedure TForm2.WebBrowser1BeforeNavigate2(ASender: TObject;
const pDisp: IDispatch; {$IFDEF USE_SHDOCVW_TLB}const{$ELSE}var{$ENDIF} URL, Flags, TargetFrameName, PostData,
const pDisp: IDispatch; const URL, Flags, TargetFrameName, PostData,
Headers: OleVariant; var Cancel: WordBool);
var
myURL, myUrl2, getData: string;
237,4 → 240,11
{$ENDREGION}
end;
 
procedure TForm2.WebBrowser1WindowClosing(ASender: TObject;
IsChildWindow: WordBool; var Cancel: WordBool);
begin
Close;
Cancel := true;
end;
 
end.
/trunk/EditorMain.dfm
69,6 → 69,7
Align = alClient
TabOrder = 0
OnBeforeNavigate2 = WebBrowser1BeforeNavigate2
OnWindowClosing = WebBrowser1WindowClosing
ExplicitWidth = 348
ExplicitHeight = 150
ControlData = {
112,7 → 113,6
Font.Name = 'Courier New'
Font.Style = []
TabOrder = 0
OnKeyDown = SynEdit1KeyDown
OnMouseWheelDown = SynEdit1MouseWheelDown
OnMouseWheelUp = SynEdit1MouseWheelUp
CodeFolding.CollapsedLineColor = clGrayText
131,7 → 131,7
Gutter.Gradient = True
Gutter.GradientStartColor = cl3DLight
Highlighter = SynPHPSyn1
Options = [eoAutoIndent, eoDragDropEditing, eoEnhanceHomeKey, eoEnhanceEndKey, eoGroupUndo, eoHideShowScrollbars, eoKeepCaretX, eoScrollByOneLess, eoShowScrollHint, eoSmartTabDelete, eoTabIndent, eoTrimTrailingSpaces]
Options = [eoAutoIndent, eoDragDropEditing, eoEnhanceHomeKey, eoEnhanceEndKey, eoGroupUndo, eoHideShowScrollbars, eoKeepCaretX, eoScrollByOneLess, eoShowScrollHint, eoTabIndent]
SearchEngine = SynEditSearch1
WantTabs = True
OnChange = SynEdit1Change
/trunk/EditorMain.pas
153,8 → 153,8
procedure Saveas1Click(Sender: TObject);
procedure Save1Click(Sender: TObject);
procedure BtnSpecialCharsClick(Sender: TObject);
procedure SynEdit1KeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure WebBrowser1WindowClosing(ASender: TObject;
IsChildWindow: WordBool; var Cancel: WordBool);
private
CurSearchTerm: string;
HlpPrevPageIndex: integer;
454,29 → 454,6
*)
end;
 
procedure TForm1.SynEdit1KeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
var
opts: TSynEditorOptions;
begin
// Hack: We want to use smart tabs/delete, but we don't want to jump to the very beginning if we have a fully empty line
// e.g. you start a line, add 10 tabs, and want to delete 1 tab, but then you remove all 10! That sucks!
if Trim(SynEdit1.LineText) = '' then
begin
opts := SynEdit1.Options;
Exclude(opts, eoSmartTabDelete);
Exclude(opts, eoTrimTrailingSpaces);
SynEdit1.Options := opts;
end
else
begin
opts := SynEdit1.Options;
Include(opts, eoSmartTabDelete);
Include(opts, eoTrimTrailingSpaces);
SynEdit1.Options := opts;
end;
end;
 
procedure TForm1.SynEdit1MouseCursor(Sender: TObject; const aLineCharPos: TBufferCoord; var aCursor: TCursor);
{$IFDEF OnlineHelp}
var
701,6 → 678,16
begin
BeforeNavigate(URL, Cancel);
end;
procedure TForm1.WebBrowser1WindowClosing(ASender: TObject;
IsChildWindow: WordBool; var Cancel: WordBool);
resourcestring
LNG_CLOSE_REQUEST = 'A script has requested the window to be closed. The window of a standalone script would now close.';
begin
ShowMessage(LNG_CLOSE_REQUEST);
TWebBrowser(ASender).Clear;
Cancel := true;
end;
 
(*
{$ELSE}
procedure TForm1.WebBrowser1BeforeNavigate2(ASender: TObject;
/trunk/FastPHP.inc
1,2 → 1,2
 
{$DEFINE USE_SHDOCVW_TLB}
{.$DEFINE USE_SHDOCVW_TLB}