From ea77bd45cf7c3ab81e9b118cd909851a6d7d24e4 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 27 May 2011 07:19:10 +0000 Subject: [PATCH] examples: objectinspector: lrs to lfm git-svn-id: trunk@30924 - --- .gitattributes | 1 - examples/objectinspector/mainunit.lrs | 17 ---------------- examples/objectinspector/mainunit.pas | 27 +++++++++++++------------- examples/objectinspector/oiexample.lpi | 26 ++++++++++++++----------- 4 files changed, 28 insertions(+), 43 deletions(-) delete mode 100644 examples/objectinspector/mainunit.lrs diff --git a/.gitattributes b/.gitattributes index 07cfc8bcbc..8b48270467 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3702,7 +3702,6 @@ examples/notebku.pp svneol=native#text/pascal examples/notebooktest.lpi svneol=native#text/plain examples/notebooktest.pp svneol=native#text/pascal examples/objectinspector/mainunit.lfm svneol=native#text/plain -examples/objectinspector/mainunit.lrs svneol=native#text/pascal examples/objectinspector/mainunit.pas svneol=native#text/pascal examples/objectinspector/oiexample.lpi svneol=native#text/plain examples/objectinspector/oiexample.lpr svneol=native#text/pascal diff --git a/examples/objectinspector/mainunit.lrs b/examples/objectinspector/mainunit.lrs deleted file mode 100644 index 87840e05d7..0000000000 --- a/examples/objectinspector/mainunit.lrs +++ /dev/null @@ -1,17 +0,0 @@ -LazarusResources.Add('TForm1','FORMDATA',[ - 'TPF0'#6'TForm1'#5'Form1'#7'CAPTION'#6#5'Form1'#12'CLIENTHEIGHT'#3','#1#11'CL' - +'IENTWIDTH'#3#227#1#8'ONCREATE'#7#11'Form1CREATE'#9'ONDESTROY'#7#12'Form1DES' - +'TROY'#18'HORZSCROLLBAR.PAGE'#3#228#1#18'VERTSCROLLBAR.PAGE'#3'-'#1#4'LEFT'#3 - +#190#1#6'HEIGHT'#3','#1#3'TOP'#3#1#1#5'WIDTH'#3#227#1#0#9'TGROUPBOX'#10'OIGr' - +'oupbox'#7'CAPTION'#6#14'Root Component'#12'CLIENTHEIGHT'#2'h'#11'CLIENTWIDT' - +'H'#3#172#0#11'PARENTCTL3D'#8#8'TABORDER'#2#0#4'LEFT'#2#16#6'HEIGHT'#2'y'#3 - +'TOP'#2#24#5'WIDTH'#3#176#0#0#7'TBUTTON'#19'SetOIRootFormButton'#7'CAPTION'#6 - +#16'Set Form as Root'#7'TABSTOP'#9#8'TABORDER'#2#0#7'ONCLICK'#7#24'SetOIRoot' - +'FormButtonCLICK'#4'LEFT'#2#15#6'HEIGHT'#2#25#3'TOP'#2#16#5'WIDTH'#3#139#0#0 - +#0#7'TBUTTON'#21'SetCompAsOIRootButton'#7'CAPTION'#6#13'Set Component'#7'TAB' - +'STOP'#9#8'TABORDER'#2#1#7'ONCLICK'#7#26'SetCompAsOIRootButtonCLICK'#4'LEFT' - +#2#15#6'HEIGHT'#2#25#3'TOP'#2'6'#5'WIDTH'#3#139#0#0#0#0#9'TGROUPBOX'#16'Prop' - +'GridGroupbox'#7'CAPTION'#6#12'PropertyGrid'#12'CLIENTHEIGHT'#3#244#0#11'CLI' - +'ENTWIDTH'#3#253#0#11'PARENTCTL3D'#8#8'TABORDER'#2#1#4'LEFT'#3#207#0#6'HEIGH' - +'T'#3#5#1#3'TOP'#2#24#5'WIDTH'#3#1#1#0#0#0 -]); diff --git a/examples/objectinspector/mainunit.pas b/examples/objectinspector/mainunit.pas index 1432dcddb1..f2499f7db6 100644 --- a/examples/objectinspector/mainunit.pas +++ b/examples/objectinspector/mainunit.pas @@ -21,15 +21,15 @@ type end; TForm1 = class(TForm) - PropGridGroupbox: TGROUPBOX; - SetCompAsOIRootButton: TBUTTON; - SetOIRootFormButton: TBUTTON; - OIGroupbox: TGROUPBOX; + PropGridGroupbox: TGroupBox; + SetCompAsOIRootButton: TButton; + SetOIRootFormButton: TButton; + OIGroupbox: TGroupBox; PropertyGrid: TOIPropertyGrid; - procedure Form1CREATE(Sender: TObject); - procedure Form1DESTROY(Sender: TObject); - procedure SetCompAsOIRootButtonCLICK(Sender: TObject); - procedure SetOIRootFormButtonCLICK(Sender: TObject); + procedure Form1Create(Sender: TObject); + procedure Form1Destroy(Sender: TObject); + procedure SetCompAsOIRootButtonClick(Sender: TObject); + procedure SetOIRootFormButtonClick(Sender: TObject); private procedure SetObjectInspectorRoot(AComponent: TComponent); public @@ -45,7 +45,7 @@ implementation { TForm1 } -procedure TForm1.Form1CREATE(Sender: TObject); +procedure TForm1.Form1Create(Sender: TObject); begin // create the PropertyEditorHook (the interface to the properties) ThePropertyEditorHook:=TPropertyEditorHook.Create; @@ -75,7 +75,7 @@ begin SetObjectInspectorRoot(Self); end; -procedure TForm1.Form1DESTROY(Sender: TObject); +procedure TForm1.Form1Destroy(Sender: TObject); begin // TheObjectInspector is owned by the Application and therefore destroyed // automatically @@ -83,12 +83,12 @@ begin ARootComponent.Free; end; -procedure TForm1.SetCompAsOIRootButtonCLICK(Sender: TObject); +procedure TForm1.SetCompAsOIRootButtonClick(Sender: TObject); begin SetObjectInspectorRoot(ARootComponent); end; -procedure TForm1.SetOIRootFormButtonCLICK(Sender: TObject); +procedure TForm1.SetOIRootFormButtonClick(Sender: TObject); begin SetObjectInspectorRoot(Self); end; @@ -113,8 +113,7 @@ begin FAnInteger:=AValue; end; -initialization - {$I mainunit.lrs} +{$R *.lfm} end. diff --git a/examples/objectinspector/oiexample.lpi b/examples/objectinspector/oiexample.lpi index b109d5e235..693b53780f 100644 --- a/examples/objectinspector/oiexample.lpi +++ b/examples/objectinspector/oiexample.lpi @@ -1,15 +1,20 @@ + - + + + - - + <ResourceType Value="res"/> </General> + <BuildModes Count="1"> + <Item1 Name="default" Default="True"/> + </BuildModes> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -34,24 +39,23 @@ </Unit0> <Unit1> <Filename Value="mainunit.pas"/> - <ComponentName Value="Form1"/> <IsPartOfProject Value="True"/> - <ResourceFilename Value="mainunit.lrs"/> + <ComponentName Value="Form1"/> <UnitName Value="MainUnit"/> </Unit1> </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="10"/> <PathDelim Value="\"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)\components\units\"/> - <SrcPath Value="$(LazarusDir)\designer\"/> + <OtherUnitFiles Value="$(LazarusDir)\components\units"/> + <SrcPath Value="$(LazarusDir)\designer"/> </SearchPaths> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> <Other> + <CompilerMessages> + <UseMsgFile Value="True"/> + </CompilerMessages> <CompilerPath Value="$(CompPath)"/> </Other> </CompilerOptions>