소스 검색

CH: Added new forms and fixed the application.exename problem by looking in registry

Jean-Francois Goulet 20 년 전
부모
커밋
9a04a72ce5
3개의 변경된 파일49개의 추가작업 그리고 19개의 파일을 삭제
  1. 4 4
      LuaEdit/LuaEditDebug/LuaEditDebug.cfg
  2. 8 7
      LuaEdit/LuaEditDebug/LuaEditDebug.dof
  3. 37 8
      LuaEdit/LuaEditDebug/LuaEditDebug.dpr

+ 4 - 4
LuaEdit/LuaEditDebug/LuaEditDebug.cfg

@@ -34,10 +34,10 @@
 -E"..\bin"
 -E"..\bin"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LE"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
 -LN"c:\program files\borland\delphi7\Projects\Bpl"
--U"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug"
--O"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug"
--I"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug"
--R"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug"
+-U"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax"
+-O"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax"
+-I"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax"
+-R"C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax"
 -DDELPHI_7
 -DDELPHI_7
 -w-UNSAFE_TYPE
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CODE

+ 8 - 7
LuaEdit/LuaEditDebug/LuaEditDebug.dof

@@ -94,14 +94,14 @@ OutputDir=..\bin
 UnitOutputDir=
 UnitOutputDir=
 PackageDLLOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 PackageDCPOutputDir=
-SearchPath=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug
+SearchPath=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP;ZMstr7R178
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP;ZMstr7R178
 Conditionals=DELPHI_7
 Conditionals=DELPHI_7
 DebugSourceDirs=
 DebugSourceDirs=
 UsePackages=0
 UsePackages=0
 [Parameters]
 [Parameters]
 RunParams=
 RunParams=
-HostApplication=
+HostApplication=C:\Prog\Delphi\Tests\Maxm\Test\DB_Op.exe
 Launcher=
 Launcher=
 UseLauncher=0
 UseLauncher=0
 DebugCWD=
 DebugCWD=
@@ -141,11 +141,12 @@ Item0=DELPHI_7
 Count=1
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
 [HistoryLists\hlSearchPath]
-Count=4
-Item0=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug
-Item1=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore
-Item2=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages
-Item3=E:\Programming\Borland\Comuni;E:\Programming\Borland\Comuni\LUA;E:\Programming\Borland\Delphi\Packages\PropEditors;E:\Programming\Borland\Delphi\Packages\ActiveX;E:\Programming\Borland\Delphi\Packages\Altri;E:\Programming\Borland\Delphi\Packages\Compress;E:\Programming\Borland\Delphi\Packages\MaxMBeppeG;E:\Programming\Borland\Delphi\Packages\MaxMBeppeG\Printset;E:\Programming\Borland\Delphi\Packages\Database;E:\Programming\Borland\Delphi\Packages\Inspector;E:\Programming\Borland\Delphi\Packages\Internet;E:\Programming\Borland\Delphi\Packages\Multimedia;E:\Programming\Borland\Delphi\Packages\Special;E:\Programming\Borland\Delphi\Packages\ui;E:\Programming\Borland\Delphi\Packages\ImageLib;E:\Programming\Borland\Delphi7\Packages\Indy 9;E:\Programming\Borland\Delphi7\Packages\DIB;E:\Programming\Borland\Delphi7\Packages\fpiette\ics\Delphi\Vc32;E:\Programming\Borland\Delphi7\Packages\Graphics;E:\Programming\Borland\Delphi7\Libs\Pal_dcp;E:\Programming\Borland\Delphi7\Libs\Pal_bpl;E:\Programming\Borland\Delphi7\Packages\ZipMaster\vcl;E:\Programming\Borland\Delphi\Packages\KOL;E:\Programming\Borland\Delphi7\Packages\synedit\Source;E:\Programming\Borland\Delphi7\Libs\DCU;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\common;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\vcl;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\windows;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\visclx;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\common;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\Resources;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\run
+Count=5
+Item0=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug;C:\Prog\Delphi\LuaEdit\Syntax
+Item1=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore;C:\Prog\Delphi\LuaEdit\RunTimeDebug
+Item2=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\LuaEdit\LuaCore
+Item3=C:\Prog\Delphi\Component\JEDI\jcl\packages\d7;C:\Prog\Delphi\Component\JEDI\jvcl\packages\d7;C:\Prog\Delphi\Component\SynEdit\Packages
+Item4=E:\Programming\Borland\Comuni;E:\Programming\Borland\Comuni\LUA;E:\Programming\Borland\Delphi\Packages\PropEditors;E:\Programming\Borland\Delphi\Packages\ActiveX;E:\Programming\Borland\Delphi\Packages\Altri;E:\Programming\Borland\Delphi\Packages\Compress;E:\Programming\Borland\Delphi\Packages\MaxMBeppeG;E:\Programming\Borland\Delphi\Packages\MaxMBeppeG\Printset;E:\Programming\Borland\Delphi\Packages\Database;E:\Programming\Borland\Delphi\Packages\Inspector;E:\Programming\Borland\Delphi\Packages\Internet;E:\Programming\Borland\Delphi\Packages\Multimedia;E:\Programming\Borland\Delphi\Packages\Special;E:\Programming\Borland\Delphi\Packages\ui;E:\Programming\Borland\Delphi\Packages\ImageLib;E:\Programming\Borland\Delphi7\Packages\Indy 9;E:\Programming\Borland\Delphi7\Packages\DIB;E:\Programming\Borland\Delphi7\Packages\fpiette\ics\Delphi\Vc32;E:\Programming\Borland\Delphi7\Packages\Graphics;E:\Programming\Borland\Delphi7\Libs\Pal_dcp;E:\Programming\Borland\Delphi7\Libs\Pal_bpl;E:\Programming\Borland\Delphi7\Packages\ZipMaster\vcl;E:\Programming\Borland\Delphi\Packages\KOL;E:\Programming\Borland\Delphi7\Packages\synedit\Source;E:\Programming\Borland\Delphi7\Libs\DCU;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\common;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\vcl;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\windows;E:\Programming\Borland\Delphi\Packages\Jedi\jcl\source\visclx;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\common;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\Resources;E:\Programming\Borland\Delphi\Packages\Jedi\jvcl\run
 [HistoryLists\hlUnitOutputDirectory]
 [HistoryLists\hlUnitOutputDirectory]
 Count=1
 Count=1
 Item0=E:\Programming\Borland\Delphi7\Libs\DCU
 Item0=E:\Programming\Borland\Delphi7\Libs\DCU

+ 37 - 8
LuaEdit/LuaEditDebug/LuaEditDebug.dpr

@@ -4,9 +4,12 @@ library LuaEditDebug;
 
 
 uses
 uses
   SysUtils,
   SysUtils,
+  Messages,
+  Dialogs,
   Classes,
   Classes,
   Windows,
   Windows,
   Controls,
   Controls,
+  Registry,
   Forms,
   Forms,
   lua,
   lua,
   LuaUtils,
   LuaUtils,
@@ -46,11 +49,19 @@ uses
   ExSaveExit in '..\ExSaveExit.pas' {frmExSaveExit},
   ExSaveExit in '..\ExSaveExit.pas' {frmExSaveExit},
   AsciiTable in '..\AsciiTable.pas' {frmAsciiTable},
   AsciiTable in '..\AsciiTable.pas' {frmAsciiTable},
   ReadOnlyMsgBox in '..\ReadOnlyMsgBox.pas' {frmReadOnlyMsgBox},
   ReadOnlyMsgBox in '..\ReadOnlyMsgBox.pas' {frmReadOnlyMsgBox},
-  Rings in '..\Rings.pas' {frmRings};
+  Rings in '..\Rings.pas' {frmRings},
+  FindInFiles in '..\FindInFiles.pas' {frmFindInFiles},
+  FindWindow1 in '..\FindWindow1.pas' {frmFindWindow1},
+  FindWindow2 in '..\FindWindow2.pas' {frmFindWindow2},
+  InternalBrowser in '..\InternalBrowser.pas' {frmInternalBrowser},
+  SearchPath in '..\SearchPath.pas' {frmSearchPath},
+  SIFReport in '..\SIFReport.pas' {frmSIFReport};
 
 
 {$R *.res}
 {$R *.res}
 
 
-function InitForms :TfrmMain;
+function InitForms: TfrmMain;
+var
+  pReg: TRegistry;
 begin
 begin
   RTAssert(0, true, 'LuaEditDebug Application='+IntToHex(Integer(Application), 8), '', 0);
   RTAssert(0, true, 'LuaEditDebug Application='+IntToHex(Integer(Application), 8), '', 0);
   RTAssert(0, true, 'Creating...', '', 0);
   RTAssert(0, true, 'Creating...', '', 0);
@@ -79,20 +90,38 @@ begin
   Application.CreateForm(TfrmAddBreakpoint, frmAddBreakpoint);
   Application.CreateForm(TfrmAddBreakpoint, frmAddBreakpoint);
   Application.CreateForm(TfrmEditorSettings, frmEditorSettings);
   Application.CreateForm(TfrmEditorSettings, frmEditorSettings);
   Application.CreateForm(TfrmAsciiTable, frmAsciiTable);
   Application.CreateForm(TfrmAsciiTable, frmAsciiTable);
+  Application.CreateForm(TfrmFindInFiles, frmFindInFiles);
+  Application.CreateForm(TfrmFindWindow1, frmFindWindow1);
+  Application.CreateForm(TfrmFindWindow2, frmFindWindow2);
+  Application.CreateForm(TfrmInternalBrowser, frmInternalBrowser);
+  Application.CreateForm(TfrmSearchPath, frmSearchPath);
+  Application.CreateForm(TfrmSIFReport, frmSIFReport);
+  
+  if (Application.MainForm = nil) then
+    RTAssert(0, true, 'Creating done Nil', '', 0)
+  else
+    RTAssert(0, (frmMain = Application.MainForm), 'Creating done frmMain', 'Creating done '+Application.MainForm.Name, 0);
 
 
-  if (Application.MainForm=Nil)
-  then RTAssert(0, true, 'Creating done Nil', '', 0)
-  else RTAssert(0, (frmMain=Application.MainForm), 'Creating done frmMain', 'Creating done '+Application.MainForm.Name, 0);
+  // Initialize a few things
   frmMain.CheckButtons;
   frmMain.CheckButtons;
   frmMain.LoadEditorSettings;
   frmMain.LoadEditorSettings;
-  LoadDockTreeFromFile(ExtractFilePath(Application.ExeName) + 'LuaEdit.dck');
+
+  // Create registry class and switching root key to local machine
+  pReg := TRegistry.Create;
+  pReg.RootKey := HKEY_LOCAL_MACHINE;
+
+  if pReg.OpenKey('\Software\LuaEdit', False) then
+    LoadDockTreeFromFile(pReg.ReadString('ApplicationPath') + 'LuaEdit.dck');
+
+  // Free registry class and return main form
+  pReg.Free;
   Result :=frmMain;
   Result :=frmMain;
 end;
 end;
 
 
 procedure UnInitForms;
 procedure UnInitForms;
 Var
 Var
-   MainFormHandle :HWnd;
-   i              :Integer;
+   MainFormHandle: HWnd;
+   i: Integer;
 
 
 begin
 begin
 try
 try