WebSVN – fastphp – Path Comparison – / – /trunk Rev 61 and /trunk Rev 62

Regard whitespace Rev 61 → Rev 62

 /trunk/EditorMain.dfm
 ,7 → 1,7
 object Form1: TForm1
   Left = 0
   Top = 0
-  Caption = 'ViaThinkSoft FastPHP 0.1'
+  Caption = 'ViaThinkSoft FastPHP 0.2'
   ClientHeight = 661
   ClientWidth = 1120
   Color = clBtnFace
 ,6 → 404,190
         DDAF8CDDAF8CDDAF8CDDAF8CDDAF8CFCF0E6}
       Visible = False
     end
+    object BtnLightOn: TImage
+      Left = 1022
+      Top = 8
+      Width = 24
+      Height = 22
+      AutoSize = True
+      Picture.Data = {
+        07544269746D617066060000424D660600000000000036000000280000001800
+        000016000000010018000000000030060000C30E0000C30E0000000000000000
+F9E8DAD5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989
+        D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A9
+D5A989D5A989F9E8DAD1A583E8CDB9CCF9FFCCF9FFCCF9FFCCF9FFCCF9FFCC
+        F9FFCCF9FFCCF9FFBAE4E9414F51728C8FCCF9FFCCF9FFCCF9FFCCF9FFCCF9FF
+        CCF9FFCCF9FFCCF9FFCCF9FFE8CDB9D1A583CBA07DC4EFFFC4EFFF9FE5FF9FE5
+        FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FF59808E141D2025363C81BACF9FE5FF9F
+        E5FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FFC4EFFFCBA07DC69976BEEDFF
+E1FF94E1FF94E1FF94E1FF94E1FF94E1FF94E1FF94E1FF35515C1521251925
+A6294A895E1FF95E1FF95E1FF95E1FF95E1FF95E1FF95E1FF95E1FFBEEDFFC6
+C1936FB8EBFF8CDFFF8BDFFF8BDFFF8BDFFF8BDFFF8BDFFF8BDFFF88DBFA
+F480F181C101A1E5181938CDFFF8CDFFF8CDFFF8CDFFF8CDFFF8CDFFF8CDF
+        FF8CDFFFB8EBFFC1936FBD8C68B2EAFF82DCFF81DCFF81DCFF81DCFF81DCFF81
+        DCFF81DCFF69B3D0111D221F353E18293021384182DCFF82DCFF82DCFF82DCFF
+DCFF82DCFF82DCFF82DCFFB2EAFFBD8C68B68762ABE8FF77DAFF76DAFF76DA
+        FF76DAFF64B9D873D5F976DAFF4A89A00D191D60B1CF3F73870E1A1E77DAFF77
+        DAFF69C0E16ECAEC77DAFF77DAFF77DAFF77DAFFABE8FFB68762B4835DA4E7FF
+BD7FF6AD7FF6AD7FF6AD7FF3B788E30627468D2F9274E5D172F386AD7FF59B4
+        D509131654A8C75BB8DA25495758B1D26BD7FF6BD7FF6BD7FF6BD7FFA4E7FFB4
+DB07F5A9EE5FF61D5FF60D5FF60D5FF60D5FF3F8CA81A3A463A819B0B171C
+F697E60D5FF5ECEF70E20260F2127306A7F1D3F4C56BEE361D5FF61D5FF61D5
+        FF61D5FF9EE5FFB07F5AAF7D5698E4FF57D3FF56D3FF56D3FF56D3FF56D3FF2D
+D840A181D0D21284DBDE456D3FF57D3FF31768F091519132F3943A3C557D3FF
+D3FF57D3FF57D3FF57D3FF98E4FFAF7D56AE7C5593E3FF4FD1FF4ED1FF4ED1
+        FF4ED1FF4ED1FF1E5062060F123690B04ED1FF4ED1FF4FD1FF4ECFFC27677E0A
+F3EA5C94FD1FF4FD1FF4FD1FF4FD1FF4FD1FF93E3FFAE7C55AF7D5590E2FF
+AD0FF49D0FF3EB0D8389FC340B7E00A1D2417425149D0FF49D0FF49D0FF4AD0
+        FF4AD0FF4AD0FF0C222A215D723CAAD03AA4C94AD0FF4AD0FF4AD0FF90E2FFAF
+D55B07F598FE2FF49D0FF48D0FF2975901E5669308AA908181D2B7D9948D0FF
+D0FF48D0FF49D0FF49D0FF49D0FF133743184453256981215F7449D0FF49D0
+        FF49D0FF8FE2FFB07F59B5835CCAEFFCA9E5FAA8E5FA7099A75A7B867EACBC1E
+C222F33A8E5FAA8E5FAA8E5FAA9E5FAA9E5FAA3DDF1161E2054717C698E9B
+A9E5FAA9E5FAA9E5FACAEFFCB5835CB88762D0F1FCB3E8FAB2E8FAB2E8
+        FAB2E8FAB2E8FA536C75090C0D6D8E99B2E8FAB2E8FAB3E8FAABDDEE475C6314
+B9AC7D7B3E8FAB3E8FAB3E8FAB3E8FAB3E8FAD0F1FCB88762BD8C68D5F3FD
+        BCECFBBBECFBBBECFBBBECFBBBECFB9EC7D41C2325222B2E475A5F6B8790647D
+        853441451D2527425258B9E8F7BCECFBBCECFBBCECFBBCECFBBCECFBD5F3FDBD
+C68C4936EDAF5FDC3EFFCC3EFFCC3EFFCC3EFFC9ABDC847575C8FAFB93A474B
+F423E4C503C494D2E383B4A5B60748E965C7077BAE4F0C3EFFCC3EFFCC3EF
+        FCC3EFFCDAF5FDC4936ECA9A77DFF7FECAF2FDCAF2FDCAF2FDCAF2FD6E848A43
+B5D9E3C8EFFA8BA6AE596A6F6E848AA6C6CFCAF2FD8FACB4414E51A6C7D0
+        CAF2FDCAF2FDCAF2FDCAF2FDDFF7FECA9A77CFA07DE2F9FED0F5FED0F5FED0F5
+        FED0F5FE8FA8AEAECDD4D0F5FED0F5FED0F5FE515F6396B1B7D0F5FED0F5FED0
+        F5FE8CA5ABB3D3DBD0F5FED0F5FED0F5FED0F5FEE2F9FECFA07DD3A683E5FAFE
+        E5FAFED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FE4651548DA4
+        A8D5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FEE5FAFED3
+        A683D9AA87E1C4AEE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFF
+        E8FBFF9BA7AAC8D9DCE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FB
+        FFE8FBFFE1C4AED9AA87FCF0E6DDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDD
+        AF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8C
+        DDAF8CDDAF8CDDAF8CDDAF8CDDAF8CFCF0E6}
+      Visible = False
+    end
+    object BtnLightOff: TImage
+      Left = 1012
+      Top = 8
+      Width = 24
+      Height = 22
+      AutoSize = True
+      Picture.Data = {
+        07544269746D617066060000424D660600000000000036000000280000001800
+        000016000000010018000000000030060000C30E0000C30E0000000000000000
+FFFFFFDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+        DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD6D6D6D6D6D6D6D6D6DDDDDDDDDDDDDDDD
+        DDDDDDDDDDDDDDFFFFFFD8D8D8FEFEFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFFFFFFFFFFFE9E9E95151518F8F8FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFFFFFFFFFFFFFFFFFFFFEFEFED8D8D8D2D2D2FFFFFFFFFFFFFDFDFDFDFD
+        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8D8D8D2020203C3C3CCDCDCDFDFDFDFD
+        FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFD2D2D2CCCCCCFFFFFF
+        F8F8F8F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F75959592424242929
+A3A3A3F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F7F8F8F8FFFFFFCC
+        CCCCC6C6C6FFFFFFF3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3EEEEEE
+        4545451B1B1B1D1D1D8C8C8CF3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3F3
+        F3F3F3F3FFFFFFC6C6C6C0C0C0FFFFFFEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+        EEEEEEEEEEC2C2C22020203A3A3A2D2D2D3D3D3DEEEEEEEEEEEEEEEEEEEEEEEE
+        EEEEEEEEEEEEEEEEEEEEEEEEFFFFFFC0C0C0BABABAFFFFFFE9E9E9E8E8E8E8E8
+        E8E8E8E8C5C5C5E3E3E3E8E8E89292921A1A1ABCBCBC7B7B7B1B1B1BE8E8E8E8
+        E8E8CDCDCDD7D7D7E8E8E8E8E8E8E8E8E8E9E9E9FFFFFFBABABAB6B6B6FFFFFF
+        E3E3E3E2E2E2E2E2E2E2E2E27E7E7E676767DDDDDD525252323232E2E2E2BDBD
+        BD131313B0B0B0C1C1C14D4D4DBABABAE2E2E2E2E2E2E2E2E2E3E3E3FFFFFFB6
+        B6B6B3B3B3FCFCFCDEDEDEDDDDDDDDDDDDDDDDDD9292923D3D3D868686181818
+D6D6DDDDDDDD6D6D62121212222226E6E6E424242C5C5C5DDDDDDDDDDDDDDDD
+        DDDEDEDEFCFCFCB3B3B3B0B0B0F9F9F9D9D9D9D8D8D8D8D8D8D8D8D8D8D8D870
+        7070191919222222C1C1C1D8D8D8D8D8D8797979151515303030A7A7A7D8D8D8
+        D8D8D8D8D8D8D8D8D8D9D9D9F9F9F9B0B0B0AFAFAFF7F7F7D5D5D5D4D4D4D4D4
+        D4D4D4D4D4D4D45151510F0F0F929292D4D4D4D4D4D4D4D4D4D2D2D26969691A
+A1AA7A7A7D4D4D4D4D4D4D4D4D4D4D4D4D5D5D5F7F7F7AFAFAFB0B0B0F5F5F5
+        D2D2D2D2D2D2B2B2B2A1A1A1B8B8B81E1E1E434343D2D2D2D2D2D2D2D2D2D2D2
+        D2D2D2D2D2D2D22323235E5E5EABABABA6A6A6D2D2D2D2D2D2D2D2D2F5F5F5B0
+        B0B0B2B2B2F5F5F5D2D2D2D1D1D17676765656568B8B8B1818187D7D7DD1D1D1
+        D1D1D1D1D1D1D1D1D1D1D1D1D1D1D13737374444446A6A6A5F5F5FD1D1D1D1D1
+        D1D2D2D2F5F5F5B2B2B2B6B6B6FFFFFFFFFFFFFFFFFFAAAAAA898989C0C0C02D
+D2D343434FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6F6F62121217E7E7E9E9E9E
+FFFFFFFFFFFFFFFFFFFFFFFFB6B6B6BBBBBBFFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFFFFFFFFF7777770D0D0D9C9C9CFFFFFFFFFFFFFFFFFFF3F3F36565651C
+C1CDBDBDBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBBBBBBC0C0C0FFFFFF
+        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD7D7D72626262F2F2F6161619292928787
+        87464646282828595959FBFBFBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC0
+        C0C0C7C7C7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCACACA5D5D5DBBBBBB4C4C4C
+        4343435151514E4E4E3C3C3C616161989898787878F3F3F3FFFFFFFFFFFFFFFF
+        FFFFFFFFFFFFFFC7C7C7CECECEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8B8B8B54
+E5E5E5FCFCFCAFAFAF7070708B8B8BD1D1D1FFFFFFB5B5B5525252D2D2D2
+        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCECECED4D4D4FFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFFFAFAFAFD5D5D5FFFFFFFFFFFFFFFFFF636363B8B8B8FFFFFFFFFFFFFF
+        FFFFACACACDCDCDCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD4D4D4D9D9D9FFFFFF
+        FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF545454A9A9
+        A9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD9
+        D9D9DEDEDEF5F5F5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFAAAAAADCDCDCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+        FFFFFFFFF5F5F5DEDEDEFFFFFFE2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2
+        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2DDDDDDDDDDDDDDDDDD
+        E2E2E2E2E2E2E2E2E2E2E2E2E2E2E2FFFFFF}
+      Visible = False
+    end
+    object BtnLight: TImage
+      Left = 926
+      Top = 8
+      Width = 24
+      Height = 22
+      Cursor = crHandPoint
+      AutoSize = True
+      Picture.Data = {
+        07544269746D617066060000424D660600000000000036000000280000001800
+        000016000000010018000000000030060000C30E0000C30E0000000000000000
+F9E8DAD5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989
+        D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A989D5A9
+D5A989D5A989F9E8DAD1A583E8CDB9CCF9FFCCF9FFCCF9FFCCF9FFCCF9FFCC
+        F9FFCCF9FFCCF9FFBAE4E9414F51728C8FCCF9FFCCF9FFCCF9FFCCF9FFCCF9FF
+        CCF9FFCCF9FFCCF9FFCCF9FFE8CDB9D1A583CBA07DC4EFFFC4EFFF9FE5FF9FE5
+        FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FF59808E141D2025363C81BACF9FE5FF9F
+        E5FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FF9FE5FFC4EFFFCBA07DC69976BEEDFF
+E1FF94E1FF94E1FF94E1FF94E1FF94E1FF94E1FF94E1FF35515C1521251925
+A6294A895E1FF95E1FF95E1FF95E1FF95E1FF95E1FF95E1FF95E1FFBEEDFFC6
+C1936FB8EBFF8CDFFF8BDFFF8BDFFF8BDFFF8BDFFF8BDFFF8BDFFF88DBFA
+F480F181C101A1E5181938CDFFF8CDFFF8CDFFF8CDFFF8CDFFF8CDFFF8CDF
+        FF8CDFFFB8EBFFC1936FBD8C68B2EAFF82DCFF81DCFF81DCFF81DCFF81DCFF81
+        DCFF81DCFF69B3D0111D221F353E18293021384182DCFF82DCFF82DCFF82DCFF
+DCFF82DCFF82DCFF82DCFFB2EAFFBD8C68B68762ABE8FF77DAFF76DAFF76DA
+        FF76DAFF64B9D873D5F976DAFF4A89A00D191D60B1CF3F73870E1A1E77DAFF77
+        DAFF69C0E16ECAEC77DAFF77DAFF77DAFF77DAFFABE8FFB68762B4835DA4E7FF
+BD7FF6AD7FF6AD7FF6AD7FF3B788E30627468D2F9274E5D172F386AD7FF59B4
+        D509131654A8C75BB8DA25495758B1D26BD7FF6BD7FF6BD7FF6BD7FFA4E7FFB4
+DB07F5A9EE5FF61D5FF60D5FF60D5FF60D5FF3F8CA81A3A463A819B0B171C
+F697E60D5FF5ECEF70E20260F2127306A7F1D3F4C56BEE361D5FF61D5FF61D5
+        FF61D5FF9EE5FFB07F5AAF7D5698E4FF57D3FF56D3FF56D3FF56D3FF56D3FF2D
+D840A181D0D21284DBDE456D3FF57D3FF31768F091519132F3943A3C557D3FF
+D3FF57D3FF57D3FF57D3FF98E4FFAF7D56AE7C5593E3FF4FD1FF4ED1FF4ED1
+        FF4ED1FF4ED1FF1E5062060F123690B04ED1FF4ED1FF4FD1FF4ECFFC27677E0A
+F3EA5C94FD1FF4FD1FF4FD1FF4FD1FF4FD1FF93E3FFAE7C55AF7D5590E2FF
+AD0FF49D0FF3EB0D8389FC340B7E00A1D2417425149D0FF49D0FF49D0FF4AD0
+        FF4AD0FF4AD0FF0C222A215D723CAAD03AA4C94AD0FF4AD0FF4AD0FF90E2FFAF
+D55B07F598FE2FF49D0FF48D0FF2975901E5669308AA908181D2B7D9948D0FF
+D0FF48D0FF49D0FF49D0FF49D0FF133743184453256981215F7449D0FF49D0
+        FF49D0FF8FE2FFB07F59B5835CCAEFFCA9E5FAA8E5FA7099A75A7B867EACBC1E
+C222F33A8E5FAA8E5FAA8E5FAA9E5FAA9E5FAA3DDF1161E2054717C698E9B
+A9E5FAA9E5FAA9E5FACAEFFCB5835CB88762D0F1FCB3E8FAB2E8FAB2E8
+        FAB2E8FAB2E8FA536C75090C0D6D8E99B2E8FAB2E8FAB3E8FAABDDEE475C6314
+B9AC7D7B3E8FAB3E8FAB3E8FAB3E8FAB3E8FAD0F1FCB88762BD8C68D5F3FD
+        BCECFBBBECFBBBECFBBBECFBBBECFB9EC7D41C2325222B2E475A5F6B8790647D
+        853441451D2527425258B9E8F7BCECFBBCECFBBCECFBBCECFBBCECFBD5F3FDBD
+C68C4936EDAF5FDC3EFFCC3EFFCC3EFFCC3EFFC9ABDC847575C8FAFB93A474B
+F423E4C503C494D2E383B4A5B60748E965C7077BAE4F0C3EFFCC3EFFCC3EF
+        FCC3EFFCDAF5FDC4936ECA9A77DFF7FECAF2FDCAF2FDCAF2FDCAF2FD6E848A43
+B5D9E3C8EFFA8BA6AE596A6F6E848AA6C6CFCAF2FD8FACB4414E51A6C7D0
+        CAF2FDCAF2FDCAF2FDCAF2FDDFF7FECA9A77CFA07DE2F9FED0F5FED0F5FED0F5
+        FED0F5FE8FA8AEAECDD4D0F5FED0F5FED0F5FE515F6396B1B7D0F5FED0F5FED0
+        F5FE8CA5ABB3D3DBD0F5FED0F5FED0F5FED0F5FEE2F9FECFA07DD3A683E5FAFE
+        E5FAFED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FE4651548DA4
+        A8D5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FED5F7FEE5FAFED3
+        A683D9AA87E1C4AEE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFF
+        E8FBFF9BA7AAC8D9DCE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FBFFE8FB
+        FFE8FBFFE1C4AED9AA87FCF0E6DDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDD
+        AF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8CDDAF8C
+        DDAF8CDDAF8CDDAF8CDDAF8CDDAF8CFCF0E6}
+      OnClick = BtnLightClick
+    end
     object Button1: TButton
       Left = 4
       Top = 0
 ,4 → 844,11
     Left = 608
     Top = 320
   end
+  object StartUpTimer: TTimer
+    Enabled = False
+    Interval = 100
+    OnTimer = StartUpTimerTimer
+    Left = 712
+    Top = 56
 end
+end

 /trunk/EditorMain.pas
 ,6 → 2,8
 {$Include 'FastPHP.inc'}
+// TODO 70423 * <fastphp> bug beheben, bei dem php.exe im hintergrund geöffnet bleibt, wenn man den editor schließt !!!!!!!!!
 (*
   This program requires
   - Microsoft Internet Controls (TWebBrowser)
 ,7 → 38,7
   Dialogs, StdCtrls, OleCtrls, ComCtrls, ExtCtrls, ToolWin, IniFiles,
   SynEditHighlighter, SynHighlighterPHP, SynEdit, ShDocVw_TLB, FindReplace,
   ActnList, SynEditMiscClasses, SynEditSearch, RunPHP, ImgList, SynUnicode,
-  System.ImageList, System.Actions, Vcl.Menus, SHDocVw;
+  System.ImageList, System.Actions, Vcl.Menus, SHDocVw, Vcl.Themes;
 {.$DEFINE OnlineHelp}
 ,6 → 101,10
     BtnSpecialChars: TImage;
     BtnSpecialCharsOff: TImage;
     BtnSpecialCharsOn: TImage;
+    BtnLightOn: TImage;
+    BtnLightOff: TImage;
+    BtnLight: TImage;
+    StartUpTimer: TTimer;
     procedure Run(Sender: TObject);
     procedure RunConsole(Sender: TObject);
     procedure FormShow(Sender: TObject);
 ,6 → 161,8
     procedure BtnSpecialCharsClick(Sender: TObject);
     procedure WebBrowser1WindowClosing(ASender: TObject;
       IsChildWindow: WordBool; var Cancel: WordBool);
+    procedure BtnLightClick(Sender: TObject);
+    procedure StartUpTimerTimer(Sender: TObject);
   private
     CurSearchTerm: string;
     HlpPrevPageIndex: integer;
 ,6 → 183,9
     function GetScrapFile: string;
     procedure StartCodeExplorer;
     procedure RefreshModifySign;
+    procedure Theme_Light;
+    procedure Theme_Dark;
+    function IsThemeDark: boolean;
   end;
 var
 ,7 → 262,7
 begin
   If OpenDialog3.Execute then
   begin
-    ShellExecute(0, 'open', PChar(ParamStr(0)), PChar(OpenDialog3.FileName), '', SW_NORMAL);
+    ShellExecute(0, 'open', PChar(ParamStr(0)), PChar('"' + OpenDialog3.FileName + '"'), '', SW_NORMAL);
   end;
 end;
 ,6 → 408,8
 procedure TForm1.Run(Sender: TObject);
 var
   bakTS: TTabSheet;
+  ss: TStringStream;
+  bakPos: Int64;
 begin
   memo2.Lines.Text := '';
 ,10 → 433,23
   try
     ActionSave.Execute; // TODO: if it is not the scrap file: do not save the file, since the user did not intended to save... better create a temporary file and run it instead.
+    // TODO 70421 * <fastphp> flush() mittels ContentCallBack implementieren... ich möchte bei langen scripts statusanzeigen realisieren können mit javascript das stück für stück geladen wird !!!!!!!!
+    // TODO 70422 * <fastphp> wenn ein script hängt, soll man es abwürgen dürfen!!!!!!
     memo2.Lines.Text := RunPHPScript(GetScrapFile, Sender=ActionLint, False);
-    Webbrowser1.LoadHTML(MarkUpLineReference(memo2.Lines.Text), GetScrapFile);
+    // Webbrowser1.LoadHTML(MarkUpLineReference(memo2.Lines.Text), GetScrapFile);
+    // Alternatively:
+    (*
+    ss := TstringStream.Create;
+    ss.WriteString(MarkUpLineReference(memo2.Lines.Text));
+    ss.Position := 0;
+    Webbrowser1.LoadStream(ss, GetScrapFile);
+    Webbrowser1.Wait;
+    ss.Free;
+    *)
     if IsTextHTML(memo2.lines.text) then
       PageControl1.ActivePage := HtmlTabSheet
     else
 ,6 → 674,53
   SynEdit1.SetFocus;
 end;
+procedure TForm1.Theme_Dark;
+begin
+  if IsThemeDark then exit;
+  TStyleManager.TrySetStyle('Windows10 SlateGray');
+  Color := 1316887;
+  Font.Color := clCream;
+  //Memo2.Font.Color := clCream;
+  //Memo2.ParentColor := true;
+  SynEdit1.ActiveLineColor := 2238502;
+  SynEdit1.Color := 1316887;
+  SynEdit1.Font.Color := clCream;
+  SynEdit1.Gutter.Color := 1316887;
+  SynEdit1.Gutter.Font.Color := clCream;
+  SynEdit1.Gutter.GradientStartColor := 2238502;
+  SynEdit1.Gutter.GradientEndColor := 1316887;
+  SynPHPSyn1.CommentAttri.Foreground := 6314591;
+  SynPHPSyn1.IdentifierAttri.Foreground := 9627120;
+  SynPHPSyn1.KeyAttri.Foreground := 4157595;
+  SynPHPSyn1.NumberAttri.Foreground := 5008079;
+  SynPHPSyn1.StringAttri.Foreground := 6987151;
+  SynPHPSyn1.SymbolAttri.Foreground := 8769754;
+  SynPHPSyn1.VariableAttri.Foreground := 6924493;
+end;
+procedure TForm1.Theme_Light;
+begin
+  if not IsThemeDark then exit;
+  TStyleManager.TrySetStyle('Windows');
+  Color := clBtnFace;
+  Font.Color := clWindowText;
+  //Memo2.Font.Color := clWindowText;
+  SynEdit1.ActiveLineColor := 14680010;
+  SynEdit1.Color := clWindow;
+  SynEdit1.Font.Color := clWindowText;
+  SynEdit1.Gutter.Color := clBtnFace;
+  SynEdit1.Gutter.Font.Color := clWindowText;
+  SynEdit1.Gutter.GradientStartcolor := cl3dLight;
+  SynEdit1.Gutter.GradientEndColor := clBtnFace;;
+  SynPHPSyn1.CommentAttri.Foreground := 33023;
+  SynPHPSyn1.IdentifierAttri.Foreground := 4194304;
+  SynPHPSyn1.KeyAttri.Foreground := 4227072;
+  SynPHPSyn1.NumberAttri.Foreground := 213;
+  SynPHPSyn1.StringAttri.Foreground := 13762560;
+  SynPHPSyn1.SymbolAttri.Foreground := 4227072;
+  SynPHPSyn1.VariableAttri.Foreground := 213;
+end;
 procedure TForm1.Timer1Timer(Sender: TObject);
 begin
   {$IFDEF OnlineHelp}
 ,7 → 793,7
   end;
   {$ENDREGION}
-  {$REGION 'Intelligent browser (executes PHP scripts)'}
+  {$REGION 'Intelligent browser (executes PHP scripts which are clicked in a hyperlink)'}
   if URL <> 'about:blank' then
   begin
     myUrl := URL;
 ,6 → 803,7
     // TODO: myURL urldecode
     // TODO: maybe we could even open that file in the editor!
+    // TODO: ?parameter=....
     if FileExists(myURL) and (EndsText('.php', myURL) or EndsText('.php3', myURL) or EndsText('.php4', myURL) or EndsText('.php5', myURL) or EndsText('.phps', myURL)) then
     begin
 ,6 → 814,22
   {$ENDREGION}
 end;
+procedure TForm1.BtnLightClick(Sender: TObject);
+begin
+  if IsThemeDark then
+  begin
+    BtnLight.Picture.Assign(BtnLightOn.Picture);
+    Theme_Light;
+    TFastPHPConfig.DarkTheme := false;
+  end
+  else
+  begin
+    BtnLight.Picture.Assign(BtnLightOff.Picture);
+    Theme_Dark;
+    TFastPHPConfig.DarkTheme := true;
+  end;
+end;
 procedure TForm1.BtnSpecialCharsClick(Sender: TObject);
 var
   opts: TSynEditorOptions;
 ,6 → 959,8
   DoubleBuffered := true;
   StartCodeExplorer;
+  StartupTimer.Enabled := true;
 end;
 procedure TForm1.Save1Click(Sender: TObject);
 ,6 → 989,25
   codeExplorer.Resume;
 end;
+procedure TForm1.StartUpTimerTimer(Sender: TObject);
+begin
+  StartupTimer.Enabled := false;
+  // We need this timer because we cannot change the Theme during OnShow,
+  // because the Delphi VCL Theme is buggy!
+  if TFastPHPConfig.DarkTheme then
+  begin
+    BtnLight.Picture.Assign(BtnLightOff.Picture);
+    Theme_Dark;
+  end
+  else
+  begin
+    BtnLight.Picture.Assign(BtnLightOn.Picture);
+    Theme_Light;
+  end;
+end;
 function TForm1.GetScrapFile: string;
 var
   tmpPath: string;
 ,6 → 1358,11
   result := true;
 end;
+function TForm1.IsThemeDark: boolean;
+begin
+  result := Assigned(TStyleManager.ActiveStyle) and (TStyleManager.ActiveStyle.Name<>'Windows');
+end;
 function TForm1.OutputNotifyCallback(const data: AnsiString): boolean;
 begin
   result := TreeView1.FillWithFastPHPData(data);

 /trunk/FastPHPBrowser.dproj
 ,13 → 72,14
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <Icon_MainIcon>FastPHPBrowser_Icon.ico</Icon_MainIcon>
-        <DCC_ExeOutput>E:\__fastphp</DCC_ExeOutput>
-        <Debugger_RunParams>E:\__fastphp\test_ajax.xphp</Debugger_RunParams>
+        <DCC_ExeOutput>D:\__fastphp</DCC_ExeOutput>
+        <Debugger_RunParams>D:\_test\scrap.php</Debugger_RunParams>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <DCC_RemoteDebug>false</DCC_RemoteDebug>
         <AppDPIAwarenessMode>PerMonitor</AppDPIAwarenessMode>
+        <VerInfo_Keys>CompanyName=ViaThinkSoft;FileDescription=FastPHP Browser;FileVersion=1.0.0.0;InternalName=FastPHP Browser;LegalCopyright=(C) 2020 ViaThinkSoft, Daniel Marschall;LegalTrademarks=;OriginalFilename=FastPHPBrowser.exe;ProductName=FastPHP;ProductVersion=1.0.0.0;Comments=www.viathinksoft.com</VerInfo_Keys>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
 ,6 → 93,11
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Icon_MainIcon>FastPHPBrowser_Icon1.ico</Icon_MainIcon>
+        <BT_BuildType>Debug</BT_BuildType>
+        <Debugger_RunParams>D:\_test\scrap.php</Debugger_RunParams>
+        <VerInfo_MajorVer>0</VerInfo_MajorVer>
+        <VerInfo_MinorVer>2</VerInfo_MinorVer>
+        <VerInfo_Keys>CompanyName=ViaThinkSoft;FileDescription=FastPHP Browser;FileVersion=0.2.0.0;InternalName=FastPHP Browser;LegalCopyright=(C) 2016-2020 Daniel Marschall, ViaThinkSoft;LegalTrademarks=;OriginalFilename=FastPHPBrowser.exe;ProductName=FastPHP;ProductVersion=0.2;Comments=www.viathinksoft.com</VerInfo_Keys>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

/trunk/FastPHPBrowser.res
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

 /trunk/FastPHPConfig.pas
 ,6 → 15,8
     class procedure SetPhpInterpreter(const Value: string); static;
     class function GetSpecialChars: boolean; static;
     class procedure SetSpecialChars(const Value: boolean); static;
+    class function GetDarkTheme: boolean; static;
+    class procedure SetDarkTheme(const Value: boolean); static;
   public
     class property FontSize: integer read GetFontSize write SetFontSize;
     class property ScrapFile: string read GetScrapFile write SetScrapFile;
 ,6 → 23,7
     class property HelpIndex: string read GetHelpIndex write SetHelpIndex;
     class property PhpInterpreter: string read GetPhpInterpreter write SetPhpInterpreter;
     class property SpecialChars: boolean read GetSpecialChars write SetSpecialChars;
+    class property DarkTheme: boolean read GetDarkTheme write SetDarkTheme;
   end;
 implementation
 ,6 → 107,25
   end;
 end;
+class function TFastPHPConfig.GetDarkTheme: boolean;
+var
+  reg: TRegistry;
+begin
+  result := false;
+  reg := TRegistry.Create;
+  try
+    reg.RootKey := HKEY_CURRENT_USER;
+    if reg.OpenKey('Software\ViaThinkSoft\FastPHP\Editor', false) then
+    begin
+      if reg.ValueExists('DarkTheme') then
+        result := reg.ReadBool('DarkTheme');
+      reg.CloseKey;
+    end;
+  finally
+    reg.Free;
+  end;
+end;
 class function TFastPHPConfig.GetFontSize: integer;
 var
   reg: TRegistry;
 ,6 → 145,23
   end;
 end;
+class procedure TFastPHPConfig.SetDarkTheme(const Value: boolean);
+var
+  reg: TRegistry;
+begin
+  reg := TRegistry.Create;
+  try
+    reg.RootKey := HKEY_CURRENT_USER;
+    if reg.OpenKey('Software\ViaThinkSoft\FastPHP\Editor', true) then
+    begin
+      reg.WriteBool('DarkTheme', Value);
+      reg.CloseKey;
+    end;
+  finally
+    reg.Free;
+  end;
+end;
 class procedure TFastPHPConfig.SetFontSize(Value: integer);
 var
   reg: TRegistry;

 /trunk/FastPHPEditor.dpr
 ,12 → 10,18
   RunPHP in 'RunPHP.pas',
   FastPHPTreeView in 'FastPHPTreeView.pas',
   ImageListEx in 'ImageListEx.pas',
-  FastPHPConfig in 'FastPHPConfig.pas';
+  FastPHPConfig in 'FastPHPConfig.pas',
+  Vcl.Themes,
+  Vcl.Styles;
 {$R *.res}
 begin
+  {$IFDEF DEBUG}
   ReportMemoryLeaksOnShutdown := True;
+  {$ELSE}
+  ReportMemoryLeaksOnShutdown := False;
+  {$ENDIF}
   Application.Initialize;
   // Application.MainFormOnTaskbar := True;
   Application.CreateForm(TForm1, Form1);

 /trunk/FastPHPEditor.dproj
 ,13 → 49,14
         <DCC_K>false</DCC_K>
         <DCC_N>true</DCC_N>
         <VerInfo_Locale>1031</VerInfo_Locale>
-        <VerInfo_MinorVer>1</VerInfo_MinorVer>
+        <VerInfo_MinorVer>2</VerInfo_MinorVer>
         <DCC_DebugInformation>1</DCC_DebugInformation>
         <DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
-        <VerInfo_Keys>CompanyName=ViaThinkSoft;FileDescription=FastPHP Editor;FileVersion=0.1.0.0;InternalName=FastPHP;LegalCopyright=(C) 2016 ViaThinkSoft;LegalTrademarks=;OriginalFilename=FastPHP.exe;ProductName=ViaThinkSoft FastPHP Editor;ProductVersion=0.1;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=ViaThinkSoft;FileDescription=FastPHP Editor;FileVersion=0.2.0.0;InternalName=FastPHP;LegalCopyright=(C) 2016-2020 Daniel Marschall, ViaThinkSoft;LegalTrademarks=;OriginalFilename=FastPHP.exe;ProductName=ViaThinkSoft FastPHP Editor;ProductVersion=0.2;Comments=www.viathinksoft.de</VerInfo_Keys>
         <DCC_ImageBase>00400000</DCC_ImageBase>
         <DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;FMXTee.Chart;$(DCC_Namespace)</DCC_Namespace>
+        <Custom_Styles>&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;</Custom_Styles>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
 ,7 → 92,7
         <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <DCC_ExeOutput>E:\__fastphp</DCC_ExeOutput>
+        <DCC_ExeOutput>D:\__fastphp</DCC_ExeOutput>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Icon_MainIcon>FastPHP_Icon2.ico</Icon_MainIcon>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>

Subversion Repositories fastphp

Compare Revisions

Regard whitespace Rev 61 → Rev 62