CH: bug fixes in debugging engine + new features added

LuaEdit/Breakpoints.dfm

@@ -25,7 +25,7 @@ object frmBreakpoints: TfrmBreakpoints
     Left = 0
     Top = 0
     Width = 539
-    Height = 266
+    Height = 273
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 0
@@ -117,7 +117,7 @@ object frmBreakpoints: TfrmBreakpoints
       Left = 0
       Top = 24
       Width = 539
-      Height = 242
+      Height = 249
       Align = alClient
       Checkboxes = True
       Columns = <
@@ -694,15 +694,18 @@ object frmBreakpoints: TfrmBreakpoints
     Top = 80
     object RemoveBreakpoint1: TMenuItem
       Caption = 'Remove Breakpoint'
+      OnClick = RemoveBreakpoint1Click
     end
     object N1: TMenuItem
       Caption = '-'
     end
     object Goto1: TMenuItem
       Caption = 'Goto Breakpoint'
+      OnClick = Goto1Click
     end
     object Condition1: TMenuItem
       Caption = 'Set Condition...'
+      OnClick = Condition1Click
     end
   end
   object JvDockClient1: TJvDockClient

LuaEdit/Breakpoints.pas

@@ -45,6 +45,9 @@ type
     procedure FormCreate(Sender: TObject);
     procedure tbtnAddClick(Sender: TObject);
     procedure popmBreakpointsPopup(Sender: TObject);
+    procedure Condition1Click(Sender: TObject);
+    procedure Goto1Click(Sender: TObject);
+    procedure RemoveBreakpoint1Click(Sender: TObject);
   private
     { Private declarations }
   public
@@ -318,4 +321,19 @@ begin
   Condition1.Enabled := (lvwBreakpoints.Items.Count > 0);
 end;
 
+procedure TfrmBreakpoints.Condition1Click(Sender: TObject);
+begin
+  tbtnEditCondition.Click;
+end;
+
+procedure TfrmBreakpoints.Goto1Click(Sender: TObject);
+begin
+  tbtnGoto.Click;
+end;
+
+procedure TfrmBreakpoints.RemoveBreakpoint1Click(Sender: TObject);
+begin
+  tbtnRemove.Click;
+end;
+
 end.

LuaEdit/EditorSettings.dfm

@@ -120,7 +120,7 @@ object frmEditorSettings: TfrmEditorSettings
       Top = 0
       Width = 492
       Height = 375
-      ActivePage = stabGeneral
+      ActivePage = TabSheet1
       Align = alClient
       TabOrder = 0
       object stabGeneral: TTabSheet
@@ -311,6 +311,48 @@ object frmEditorSettings: TfrmEditorSettings
           end
         end
       end
+      object TabSheet1: TTabSheet
+        Caption = 'Environment'
+        ImageIndex = 3
+        object GroupBox4: TGroupBox
+          Left = 16
+          Top = 16
+          Width = 457
+          Height = 89
+          Caption = 'Search Path'
+          TabOrder = 0
+          DesignSize = (
+            457
+            89)
+          object Label10: TLabel
+            Left = 17
+            Top = 30
+            Width = 42
+            Height = 13
+            Caption = 'Libraries:'
+          end
+          object txtLibraries: TEdit
+            Left = 17
+            Top = 44
+            Width = 401
+            Height = 21
+            TabOrder = 0
+          end
+          object btnBrowseLibraries: TButton
+            Left = 424
+            Top = 46
+            Width = 20
+            Height = 17
+            Hint = 'Browse for Completion Proposal Search Paths...'
+            Anchors = [akTop, akRight]
+            Caption = '...'
+            ParentShowHint = False
+            ShowHint = True
+            TabOrder = 1
+            OnClick = btnBrowseLibrariesClick
+          end
+        end
+      end
       object stabDisplay: TTabSheet
         Caption = 'Display'
         ImageIndex = 1

LuaEdit/EditorSettings.pas

@@ -68,6 +68,11 @@ type
     chkSaveUnitsInc: TCheckBox;
     chkSaveBreakpoints: TCheckBox;
     chkShowExSaveDlg: TCheckBox;
+    TabSheet1: TTabSheet;
+    GroupBox4: TGroupBox;
+    txtLibraries: TEdit;
+    Label10: TLabel;
+    btnBrowseLibraries: TButton;
     procedure cboFontsMeasureItem(Control: TWinControl; Index: Integer;  var Height: Integer);
     procedure cboFontsDrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState);
     procedure FormCreate(Sender: TObject);
@@ -92,6 +97,7 @@ type
     procedure chkFileAssociateClick(Sender: TObject);
     procedure cboFontSizeMeasureItem(Control: TWinControl; Index: Integer;
       var Height: Integer);
+    procedure btnBrowseLibrariesClick(Sender: TObject);
   private
     { Private declarations }
   public
@@ -111,7 +117,7 @@ function WinExit(iFlags: integer): Boolean; cdecl; external 'LuaEditSys.dll';
 
 implementation
 
-uses RegSetFileType;
+uses RegSetFileType, SearchPath;
 
 {$R *.dfm}
 
@@ -266,7 +272,7 @@ var
   x: Integer;
 begin
   Screen.Cursor := crHourGlass;
-  pIniFile := TIniFile.Create(ExtractFilePath(Application.ExeName)+'\LuaEdit.ini');
+  pIniFile := TIniFile.Create(ExtractFilePath(Application.ExeName)+'LuaEdit.ini');
 
   //Writing general settings
   if chkAutoIndent.Checked then
@@ -370,6 +376,9 @@ begin
     end;
   end;
 
+  // Writing environement settings
+  pIniFile.WriteString('Environement', 'LibrariesSearchPaths', txtLibraries.Text);
+
   //Writing display settings
   pIniFile.WriteBool('Display', 'ShowGutter', chkShowGutter.Checked);
   pIniFile.WriteBool('Display', 'ShowLineNumbers', chkShowLineNumbers.Checked);
@@ -587,9 +596,10 @@ begin
   chkSaveProjectsInc.Checked := SaveProjectsInc;
   chkSaveUnitsInc.Checked := SaveUnitsInc;
   chkShowExSaveDlg.Checked := ShowExSaveDlg;
-
+  chkSaveBreakpoints.Checked := SaveBreakpoints;
   txtUndoLimit.Text := IntToStr(Main.UndoLimit);
   txtTabWidth.Text := IntToStr(Main.TabWidth);
+  txtLibraries.Text := LibrariesSearchPaths.CommaText;
   chkShowGutter.Checked := Main.ShowGutter;
   chkShowLineNumbers.Checked := Main.ShowLineNumbers;
   chkLeadingZeros.Checked := Main.LeadingZeros;
@@ -638,4 +648,18 @@ begin
     NotifyRestart(False);
 end;
 
+procedure TfrmEditorSettings.btnBrowseLibrariesClick(Sender: TObject);
+begin
+  // Initialize search path form
+  frmSearchPath := TfrmSearchPath.Create(nil);
+  frmSearchPath.InitSearchPathForm(txtLibraries.Text, 'Libraries Search Paths', 'Select libraries search paths for LuaEdit to use when looking for *.lib and *.def files:');
+
+  // Show form and replace current path string by the new one
+  if frmSearchPath.ShowModal = mrOk then
+     txtLibraries.Text := frmSearchPath.GetSearchPathString;
+
+  // Free search path form
+  frmSearchPath.Free;
+end;
+
 end.

LuaEdit/LuaEdit.dof

@@ -3,21 +3,21 @@ Version=7.0
 [Compiler]
 A=8
 B=0
-C=0
-D=0
+C=1
+D=1
 E=0
 F=0
 G=1
 H=1
-I=0
+I=1
 J=0
 K=0
-L=0
+L=1
 M=0
 N=1
 O=0
 P=1
-Q=0
+Q=1
 R=0
 S=0
 T=0
@@ -25,7 +25,7 @@ U=0
 V=1
 W=0
 X=1
-Y=0
+Y=1
 Z=1
 ShowHints=1
 ShowWarnings=1
@@ -83,7 +83,7 @@ UnsafeCast=0
 MapFile=3
 OutputObjs=0
 ConsoleApp=1
-DebugInfo=0
+DebugInfo=1
 RemoteSymbols=0
 MinStackSize=16384
 MaxStackSize=1048576
@@ -94,7 +94,7 @@ OutputDir=.\bin
 UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=.\Syntax;.\LuaCore
+SearchPath=$(DELPHI)\Lib\Debug;C:\Prog\Delphi\Component\JEDI\jcl\lib\D7\debug;.\Syntax;.\LuaCore;C:\Prog\Delphi\Component\XPMenu;C:\Prog\Delphi\Component\SynEdit\Source
 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;DJcl;JvStdCtrlsD7R;JvAppFrmD7R;JvCoreD7R;JvBandsD7R;JvDockingD7R;JvDotNetCtrlsD7R;JvEDID7R;qrpt;JvGlobusD7R;JvHMID7R;JvInspectorD7R;JvInterpreterD7R;JvJansD7R;JvManagedThreadsD7R;JvCmpD7R;JvMMD7R;JvNetD7R;JvPageCompsD7R;JvPluginD7R;JvPrintPreviewD7R;JvCtrlsD7R;JvSystemD7R;JvTimeFrameworkD7R;JvUIBD7R;JvValidatorsD7R;JvWizardD7R;JvXPCtrlsD7R;JvCryptD7R;JvCustomD7R;JvBDED7R;JvDBD7R;JvDlgsD7R
 Conditionals=
 DebugSourceDirs=
@@ -113,9 +113,9 @@ RootDir=
 IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=2
-MinorVer=1
+MinorVer=2
 Release=1
-Build=628
+Build=132
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=Open Source
 FileDescription=IDE for Lua 5.0.2
-FileVersion=2.1.1.628
+FileVersion=2.2.1.132
 InternalName=LuaEdit
 LegalCopyright=LuaEdit Copyright 2004-2005 ©
 LegalTrademarks=
@@ -138,10 +138,10 @@ Comments=This project was originally created by Jean-Francois Goulet
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
-Count=2
-Item0=.\Syntax;.\LuaCore
-Item1=$(DELPHI)\Lib\Debug;C:\Prog\Delphi\Component\JEDI\jcl\lib\D7\debug;.\Syntax;.\LuaCore
+Count=3
+Item0=$(DELPHI)\Lib\Debug;C:\Prog\Delphi\Component\JEDI\jcl\lib\D7\debug;.\Syntax;.\LuaCore;C:\Prog\Delphi\Component\XPMenu;C:\Prog\Delphi\Component\SynEdit\Source
+Item1=C:\Prog\Delphi\Component\SynEdit\Packages;C:\Prog\Delphi\Component\SynEdit\Source
+Item2=C:\Prog\Delphi\Component\SynEdit\Packages
 [HistoryLists\hlOutputDirectorry]
-Count=2
+Count=1
 Item0=.\bin
-Item1=C:\Program Files\LuaEdit

LuaEdit/LuaEdit.dpr

@@ -44,7 +44,8 @@ uses
   ExSaveExit in 'ExSaveExit.pas' {frmExSaveExit},
   AsciiTable in 'AsciiTable.pas' {frmAsciiTable},
   ReadOnlyMsgBox in 'ReadOnlyMsgBox.pas' {frmReadOnlyMsgBox},
-  Rings in 'Rings.pas' {frmRings};
+  Rings in 'Rings.pas' {frmRings},
+  SearchPath in 'SearchPath.pas' {frmSearchPath};
 
 {$R *.res}
 

LuaEdit/Main.dfm

@@ -1,6 +1,6 @@
 object frmMain: TfrmMain
-  Left = 301
-  Top = 180
+  Left = 355
+  Top = 183
   Width = 684
   Height = 490
   Caption = 'LuaEdit'
@@ -48,7 +48,7 @@ object frmMain: TfrmMain
     Left = 0
     Top = 56
     Width = 676
-    Height = 380
+    Height = 388
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 0
@@ -56,7 +56,7 @@ object frmMain: TfrmMain
       Left = 0
       Top = 0
       Width = 676
-      Height = 380
+      Height = 388
       Align = alClient
       BevelOuter = bvNone
       TabOrder = 0
@@ -64,29 +64,44 @@ object frmMain: TfrmMain
         Left = 0
         Top = 0
         Width = 676
-        Height = 380
+        Height = 388
         Align = alClient
         BevelOuter = bvNone
         TabOrder = 0
         object stbMain: TStatusBar
           Left = 0
-          Top = 361
+          Top = 369
           Width = 676
           Height = 19
           Panels = <
             item
+              Bevel = pbNone
+              Style = psOwnerDraw
               Width = 100
             end
             item
+              Bevel = pbNone
+              Style = psOwnerDraw
               Width = 75
             end
             item
+              Bevel = pbNone
+              Style = psOwnerDraw
               Width = 75
             end
             item
+              Bevel = pbNone
+              Style = psOwnerDraw
               Width = 75
             end
             item
+              Bevel = pbNone
+              Style = psOwnerDraw
+              Width = 75
+            end
+            item
+              Bevel = pbNone
+              Style = psOwnerDraw
               Width = 75
             end>
           OnDrawPanel = stbMainDrawPanel
@@ -107,7 +122,7 @@ object frmMain: TfrmMain
           Left = 0
           Top = 25
           Width = 676
-          Height = 336
+          Height = 344
           Align = alClient
           BevelOuter = bvNone
           Color = clWhite
@@ -222,7 +237,7 @@ object frmMain: TfrmMain
     object tlbBaseFile: TToolBar
       Left = 11
       Top = 2
-      Width = 296
+      Width = 283
       Height = 22
       Align = alLeft
       AutoSize = True
@@ -334,7 +349,7 @@ object frmMain: TfrmMain
     object tlbEdit: TToolBar
       Left = 11
       Top = 28
-      Width = 216
+      Width = 272
       Height = 22
       Align = alLeft
       AutoSize = True
@@ -411,6 +426,16 @@ object frmMain: TfrmMain
         ParentShowHint = False
         ShowHint = True
       end
+      object ToolButton24: TToolButton
+        Left = 216
+        Top = 0
+        Action = actBlockComment
+      end
+      object ToolButton25: TToolButton
+        Left = 244
+        Top = 0
+        Action = actBlockUncomment
+      end
     end
   end
   object actListMain: TActionList
@@ -569,10 +594,10 @@ object frmMain: TfrmMain
     end
     object actGoToLine: TAction
       Category = 'Code Manipulation'
-      Caption = 'Go to Line...'
-      Hint = 'Go to Line...'
+      Caption = 'Goto Line...'
+      Hint = 'Goto Line...'
       ImageIndex = 20
-      ShortCut = 16455
+      ShortCut = 24647
       OnExecute = actGoToLineExecute
     end
     object actRunScript: TAction
@@ -811,15 +836,39 @@ object frmMain: TfrmMain
       OnExecute = actShowFunctionListExecute
     end
     object actFunctionHeader: TAction
-      Category = 'Code Manipulation'
+      Category = 'Tools'
       Caption = 'Function Header...'
+      OnExecute = actFunctionHeaderExecute
+    end
+    object actGotoLastEdited: TAction
+      Category = 'Code Manipulation'
+      Caption = 'Goto Last Edited'
+      Hint = 'Goto Last Edited Line'
+      ShortCut = 24652
+      OnExecute = actGotoLastEditedExecute
+    end
+    object actBlockComment: TAction
+      Category = 'Code Manipulation'
+      Caption = 'Comment Selection'
+      Hint = 'Comment Selection'
+      ImageIndex = 57
+      ShortCut = 24643
+      OnExecute = actBlockCommentExecute
+    end
+    object actBlockUncomment: TAction
+      Category = 'Code Manipulation'
+      Caption = 'Uncomment Selection'
+      Hint = 'Uncomment Selection'
+      ImageIndex = 56
+      ShortCut = 24662
+      OnExecute = actBlockUncommentExecute
     end
   end
   object imlActions: TImageList
     Left = 48
     Top = 217
     Bitmap = {
-      494C010138003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01013A003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000F0000000010020000000000000F0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -830,6 +879,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000424242004242420042424200424242004242420042424200424242004242
+      4200424242004242420042424200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -838,6 +889,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000424242004242420042424200424242004242420042424200424242004242
+      4200424242004242420042424200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -850,6 +903,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000424242004242420042424200424242004242
+      4200424242004242420042424200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -858,6 +913,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000424242004242420042424200424242004242
+      4200424242004242420042424200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -870,6 +927,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF
+      4200FFFF4200FFFF4200FFFF4200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -878,6 +937,8 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF
+      4200FFFF4200FFFF4200FFFF4200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -890,60 +951,48 @@ object frmMain: TfrmMain
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000FFFF4200FFFF4200FFFF4200FFFF4200FFFF42009D4242009D9D
+      9D00FFFF4200FFFF4200FFFF4200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000009D42
+      42009D4242009D4242009D424200000000000000000000000000000000009D42
+      42009D9D9D000000000000000000000000000000000000000000000000000000
+      000000000000FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF4200FFFF
+      4200FFFF4200FFFF4200FFFF4200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000009D42
+      42009D4242009D42420000000000000000000000000000000000000000000000
+      00009D4242000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000009D42
+      42009D4242009D42420000000000000000000000000000000000000000000000
+      00009D4242000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000009D42
+      420000000000000000009D4242009D9D9D000000000000000000000000009D42
+      42009D9D9D000000000000000000000000000000000000000000424242004242
+      4200000000004242420042424200424242004242420042424200424242004242
+      4200424242004242420042424200000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000009D4242009D4242009D4242009D4242009D9D
+      9D00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -2743,11 +2792,11 @@ object frmMain: TfrmMain
       000000000000C1C1C1009B9B9B008D8D8D008D8D8D009B9B9B00B4B4B4000000
       000000000000000000000000000000000000424D3E000000000000003E000000
       2800000040000000F00000000100010000000000800700000000000000000000
-      000000000000000000000000FFFFFF0000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000FFFFFFFFFFFFFC018001F803FFFF8C01
+      000000000000000000000000FFFFFF00FFFFFFFF00000000F001FFFF00000000
+      FFFFF00100000000FFFFFFFF00000000FE01FFFF00000000FFFFFE0100000000
+      FFFFFFFF00000000F801FFFF00000000FFFFF80100000000FFFFFFFF00000000
+      F801FFFF00000000E1E7F80100000000E3F7FFFF00000000E3F7FFFF00000000
+      ECE7C80100000000FE0FFFFF00000000FFFFFFFFFFFFFC018001F803FFFF8C01
       00009003FC7F04010000B003F39F04010000B003EFEF04010000A003DFFF8C01
       00008FE7DFF7FC010000FFFFBFE3FC010000FFFFBFC104030000FFFFDFF70407
       0000FFE7DFFF040F0000FFE7EFEF07FF0000FF81F39F06030000FF81FC7FFF07
@@ -2891,6 +2940,12 @@ object frmMain: TfrmMain
     object UnindentSelection2: TMenuItem
       Action = actBlockUnindent
     end
+    object CommentSelection2: TMenuItem
+      Action = actBlockComment
+    end
+    object UncommentSelection2: TMenuItem
+      Action = actBlockUncomment
+    end
     object N16: TMenuItem
       Caption = '-'
     end
@@ -3038,12 +3093,21 @@ object frmMain: TfrmMain
         OnClick = GotoBookmarkClick
       end
     end
-    object N15: TMenuItem
+    object N24: TMenuItem
       Caption = '-'
     end
     object AddBreakpoint1: TMenuItem
       Action = actAddBreakpoint
     end
+    object N15: TMenuItem
+      Caption = '-'
+    end
+    object GotoLastEdited2: TMenuItem
+      Action = actGotoLastEdited
+    end
+    object GotoLine2: TMenuItem
+      Action = actGoToLine
+    end
     object N20: TMenuItem
       Caption = '-'
     end
@@ -3845,9 +3909,18 @@ object frmMain: TfrmMain
       object UnindentSelection1: TMenuItem
         Action = actBlockUnindent
       end
+      object CommentSelection1: TMenuItem
+        Action = actBlockComment
+      end
+      object UncommentSelection1: TMenuItem
+        Action = actBlockUncomment
+      end
       object N4: TMenuItem
         Caption = '-'
       end
+      object GotoLastEdited1: TMenuItem
+        Action = actGotoLastEdited
+      end
       object GotoLine1: TMenuItem
         Action = actGoToLine
       end
@@ -3982,6 +4055,15 @@ object frmMain: TfrmMain
         ImageIndex = 37
         OnClick = AsciiTable1Click
       end
+      object N23: TMenuItem
+        Caption = '-'
+      end
+      object HeaderBuilder1: TMenuItem
+        Caption = 'Header Builder'
+        object Functions1: TMenuItem
+          Action = actFunctionHeader
+        end
+      end
       object N13: TMenuItem
         Caption = '-'
       end
@@ -4050,4 +4132,10 @@ object frmMain: TfrmMain
     Left = 144
     Top = 313
   end
+  object jvAppDrop: TJvDragDrop
+    DropTarget = Owner
+    OnDrop = jvAppDropDrop
+    Left = 144
+    Top = 281
+  end
 end