IDE: less hints, initialize vars, use unused parameters

git-svn-id: trunk@44457 -
This commit is contained in:
mattias 2014-03-17 11:25:57 +00:00
parent 914882e83c
commit d841be9240
20 changed files with 112 additions and 140 deletions

View File

@ -89,6 +89,7 @@ var
strItem: string; strItem: string;
canAdd: boolean; canAdd: boolean;
begin begin
strItem:='';
if not InputQuery(cgCheckGroupEditor, clbAdd, strItem) then if not InputQuery(cgCheckGroupEditor, clbAdd, strItem) then
Exit; Exit;
canAdd := True; canAdd := True;

View File

@ -82,6 +82,7 @@ procedure TCheckListBoxEditorDlg.actAddExecute(Sender: TObject);
var var
strItem: string; strItem: string;
begin begin
strItem:='';
if InputQuery(clbCheckListBoxEditor, clbAdd, strItem) then if InputQuery(clbCheckListBoxEditor, clbAdd, strItem) then
begin begin
FCheck.Items.Add(strItem); FCheck.Items.Add(strItem);

View File

@ -38,7 +38,7 @@ type
protected protected
procedure UpdateCaption; procedure UpdateCaption;
procedure UpdateButtons; procedure UpdateButtons;
procedure PersistentAdded(APersistent: TPersistent; Select: boolean); procedure PersistentAdded({%H-}APersistent: TPersistent; {%H-}Select: boolean);
procedure ComponentRenamed(AComponent: TComponent); procedure ComponentRenamed(AComponent: TComponent);
procedure PersistentDeleting(APersistent: TPersistent); procedure PersistentDeleting(APersistent: TPersistent);
procedure RefreshPropertyValues; procedure RefreshPropertyValues;

View File

@ -37,12 +37,12 @@ type
procedure DisplayColumn(Value : Integer); procedure DisplayColumn(Value : Integer);
procedure SetColumns(const AValue: TListColumns); procedure SetColumns(const AValue: TListColumns);
protected protected
procedure AddButtonOnClick(sender : TObject); procedure AddButtonOnClick({%H-}sender : TObject);
procedure DeleteButtonOnClick(sender : TObject); procedure DeleteButtonOnClick({%H-}sender : TObject);
procedure MoveUpButtonOnClick(sender : TObject); procedure MoveUpButtonOnClick({%H-}sender : TObject);
procedure MoveDownButtonOnClick(sender : TObject); procedure MoveDownButtonOnClick({%H-}sender : TObject);
procedure AlignmentRadioGroupOnClick(sender : TObject); procedure AlignmentRadioGroupOnClick({%H-}sender : TObject);
procedure ColumnsListBoxOnClick(sender : TObject); procedure ColumnsListBoxOnClick({%H-}sender : TObject);
Procedure CaptionEditOnChange(Sender : TObject); Procedure CaptionEditOnChange(Sender : TObject);
Procedure WidthEditOnChange(Sender : TObject); Procedure WidthEditOnChange(Sender : TObject);
Procedure cbVisibleOnClick(Sender : TObject); Procedure cbVisibleOnClick(Sender : TObject);

View File

@ -195,17 +195,17 @@ type
procedure DoChange; virtual; procedure DoChange; virtual;
procedure DoBeginUpdate; virtual; procedure DoBeginUpdate; virtual;
procedure DoEndUpdate(Changed: boolean); virtual; procedure DoEndUpdate(Changed: boolean); virtual;
procedure OnPageAddedComponent(Component: TRegisteredComponent); virtual; procedure OnPageAddedComponent({%H-}Component: TRegisteredComponent); virtual;
procedure OnPageRemovedComponent(Page: TBaseComponentPage; procedure OnPageRemovedComponent({%H-}Page: TBaseComponentPage;
Component: TRegisteredComponent); virtual; {%H-}Component: TRegisteredComponent); virtual;
procedure OnComponentVisibleChanged(AComponent: TRegisteredComponent); virtual; procedure OnComponentVisibleChanged({%H-}AComponent: TRegisteredComponent); virtual;
procedure OnPageVisibleChanged(APage: TBaseComponentPage); virtual; procedure OnPageVisibleChanged({%H-}APage: TBaseComponentPage); virtual;
procedure Update; virtual; procedure Update; virtual;
procedure UpdateVisible(AComponent: TRegisteredComponent); virtual; procedure UpdateVisible(AComponent: TRegisteredComponent); virtual;
function GetSelected: TRegisteredComponent; virtual; function GetSelected: TRegisteredComponent; virtual;
procedure SetBaseComponentPageClass(const AValue: TBaseComponentPageClass); virtual; procedure SetBaseComponentPageClass(const AValue: TBaseComponentPageClass); virtual;
procedure SetRegisteredComponentClass(const AValue: TRegisteredComponentClass); virtual; procedure SetRegisteredComponentClass(const AValue: TRegisteredComponentClass); virtual;
procedure SetSelected(const AValue: TRegisteredComponent); virtual; procedure SetSelected(const AValue: TRegisteredComponent); virtual; abstract;
function SortPagesDefaultOrder: Boolean; function SortPagesDefaultOrder: Boolean;
public public
constructor Create; constructor Create;
@ -231,7 +231,7 @@ type
procedure UpdateVisible; virtual; procedure UpdateVisible; virtual;
procedure IterateRegisteredClasses(Proc: TGetComponentClassEvent); procedure IterateRegisteredClasses(Proc: TGetComponentClassEvent);
procedure RegisterCustomIDEComponents( procedure RegisterCustomIDEComponents(
const RegisterProc: RegisterUnitComponentProc); virtual; const RegisterProc: RegisterUnitComponentProc); virtual; abstract;
procedure RemoveAllHandlersOfObject(AnObject: TObject); procedure RemoveAllHandlersOfObject(AnObject: TObject);
procedure AddHandlerUpdateVisible( procedure AddHandlerUpdateVisible(
const OnUpdateCompVisibleEvent: TUpdateCompVisibleEvent; const OnUpdateCompVisibleEvent: TUpdateCompVisibleEvent;
@ -324,8 +324,6 @@ begin
end; end;
destructor TCompPaletteOptions.Destroy; destructor TCompPaletteOptions.Destroy;
var
i: Integer;
begin begin
ClearComponentPages; ClearComponentPages;
FComponentPages.Free; FComponentPages.Free;
@ -408,8 +406,7 @@ end;
function TCompPaletteOptions.Save: boolean; function TCompPaletteOptions.Save: boolean;
var var
CompList: TStringList; CompList: TStringList;
Path, SubPath, CompPath, ss: String; Path, SubPath, CompPath: String;
PageCount, CompCount: Integer;
i, j: Integer; i, j: Integer;
begin begin
Result:=False; Result:=False;
@ -668,7 +665,7 @@ procedure TBaseComponentPalette.AddHandler(HandlerType: TComponentPaletteHandler
begin begin
if FHandlers[HandlerType]=nil then if FHandlers[HandlerType]=nil then
FHandlers[HandlerType]:=TMethodList.Create; FHandlers[HandlerType]:=TMethodList.Create;
FHandlers[HandlerType].Add(AMethod); FHandlers[HandlerType].Add(AMethod,AsLast);
end; end;
function TBaseComponentPalette.GetSelected: TRegisteredComponent; function TBaseComponentPalette.GetSelected: TRegisteredComponent;
@ -689,11 +686,6 @@ begin
UpdateVisible; UpdateVisible;
end; end;
procedure TBaseComponentPalette.SetSelected(const AValue: TRegisteredComponent);
begin
// ignore
end;
procedure TBaseComponentPalette.DoChange; procedure TBaseComponentPalette.DoChange;
begin begin
if FUpdateLock>0 then if FUpdateLock>0 then
@ -993,12 +985,6 @@ begin
end; end;
end; end;
procedure TBaseComponentPalette.RegisterCustomIDEComponents(
const RegisterProc: RegisterUnitComponentProc);
begin
end;
procedure TBaseComponentPalette.RemoveAllHandlersOfObject(AnObject: TObject); procedure TBaseComponentPalette.RemoveAllHandlersOfObject(AnObject: TObject);
var var
HandlerType: TComponentPaletteHandlerType; HandlerType: TComponentPaletteHandlerType;
@ -1010,7 +996,7 @@ end;
procedure TBaseComponentPalette.AddHandlerUpdateVisible( procedure TBaseComponentPalette.AddHandlerUpdateVisible(
const OnUpdateCompVisibleEvent: TUpdateCompVisibleEvent; AsLast: boolean); const OnUpdateCompVisibleEvent: TUpdateCompVisibleEvent; AsLast: boolean);
begin begin
AddHandler(cphtUpdateVisible,TMethod(OnUpdateCompVisibleEvent)); AddHandler(cphtUpdateVisible,TMethod(OnUpdateCompVisibleEvent),AsLast);
end; end;
procedure TBaseComponentPalette.RemoveHandlerUpdateVisible( procedure TBaseComponentPalette.RemoveHandlerUpdateVisible(

View File

@ -20,7 +20,7 @@ type
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure MoveUpBtnClick(Sender: TObject); procedure MoveUpBtnClick(Sender: TObject);
procedure MoveDownBtnClick(Sender: TObject); procedure MoveDownBtnClick(Sender: TObject);
procedure StringGrid1ButtonClick(Sender: TObject; aCol, aRow: Integer); procedure StringGrid1ButtonClick(Sender: TObject; {%H-}aCol, {%H-}aRow: Integer);
procedure StringGrid1Click(Sender: TObject); procedure StringGrid1Click(Sender: TObject);
procedure StringGrid1EditingDone(Sender: TObject); procedure StringGrid1EditingDone(Sender: TObject);
private private

View File

@ -42,10 +42,10 @@ type
procedure BAddClick(Sender: TObject); procedure BAddClick(Sender: TObject);
procedure BClearClick(Sender: TObject); procedure BClearClick(Sender: TObject);
procedure BDeleteClick(Sender: TObject); procedure BDeleteClick(Sender: TObject);
procedure LBComponentsSelectionChange(Sender: TObject; User: boolean); procedure LBComponentsSelectionChange(Sender: TObject; {%H-}User: boolean);
procedure LBPropertiesDblClick(Sender: TObject); procedure LBPropertiesDblClick(Sender: TObject);
procedure SelectPropertiesFormClose(Sender: TObject; procedure SelectPropertiesFormClose(Sender: TObject;
var CloseAction: TCloseAction); var {%H-}CloseAction: TCloseAction);
procedure SelectPropertiesFormCreate(Sender: TObject); procedure SelectPropertiesFormCreate(Sender: TObject);
private private
FSelectedComponent : TComponent; FSelectedComponent : TComponent;

View File

@ -17,8 +17,8 @@ interface
uses uses
Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, LCLType, GraphType, Classes, TypInfo, SysUtils, LCLProc, Forms, Controls, LCLType, GraphType,
FileUtil, Graphics, StdCtrls, Buttons, ComCtrls, Menus, ExtCtrls, Dialogs, FileUtil, Graphics, Buttons, Menus, ExtCtrls, Dialogs,
LCLIntf, ExtDlgs, PropEdits, PropEditUtils, ImgList, Math, LCLIntf, PropEdits, PropEditUtils, ImgList, Math,
GraphicPropEdit; // defines TGraphicPropertyEditorForm GraphicPropEdit; // defines TGraphicPropertyEditorForm
type type
@ -59,7 +59,7 @@ type
function OrdValueToVisualValue(OrdValue: longint): string; override; function OrdValueToVisualValue(OrdValue: longint): string; override;
procedure GetValues(Proc: TGetStrProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure SetValue(const NewValue: ansistring); override; procedure SetValue(const NewValue: ansistring); override;
procedure ListMeasureWidth(const CurValue: ansistring; Index: integer; procedure ListMeasureWidth(const {%H-}CurValue: ansistring; {%H-}Index: integer;
ACanvas: TCanvas; var AWidth: Integer); override; ACanvas: TCanvas; var AWidth: Integer); override;
procedure ListDrawValue(const CurValue: ansistring; Index: integer; procedure ListDrawValue(const CurValue: ansistring; Index: integer;
ACanvas: TCanvas; const ARect:TRect; AState: TPropEditDrawState); override; ACanvas: TCanvas; const ARect:TRect; AState: TPropEditDrawState); override;
@ -73,8 +73,8 @@ type
TBrushStylePropertyEditor = class(TEnumPropertyEditor) TBrushStylePropertyEditor = class(TEnumPropertyEditor)
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
procedure ListMeasureWidth(const CurValue: ansistring; Index:integer; procedure ListMeasureWidth(const {%H-}CurValue: ansistring; {%H-}Index:integer;
ACanvas: TCanvas; var AWidth: Integer); override; {%H-}ACanvas: TCanvas; var AWidth: Integer); override;
procedure ListDrawValue(const CurValue: ansistring; Index:integer; procedure ListDrawValue(const CurValue: ansistring; Index:integer;
ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override; ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override;
procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect; procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect;
@ -87,9 +87,9 @@ type
TPenStylePropertyEditor = class(TEnumPropertyEditor) TPenStylePropertyEditor = class(TEnumPropertyEditor)
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
procedure ListMeasureWidth(const CurValue: ansistring; Index:integer; procedure ListMeasureWidth(const {%H-}CurValue: ansistring; {%H-}Index:integer;
ACanvas: TCanvas; var AWidth: Integer); override; {%H-}ACanvas: TCanvas; var AWidth: Integer); override;
procedure ListDrawValue(const CurValue: ansistring; Index:integer; procedure ListDrawValue(const CurValue: ansistring; {%H-}Index:integer;
ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override; ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override;
procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect; procedure PropDrawValue(ACanvas: TCanvas; const ARect: TRect;
AState:TPropEditDrawState); override; AState:TPropEditDrawState); override;
@ -136,7 +136,7 @@ type
public public
function GetAttributes: TPropertyAttributes; override; function GetAttributes: TPropertyAttributes; override;
procedure GetValues(Proc: TGetStrProc); override; procedure GetValues(Proc: TGetStrProc); override;
procedure ListMeasureHeight(const AValue: ansistring; Index:integer; procedure ListMeasureHeight(const {%H-}AValue: ansistring; {%H-}Index:integer;
ACanvas:TCanvas; var AHeight: Integer); override; ACanvas:TCanvas; var AHeight: Integer); override;
procedure ListDrawValue(const CurValue: ansistring; Index:integer; procedure ListDrawValue(const CurValue: ansistring; Index:integer;
ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override; ACanvas: TCanvas; const ARect: TRect; AState: TPropEditDrawState); override;

View File

@ -37,7 +37,7 @@ type
public public
constructor Create(TheNode: THelpNode; const RegularExpression, constructor Create(TheNode: THelpNode; const RegularExpression,
TheModifierStr: string); TheModifierStr: string);
function MessageMatches(const TheMessage: string; MessageParts: TStrings function MessageMatches(const TheMessage: string; {%H-}MessageParts: TStrings
): boolean; override; ): boolean; override;
property Expression: string read FExpression write FExpression; property Expression: string read FExpression write FExpression;
property ModifierStr: string read FModifierStr write FModifierStr; property ModifierStr: string read FModifierStr write FModifierStr;

View File

@ -134,7 +134,7 @@ type
procedure Setup(ADialog: TAbstractOptionsEditorDialog); virtual; abstract; procedure Setup(ADialog: TAbstractOptionsEditorDialog); virtual; abstract;
procedure ReadSettings(AOptions: TAbstractIDEOptions); virtual; abstract; procedure ReadSettings(AOptions: TAbstractIDEOptions); virtual; abstract;
procedure WriteSettings(AOptions: TAbstractIDEOptions); virtual; abstract; procedure WriteSettings(AOptions: TAbstractIDEOptions); virtual; abstract;
procedure RestoreSettings(AOptions: TAbstractIDEOptions); virtual; procedure RestoreSettings({%H-}AOptions: TAbstractIDEOptions); virtual;
class function SupportedOptionsClass: TAbstractIDEOptionsClass; virtual; abstract; class function SupportedOptionsClass: TAbstractIDEOptionsClass; virtual; abstract;
class function DefaultCollapseChildNodes: Boolean; virtual; class function DefaultCollapseChildNodes: Boolean; virtual;
function FindOptionControl(AClass: TControlClass): TControl; function FindOptionControl(AClass: TControlClass): TControl;
@ -544,7 +544,7 @@ var
Result:=False; // ToDo... Result:=False; // ToDo...
end; end;
function SearchMemo(AControl: TCustomMemo): Boolean; function SearchMemo({%H-}AControl: TCustomMemo): Boolean;
begin begin
Result:=False; // Memo.Caption returns all the lines, skip. Result:=False; // Memo.Caption returns all the lines, skip.
end; end;

View File

@ -17,7 +17,7 @@ unit IDEWindowIntf;
interface interface
uses uses
Math, types, Classes, SysUtils, LCLProc, LazConfigStorage, Forms, Controls; Math, Classes, SysUtils, LCLProc, LazConfigStorage, Forms, Controls;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// layout settings of modal forms (dialogs) in the IDE // layout settings of modal forms (dialogs) in the IDE
@ -89,7 +89,7 @@ type
TIDEDialogLayoutStorage = class(TComponent) TIDEDialogLayoutStorage = class(TComponent)
protected protected
procedure OnCreateForm(Sender: TObject); procedure OnCreateForm(Sender: TObject);
procedure OnCloseForm(Sender: TObject; var CloseAction: TCloseAction); procedure OnCloseForm(Sender: TObject; var {%H-}CloseAction: TCloseAction);
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -209,7 +209,7 @@ type
function GetFormCaption: string; function GetFormCaption: string;
function GetFormID: string; function GetFormID: string;
procedure SetForm(const AValue: TCustomForm); procedure SetForm(const AValue: TCustomForm);
procedure OnFormClose(Sender: TObject; var CloseAction: TCloseAction); procedure OnFormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
protected protected
procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure Notification(AComponent: TComponent; Operation: TOperation); override;
public public
@ -436,7 +436,7 @@ type
procedure MakeIDEWindowDockable(AControl: TWinControl); virtual; abstract; // make AControl dockable, it can be docked and other dockable windows can be docked to it, this does not make it visible procedure MakeIDEWindowDockable(AControl: TWinControl); virtual; abstract; // make AControl dockable, it can be docked and other dockable windows can be docked to it, this does not make it visible
procedure MakeIDEWindowDockSite(AForm: TCustomForm; ASides: TDockSides = [alBottom]); virtual; abstract; // make AForm a dock site, AForm can not be docked, its Parent must be kept nil, this does not make it visible procedure MakeIDEWindowDockSite(AForm: TCustomForm; ASides: TDockSides = [alBottom]); virtual; abstract; // make AForm a dock site, AForm can not be docked, its Parent must be kept nil, this does not make it visible
procedure ShowForm(AForm: TCustomForm; BringToFront: boolean); virtual; abstract; // make a form visible, set BringToFront=true if form should be shown on active screen and on front of other windows, normally this focus the form procedure ShowForm(AForm: TCustomForm; BringToFront: boolean); virtual; abstract; // make a form visible, set BringToFront=true if form should be shown on active screen and on front of other windows, normally this focus the form
function AddableInWindowMenu(AForm: TCustomForm): boolean; virtual; function AddableInWindowMenu({%H-}AForm: TCustomForm): boolean; virtual;
procedure CloseAll; virtual; // close all forms, called after IDE has saved all and shuts down procedure CloseAll; virtual; // close all forms, called after IDE has saved all and shuts down
property HideSimpleLayoutOptions: boolean read FHideSimpleLayoutOptions; property HideSimpleLayoutOptions: boolean read FHideSimpleLayoutOptions;
end; end;
@ -1315,13 +1315,15 @@ begin
iwpdUseWindowSetting: iwpdUseWindowSetting:
f := WindowPlacement in [iwpRestoreWindowGeometry, iwpRestoreWindowSize]; f := WindowPlacement in [iwpRestoreWindowGeometry, iwpRestoreWindowSize];
end; end;
if f then if f then begin
j:=-1;
if Creator.OnGetDividerSize(fForm, FDividers[i].Id, j) then if Creator.OnGetDividerSize(fForm, FDividers[i].Id, j) then
FDividers[i].Size := j FDividers[i].Size := j
else else
FDividers[i].Size := -1; // Default / Not Changed / Unavailable FDividers[i].Size := -1; // Default / Not Changed / Unavailable
end; end;
end; end;
end;
procedure TSimpleWindowLayout.GetCurrentPosition; procedure TSimpleWindowLayout.GetCurrentPosition;
begin begin

View File

@ -43,8 +43,8 @@ type
procedure BtnLoadClick(Sender: TObject); procedure BtnLoadClick(Sender: TObject);
procedure BtnSaveClick(Sender: TObject); procedure BtnSaveClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure StringGridPrepareCanvas(sender: TObject; Col, Row: Integer; procedure StringGridPrepareCanvas({%H-}sender: TObject; Col, Row: Integer;
aState: TGridDrawState); {%H-}aState: TGridDrawState);
procedure SwapRowCol(Sender:TObject); procedure SwapRowCol(Sender:TObject);
private private
FModified: Boolean; FModified: Boolean;

View File

@ -29,13 +29,13 @@ type
property GraphTimeStamp: integer read FGraphTimeStamp; property GraphTimeStamp: integer read FGraphTimeStamp;
procedure IncreaseBaseStamp; procedure IncreaseBaseStamp;
procedure IncreaseGraphStamp; procedure IncreaseGraphStamp;
function StrHasMacros(const s: string): boolean; virtual; function StrHasMacros(const s: string): boolean; virtual; abstract;
function SubstituteMacros(var s: string): boolean; virtual; function SubstituteMacros(var s: string): boolean; virtual; abstract;
function IsMacro(const Name: string): boolean; virtual; function IsMacro(const Name: string): boolean; virtual; abstract;
// file utility functions // file utility functions
function CreateAbsoluteSearchPath(var SearchPath: string; function CreateAbsoluteSearchPath(var SearchPath: string;
const BaseDirectory: string): boolean; const BaseDirectory: string): boolean;
procedure Add(NewMacro: TTransferMacro);virtual; procedure Add(NewMacro: TTransferMacro); virtual; abstract;
end; end;
var var
@ -49,7 +49,6 @@ implementation
const const
MaxStamp = $7fffffff; MaxStamp = $7fffffff;
MinStamp = -$7fffffff; MinStamp = -$7fffffff;
InvalidStamp = MinStamp-1;
procedure RenameIDEMacroInString(var s: string; const OldName, NewName: string); procedure RenameIDEMacroInString(var s: string; const OldName, NewName: string);
var var
@ -103,22 +102,6 @@ begin
FGraphTimeStamp:=MinStamp; FGraphTimeStamp:=MinStamp;
end; end;
function TIDEMacros.StrHasMacros(const s: string): boolean;
begin
Result:=false;
end;
function TIDEMacros.SubstituteMacros(var s: string): boolean;
begin
Result:=true;
end;
function TIDEMacros.IsMacro(const Name: string): boolean;
begin
if Name='' then ;
Result:=true;
end;
function TIDEMacros.CreateAbsoluteSearchPath(var SearchPath: string; function TIDEMacros.CreateAbsoluteSearchPath(var SearchPath: string;
const BaseDirectory: string): boolean; const BaseDirectory: string): boolean;
var var
@ -131,9 +114,5 @@ begin
SearchPath:=MinimizeSearchPath(LazFileUtils.CreateAbsoluteSearchPath(SearchPath,BaseDir)); SearchPath:=MinimizeSearchPath(LazFileUtils.CreateAbsoluteSearchPath(SearchPath,BaseDir));
end; end;
procedure TIDEMacros.Add(NewMacro: TTransferMacro);
Begin
end;
end. end.

View File

@ -16,7 +16,7 @@ unit NewItemIntf;
interface interface
uses uses
Classes, SysUtils, ObjInspStrConsts; Classes, SysUtils;
type type
// Flags/Options for the items // Flags/Options for the items
@ -49,7 +49,7 @@ type
function Description: string; virtual; function Description: string; virtual;
function IndexOfTemplate(const TemplateName: string): integer; virtual; function IndexOfTemplate(const TemplateName: string): integer; virtual;
function FindTemplateByName(const TemplateName: string): TNewIDEItemTemplate; virtual; function FindTemplateByName(const TemplateName: string): TNewIDEItemTemplate; virtual;
function IndexOfCategory(const CategoryName: string): integer; virtual; function IndexOfCategory(const {%H-}CategoryName: string): integer; virtual;
function FindCategoryByName(const CategoryName: string): TNewIDEItemCategory; virtual; function FindCategoryByName(const CategoryName: string): TNewIDEItemCategory; virtual;
public public
property Count: integer read GetCount; property Count: integer read GetCount;

View File

@ -16,7 +16,7 @@ unit PackageIntf;
interface interface
uses uses
Classes, SysUtils, contnrs, LCLProc, Forms, LazConfigStorage, AvgLvlTree, Classes, SysUtils, contnrs, LCLProc, Forms, LazConfigStorage,
NewItemIntf, CompOptsIntf, IDEOptionsIntf; NewItemIntf, CompOptsIntf, IDEOptionsIntf;
const const
@ -732,7 +732,7 @@ procedure TPackageEditingInterface.AddHandler(HandlerType: TPkgIntfHandlerType;
begin begin
if FHandlers[HandlerType]=nil then if FHandlers[HandlerType]=nil then
FHandlers[HandlerType]:=TMethodList.Create; FHandlers[HandlerType]:=TMethodList.Create;
FHandlers[HandlerType].Add(AMethod); FHandlers[HandlerType].Add(AMethod,AsLast);
end; end;
procedure TPackageEditingInterface.RemoveHandler( procedure TPackageEditingInterface.RemoveHandler(
@ -767,7 +767,7 @@ end;
procedure TPackageEditingInterface.AddHandlerOnGraphChanged( procedure TPackageEditingInterface.AddHandlerOnGraphChanged(
const OnGraphChanged: TNotifyEvent; AsLast: boolean); const OnGraphChanged: TNotifyEvent; AsLast: boolean);
begin begin
AddHandler(pihtGraphChanged,TMethod(OnGraphChanged)); AddHandler(pihtGraphChanged,TMethod(OnGraphChanged),AsLast);
end; end;
procedure TPackageEditingInterface.RemoveHandlerOnGraphChanged( procedure TPackageEditingInterface.RemoveHandlerOnGraphChanged(
@ -779,7 +779,7 @@ end;
procedure TPackageEditingInterface.AddHandlerOnPackageFileLoaded( procedure TPackageEditingInterface.AddHandlerOnPackageFileLoaded(
const OnPkgLoaded: TNotifyEvent; AsLast: boolean); const OnPkgLoaded: TNotifyEvent; AsLast: boolean);
begin begin
AddHandler(pihtPackageFileLoaded,TMethod(OnPkgLoaded)); AddHandler(pihtPackageFileLoaded,TMethod(OnPkgLoaded),AsLast);
end; end;
procedure TPackageEditingInterface.RemoveHandlerOnPackageFileLoaded( procedure TPackageEditingInterface.RemoveHandlerOnPackageFileLoaded(

View File

@ -115,15 +115,15 @@ type
constructor Create; virtual; constructor Create; virtual;
function GetLocalizedName: string; virtual; function GetLocalizedName: string; virtual;
function GetLocalizedDescription: string; virtual; function GetLocalizedDescription: string; virtual;
function GetResourceSource(const ResourceName: string): string; virtual; function GetResourceSource(const {%H-}ResourceName: string): string; virtual;
procedure Release; procedure Release;
procedure Reference; procedure Reference;
function CheckOwner(Quiet: boolean): TModalResult; virtual; function CheckOwner({%H-}Quiet: boolean): TModalResult; virtual;
function CreateSource(const Filename, SourceName, function CreateSource(const {%H-}aFilename, {%H-}aSourceName,
ResourceName: string): string; virtual; {%H-}aResourceName: string): string; virtual;
procedure UpdateDefaultPascalFileExtension(const DefPasExt: string); virtual; procedure UpdateDefaultPascalFileExtension(const DefPasExt: string); virtual;
function Init(var NewFilename: string; NewOwner: TObject; function Init(var {%H-}NewFilename: string; {%H-}NewOwner: TObject;
var NewSource: string; Quiet: boolean): TModalResult; virtual; var {%H-}NewSource: string; {%H-}Quiet: boolean): TModalResult; virtual;
public public
property Owner: TObject read FOwner write SetOwner; // project, package or nil property Owner: TObject read FOwner write SetOwner; // project, package or nil
property Name: string read FName write SetName; property Name: string read FName write SetName;
@ -164,16 +164,16 @@ type
TFileDescPascalUnit = class(TProjectFileDescriptor) TFileDescPascalUnit = class(TProjectFileDescriptor)
public public
constructor Create; override; constructor Create; override;
function CreateSource(const Filename, SourceName, function CreateSource(const aFilename, aSourceName,
ResourceName: string): string; override; aResourceName: string): string; override;
function GetLocalizedName: string; override; function GetLocalizedName: string; override;
function GetLocalizedDescription: string; override; function GetLocalizedDescription: string; override;
function GetUnitDirectives: string; virtual; function GetUnitDirectives: string; virtual;
function GetInterfaceUsesSection: string; virtual; function GetInterfaceUsesSection: string; virtual;
function GetInterfaceSource(const Filename, SourceName, function GetInterfaceSource(const {%H-}aFilename, {%H-}aSourceName,
ResourceName: string): string; virtual; {%H-}aResourceName: string): string; virtual;
function GetImplementationSource(const Filename, SourceName, function GetImplementationSource(const {%H-}aFilename, {%H-}aSourceName,
ResourceName: string): string; virtual; {%H-}aResourceName: string): string; virtual;
function CheckOwner(Quiet: boolean): TModalResult; override; function CheckOwner(Quiet: boolean): TModalResult; override;
class function CompilerOptionsToUnitDirectives(CompOpts: TLazCompilerOptions): string; class function CompilerOptionsToUnitDirectives(CompOpts: TLazCompilerOptions): string;
end; end;
@ -190,10 +190,10 @@ type
constructor Create; override; constructor Create; override;
function GetInterfaceUsesSection: string; override; function GetInterfaceUsesSection: string; override;
function GetInterfaceSource(const Filename, SourceName, function GetInterfaceSource(const {%H-}Filename, {%H-}SourceName,
ResourceName: string): string; override;
function GetImplementationSource(const Filename, SourceName,
ResourceName: string): string; override; ResourceName: string): string; override;
function GetImplementationSource(const Filename, {%H-}SourceName,
{%H-}ResourceName: string): string; override;
property DeclareClassVariable: Boolean read FDeclareClassVariable write FDeclareClassVariable; property DeclareClassVariable: Boolean read FDeclareClassVariable write FDeclareClassVariable;
end; end;
@ -293,7 +293,7 @@ type
procedure Reference; procedure Reference;
function InitDescriptor: TModalResult; // called while old project is still there, you can start a dialog to ask for settings function InitDescriptor: TModalResult; // called while old project is still there, you can start a dialog to ask for settings
function InitProject(AProject: TLazProject): TModalResult; virtual; // called after old project was closed and new was created, you must now setup global flags and compiler options function InitProject(AProject: TLazProject): TModalResult; virtual; // called after old project was closed and new was created, you must now setup global flags and compiler options
function CreateStartFiles(AProject: TLazProject): TModalResult; virtual; // called after all global settings are done, you can now create and open files function CreateStartFiles({%H-}AProject: TLazProject): TModalResult; virtual; // called after all global settings are done, you can now create and open files
public public
property Name: string read FName write SetName; property Name: string read FName write SetName;
property VisibleInNewDialog: boolean read FVisibleInNewDialog property VisibleInNewDialog: boolean read FVisibleInNewDialog
@ -414,7 +414,7 @@ type
procedure SetTitle(const AValue: String); virtual; procedure SetTitle(const AValue: String); virtual;
procedure SetUseManifest(AValue: boolean); virtual; abstract; procedure SetUseManifest(AValue: boolean); virtual; abstract;
public public
constructor Create(ProjectDescription: TProjectDescriptor); virtual; constructor Create({%H-}ProjectDescription: TProjectDescriptor); virtual;
destructor Destroy; override; destructor Destroy; override;
procedure Clear; virtual; procedure Clear; virtual;
function IsVirtual: boolean; virtual; abstract; function IsVirtual: boolean; virtual; abstract;
@ -784,8 +784,8 @@ begin
Result:=mrOk; Result:=mrOk;
end; end;
function TProjectFileDescriptor.CreateSource(const Filename, SourceName, function TProjectFileDescriptor.CreateSource(const aFilename, aSourceName,
ResourceName: string): string; aResourceName: string): string;
begin begin
Result:=''; Result:='';
end; end;
@ -817,14 +817,14 @@ begin
IsPascalUnit:=true; IsPascalUnit:=true;
end; end;
function TFileDescPascalUnit.CreateSource(const Filename, SourceName, function TFileDescPascalUnit.CreateSource(const aFilename, aSourceName,
ResourceName: string): string; aResourceName: string): string;
var var
LE: string; LE: string;
begin begin
LE:=LineEnding; LE:=LineEnding;
Result:= Result:=
'unit '+SourceName+';'+LE 'unit '+aSourceName+';'+LE
+LE +LE
+GetUnitDirectives+LE +GetUnitDirectives+LE
+LE +LE
@ -833,10 +833,10 @@ begin
+'uses'+LE +'uses'+LE
+' '+GetInterfaceUsesSection+';'+LE +' '+GetInterfaceUsesSection+';'+LE
+LE +LE
+GetInterfaceSource(Filename,SourceName,ResourceName) +GetInterfaceSource(aFilename,aSourceName,aResourceName)
+'implementation'+LE +'implementation'+LE
+LE +LE
+GetImplementationSource(Filename,SourceName,ResourceName) +GetImplementationSource(aFilename,aSourceName,aResourceName)
+'end.'+LE +'end.'+LE
+LE; +LE;
end; end;
@ -863,14 +863,14 @@ begin
Result:='Classes, SysUtils'; Result:='Classes, SysUtils';
end; end;
function TFileDescPascalUnit.GetInterfaceSource(const Filename, SourceName, function TFileDescPascalUnit.GetInterfaceSource(const aFilename, aSourceName,
ResourceName: string): string; aResourceName: string): string;
begin begin
Result:=''; Result:='';
end; end;
function TFileDescPascalUnit.GetImplementationSource(const Filename, function TFileDescPascalUnit.GetImplementationSource(const aFilename,
SourceName, ResourceName: string): string; aSourceName, aResourceName: string): string;
begin begin
Result:=''; Result:='';
end; end;

View File

@ -25,8 +25,8 @@ type
public public
constructor Create; virtual; constructor Create; virtual;
procedure DoAfterBuild(AResources: TAbstractProjectResources; AReason: TCompileReason; SaveToTestDir: boolean); virtual; procedure DoAfterBuild({%H-}AResources: TAbstractProjectResources; {%H-}AReason: TCompileReason; {%H-}SaveToTestDir: boolean); virtual;
procedure DoBeforeBuild(AResources: TAbstractProjectResources; AReason: TCompileReason; SaveToTestDir: boolean); virtual; procedure DoBeforeBuild({%H-}AResources: TAbstractProjectResources; {%H-}AReason: TCompileReason; {%H-}SaveToTestDir: boolean); virtual;
function UpdateResources(AResources: TAbstractProjectResources; const MainFilename: string): Boolean; virtual; abstract; function UpdateResources(AResources: TAbstractProjectResources; const MainFilename: string): Boolean; virtual; abstract;
procedure WriteToProjectFile(AConfig: {TXMLConfig}TObject; Path: String); virtual; abstract; procedure WriteToProjectFile(AConfig: {TXMLConfig}TObject; Path: String); virtual; abstract;
procedure ReadFromProjectFile(AConfig: {TXMLConfig}TObject; Path: String); virtual; abstract; procedure ReadFromProjectFile(AConfig: {TXMLConfig}TObject; Path: String); virtual; abstract;

View File

@ -85,6 +85,7 @@ begin
OldText := Memo.Lines.Text; OldText := Memo.Lines.Text;
end; end;
NewSortedText:='';
if ShowSortSelectionDialogFunc(OldText, nil, NewSortedText) <> mrOk then Exit; if ShowSortSelectionDialogFunc(OldText, nil, NewSortedText) <> mrOk then Exit;
if SortOnlySelection then if SortOnlySelection then
Memo.SelText := NewSortedText Memo.SelText := NewSortedText

View File

@ -892,7 +892,7 @@ end;
procedure TComponentPalette.RegisterCustomIDEComponents( procedure TComponentPalette.RegisterCustomIDEComponents(
const RegisterProc: RegisterUnitComponentProc); const RegisterProc: RegisterUnitComponentProc);
begin begin
inherited RegisterCustomIDEComponents(RegisterProc); //inherited RegisterCustomIDEComponents(RegisterProc);
{$IFDEF CustomIDEComps} {$IFDEF CustomIDEComps}
CustomIDEComps.RegisterCustomComponents(RegisterProc); CustomIDEComps.RegisterCustomComponents(RegisterProc);
{$ENDIF} {$ENDIF}

View File

@ -1,24 +1,24 @@
object CompPaletteOptionsFrame: TCompPaletteOptionsFrame object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
Left = 0 Left = 0
Height = 458 Height = 411
Top = 0 Top = 0
Width = 814 Width = 511
ClientHeight = 458 ClientHeight = 411
ClientWidth = 814 ClientWidth = 511
TabOrder = 0 TabOrder = 0
Visible = False Visible = False
DesignLeft = 309 DesignLeft = 520
DesignTop = 530 DesignTop = 374
object PagesGroupBox: TGroupBox object PagesGroupBox: TGroupBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 458 Height = 411
Top = 0 Top = 0
Width = 227 Width = 227
Align = alLeft Align = alLeft
Anchors = [] Anchors = []
Caption = 'PagesGroupBox' Caption = 'PagesGroupBox'
ClientHeight = 439 ClientHeight = 394
ClientWidth = 223 ClientWidth = 223
TabOrder = 0 TabOrder = 0
object PagesListBox: TListBox object PagesListBox: TListBox
@ -27,7 +27,7 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideRight.Control = PageMoveUpBtn AnchorSideRight.Control = PageMoveUpBtn
AnchorSideBottom.Control = AddPageButton AnchorSideBottom.Control = AddPageButton
Left = 1 Left = 1
Height = 400 Height = 354
Top = 1 Top = 1
Width = 188 Width = 188
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@ -39,7 +39,9 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
OnDragOver = PagesListBoxDragOver OnDragOver = PagesListBoxDragOver
OnKeyDown = PagesListBoxKeyDown OnKeyDown = PagesListBoxKeyDown
OnSelectionChange = PagesListBoxSelectionChange OnSelectionChange = PagesListBoxSelectionChange
ScrollWidth = 186
TabOrder = 0 TabOrder = 0
TopIndex = -1
end end
object AddPageButton: TBitBtn object AddPageButton: TBitBtn
AnchorSideLeft.Control = PagesListBox AnchorSideLeft.Control = PagesListBox
@ -47,9 +49,9 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideBottom.Control = PagesGroupBox AnchorSideBottom.Control = PagesGroupBox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 26 Height = 27
Top = 407 Top = 361
Width = 54 Width = 46
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -63,10 +65,10 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = AddPageButton AnchorSideTop.Control = AddPageButton
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 64 Left = 56
Height = 26 Height = 27
Top = 407 Top = 361
Width = 110 Width = 99
AutoSize = True AutoSize = True
BorderSpacing.Left = 9 BorderSpacing.Left = 9
BorderSpacing.Bottom = 6 BorderSpacing.Bottom = 6
@ -107,14 +109,14 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
end end
object ComponentsGroupBox: TGroupBox object ComponentsGroupBox: TGroupBox
Left = 232 Left = 232
Height = 458 Height = 411
Top = 0 Top = 0
Width = 582 Width = 279
Align = alClient Align = alClient
Anchors = [] Anchors = []
Caption = 'ComponentsGroupBox' Caption = 'ComponentsGroupBox'
ClientHeight = 439 ClientHeight = 394
ClientWidth = 578 ClientWidth = 275
TabOrder = 1 TabOrder = 1
object ComponentsListView: TListView object ComponentsListView: TListView
AnchorSideLeft.Control = ComponentsGroupBox AnchorSideLeft.Control = ComponentsGroupBox
@ -123,9 +125,9 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideBottom.Control = ComponentsGroupBox AnchorSideBottom.Control = ComponentsGroupBox
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 437 Height = 392
Top = 1 Top = 1
Width = 543 Width = 240
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Right = 5 BorderSpacing.Right = 5
BorderSpacing.Around = 1 BorderSpacing.Around = 1
@ -171,7 +173,7 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ComponentsGroupBox AnchorSideRight.Control = ComponentsGroupBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 550 Left = 247
Height = 26 Height = 26
Top = 102 Top = 102
Width = 22 Width = 22
@ -186,7 +188,7 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
AnchorSideLeft.Control = CompMoveUpBtn AnchorSideLeft.Control = CompMoveUpBtn
AnchorSideTop.Control = CompMoveUpBtn AnchorSideTop.Control = CompMoveUpBtn
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 550 Left = 247
Height = 26 Height = 26
Top = 135 Top = 135
Width = 22 Width = 22
@ -199,7 +201,7 @@ object CompPaletteOptionsFrame: TCompPaletteOptionsFrame
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 227 Left = 227
Height = 458 Height = 411
Top = 0 Top = 0
Width = 5 Width = 5
Anchors = [akLeft] Anchors = [akLeft]