Browse Source

CH: test development for next version

Jean-Francois Goulet 20 years ago
parent
commit
05c74a26ac
5 changed files with 57 additions and 69 deletions
  1. 2 2
      LuaEdit/LuaEdit.dof
  2. 1 1
      LuaEdit/LuaEdit.dpr
  3. BIN
      LuaEdit/LuaEdit.res
  4. 4 0
      LuaEdit/Main.dfm
  5. 50 66
      LuaEdit/Main.pas

+ 2 - 2
LuaEdit/LuaEdit.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=2
 MinorVer=0
 Release=1
-Build=614
+Build=625
 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.0.1.614
+FileVersion=2.0.1.625
 InternalName=LuaEdit
 LegalCopyright=LuaEdit Copyright 2004-2005 ©
 LegalTrademarks=

+ 1 - 1
LuaEdit/LuaEdit.dpr

@@ -96,7 +96,7 @@ begin
 
   if ParamCount > 0 then
   begin
-    for x := 1 to ParamCount - 1 do
+    for x := 1 to ParamCount do
     begin
       FileName := ParamStr(x);
 

BIN
LuaEdit/LuaEdit.res


+ 4 - 0
LuaEdit/Main.dfm

@@ -810,6 +810,10 @@ object frmMain: TfrmMain
       ImageIndex = 55
       OnExecute = actShowFunctionListExecute
     end
+    object actFunctionHeader: TAction
+      Category = 'Code Manipulation'
+      Caption = 'Function Header...'
+    end
   end
   object imlActions: TImageList
     Left = 48

+ 50 - 66
LuaEdit/Main.pas

@@ -409,6 +409,7 @@ type
     ClipboardRing1: TMenuItem;
     actShowFunctionList: TAction;
     FunctionList1: TMenuItem;
+    actFunctionHeader: TAction;
     procedure FormCreate(Sender: TObject);
     procedure synEditKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure actOpenFileExecute(Sender: TObject);
@@ -492,6 +493,7 @@ type
     procedure actShowRingsExecute(Sender: TObject);
     procedure actCheckSyntaxExecute(Sender: TObject);
     procedure actShowFunctionListExecute(Sender: TObject);
+    //procedure actFunctionHeaderExecute(Sender: TObject);
   private
     { Private declarations }
   public
@@ -644,6 +646,8 @@ function GetFileLastTimeModified(const sFileName: PChar): TDateTime; cdecl; exte
 function GetFileReadOnlyAttr(const sFileName: PChar): Boolean; cdecl; external 'LuaEditSys.dll';
 procedure ToggleFileReadOnlyAttr(const sFileName: PChar); cdecl; external 'LuaEditSys.dll';
 
+function FunctionHeaderBuilder(sLine: PChar): PChar; cdecl; external 'HdrBld.dll';
+
 implementation
 
 uses
@@ -1978,64 +1982,37 @@ end;
 
 procedure TfrmMain.CheckButtons;
 begin
-  if LuaOpenedUnits.Count = 0 then
-  begin
-    actSave.Enabled := False;
-    actSaveAs.Enabled := False;
-    actSaveProjectAs.Enabled := False;
-    actSaveAll.Enabled := False;
-    actSearch.Enabled := False;
-    actSearchAgain.Enabled := False;
-    actSearchReplace.Enabled := False;
-    actSelectAll.Enabled := False;
-    actGoToLine.Enabled := False;
-    actCut.Enabled := False;
-    actCopy.Enabled := False;
-    actPaste.Enabled := False;
-    actUndo.Enabled := False;
-    actRedo.Enabled := False;
-    actRunScript.Enabled := False;
-    actPause.Enabled := False;
-    actStop.Enabled := False;
-    actCheckSyntax.Enabled := False;
-    actStepInto.Enabled := False;
-    actStepOver.Enabled := False;
-    actRunToCursor.Enabled := False;
-    actAddBreakpoint.Enabled := False;
-    actPrint.Enabled := False;
-    actBlockIndent.Enabled := False;
-    actBlockUnindent.Enabled := False;
-    PrintSetup1.Enabled := False;
-  end
-  else
-  begin
-    actSave.Enabled := True;
-    actSaveAs.Enabled := True;
-    actSaveProjectAs.Enabled := True;
-    actSaveAll.Enabled := True;
-    actSearch.Enabled := True;
-    actSearchAgain.Enabled := True;
-    actSearchReplace.Enabled := True;
-    actSelectAll.Enabled := True;
-    actGotoLine.Enabled := True;
-    actCut.Enabled := True;
-    actCopy.Enabled := True;
-    actPaste.Enabled := True;
-    actUndo.Enabled := True;
-    actRedo.Enabled := True;
-    actRunScript.Enabled := True;
-    actPause.Enabled := True;
-    actStop.Enabled := True;
-    actCheckSyntax.Enabled := True;
-    actStepInto.Enabled := True;
-    actStepOver.Enabled := True;
-    actRunToCursor.Enabled := True;
-    actAddBreakpoint.Enabled := True;
-    actPrint.Enabled := True;
-    actBlockIndent.Enabled := True;
-    actBlockUnindent.Enabled := True;
-    PrintSetup1.Enabled := True;
+  actClose.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSave.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSaveAs.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSaveProjectAs.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSaveAll.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSearch.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSearchAgain.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSearchReplace.Enabled := not (LuaOpenedUnits.Count = 0);
+  actSelectAll.Enabled := not (LuaOpenedUnits.Count = 0);
+  actGoToLine.Enabled := not (LuaOpenedUnits.Count = 0);
+  actCut.Enabled := not (LuaOpenedUnits.Count = 0);
+  actCopy.Enabled := not (LuaOpenedUnits.Count = 0);
+  actPaste.Enabled := not (LuaOpenedUnits.Count = 0);
+  actUndo.Enabled := not (LuaOpenedUnits.Count = 0);
+  actRedo.Enabled := not (LuaOpenedUnits.Count = 0);
+  actRunScript.Enabled := not (LuaOpenedUnits.Count = 0);
+  actPause.Enabled := not (LuaOpenedUnits.Count = 0);
+  actStop.Enabled := not (LuaOpenedUnits.Count = 0);
+  actCheckSyntax.Enabled := not (LuaOpenedUnits.Count = 0);
+  actStepInto.Enabled := not (LuaOpenedUnits.Count = 0);
+  actStepOver.Enabled := not (LuaOpenedUnits.Count = 0);
+  actRunToCursor.Enabled := not (LuaOpenedUnits.Count = 0);
+  actAddBreakpoint.Enabled := not (LuaOpenedUnits.Count = 0);
+  actPrint.Enabled := not (LuaOpenedUnits.Count = 0);
+  actBlockIndent.Enabled := not (LuaOpenedUnits.Count = 0);
+  actBlockUnindent.Enabled := not (LuaOpenedUnits.Count = 0);
+  PrintSetup1.Enabled := not (LuaOpenedUnits.Count = 0);
+  //HeaderBuilder1.Enabled := not (LuaOpenedUnits.Count = 0);
 
+  if LuaOpenedUnits.Count > 0 then
+  begin
     if Assigned(jvUnitBar.SelectedTab) then
     begin
       if TLuaUnit(jvUnitBar.SelectedTab.Data).synUnit.UndoList.ItemCount = 0 then
@@ -2055,15 +2032,6 @@ begin
     end;
   end;
 
-  if LuaOpenedUnits.Count = 0 then
-  begin
-    actClose.Enabled := False;
-  end
-  else
-  begin
-    actClose.Enabled := True;
-  end;
-
   if Assigned(frmProjectTree.trvProjectTree.Selected) then
   begin
     if ((frmProjectTree.trvProjectTree.Selected.ImageIndex = 0) or (frmProjectTree.trvProjectTree.Selected.SelectedIndex = 0)) then
@@ -6775,4 +6743,20 @@ begin
   Close2.Enabled := (jvUnitBar.Tabs.Count <> 0);
 end;
 
+{
+procedure TfrmMain.actFunctionHeaderExecute(Sender: TObject);
+var
+  sLine: String;
+begin
+  if Assigned(jvUnitBar.SelectedTab) then
+  begin
+    if Assigned(jvUnitBar.SelectedTab.Data) then
+    begin
+      sLine := TLuaUnit(jvUnitBar.SelectedTab.Data).synUnit.Lines[TLuaUnit(jvUnitBar.SelectedTab.Data).synUnit.CaretY - 1];
+      FunctionHeaderBuilder(PChar(sLine));
+    end;
+  end;
+end;
+}
+
 end.