Specifiying property type : better name of the combobox items

compilation fix

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@978 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2009-10-07 13:11:15 +00:00
parent b94b6d8a61
commit b6b09eca44
8 changed files with 140 additions and 132 deletions

View File

@ -733,6 +733,7 @@ var
sym : TPasElement; sym : TPasElement;
moduleList, decList : TList; moduleList, decList : TList;
mdl : TPasModule; mdl : TPasModule;
locExtName : string;
begin begin
moduleList := AContainer.Package.Modules; moduleList := AContainer.Package.Modules;
for i := 0 to Pred(moduleList.Count) do begin for i := 0 to Pred(moduleList.Count) do begin
@ -740,14 +741,24 @@ begin
decList := mdl.InterfaceSection.Declarations; decList := mdl.InterfaceSection.Declarations;
for j := 0 to Pred(decList.Count) do begin for j := 0 to Pred(decList.Count) do begin
sym := TPasElement(decList[j]); sym := TPasElement(decList[j]);
if sym.InheritsFrom(TPasType) and ( not sym.InheritsFrom(TPasNativeSimpleContentClassType) ) then begin if sym.InheritsFrom(TPasType) {and ( not sym.InheritsFrom(TPasNativeSimpleContentClassType) )} then begin
if ( ALs.IndexOfObject(sym) = -1 ) then begin if ( ALs.IndexOfObject(sym) = -1 ) then begin
if sym.InheritsFrom(TPasNativeSpecialSimpleType) or if sym.InheritsFrom(TPasNativeSpecialSimpleType) or
sym.InheritsFrom(TPasNativeSpecialSimpleContentClassType) sym.InheritsFrom(TPasNativeSpecialSimpleContentClassType)
then begin then begin
ALs.AddObject(sym.Name,sym); //ALs.AddObject(sym.Name,sym);
locExtName := AContainer.GetExternalName(sym);
if ( sym.Name = locExtName ) then
ALs.AddObject(sym.Name,sym)
else
ALs.AddObject(Format('%s - ( %s )',[sym.Name,AContainer.GetExternalName(sym)]),sym);
end else begin end else begin
ALs.AddObject(AContainer.GetExternalName(sym),sym); //ALs.AddObject(AContainer.GetExternalName(sym),sym);
locExtName := AContainer.GetExternalName(sym);
if ( sym.Name = locExtName ) then
ALs.AddObject(AContainer.GetExternalName(sym),sym)
else
ALs.AddObject(Format('%s - ( %s )',[AContainer.GetExternalName(sym),sym.Name]),sym);
end; end;
end; end;
end; end;

View File

@ -40,24 +40,24 @@
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="uwsttypelibraryedit.pas"/> <Filename Value="uwsttypelibraryedit.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="fWstTypeLibraryEdit"/> <ComponentName Value="fWstTypeLibraryEdit"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uwsttypelibraryedit"/> <UnitName Value="uwsttypelibraryedit"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="uabout.pas"/> <Filename Value="uabout.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="fAbout"/> <ComponentName Value="fAbout"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<IsPartOfProject Value="True"/>
<UnitName Value="uabout"/> <UnitName Value="uabout"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="ufenumedit.pas"/> <Filename Value="ufenumedit.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="fEnumEdit"/> <ComponentName Value="fEnumEdit"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufEnumedit"/> <UnitName Value="ufEnumedit"/>
</Unit3> </Unit3>
@ -78,30 +78,30 @@
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="ufclassedit.pas"/> <Filename Value="ufclassedit.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="fClassEdit"/> <ComponentName Value="fClassEdit"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufclassedit"/> <UnitName Value="ufclassedit"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="ufpropedit.pas"/> <Filename Value="ufpropedit.pas"/>
<ComponentName Value="fPropEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fPropEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufpropedit"/> <UnitName Value="ufpropedit"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="uinterfaceedit.pas"/> <Filename Value="uinterfaceedit.pas"/>
<ComponentName Value="fInterfaceEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fInterfaceEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uinterfaceedit"/> <UnitName Value="uinterfaceedit"/>
</Unit9> </Unit9>
<Unit10> <Unit10>
<Filename Value="udm.pas"/> <Filename Value="udm.pas"/>
<ComponentName Value="DM"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="DM"/>
<ResourceBaseClass Value="DataModule"/> <ResourceBaseClass Value="DataModule"/>
<UnitName Value="udm"/> <UnitName Value="udm"/>
</Unit10> </Unit10>
@ -117,8 +117,8 @@
</Unit12> </Unit12>
<Unit13> <Unit13>
<Filename Value="uprocedit.pas"/> <Filename Value="uprocedit.pas"/>
<ComponentName Value="fProcEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fProcEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uprocedit"/> <UnitName Value="uprocedit"/>
</Unit13> </Unit13>
@ -129,50 +129,50 @@
</Unit14> </Unit14>
<Unit15> <Unit15>
<Filename Value="uargedit.pas"/> <Filename Value="uargedit.pas"/>
<ComponentName Value="fArgEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fArgEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uargedit"/> <UnitName Value="uargedit"/>
</Unit15> </Unit15>
<Unit16> <Unit16>
<Filename Value="umoduleedit.pas"/> <Filename Value="umoduleedit.pas"/>
<ComponentName Value="fModuleEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fModuleEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="umoduleedit"/> <UnitName Value="umoduleedit"/>
</Unit16> </Unit16>
<Unit17> <Unit17>
<Filename Value="ubindingedit.pas"/> <Filename Value="ubindingedit.pas"/>
<ComponentName Value="fBindingEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fBindingEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ubindingedit"/> <UnitName Value="ubindingedit"/>
</Unit17> </Unit17>
<Unit18> <Unit18>
<Filename Value="ufrmsaveoption.pas"/> <Filename Value="ufrmsaveoption.pas"/>
<ComponentName Value="frmSaveOptions"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="frmSaveOptions"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufrmsaveoption"/> <UnitName Value="ufrmsaveoption"/>
</Unit18> </Unit18>
<Unit19> <Unit19>
<Filename Value="ufarrayedit.pas"/> <Filename Value="ufarrayedit.pas"/>
<ComponentName Value="fArrayEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fArrayEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufarrayedit"/> <UnitName Value="ufarrayedit"/>
</Unit19> </Unit19>
<Unit20> <Unit20>
<Filename Value="uftypealiasedit.pas"/> <Filename Value="uftypealiasedit.pas"/>
<ComponentName Value="fTypeAliasEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fTypeAliasEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="uftypealiasedit"/> <UnitName Value="uftypealiasedit"/>
</Unit20> </Unit20>
<Unit21> <Unit21>
<Filename Value="ufrecordedit.pas"/> <Filename Value="ufrecordedit.pas"/>
<ComponentName Value="fRecordEdit"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="fRecordEdit"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="ufrecordedit"/> <UnitName Value="ufrecordedit"/>
</Unit21> </Unit21>

View File

@ -12,8 +12,9 @@ object fInterfaceEdit: TfInterfaceEdit
ClientWidth = 531 ClientWidth = 531
OnCreate = FormCreate OnCreate = FormCreate
Position = poDesktopCenter Position = poDesktopCenter
LCLVersion = '0.9.25' LCLVersion = '0.9.29'
object Panel1: TPanel object Panel1: TPanel
Left = 0
Height = 50 Height = 50
Top = 514 Top = 514
Width = 531 Width = 531
@ -46,7 +47,9 @@ object fInterfaceEdit: TfInterfaceEdit
end end
end end
object PC: TPageControl object PC: TPageControl
Left = 0
Height = 514 Height = 514
Top = 0
Width = 531 Width = 531
ActivePage = TabSheet1 ActivePage = TabSheet1
Align = alClient Align = alClient
@ -66,7 +69,7 @@ object fInterfaceEdit: TfInterfaceEdit
end end
object edtName: TEdit object edtName: TEdit
Left = 60 Left = 60
Height = 23 Height = 21
Top = 26 Top = 26
Width = 443 Width = 443
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
@ -83,7 +86,9 @@ object fInterfaceEdit: TfInterfaceEdit
ClientWidth = 480 ClientWidth = 480
TabOrder = 1 TabOrder = 1
object trvMethods: TTreeView object trvMethods: TTreeView
Left = 0
Height = 350 Height = 350
Top = 0
Width = 480 Width = 480
Align = alClient Align = alClient
DefaultItemHeight = 15 DefaultItemHeight = 15
@ -135,30 +140,25 @@ object fInterfaceEdit: TfInterfaceEdit
top = 200 top = 200
object actOK: TAction object actOK: TAction
Caption = 'OK' Caption = 'OK'
DisableIfNoHandler = True
OnExecute = actOKExecute OnExecute = actOKExecute
OnUpdate = actOKUpdate OnUpdate = actOKUpdate
end end
object actNewMethod: TAction object actNewMethod: TAction
Caption = 'New operation' Caption = 'New operation'
DisableIfNoHandler = True
OnExecute = actNewMethodExecute OnExecute = actNewMethodExecute
end end
object actUpdateOperation: TAction object actUpdateOperation: TAction
Caption = 'Edit Operation' Caption = 'Edit Operation'
DisableIfNoHandler = True
OnExecute = actUpdateOperationExecute OnExecute = actUpdateOperationExecute
OnUpdate = actUpdateOperationUpdate OnUpdate = actUpdateOperationUpdate
end end
object actDeleteOperation: TAction object actDeleteOperation: TAction
Caption = 'Delete Operation' Caption = 'Delete Operation'
DisableIfNoHandler = True
OnExecute = actDeleteOperationExecute OnExecute = actDeleteOperationExecute
OnUpdate = actUpdateOperationUpdate OnUpdate = actUpdateOperationUpdate
end end
object actBindingEdit: TAction object actBindingEdit: TAction
Caption = 'Edit Binding' Caption = 'Edit Binding'
DisableIfNoHandler = True
OnExecute = actBindingEditExecute OnExecute = actBindingEditExecute
OnUpdate = actBindingEditUpdate OnUpdate = actBindingEditUpdate
end end

View File

@ -1,57 +1,54 @@
{ Ceci est un fichier ressource g�n�r� automatiquement par Lazarus }
LazarusResources.Add('TfInterfaceEdit','FORMDATA',[ LazarusResources.Add('TfInterfaceEdit','FORMDATA',[
'TPF0'#15'TfInterfaceEdit'#14'fInterfaceEdit'#4'Left'#3'i'#1#6'Height'#3'4'#2 'TPF0'#15'TfInterfaceEdit'#14'fInterfaceEdit'#4'Left'#3'i'#1#6'Height'#3'4'#2
+#3'Top'#3'%'#1#5'Width'#3#19#2#18'HorzScrollBar.Page'#3#18#2#18'VertScrollBa' +#3'Top'#3'%'#1#5'Width'#3#19#2#18'HorzScrollBar.Page'#3#18#2#18'VertScrollBa'
+'r.Page'#3'3'#2#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'bsSizeTo' +'r.Page'#3'3'#2#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'bsSizeTo'
+'olWin'#7'Caption'#6#14'fInterfaceEdit'#12'ClientHeight'#3'4'#2#11'ClientWid' +'olWin'#7'Caption'#6#14'fInterfaceEdit'#12'ClientHeight'#3'4'#2#11'ClientWid'
+'th'#3#19#2#8'OnCreate'#7#10'FormCreate'#8'Position'#7#15'poDesktopCenter'#10 +'th'#3#19#2#8'OnCreate'#7#10'FormCreate'#8'Position'#7#15'poDesktopCenter'#10
+'LCLVersion'#6#6'0.9.25'#0#6'TPanel'#6'Panel1'#6'Height'#2'2'#3'Top'#3#2#2#5 +'LCLVersion'#6#6'0.9.29'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Height'#2'2'#3
+'Width'#3#19#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11'ClientWidth'#3 +'Top'#3#2#2#5'Width'#3#19#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'2'#11
+#19#2#8'TabOrder'#2#0#0#7'TButton'#7'Button1'#4'Left'#3#180#1#6'Height'#2#25 +'ClientWidth'#3#19#2#8'TabOrder'#2#0#0#7'TButton'#7'Button1'#4'Left'#3#180#1
+#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpac' +#6'Height'#2#25#3'Top'#2#10#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0
+'ing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2 +#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'Mod'
+#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'Z'#1#6'Height'#2#25#3'T' +'alResult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3'Z'#1#6'He'
+'op'#2#10#5'Width'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'akTop'#7'akRigh' +'ight'#2#25#3'Top'#2#10#5'Width'#2'K'#6'Action'#7#5'actOK'#7'Anchors'#11#5'a'
+'t'#0#25'BorderSpacing.InnerBorder'#2#4#7'Default'#9#8'TabOrder'#2#1#0#0#0#12 +'kTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Default'#9#8'TabOrde'
+'TPageControl'#2'PC'#6'Height'#3#2#2#5'Width'#3#19#2#10'ActivePage'#7#9'TabS' +'r'#2#1#0#0#0#12'TPageControl'#2'PC'#4'Left'#2#0#6'Height'#3#2#2#3'Top'#2#0#5
+'heet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#1#0#9'TTabSheet' +'Width'#3#19#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabInd'
+#9'TabSheet1'#7'Caption'#6#20'Interface definition'#12'ClientHeight'#3#232#1 +'ex'#2#0#8'TabOrder'#2#1#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#20'Interfa'
+#11'ClientWidth'#3#11#2#0#6'TLabel'#6'Label1'#4'Left'#2#20#6'Height'#2#14#3 +'ce definition'#12'ClientHeight'#3#232#1#11'ClientWidth'#3#11#2#0#6'TLabel'#6
+'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#5'TEdit' +'Label1'#4'Left'#2#20#6'Height'#2#14#3'Top'#2#26#5'Width'#2#28#7'Caption'#6#4
+#7'edtName'#4'Left'#2'<'#6'Height'#2#23#3'Top'#2#26#5'Width'#3#187#1#7'Ancho' +'Name'#11'ParentColor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'<'#6'Height'#2#21
+'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#0#0#9'TGroupBox'#9'G' +#3'Top'#2#26#5'Width'#3#187#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+'roupBox1'#4'Left'#2#20#6'Height'#3'p'#1#3'Top'#2'J'#5'Width'#3#228#1#7'Anch' +'TabOrder'#2#0#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#20#6'Height'#3'p'#1#3
+'ors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'Caption'#6#11' Metho' +'Top'#2'J'#5'Width'#3#228#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'ak'
+'ds '#12'ClientHeight'#3'^'#1#11'ClientWidth'#3#224#1#8'TabOrder'#2#1#0#9'T' +'Bottom'#0#7'Caption'#6#11' Methods '#12'ClientHeight'#3'^'#1#11'ClientWid'
+'TreeView'#10'trvMethods'#6'Height'#3'^'#1#5'Width'#3#224#1#5'Align'#7#8'alC' +'th'#3#224#1#8'TabOrder'#2#1#0#9'TTreeView'#10'trvMethods'#4'Left'#2#0#6'Hei'
+'lient'#17'DefaultItemHeight'#2#15#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder' +'ght'#3'^'#1#3'Top'#2#0#5'Width'#3#224#1#5'Align'#7#8'alClient'#17'DefaultIt'
+#2#0#0#0#0#7'TButton'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#194#1#5 +'emHeight'#2#15#9'PopupMenu'#7#10'PopupMenu1'#8'TabOrder'#2#0#0#0#0#7'TButto'
+'Width'#2'c'#6'Action'#7#12'actNewMethod'#25'BorderSpacing.InnerBorder'#2#4#8 +'n'#7'Button3'#4'Left'#2#20#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'c'#6'Ac'
+'TabOrder'#2#2#0#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'To' +'tion'#7#12'actNewMethod'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#2#0
+'p'#3#194#1#5'Width'#2'k'#6'Action'#7#18'actUpdateOperation'#25'BorderSpacin' +#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'Top'#3#194#1#5'Wid'
+'g.InnerBorder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#252#0 +'th'#2'k'#6'Action'#7#18'actUpdateOperation'#25'BorderSpacing.InnerBorder'#2
+#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'h'#6'Action'#7#18'actDeleteOperati' +#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button5'#4'Left'#3#252#0#6'Height'#2#25#3
+'on'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#7'Butt' +'Top'#3#194#1#5'Width'#2'h'#6'Action'#7#18'actDeleteOperation'#25'BorderSpac'
+'on6'#4'Left'#3#140#1#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'k'#6'Action'#7 +'ing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#7'Button6'#4'Left'#3#140
+#14'actBindingEdit'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.Inn' +#1#6'Height'#2#25#3'Top'#3#194#1#5'Width'#2'k'#6'Action'#7#14'actBindingEdit'
+'erBorder'#2#4#8'TabOrder'#2#5#0#0#0#0#11'TActionList'#2'AL'#4'left'#3#130#0 +#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab'
+#3'top'#3#200#0#0#7'TAction'#5'actOK'#7'Caption'#6#2'OK'#18'DisableIfNoHandl' +'Order'#2#5#0#0#0#0#11'TActionList'#2'AL'#4'left'#3#130#0#3'top'#3#200#0#0#7
+'er'#9#9'OnExecute'#7#12'actOKExecute'#8'OnUpdate'#7#11'actOKUpdate'#0#0#7'T' +'TAction'#5'actOK'#7'Caption'#6#2'OK'#9'OnExecute'#7#12'actOKExecute'#8'OnUp'
+'Action'#12'actNewMethod'#7'Caption'#6#13'New operation'#18'DisableIfNoHandl' +'date'#7#11'actOKUpdate'#0#0#7'TAction'#12'actNewMethod'#7'Caption'#6#13'New'
+'er'#9#9'OnExecute'#7#19'actNewMethodExecute'#0#0#7'TAction'#18'actUpdateOpe' +' operation'#9'OnExecute'#7#19'actNewMethodExecute'#0#0#7'TAction'#18'actUpd'
+'ration'#7'Caption'#6#14'Edit Operation'#18'DisableIfNoHandler'#9#9'OnExecut' +'ateOperation'#7'Caption'#6#14'Edit Operation'#9'OnExecute'#7#25'actUpdateOp'
+'e'#7#25'actUpdateOperationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdat' +'erationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdate'#0#0#7'TAction'#18
+'e'#0#0#7'TAction'#18'actDeleteOperation'#7'Caption'#6#16'Delete Operation' +'actDeleteOperation'#7'Caption'#6#16'Delete Operation'#9'OnExecute'#7#25'act'
+#18'DisableIfNoHandler'#9#9'OnExecute'#7#25'actDeleteOperationExecute'#8'OnU' +'DeleteOperationExecute'#8'OnUpdate'#7#24'actUpdateOperationUpdate'#0#0#7'TA'
+'pdate'#7#24'actUpdateOperationUpdate'#0#0#7'TAction'#14'actBindingEdit'#7'C' +'ction'#14'actBindingEdit'#7'Caption'#6#12'Edit Binding'#9'OnExecute'#7#21'a'
+'aption'#6#12'Edit Binding'#18'DisableIfNoHandler'#9#9'OnExecute'#7#21'actBi' +'ctBindingEditExecute'#8'OnUpdate'#7#20'actBindingEditUpdate'#0#0#0#10'TPopu'
+'ndingEditExecute'#8'OnUpdate'#7#20'actBindingEditUpdate'#0#0#0#10'TPopupMen' +'pMenu'#10'PopupMenu1'#4'left'#2'T'#3'top'#3#233#0#0#9'TMenuItem'#9'MenuItem'
+'u'#10'PopupMenu1'#4'left'#2'T'#3'top'#3#233#0#0#9'TMenuItem'#9'MenuItem1'#6 +'1'#6'Action'#7#12'actNewMethod'#7'OnClick'#7#19'actNewMethodExecute'#0#0#9
+'Action'#7#12'actNewMethod'#7'OnClick'#7#19'actNewMethodExecute'#0#0#9'TMenu' +'TMenuItem'#9'MenuItem2'#6'Action'#7#18'actUpdateOperation'#7'OnClick'#7#25
+'Item'#9'MenuItem2'#6'Action'#7#18'actUpdateOperation'#7'OnClick'#7#25'actUp' +'actUpdateOperationExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#18'act'
+'dateOperationExecute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#18'actDelet' +'DeleteOperation'#7'OnClick'#7#25'actDeleteOperationExecute'#0#0#9'TMenuItem'
+'eOperation'#7'OnClick'#7#25'actDeleteOperationExecute'#0#0#9'TMenuItem'#9'M' +#9'MenuItem4'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#14
+'enuItem4'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#14'ac' +'actBindingEdit'#7'OnClick'#7#21'actBindingEditExecute'#0#0#0#0
+'tBindingEdit'#7'OnClick'#7#21'actBindingEditExecute'#0#0#0#0
]); ]);

View File

@ -99,7 +99,7 @@ var
begin begin
node := trvMethods.Selected; node := trvMethods.Selected;
locObj := TPasProcedure(node.Data); locObj := TPasProcedure(node.Data);
edit_helper.UpdateObject(locObj,FSymbolTable); edit_helper.UpdateObject(TPasElement(locObj),FSymbolTable);
trvMethods.BeginUpdate(); trvMethods.BeginUpdate();
try try
newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent); newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent);
@ -171,7 +171,7 @@ var
begin begin
node := trvMethods.Selected; node := trvMethods.Selected;
locObj := TwstBinding(node.Data); locObj := TwstBinding(node.Data);
edit_helper.UpdateObject(locObj,FSymbolTable); edit_helper.UpdateObject(TPasElement(locObj),FSymbolTable);
trvMethods.BeginUpdate(); trvMethods.BeginUpdate();
try try
newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent); newNode := FindPainter(locObj).Paint(FSymbolTable,locObj,node.Parent);

View File

@ -9,9 +9,11 @@ object fProcEdit: TfProcEdit
ClientHeight = 543 ClientHeight = 543
ClientWidth = 522 ClientWidth = 522
Position = poMainFormCenter Position = poMainFormCenter
LCLVersion = '0.9.26.2' LCLVersion = '0.9.29'
object PageControl1: TPageControl object PageControl1: TPageControl
Left = 0
Height = 493 Height = 493
Top = 0
Width = 522 Width = 522
ActivePage = TabSheet1 ActivePage = TabSheet1
Align = alClient Align = alClient
@ -31,7 +33,7 @@ object fProcEdit: TfProcEdit
end end
object edtName: TEdit object edtName: TEdit
Left = 112 Left = 112
Height = 23 Height = 21
Top = 26 Top = 26
Width = 388 Width = 388
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
@ -49,7 +51,9 @@ object fProcEdit: TfProcEdit
ClientWidth = 485 ClientWidth = 485
TabOrder = 3 TabOrder = 3
object edtParams: TListView object edtParams: TListView
Left = 0
Height = 286 Height = 286
Top = 0
Width = 485 Width = 485
Align = alClient Align = alClient
Columns = < Columns = <
@ -76,7 +80,7 @@ object fProcEdit: TfProcEdit
Left = 12 Left = 12
Height = 17 Height = 17
Top = 74 Top = 74
Width = 94 Width = 97
Caption = 'Function returns' Caption = 'Function returns'
OnClick = edtFunctionClick OnClick = edtFunctionClick
OnEditingDone = edtFunctionEditingDone OnEditingDone = edtFunctionEditingDone
@ -125,6 +129,7 @@ object fProcEdit: TfProcEdit
end end
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0
Height = 50 Height = 50
Top = 493 Top = 493
Width = 522 Width = 522
@ -161,24 +166,20 @@ object fProcEdit: TfProcEdit
top = 241 top = 241
object actOk: TAction object actOk: TAction
Caption = 'OK' Caption = 'OK'
DisableIfNoHandler = True
OnExecute = actOkExecute OnExecute = actOkExecute
OnUpdate = actOkUpdate OnUpdate = actOkUpdate
end end
object actNewArg: TAction object actNewArg: TAction
Caption = 'New Argument' Caption = 'New Argument'
DisableIfNoHandler = True
OnExecute = actNewArgExecute OnExecute = actNewArgExecute
end end
object actUpdateArgument: TAction object actUpdateArgument: TAction
Caption = 'Edit Argument' Caption = 'Edit Argument'
DisableIfNoHandler = True
OnExecute = actUpdateArgumentExecute OnExecute = actUpdateArgumentExecute
OnUpdate = actUpdateArgumentUpdate OnUpdate = actUpdateArgumentUpdate
end end
object actDeleteArgument: TAction object actDeleteArgument: TAction
Caption = 'Delete Argument' Caption = 'Delete Argument'
DisableIfNoHandler = True
OnExecute = actDeleteArgumentExecute OnExecute = actDeleteArgumentExecute
OnUpdate = actUpdateArgumentUpdate OnUpdate = actUpdateArgumentUpdate
end end

View File

@ -4,51 +4,50 @@ LazarusResources.Add('TfProcEdit','FORMDATA',[
'TPF0'#10'TfProcEdit'#9'fProcEdit'#4'Left'#3'"'#1#6'Height'#3#31#2#3'Top'#2'v' 'TPF0'#10'TfProcEdit'#9'fProcEdit'#4'Left'#3'"'#1#6'Height'#3#31#2#3'Top'#2'v'
+#5'Width'#3#10#2#13'ActiveControl'#7#7'edtName'#11'BorderStyle'#7#13'bsSizeT' +#5'Width'#3#10#2#13'ActiveControl'#7#7'edtName'#11'BorderStyle'#7#13'bsSizeT'
+'oolWin'#7'Caption'#6#9'fProcEdit'#12'ClientHeight'#3#31#2#11'ClientWidth'#3 +'oolWin'#7'Caption'#6#9'fProcEdit'#12'ClientHeight'#3#31#2#11'ClientWidth'#3
+#10#2#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#8'0.9.26.2'#0#12'T' +#10#2#8'Position'#7#16'poMainFormCenter'#10'LCLVersion'#6#6'0.9.29'#0#12'TPa'
+'PageControl'#12'PageControl1'#6'Height'#3#237#1#5'Width'#3#10#2#10'ActivePa' +'geControl'#12'PageControl1'#4'Left'#2#0#6'Height'#3#237#1#3'Top'#2#0#5'Widt'
+'ge'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#0 +'h'#3#10#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabIndex'#2
+#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#10'&Operation'#12'ClientHeight'#3#211 +#0#8'TabOrder'#2#0#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#10'&Operation'#12
+#1#11'ClientWidth'#3#2#2#0#6'TLabel'#6'Label1'#4'Left'#2#12#6'Height'#2#14#3 +'ClientHeight'#3#211#1#11'ClientWidth'#3#2#2#0#6'TLabel'#6'Label1'#4'Left'#2
+'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentColor'#8#0#0#5'TEdit' +#12#6'Height'#2#14#3'Top'#2#26#5'Width'#2#28#7'Caption'#6#4'Name'#11'ParentC'
+#7'edtName'#4'Left'#2'p'#6'Height'#2#23#3'Top'#2#26#5'Width'#3#132#1#7'Ancho' +'olor'#8#0#0#5'TEdit'#7'edtName'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2#26#5'W'
+'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0#4'Text'#6#7'edtName' +'idth'#3#132#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0
+#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#11#6'Height'#3'0'#1#3'Top'#2'r'#5'W' +#4'Text'#6#7'edtName'#0#0#9'TGroupBox'#9'GroupBox1'#4'Left'#2#11#6'Height'#3
+'idth'#3#233#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#7'C' +'0'#1#3'Top'#2'r'#5'Width'#3#233#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+'aption'#6#15' Parametters '#12'ClientHeight'#3#30#1#11'ClientWidth'#3#229 +'t'#8'akBottom'#0#7'Caption'#6#15' Parametters '#12'ClientHeight'#3#30#1#11
+#1#8'TabOrder'#2#3#0#9'TListView'#9'edtParams'#6'Height'#3#30#1#5'Width'#3 +'ClientWidth'#3#229#1#8'TabOrder'#2#3#0#9'TListView'#9'edtParams'#4'Left'#2#0
+#229#1#5'Align'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#4'Name'#5'Width'#3 +#6'Height'#3#30#1#3'Top'#2#0#5'Width'#3#229#1#5'Align'#7#8'alClient'#7'Colum'
+#180#0#0#1#7'Caption'#6#4'Type'#5'Width'#3#190#0#0#1#7'Caption'#6#8'Modifier' +'ns'#14#1#7'Caption'#6#4'Name'#5'Width'#3#180#0#0#1#7'Caption'#6#4'Type'#5'W'
+#5'Width'#2'<'#0#1#0#0#9'RowSelect'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsRep' +'idth'#3#190#0#0#1#7'Caption'#6#8'Modifier'#5'Width'#2'<'#0#1#0#0#9'RowSelec'
+'ort'#0#0#0#9'TCheckBox'#11'edtFunction'#4'Left'#2#12#6'Height'#2#17#3'Top'#2 +'t'#9#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport'#0#0#0#9'TCheckBox'#11'edtFu'
+'J'#5'Width'#2'^'#7'Caption'#6#16'Function returns'#7'OnClick'#7#16'edtFunct' +'nction'#4'Left'#2#12#6'Height'#2#17#3'Top'#2'J'#5'Width'#2'a'#7'Caption'#6
+'ionClick'#13'OnEditingDone'#7#22'edtFunctionEditingDone'#8'TabOrder'#2#1#0#0 +#16'Function returns'#7'OnClick'#7#16'edtFunctionClick'#13'OnEditingDone'#7
+#9'TComboBox'#13'edtResultType'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2'J'#5'Wi' +#22'edtFunctionEditingDone'#8'TabOrder'#2#1#0#0#9'TComboBox'#13'edtResultTyp'
+'dth'#3#132#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2 +'e'#4'Left'#2'p'#6'Height'#2#21#3'Top'#2'J'#5'Width'#3#132#1#7'Anchors'#11#5
+#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#2#0#0#7'TButton'#7'Button3'#4 +'akTop'#6'akLeft'#7'akRight'#0#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownL'
+'Left'#2#12#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#9'actNew' +'ist'#8'TabOrder'#2#2#0#0#7'TButton'#7'Button3'#4'Left'#2#12#6'Height'#2#25#3
+'Arg'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4 +'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#9'actNewArg'#7'Anchors'#11#6'akLeft'
+#8'TabOrder'#2#4#0#0#7'TButton'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3 +#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButt'
+'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#17'actUpdateArgument'#7'Anchors'#11#6 +'on'#7'Button4'#4'Left'#3#132#0#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6
+'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0#0 +'Action'#7#17'actUpdateArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'Bo'
+#7'TButton'#7'Button5'#4'Left'#3#248#0#6'Height'#2#25#3'Top'#3#173#1#5'Width' +'rderSpacing.InnerBorder'#2#4#8'TabOrder'#2#5#0#0#7'TButton'#7'Button5'#4'Le'
+#2'l'#6'Action'#7#17'actDeleteArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0 +'ft'#3#248#0#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'l'#6'Action'#7#17'actD'
+#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#6#0#0#0#0#6'TPanel'#6'Panel' +'eleteArgument'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#25'BorderSpacing.Inner'
+'1'#6'Height'#2'2'#3'Top'#3#237#1#5'Width'#3#10#2#5'Align'#7#8'alBottom'#12 +'Border'#2#4#8'TabOrder'#2#6#0#0#0#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Heigh'
+'ClientHeight'#2'2'#11'ClientWidth'#3#10#2#8'TabOrder'#2#1#0#7'TButton'#7'Bu' +'t'#2'2'#3'Top'#3#237#1#5'Width'#3#10#2#5'Align'#7#8'alBottom'#12'ClientHeig'
+'tton1'#4'Left'#3'X'#1#6'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#6'Action'#7#5 +'ht'#2'2'#11'ClientWidth'#3#10#2#8'TabOrder'#2#1#0#7'TButton'#7'Button1'#4'L'
+'actOk'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4 +'eft'#3'X'#1#6'Height'#2#25#3'Top'#2#11#5'Width'#2'K'#6'Action'#7#5'actOk'#7
+#7'Default'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3#176#1#6'He' +'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Defau'
+'ight'#2#25#3'Top'#2#11#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25 +'lt'#9#8'TabOrder'#2#0#0#0#7'TButton'#7'Button2'#4'Left'#3#176#1#6'Height'#2
+'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalR' +#25#3'Top'#2#11#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderS'
+'esult'#2#2#8'TabOrder'#2#1#0#0#0#11'TActionList'#2'AL'#4'left'#3#198#0#3'to' +'pacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2
+'p'#3#241#0#0#7'TAction'#5'actOk'#7'Caption'#6#2'OK'#18'DisableIfNoHandler'#9 +#2#8'TabOrder'#2#1#0#0#0#11'TActionList'#2'AL'#4'left'#3#198#0#3'top'#3#241#0
+#9'OnExecute'#7#12'actOkExecute'#8'OnUpdate'#7#11'actOkUpdate'#0#0#7'TAction' +#0#7'TAction'#5'actOk'#7'Caption'#6#2'OK'#9'OnExecute'#7#12'actOkExecute'#8
+#9'actNewArg'#7'Caption'#6#12'New Argument'#18'DisableIfNoHandler'#9#9'OnExe' +'OnUpdate'#7#11'actOkUpdate'#0#0#7'TAction'#9'actNewArg'#7'Caption'#6#12'New'
+'cute'#7#16'actNewArgExecute'#0#0#7'TAction'#17'actUpdateArgument'#7'Caption' +' Argument'#9'OnExecute'#7#16'actNewArgExecute'#0#0#7'TAction'#17'actUpdateA'
+#6#13'Edit Argument'#18'DisableIfNoHandler'#9#9'OnExecute'#7#24'actUpdateArg' +'rgument'#7'Caption'#6#13'Edit Argument'#9'OnExecute'#7#24'actUpdateArgument'
+'umentExecute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#7'TAction'#17'a' +'Execute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#7'TAction'#17'actDel'
+'ctDeleteArgument'#7'Caption'#6#15'Delete Argument'#18'DisableIfNoHandler'#9 +'eteArgument'#7'Caption'#6#15'Delete Argument'#9'OnExecute'#7#24'actDeleteAr'
+#9'OnExecute'#7#24'actDeleteArgumentExecute'#8'OnUpdate'#7#23'actUpdateArgum' +'gumentExecute'#8'OnUpdate'#7#23'actUpdateArgumentUpdate'#0#0#0#10'TPopupMen'
+'entUpdate'#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2'S'#3'top'#3#217#0#0 +'u'#10'PopupMenu1'#4'left'#2'S'#3'top'#3#217#0#0#0#0
+#0#0
]); ]);

View File

@ -151,7 +151,7 @@ begin
itm := edtParams.ItemFocused; itm := edtParams.ItemFocused;
if Assigned(itm) then begin if Assigned(itm) then begin
prp := TPasArgument(itm.Data); prp := TPasArgument(itm.Data);
if edit_helper.UpdateObject(prp,FSymbolTable) then begin if edit_helper.UpdateObject(TPasElement(prp),FSymbolTable) then begin
itm.Free(); itm.Free();
LoadArgument(prp); LoadArgument(prp);
end; end;