From a4dc35765da08ea58450acc3fc76f6f17eb0d33a Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 8 Sep 2007 14:11:53 +0000 Subject: [PATCH] IDEIntf: added lfm/lrs files for objectinspector git-svn-id: trunk@11965 - --- .gitattributes | 2 + designer/objinspext.pas | 16 +-- examples/objectinspector/mainunit.pas | 4 +- ide/customformeditor.pp | 8 +- ide/formeditor.pp | 4 +- ide/helpmanager.pas | 6 +- ide/main.pp | 16 +-- ide/mainintf.pas | 2 +- ideintf/objectinspector.lfm | 41 ++++++ ideintf/objectinspector.lrs | 16 +++ ideintf/objectinspector.pp | 200 ++++++++++++-------------- 11 files changed, 175 insertions(+), 140 deletions(-) create mode 100644 ideintf/objectinspector.lfm create mode 100644 ideintf/objectinspector.lrs diff --git a/.gitattributes b/.gitattributes index 1cc70cc8af..f005dd549a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1999,6 +1999,8 @@ ideintf/newfield.lfm svneol=native#text/plain ideintf/newfield.lrs svneol=native#text/pascal ideintf/newfield.pas svneol=native#text/pascal ideintf/newitemintf.pas svneol=native#text/pascal +ideintf/objectinspector.lfm svneol=native#text/plain +ideintf/objectinspector.lrs svneol=native#text/plain ideintf/objectinspector.pp svneol=native#text/pascal ideintf/objinspstrconsts.pas svneol=native#text/pascal ideintf/oi_box.bmp -text svneol=unset#image/bmp diff --git a/designer/objinspext.pas b/designer/objinspext.pas index d8d628fc87..bd6935c8f6 100644 --- a/designer/objinspext.pas +++ b/designer/objinspext.pas @@ -41,17 +41,17 @@ type procedure OkButtonClick(Sender: TObject); private FAddMode: Boolean; - FObjectInspector: TObjectInspector; + FObjectInspector: TObjectInspectorDlg; FPropertyName: string; procedure SetAddMode(const AValue: Boolean); - procedure SetObjectInspector(const AValue: TObjectInspector); + procedure SetObjectInspector(const AValue: TObjectInspectorDlg); procedure UpdateLabel; procedure UpdateComboBox; procedure UpdateMode; public constructor Create(TheOwner: TComponent); override; public - property ObjectInspector: TObjectInspector read FObjectInspector + property ObjectInspector: TObjectInspectorDlg read FObjectInspector write SetObjectInspector; property PropertyName: string read FPropertyName; property AddMode: Boolean read FAddMode write SetAddMode; @@ -63,14 +63,14 @@ const var DefaultOIFavouriteProperties: TOIFavouriteProperties; -function ShowAddRemoveFavouriteDialog(ObjInspector: TObjectInspector; +function ShowAddRemoveFavouriteDialog(ObjInspector: TObjectInspectorDlg; Add: Boolean): TModalResult; function CreateDefaultOIFavouriteProperties: TOIFavouriteProperties; function LoadOIFavouriteProperties: TOIFavouriteProperties; procedure SaveOIFavouriteProperties(Favourites: TOIFavouriteProperties); function GetOIFavouriteConfigFilename: string; -function FindDeclarationOfOIProperty(AnInspector: TObjectInspector; +function FindDeclarationOfOIProperty(AnInspector: TObjectInspectorDlg; Row: TOIPropertyGridRow; out Code: TCodeBuffer; out Caret: TPoint; out NewTopLine: integer): Boolean; @@ -107,7 +107,7 @@ begin Result.DeleteDoubles; end; -function ShowAddRemoveFavouriteDialog(ObjInspector: TObjectInspector; +function ShowAddRemoveFavouriteDialog(ObjInspector: TObjectInspectorDlg; Add: Boolean): TModalResult; var OIAddRemoveFavouriteDlg: TOIAddRemoveFavouriteDlg; @@ -191,7 +191,7 @@ begin Result:=AppendPathDelim(GetPrimaryConfigPath)+DefaultOIFavouriteConfigFilename; end; -function FindDeclarationOfOIProperty(AnInspector: TObjectInspector; +function FindDeclarationOfOIProperty(AnInspector: TObjectInspectorDlg; Row: TOIPropertyGridRow; out Code: TCodeBuffer; out Caret: TPoint; out NewTopLine: integer): Boolean; var @@ -297,7 +297,7 @@ begin [mbOk],0); end; -procedure TOIAddRemoveFavouriteDlg.SetObjectInspector(const AValue: TObjectInspector +procedure TOIAddRemoveFavouriteDlg.SetObjectInspector(const AValue: TObjectInspectorDlg ); var CurRow: TOIPropertyGridRow; diff --git a/examples/objectinspector/mainunit.pas b/examples/objectinspector/mainunit.pas index 6eb520ab52..1432dcddb1 100644 --- a/examples/objectinspector/mainunit.pas +++ b/examples/objectinspector/mainunit.pas @@ -33,7 +33,7 @@ type private procedure SetObjectInspectorRoot(AComponent: TComponent); public - TheObjectInspector: TObjectInspector; + TheObjectInspector: TObjectInspectorDlg; ThePropertyEditorHook: TPropertyEditorHook; ARootComponent: TMyComponent; end; @@ -51,7 +51,7 @@ begin ThePropertyEditorHook:=TPropertyEditorHook.Create; // create the ObjectInspector - TheObjectInspector:=TObjectInspector.Create(Application); + TheObjectInspector:=TObjectInspectorDlg.Create(Application); TheObjectInspector.PropertyEditorHook:=ThePropertyEditorHook; TheObjectInspector.SetBounds(10,10,240,500); diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp index c0b6a0fd43..45b6be40f6 100644 --- a/ide/customformeditor.pp +++ b/ide/customformeditor.pp @@ -114,7 +114,7 @@ each control that's dropped onto the form FComponentInterfaces: TAVLTree; // tree of TComponentInterface sorted for // component FSelection: TPersistentSelectionList; - FObj_Inspector: TObjectInspector; + FObj_Inspector: TObjectInspectorDlg; FDefineProperties: TAVLTree;// tree of TDefinePropertiesCacheItem FStandardDefinePropertiesRegistered: Boolean; FDesignerBaseClasses: TFPList; // list of TComponentClass @@ -125,7 +125,7 @@ each control that's dropped onto the form FNonControlForms: TAVLTree; // tree of TNonControlDesignerForm sorted for LookupRoot procedure SetSelection(const ASelection: TPersistentSelectionList); procedure OnObjectInspectorModified(Sender: TObject); - procedure SetObj_Inspector(AnObjectInspector: TObjectInspector); virtual; + procedure SetObj_Inspector(AnObjectInspector: TObjectInspectorDlg); virtual; procedure JITListReaderError(Sender: TObject; ErrorType: TJITFormError; var Action: TModalResult); virtual; procedure JITListPropertyNotFound(Sender: TObject; Reader: TReader; @@ -250,7 +250,7 @@ each control that's dropped onto the form public property Selection: TPersistentSelectionList read FSelection write SetSelection; - property Obj_Inspector: TObjectInspector + property Obj_Inspector: TObjectInspectorDlg read FObj_Inspector write SetObj_Inspector; property PropertyEditorHook: TPropertyEditorHook read GetPropertyEditorHook; end; @@ -2215,7 +2215,7 @@ begin end; procedure TCustomFormEditor.SetObj_Inspector( - AnObjectInspector: TObjectInspector); + AnObjectInspector: TObjectInspectorDlg); begin if AnObjectInspector=FObj_Inspector then exit; if FObj_Inspector<>nil then begin diff --git a/ide/formeditor.pp b/ide/formeditor.pp index e08a7a61ed..8ce8c92f07 100644 --- a/ide/formeditor.pp +++ b/ide/formeditor.pp @@ -40,7 +40,7 @@ type TFormEditor = class(TCustomFormEditor) protected - procedure SetObj_Inspector(AnObjectInspector: TObjectInspector); override; + procedure SetObj_Inspector(AnObjectInspector: TObjectInspectorDlg); override; public procedure PaintAllDesignerItems; procedure CheckDesignerPositions; @@ -72,7 +72,7 @@ begin FormEditor1:=nil; end; -procedure TFormEditor.SetObj_Inspector(AnObjectInspector: TObjectInspector); +procedure TFormEditor.SetObj_Inspector(AnObjectInspector: TObjectInspectorDlg); begin if AnObjectInspector=Obj_Inspector then exit; inherited SetObj_Inspector(AnObjectInspector); diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas index 92c7b00ebe..d856e17617 100644 --- a/ide/helpmanager.pas +++ b/ide/helpmanager.pas @@ -839,7 +839,7 @@ end; procedure THelpManager.ShowHelpForObjectInspector(Sender: TObject); var - AnInspector: TObjectInspector; + AnInspector: TObjectInspectorDlg; Code: TCodeBuffer; Caret: TPoint; ErrMsg: string; @@ -847,8 +847,8 @@ var begin //DebugLn('THelpManager.ShowHelpForObjectInspector ',dbgsName(Sender)); if Sender=nil then Sender:=ObjectInspector1; - if Sender is TObjectInspector then begin - AnInspector:=TObjectInspector(Sender); + if Sender is TObjectInspectorDlg then begin + AnInspector:=TObjectInspectorDlg(Sender); if AnInspector.GetActivePropertyRow<>nil then begin if FindDeclarationOfOIProperty(AnInspector,nil,Code,Caret,NewTopLine) then begin diff --git a/ide/main.pp b/ide/main.pp index 7aa0a6cecd..6b4febb05a 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -1261,15 +1261,15 @@ end; procedure TMainIDE.OIOnFindDeclarationOfProperty(Sender: TObject); var - AnInspector: TObjectInspector; + AnInspector: TObjectInspectorDlg; Code: TCodeBuffer; Caret: TPoint; NewTopLine: integer; begin if not BeginCodeTools then exit; if Sender=nil then Sender:=ObjectInspector1; - if Sender is TObjectInspector then begin - AnInspector:=TObjectInspector(Sender); + if Sender is TObjectInspectorDlg then begin + AnInspector:=TObjectInspectorDlg(Sender); if FindDeclarationOfOIProperty(AnInspector,nil,Code,Caret,NewTopLine) then DoOpenFileAndJumpToPos(Code.Filename,Caret,NewTopLine,-1,[]); end; @@ -1519,8 +1519,8 @@ end; procedure TMainIDE.SetupObjectInspector; begin - ObjectInspector1 := TObjectInspector.Create(OwningComponent); - ObjectInspector1.BorderStyle:=bsSizeToolWin; + ObjectInspector1 := TObjectInspectorDlg.Create(OwningComponent); + ObjectInspector1.BorderStyle:=bsSizeable; ObjectInspector1.Favourites:=LoadOIFavouriteProperties; ObjectInspector1.FindDeclarationPopupmenuItem.Visible:=true; ObjectInspector1.OnAddToFavourites:=@OIOnAddToFavourites; @@ -1531,7 +1531,7 @@ begin ObjectInspector1.OnShowOptions:=@OIOnShowOptions; ObjectInspector1.OnDestroy:=@OIOnDestroy; ObjectInspector1.ShowFavouritePage:=true; - IDECmdScopeObjectInspectorOnly.AddWindowClass(TObjectInspector); + IDECmdScopeObjectInspectorOnly.AddWindowClass(TObjectInspectorDlg); GlobalDesignHook:=TPropertyEditorHook.Create; GlobalDesignHook.GetPrivateDirectory:=AppendPathDelim(GetPrimaryConfigPath); @@ -2431,7 +2431,7 @@ begin ecContextHelp: if Sender=MessagesView then HelpBoss.ShowHelpForMessage(-1) - else if Sender is TObjectInspector then + else if Sender is TObjectInspectorDlg then HelpBoss.ShowHelpForObjectInspector(Sender); ecSave: @@ -2439,7 +2439,7 @@ begin GetDesignerUnit(TDesigner(Sender),ASrcEdit,AnUnitInfo); if (AnUnitInfo<>nil) and (AnUnitInfo.EditorIndex>=0) then DoSaveEditorFile(AnUnitInfo.EditorIndex,[sfCheckAmbiguousFiles]); - end else if (Sender is TObjectInspector) then begin + end else if (Sender is TObjectInspectorDlg) then begin GetObjectInspectorUnit(ASrcEdit,AnUnitInfo); if (AnUnitInfo<>nil) and (AnUnitInfo.EditorIndex>=0) then DoSaveEditorFile(AnUnitInfo.EditorIndex,[sfCheckAmbiguousFiles]); diff --git a/ide/mainintf.pas b/ide/mainintf.pas index f6641c598d..ff19f402d7 100644 --- a/ide/mainintf.pas +++ b/ide/mainintf.pas @@ -187,7 +187,7 @@ type var MainIDEInterface: TMainIDEInterface; - ObjectInspector1: TObjectInspector = nil; + ObjectInspector1: TObjectInspectorDlg = nil; const OpenFlagNames: array[TOpenFlag] of string = ( diff --git a/ideintf/objectinspector.lfm b/ideintf/objectinspector.lfm new file mode 100644 index 0000000000..592be08c7f --- /dev/null +++ b/ideintf/objectinspector.lfm @@ -0,0 +1,41 @@ +object ObjectInspectorDlg: TObjectInspectorDlg + Left = 292 + Height = 669 + Top = 175 + Width = 275 + HorzScrollBar.Page = 274 + VertScrollBar.Page = 668 + Caption = 'ObjectInspectorDlg' + ClientHeight = 669 + ClientWidth = 275 + KeyPreview = True + OnResize = ObjectInspectorResize + PopupMenu = MainPopupMenu + object StatusBar: TStatusBar + Height = 23 + Top = 646 + Width = 275 + Panels = < + item + Width = 100 + end + item + Width = 50 + end> + SimplePanel = False + end + object AvailPersistentComboBox: TComboBox + Height = 21 + Width = 275 + Align = alTop + AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending] + ItemHeight = 13 + OnCloseUp = AvailComboBoxCloseUp + TabOrder = 0 + end + object MainPopupMenu: TPopupMenu + OnPopup = OnMainPopupMenuPopup + left = 9 + top = 11 + end +end diff --git a/ideintf/objectinspector.lrs b/ideintf/objectinspector.lrs new file mode 100644 index 0000000000..59413828bd --- /dev/null +++ b/ideintf/objectinspector.lrs @@ -0,0 +1,16 @@ +{ This is an automatically generated lazarus resource file } + +LazarusResources.Add('TObjectInspectorDlg','FORMDATA',[ + 'TPF0'#19'TObjectInspectorDlg'#18'ObjectInspectorDlg'#4'Left'#3'$'#1#6'Height' + +#3#157#2#3'Top'#3#175#0#5'Width'#3#19#1#18'HorzScrollBar.Page'#3#18#1#18'Ver' + +'tScrollBar.Page'#3#156#2#7'Caption'#6#18'ObjectInspectorDlg'#12'ClientHeigh' + +'t'#3#157#2#11'ClientWidth'#3#19#1#10'KeyPreview'#9#8'OnResize'#7#21'ObjectI' + +'nspectorResize'#9'PopupMenu'#7#13'MainPopupMenu'#0#10'TStatusBar'#9'StatusB' + +'ar'#6'Height'#2#23#3'Top'#3#134#2#5'Width'#3#19#1#6'Panels'#14#1#5'Width'#2 + +'d'#0#1#5'Width'#2'2'#0#0#11'SimplePanel'#8#0#0#9'TComboBox'#23'AvailPersist' + +'entComboBox'#6'Height'#2#21#5'Width'#3#19#1#5'Align'#7#5'alTop'#16'AutoComp' + +'leteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#10'ItemH' + +'eight'#2#13#9'OnCloseUp'#7#20'AvailComboBoxCloseUp'#8'TabOrder'#2#0#0#0#10 + +'TPopupMenu'#13'MainPopupMenu'#7'OnPopup'#7#20'OnMainPopupMenuPopup'#4'left' + +#2#9#3'top'#2#11#0#0#0 +]); diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp index cea2051aac..352ad2a625 100644 --- a/ideintf/objectinspector.pp +++ b/ideintf/objectinspector.pp @@ -14,7 +14,7 @@ Author: Mattias Gaertner Abstract: - This unit defines the TObjectInspector. + This unit defines the TObjectInspectorDlg. It uses TOIPropertyGrid and TOIPropertyGridRow which are also defined in this unit. The object inspector uses property editors (see TPropertyEditor) to display and control properties, thus the object inspector is merely an @@ -47,7 +47,7 @@ const type EObjectInspectorException = class(Exception); - TObjectInspector = class; + TObjectInspectorDlg = class; // standard ObjectInspector pages TObjectInspectorPage = ( @@ -154,8 +154,8 @@ type constructor Create; function Load: boolean; function Save: boolean; - procedure Assign(AnObjInspector: TObjectInspector); - procedure AssignTo(AnObjInspector: TObjectInspector); + procedure Assign(AnObjInspector: TObjectInspectorDlg); + procedure AssignTo(AnObjInspector: TObjectInspectorDlg); public property ConfigStore: TConfigStorage read FConfigStore write FConfigStore; @@ -520,7 +520,7 @@ type //============================================================================ - { TObjectInspector } + { TObjectInspectorDlg } TOnAddAvailablePersistent = procedure(APersistent: TPersistent; var Allowed: boolean) of object; @@ -530,31 +530,33 @@ type ); TOIFlags = set of TOIFlag; - { TObjectInspector } + { TObjectInspectorDlg } - TObjectInspector = class(TForm) + TObjectInspectorDlg = class(TForm) + + + AddToFavoritesPopupMenuItem: TMenuItem; AvailPersistentComboBox: TComboBox; - Splitter1: TSplitter; ComponentTree: TComponentTreeView; - NoteBook: TNoteBook; - PropertyGrid: TOICustomPropertyGrid; + CopyPopupmenuItem: TMenuItem; + CutPopupmenuItem: TMenuItem; + DeletePopupmenuItem: TMenuItem; EventGrid: TOICustomPropertyGrid; FavouriteGrid: TOICustomPropertyGrid; - StatusBar: TStatusBar; - MainPopupMenu: TPopupMenu; - SetDefaultPopupMenuItem: TMenuItem; - AddToFavoritesPopupMenuItem: TMenuItem; - RemoveFromFavoritesPopupMenuItem: TMenuItem; - UndoPropertyPopupMenuItem: TMenuItem; FindDeclarationPopupmenuItem: TMenuItem; - CutPopupmenuItem: TMenuItem; - CopyPopupmenuItem: TMenuItem; - PastePopupmenuItem: TMenuItem; - DeletePopupmenuItem: TMenuItem; + MainPopupMenu: TPopupMenu; + NoteBook: TNoteBook; OptionsSeparatorMenuItem2: TMenuItem; - ShowHintsPopupMenuItem: TMenuItem; + PastePopupmenuItem: TMenuItem; + PropertyGrid: TOICustomPropertyGrid; + RemoveFromFavoritesPopupMenuItem: TMenuItem; + SetDefaultPopupMenuItem: TMenuItem; ShowComponentTreePopupMenuItem: TMenuItem; + ShowHintsPopupMenuItem: TMenuItem; ShowOptionsPopupMenuItem: TMenuItem; + Splitter1: TSplitter; + StatusBar: TStatusBar; + UndoPropertyPopupMenuItem: TMenuItem; procedure AvailComboBoxCloseUp(Sender: TObject); procedure ComponentTreeSelectionChanged(Sender: TObject); procedure ObjectInspectorResize(Sender: TObject); @@ -667,7 +669,7 @@ type end; const - DefaultObjectInspectorName: string = 'ObjectInspector'; + DefaultObjectInspectorName: string = 'ObjectInspectorDlg'; DefaultOIPageNames: array[TObjectInspectorPage] of shortstring = ( 'PropertyPage', @@ -2996,7 +2998,7 @@ begin Result:=true; end; -procedure TOIOptions.Assign(AnObjInspector: TObjectInspector); +procedure TOIOptions.Assign(AnObjInspector: TObjectInspectorDlg); var Page: TObjectInspectorPage; begin @@ -3021,7 +3023,7 @@ begin FShowHints:=AnObjInspector.PropertyGrid.ShowHint; end; -procedure TOIOptions.AssignTo(AnObjInspector: TObjectInspector); +procedure TOIOptions.AssignTo(AnObjInspector: TObjectInspectorDlg); var Page: TObjectInspectorPage; Grid: TOICustomPropertyGrid; @@ -3051,9 +3053,9 @@ end; //============================================================================== -{ TObjectInspector } +{ TObjectInspectorDlg } -constructor TObjectInspector.Create(AnOwner: TComponent); +constructor TObjectInspectorDlg.Create(AnOwner: TComponent); procedure AddPopupMenuItem(var NewMenuItem: TMenuItem; ParentMenuItem: TMenuItem; const AName, ACaption, AHint: string; @@ -3103,25 +3105,8 @@ begin FShowFavouritePage:=false; Caption := oisObjectInspector; - Name := DefaultObjectInspectorName; - KeyPreview:=true; + StatusBar.SimpleText:=oisAll; - // StatusBar - StatusBar:=TStatusBar.Create(Self); - with StatusBar do begin - Name:='StatusBar'; - Parent:=Self; - SimpleText:=oisAll; - Align:= alBottom; - end; - - // PopupMenu - MainPopupMenu:=TPopupMenu.Create(Self); - with MainPopupMenu do begin - Name:='MainPopupMenu'; - OnPopup:=@OnMainPopupMenuPopup; - AutoPopup:=true; - end; AddPopupMenuItem(SetDefaultPopupmenuItem,nil,'SetDefaultPopupMenuItem', 'Set to Default value','Set property value to Default', @OnSetDefaultPopupmenuItemClick,false,true,true); @@ -3165,18 +3150,8 @@ begin ,'ShowOptionsPopupMenuItem',oisOptions,'' ,@OnShowOptionsPopupMenuItemClick,false,true,FOnShowOptions<>nil); - PopupMenu:=MainPopupMenu; - // combobox at top (filled with available persistents) - AvailPersistentComboBox := TComboBox.Create (Self); with AvailPersistentComboBox do begin - Name:='AvailPersistentComboBox'; - Parent:=Self; - Style:=csDropDown; - Text:=''; - OnCloseUp:=@AvailComboBoxCloseUp; - //Sorted:=true; - Align:= alTop; Visible:=not FShowComponentTree; end; @@ -3196,18 +3171,16 @@ begin CreateSplitter; CreateNoteBook; - - OnResize:=@ObjectInspectorResize; end; -destructor TObjectInspector.Destroy; +destructor TObjectInspectorDlg.Destroy; begin FreeAndNil(FSelection); inherited Destroy; FreeAndNil(FFavourites); end; -procedure TObjectInspector.SetPropertyEditorHook(NewValue:TPropertyEditorHook); +procedure TObjectInspectorDlg.SetPropertyEditorHook(NewValue:TPropertyEditorHook); var Page: TObjectInspectorPage; begin @@ -3236,7 +3209,7 @@ begin end; end; -function TObjectInspector.PersistentToString(APersistent: TPersistent): string; +function TObjectInspectorDlg.PersistentToString(APersistent: TPersistent): string; begin if APersistent is TComponent then Result:=TComponent(APersistent).GetNamePath+': '+APersistent.ClassName @@ -3244,13 +3217,13 @@ begin Result:=APersistent.ClassName; end; -procedure TObjectInspector.SetComponentTreeHeight(const AValue: integer); +procedure TObjectInspectorDlg.SetComponentTreeHeight(const AValue: integer); begin if FComponentTreeHeight=AValue then exit; FComponentTreeHeight:=AValue; end; -procedure TObjectInspector.SetDefaultItemHeight(const AValue: integer); +procedure TObjectInspectorDlg.SetDefaultItemHeight(const AValue: integer); var NewValue: Integer; Page: TObjectInspectorPage; @@ -3271,14 +3244,14 @@ begin RebuildPropertyLists; end; -procedure TObjectInspector.SetOnShowOptions(const AValue: TNotifyEvent); +procedure TObjectInspectorDlg.SetOnShowOptions(const AValue: TNotifyEvent); begin if FOnShowOptions=AValue then exit; FOnShowOptions:=AValue; ShowOptionsPopupMenuItem.Visible:=FOnShowOptions<>nil; end; -procedure TObjectInspector.AddPersistentToList(APersistent: TPersistent; +procedure TObjectInspectorDlg.AddPersistentToList(APersistent: TPersistent; List: TStrings); var Allowed: boolean; @@ -3292,7 +3265,7 @@ begin List.AddObject(PersistentToString(APersistent),APersistent); end; -procedure TObjectInspector.HookLookupRootChange; +procedure TObjectInspectorDlg.HookLookupRootChange; var Page: TObjectInspectorPage; begin @@ -3302,13 +3275,13 @@ begin FillPersistentComboBox; end; -procedure TObjectInspector.FillPersistentComboBox; +procedure TObjectInspectorDlg.FillPersistentComboBox; var a:integer; Root:TComponent; OldText:AnsiString; NewList: TStringList; begin -//writeln('[TObjectInspector.FillComponentComboBox] A ',FUpdatingAvailComboBox +//writeln('[TObjectInspectorDlg.FillComponentComboBox] A ',FUpdatingAvailComboBox //,' ',FPropertyEditorHook<>nil,' ',FPropertyEditorHook.LookupRoot<>nil); if FUpdatingAvailComboBox then exit; FUpdatingAvailComboBox:=true; @@ -3321,7 +3294,7 @@ begin AddPersistentToList(FPropertyEditorHook.LookupRoot,NewList); if FPropertyEditorHook.LookupRoot is TComponent then begin Root:=TComponent(FPropertyEditorHook.LookupRoot); - //writeln('[TObjectInspector.FillComponentComboBox] B ',Root.Name,' ',Root.ComponentCount); + //writeln('[TObjectInspectorDlg.FillComponentComboBox] B ',Root.Name,' ',Root.ComponentCount); for a:=0 to Root.ComponentCount-1 do AddPersistentToList(Root.Components[a],NewList); end; @@ -3348,16 +3321,16 @@ begin end; end; -procedure TObjectInspector.BeginUpdate; +procedure TObjectInspectorDlg.BeginUpdate; begin inc(FUpdateLock); end; -procedure TObjectInspector.EndUpdate; +procedure TObjectInspectorDlg.EndUpdate; begin dec(FUpdateLock); if FUpdateLock<0 then begin - DebugLn('ERROR TObjectInspector.EndUpdate'); + DebugLn('ERROR TObjectInspectorDlg.EndUpdate'); end; if FUpdateLock=0 then begin if oifRebuildPropListsNeeded in FFLags then @@ -3365,7 +3338,7 @@ begin end; end; -function TObjectInspector.GetActivePropertyGrid: TOICustomPropertyGrid; +function TObjectInspectorDlg.GetActivePropertyGrid: TOICustomPropertyGrid; begin Result:=nil; if NoteBook=nil then exit; @@ -3376,7 +3349,7 @@ begin end; end; -function TObjectInspector.GetActivePropertyRow: TOIPropertyGridRow; +function TObjectInspectorDlg.GetActivePropertyRow: TOIPropertyGridRow; var CurGrid: TOICustomPropertyGrid; begin @@ -3386,7 +3359,7 @@ begin Result:=CurGrid.GetActiveRow; end; -function TObjectInspector.GetCurRowDefaultValue(var DefaultStr: string): boolean; +function TObjectInspectorDlg.GetCurRowDefaultValue(var DefaultStr: string): boolean; var CurRow: TOIPropertyGridRow; begin @@ -3403,7 +3376,7 @@ begin end; end; -procedure TObjectInspector.SetSelection( +procedure TObjectInspectorDlg.SetSelection( const ASelection:TPersistentSelectionList); begin if FSelection.IsEqual(ASelection) then exit; @@ -3416,7 +3389,7 @@ begin FOnSelectPersistentsInOI(Self); end; -procedure TObjectInspector.RefreshSelection; +procedure TObjectInspectorDlg.RefreshSelection; var Page: TObjectInspectorPage; begin @@ -3429,7 +3402,7 @@ begin Visible:=true; end; -procedure TObjectInspector.RefreshPropertyValues; +procedure TObjectInspectorDlg.RefreshPropertyValues; var Page: TObjectInspectorPage; begin @@ -3438,7 +3411,7 @@ begin GridControl[Page].RefreshPropertyValues; end; -procedure TObjectInspector.RebuildPropertyLists; +procedure TObjectInspectorDlg.RebuildPropertyLists; var Page: TObjectInspectorPage; begin @@ -3452,7 +3425,7 @@ begin end; end; -procedure TObjectInspector.AvailComboBoxCloseUp(Sender:TObject); +procedure TObjectInspectorDlg.AvailComboBoxCloseUp(Sender:TObject); var NewComponent,Root:TComponent; a:integer; @@ -3491,7 +3464,7 @@ begin end; end; -procedure TObjectInspector.ComponentTreeSelectionChanged(Sender: TObject); +procedure TObjectInspectorDlg.ComponentTreeSelectionChanged(Sender: TObject); begin if (PropertyEditorHook=nil) or (PropertyEditorHook.LookupRoot=nil) then exit; if FSelection.IsEqual(ComponentTree.Selection) then exit; @@ -3501,14 +3474,14 @@ begin FOnSelectPersistentsInOI(Self); end; -procedure TObjectInspector.ObjectInspectorResize(Sender: TObject); +procedure TObjectInspectorDlg.ObjectInspectorResize(Sender: TObject); begin if (ComponentTree<>nil) and (ComponentTree.Visible) and (ComponentTree.Parent=Self) then ComponentTree.Height:=ClientHeight div 4; end; -procedure TObjectInspector.OnGridKeyDown(Sender: TObject; var Key: Word; +procedure TObjectInspectorDlg.OnGridKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState); begin if Assigned(OnOIKeyDown) then OnOIKeyDown(Self,Key,Shift); @@ -3516,13 +3489,13 @@ begin OnRemainingKeyDown(Self,Key,Shift); end; -procedure TObjectInspector.OnGridKeyUp(Sender: TObject; var Key: Word; +procedure TObjectInspectorDlg.OnGridKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); begin if Assigned(OnRemainingKeyUp) then OnRemainingKeyUp(Self,Key,Shift); end; -procedure TObjectInspector.OnSetDefaultPopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnSetDefaultPopupmenuItemClick(Sender: TObject); var CurGrid: TOICustomPropertyGrid; DefaultStr: string; @@ -3534,19 +3507,19 @@ begin RefreshPropertyValues; end; -procedure TObjectInspector.OnAddToFavoritesPopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnAddToFavoritesPopupmenuItemClick(Sender: TObject); begin - //debugln('TObjectInspector.OnAddToFavouritePopupmenuItemClick'); + //debugln('TObjectInspectorDlg.OnAddToFavouritePopupmenuItemClick'); if Assigned(OnAddToFavourites) then OnAddToFavourites(Self); end; -procedure TObjectInspector.OnRemoveFromFavoritesPopupmenuItemClick( +procedure TObjectInspectorDlg.OnRemoveFromFavoritesPopupmenuItemClick( Sender: TObject); begin if Assigned(OnRemoveFromFavourites) then OnRemoveFromFavourites(Self); end; -procedure TObjectInspector.OnUndoPopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnUndoPopupmenuItemClick(Sender: TObject); var CurGrid: TOICustomPropertyGrid; CurRow: TOIPropertyGridRow; @@ -3557,14 +3530,14 @@ begin CurGrid.CurrentEditValue:=CurRow.Editor.GetVisualValue; end; -procedure TObjectInspector.OnFindDeclarationPopupmenuItemClick(Sender: TObject +procedure TObjectInspectorDlg.OnFindDeclarationPopupmenuItemClick(Sender: TObject ); begin if Assigned(OnFindDeclarationOfProperty) then OnFindDeclarationOfProperty(Self); end; -procedure TObjectInspector.OnCutPopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnCutPopupmenuItemClick(Sender: TObject); var ADesigner: TIDesigner; begin @@ -3576,7 +3549,7 @@ begin end; end; -procedure TObjectInspector.OnCopyPopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnCopyPopupmenuItemClick(Sender: TObject); var ADesigner: TIDesigner; begin @@ -3589,7 +3562,7 @@ begin end; end; -procedure TObjectInspector.OnPastePopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnPastePopupmenuItemClick(Sender: TObject); var ADesigner: TIDesigner; begin @@ -3601,7 +3574,7 @@ begin end; end; -procedure TObjectInspector.OnDeletePopupmenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnDeletePopupmenuItemClick(Sender: TObject); var ADesigner: TIDesigner; begin @@ -3614,12 +3587,12 @@ begin end; end; -procedure TObjectInspector.OnGridModified(Sender: TObject); +procedure TObjectInspectorDlg.OnGridModified(Sender: TObject); begin if Assigned(FOnModified) then FOnModified(Self); end; -procedure TObjectInspector.SetAvailComboBoxText; +procedure TObjectInspectorDlg.SetAvailComboBoxText; begin case FSelection.Count of 0: // none selected @@ -3632,14 +3605,14 @@ begin end; end; -procedure TObjectInspector.HookGetSelection( +procedure TObjectInspectorDlg.HookGetSelection( const ASelection: TPersistentSelectionList); begin if ASelection=nil then exit; ASelection.Assign(FSelection); end; -procedure TObjectInspector.HookSetSelection( +procedure TObjectInspectorDlg.HookSetSelection( const ASelection: TPersistentSelectionList); begin if ASelection=nil then exit; @@ -3649,7 +3622,7 @@ begin FOnSelectPersistentsInOI(Self); end; -procedure TObjectInspector.SetShowComponentTree(const AValue: boolean); +procedure TObjectInspectorDlg.SetShowComponentTree(const AValue: boolean); begin if FShowComponentTree=AValue then exit; FShowComponentTree:=AValue; @@ -3679,7 +3652,7 @@ begin end; end; -procedure TObjectInspector.CreateSplitter; +procedure TObjectInspectorDlg.CreateSplitter; begin // vertical splitter between component tree and notebook Splitter1:=TSplitter.Create(Self); @@ -3692,7 +3665,7 @@ begin end; end; -procedure TObjectInspector.DestroyNoteBook; +procedure TObjectInspectorDlg.DestroyNoteBook; begin if NoteBook<>nil then NoteBook.Visible:=false; @@ -3702,7 +3675,7 @@ begin FreeAndNil(NoteBook); end; -procedure TObjectInspector.CreateNoteBook; +procedure TObjectInspectorDlg.CreateNoteBook; begin DestroyNoteBook; @@ -3758,7 +3731,7 @@ begin CreateFavouritePage; end; -procedure TObjectInspector.CreateFavouritePage; +procedure TObjectInspectorDlg.CreateFavouritePage; var NewPage: TPage; i: LongInt; @@ -3799,7 +3772,7 @@ begin end; end; -procedure TObjectInspector.KeyDown(var Key: Word; Shift: TShiftState); +procedure TObjectInspectorDlg.KeyDown(var Key: Word; Shift: TShiftState); var CurGrid: TOICustomPropertyGrid; begin @@ -3813,14 +3786,14 @@ begin OnRemainingKeyDown(Self,Key,Shift); end; -procedure TObjectInspector.KeyUp(var Key: Word; Shift: TShiftState); +procedure TObjectInspectorDlg.KeyUp(var Key: Word; Shift: TShiftState); begin inherited KeyUp(Key, Shift); if (Key<>VK_UNKNOWN) and Assigned(OnRemainingKeyUp) then OnRemainingKeyUp(Self,Key,Shift); end; -procedure TObjectInspector.OnShowHintPopupMenuItemClick(Sender : TObject); +procedure TObjectInspectorDlg.OnShowHintPopupMenuItemClick(Sender : TObject); var Page: TObjectInspectorPage; begin @@ -3829,18 +3802,18 @@ begin GridControl[Page].ShowHint:=not GridControl[Page].ShowHint; end; -procedure TObjectInspector.OnShowOptionsPopupMenuItemClick(Sender: TObject); +procedure TObjectInspectorDlg.OnShowOptionsPopupMenuItemClick(Sender: TObject); begin if Assigned(FOnShowOptions) then FOnShowOptions(Sender); end; -procedure TObjectInspector.OnShowComponentTreePopupMenuItemClick(Sender: TObject +procedure TObjectInspectorDlg.OnShowComponentTreePopupMenuItemClick(Sender: TObject ); begin ShowComponentTree:=not ShowComponentTree; end; -procedure TObjectInspector.OnMainPopupMenuPopup(Sender: TObject); +procedure TObjectInspectorDlg.OnMainPopupMenuPopup(Sender: TObject); var DefaultStr: String; CurGrid: TOICustomPropertyGrid; @@ -3884,19 +3857,19 @@ begin end; end; -procedure TObjectInspector.HookRefreshPropertyValues; +procedure TObjectInspectorDlg.HookRefreshPropertyValues; begin RefreshPropertyValues; end; -procedure TObjectInspector.SetShowFavouritePage(const AValue: boolean); +procedure TObjectInspectorDlg.SetShowFavouritePage(const AValue: boolean); begin if FShowFavouritePage=AValue then exit; FShowFavouritePage:=AValue; CreateFavouritePage; end; -function TObjectInspector.GetGridControl(Page: TObjectInspectorPage +function TObjectInspectorDlg.GetGridControl(Page: TObjectInspectorPage ): TOICustomPropertyGrid; begin case Page of @@ -3906,9 +3879,9 @@ begin end; end; -procedure TObjectInspector.SetFavourites(const AValue: TOIFavouriteProperties); +procedure TObjectInspectorDlg.SetFavourites(const AValue: TOIFavouriteProperties); begin - //debugln('TObjectInspector.SetFavourites ',dbgsName(Self)); + //debugln('TObjectInspectorDlg.SetFavourites ',dbgsName(Self)); if FFavourites=AValue then exit; FFavourites:=AValue; if FavouriteGrid<>nil then @@ -4432,5 +4405,8 @@ begin +' BaseClass='+dbgsName(BaseClass); end; +initialization + {$I objectinspector.lrs} + end.