IDE: renamed lazdocselectinherited.pas to fpdocselectinherited.pas

git-svn-id: trunk@13515 -
This commit is contained in:
mattias 2007-12-29 11:05:52 +00:00
parent e27df21ad7
commit e26daf951a
6 changed files with 30 additions and 29 deletions

6
.gitattributes vendored
View File

@ -1955,6 +1955,9 @@ ide/findreplacedialog.lrs svneol=native#text/plain
ide/findreplacedialog.pp svneol=native#text/pascal ide/findreplacedialog.pp svneol=native#text/pascal
ide/formeditor.pp svneol=native#text/pascal ide/formeditor.pp svneol=native#text/pascal
ide/fpdochints.pas svneol=native#text/plain ide/fpdochints.pas svneol=native#text/plain
ide/fpdocselectinherited.lfm svneol=native#text/plain
ide/fpdocselectinherited.lrs svneol=native#text/plain
ide/fpdocselectinherited.pas svneol=native#text/plain
ide/frmcustomapplicationoptions.lfm svneol=native#text/plain ide/frmcustomapplicationoptions.lfm svneol=native#text/plain
ide/frmcustomapplicationoptions.lrs svneol=native#text/plain ide/frmcustomapplicationoptions.lrs svneol=native#text/plain
ide/frmcustomapplicationoptions.pas svneol=native#text/plain ide/frmcustomapplicationoptions.pas svneol=native#text/plain
@ -2008,9 +2011,6 @@ ide/lazconf.pp svneol=native#text/pascal
ide/lazdocfrm.lfm svneol=native#text/plain ide/lazdocfrm.lfm svneol=native#text/plain
ide/lazdocfrm.lrs svneol=native#text/plain ide/lazdocfrm.lrs svneol=native#text/plain
ide/lazdocfrm.pas svneol=native#text/plain ide/lazdocfrm.pas svneol=native#text/plain
ide/lazdocselectinherited.lfm svneol=native#text/plain
ide/lazdocselectinherited.lrs svneol=native#text/plain
ide/lazdocselectinherited.pas svneol=native#text/plain
ide/lrtpotools.pas svneol=native#text/pascal ide/lrtpotools.pas svneol=native#text/pascal
ide/macropromptdlg.pas svneol=native#text/pascal ide/macropromptdlg.pas svneol=native#text/pascal
ide/main.pp svneol=native#text/pascal ide/main.pp svneol=native#text/pascal

View File

@ -1,4 +1,4 @@
object LazDocSelectInheritedDlg: TLazDocSelectInheritedDlg object FPDocSelectInheritedDlg: TFPDocSelectInheritedDlg
Left = 282 Left = 282
Height = 75 Height = 75
Top = 158 Top = 158
@ -6,7 +6,7 @@ object LazDocSelectInheritedDlg: TLazDocSelectInheritedDlg
HorzScrollBar.Page = 329 HorzScrollBar.Page = 329
VertScrollBar.Page = 74 VertScrollBar.Page = 74
ActiveControl = OkButton ActiveControl = OkButton
Caption = 'LazDocSelectInheritedDlg' Caption = 'FPDocSelectInheritedDlg'
ClientHeight = 75 ClientHeight = 75
ClientWidth = 330 ClientWidth = 330
OnCreate = FormCreate OnCreate = FormCreate

View File

@ -1,12 +1,13 @@
{ This is an automatically generated lazarus resource file } { This is an automatically generated lazarus resource file }
LazarusResources.Add('TLazDocSelectInheritedDlg','FORMDATA',[
'TPF0'#25'TLazDocSelectInheritedDlg'#24'LazDocSelectInheritedDlg'#4'Left'#3#26 LazarusResources.Add('TFPDocSelectInheritedDlg','FORMDATA',[
+#1#6'Height'#2'K'#3'Top'#3#158#0#5'Width'#3'J'#1#18'HorzScrollBar.Page'#3'I' 'TPF0'#24'TFPDocSelectInheritedDlg'#23'FPDocSelectInheritedDlg'#4'Left'#3#26#1
+#1#18'VertScrollBar.Page'#2'J'#13'ActiveControl'#7#8'OkButton'#7'Caption'#6 +#6'Height'#2'K'#3'Top'#3#158#0#5'Width'#3'J'#1#18'HorzScrollBar.Page'#3'I'#1
+#24'LazDocSelectInheritedDlg'#12'ClientHeight'#2'K'#11'ClientWidth'#3'J'#1#8 +#18'VertScrollBar.Page'#2'J'#13'ActiveControl'#7#8'OkButton'#7'Caption'#6#23
+'OnCreate'#7#10'FormCreate'#0#9'TComboBox'#17'InheritedComboBox'#4'Left'#2#8 +'FPDocSelectInheritedDlg'#12'ClientHeight'#2'K'#11'ClientWidth'#3'J'#1#8'OnC'
+#6'Height'#2#25#3'Top'#2#8#5'Width'#3'8'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7 +'reate'#7#10'FormCreate'#0#9'TComboBox'#17'InheritedComboBox'#4'Left'#2#8#6
+'Height'#2#25#3'Top'#2#8#5'Width'#3'8'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearc' +'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearc'
+'hAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#17'InheritedComboB' +'hAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#17'InheritedComboB'
+'ox'#0#0#7'TButton'#8'OkButton'#4'Left'#2#24#6'Height'#2#25#3'Top'#2'('#5'Wi' +'ox'#0#0#7'TButton'#8'OkButton'#4'Left'#2#24#6'Height'#2#25#3'Top'#2'('#5'Wi'

View File

@ -24,7 +24,7 @@
* * * *
*************************************************************************** ***************************************************************************
} }
unit LazDocSelectInherited; unit FPDocSelectInherited;
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
@ -36,9 +36,9 @@ uses
type type
{ TLazDocSelectInheritedDlg } { TFPDocSelectInheritedDlg }
TLazDocSelectInheritedDlg = class(TForm) TFPDocSelectInheritedDlg = class(TForm)
OkButton: TButton; OkButton: TButton;
CancelButton: TButton; CancelButton: TButton;
InheritedComboBox: TComboBox; InheritedComboBox: TComboBox;
@ -47,9 +47,9 @@ type
implementation implementation
{ TLazDocSelectInheritedDlg } { TFPDocSelectInheritedDlg }
procedure TLazDocSelectInheritedDlg.FormCreate(Sender: TObject); procedure TFPDocSelectInheritedDlg.FormCreate(Sender: TObject);
begin begin
Caption:='Select an inherited entry'; Caption:='Select an inherited entry';
OkButton.Caption:='Ok'; OkButton.Caption:='Ok';
@ -57,7 +57,7 @@ begin
end; end;
initialization initialization
{$I lazdocselectinherited.lrs} {$I fpdocselectinherited.lrs}
end. end.

View File

@ -50,7 +50,7 @@ uses
IDEHelpIntf, LazHelpIntf, IDEHelpIntf, LazHelpIntf,
// IDE // IDE
IDEOptionDefs, EnvironmentOpts, IDEOptionDefs, EnvironmentOpts,
IDEProcs, LazarusIDEStrConsts, LazDocSelectInherited, CodeHelp; IDEProcs, LazarusIDEStrConsts, FPDocSelectInherited, CodeHelp;
type type
TLazDocFormFlag = ( TLazDocFormFlag = (
@ -366,12 +366,12 @@ var
i: Integer; i: Integer;
Element: TLazDocElement; Element: TLazDocElement;
Candidates: TFPList; Candidates: TFPList;
LazDocSelectInheritedDlg: TLazDocSelectInheritedDlg; FPDocSelectInheritedDlg: TFPDocSelectInheritedDlg;
ShortDescr: String; ShortDescr: String;
begin begin
if fChain=nil then exit; if fChain=nil then exit;
Candidates:=nil; Candidates:=nil;
LazDocSelectInheritedDlg:=nil; FPDocSelectInheritedDlg:=nil;
try try
// find all entries till the first inherited entry with a description // find all entries till the first inherited entry with a description
for i:=1 to fChain.Count-1 do begin for i:=1 to fChain.Count-1 do begin
@ -404,15 +404,15 @@ begin
end else begin end else begin
// there is more than one candidate // there is more than one candidate
// => ask which one to replace // => ask which one to replace
LazDocSelectInheritedDlg:=TLazDocSelectInheritedDlg.Create(nil); FPDocSelectInheritedDlg:=TFPDocSelectInheritedDlg.Create(nil);
LazDocSelectInheritedDlg.InheritedComboBox.Items.Clear; FPDocSelectInheritedDlg.InheritedComboBox.Items.Clear;
for i:=0 to Candidates.Count-1 do begin for i:=0 to Candidates.Count-1 do begin
Element:=TLazDocElement(Candidates[i]); Element:=TLazDocElement(Candidates[i]);
LazDocSelectInheritedDlg.InheritedComboBox.Items.Add( FPDocSelectInheritedDlg.InheritedComboBox.Items.Add(
GetContextTitle(Element)); GetContextTitle(Element));
end; end;
if LazDocSelectInheritedDlg.ShowModal<>mrOk then exit; if FPDocSelectInheritedDlg.ShowModal<>mrOk then exit;
i:=LazDocSelectInheritedDlg.InheritedComboBox.ItemIndex; i:=FPDocSelectInheritedDlg.InheritedComboBox.ItemIndex;
if i<0 then exit; if i<0 then exit;
Element:=TLazDocElement(Candidates[i]); Element:=TLazDocElement(Candidates[i]);
end; end;
@ -420,7 +420,7 @@ begin
// move the content of the current entry to the inherited entry // move the content of the current entry to the inherited entry
MoveToInherited(Element); MoveToInherited(Element);
finally finally
LazDocSelectInheritedDlg.Free; FPDocSelectInheritedDlg.Free;
Candidates.Free; Candidates.Free;
end; end;
end; end;

View File

@ -60,7 +60,7 @@ uses
CodeTemplatesDlg, TodoDlg, TodoList, CodeTemplatesDlg, TodoDlg, TodoList,
SortSelectionDlg, EncloseSelectionDlg, DiffDialog, ConDef, InvertAssignTool, SortSelectionDlg, EncloseSelectionDlg, DiffDialog, ConDef, InvertAssignTool,
SourceEditProcs, SourceMarks, CharacterMapDlg, SearchFrm, SourceEditProcs, SourceMarks, CharacterMapDlg, SearchFrm,
LazDocHints, LazDocFrm, FPDocHints, LazDocFrm,
BaseDebugManager, Debugger, MainIntf; BaseDebugManager, Debugger, MainIntf;
type type
@ -4806,7 +4806,7 @@ begin
if SrcEditHintWindow=nil then begin if SrcEditHintWindow=nil then begin
SrcEditHintWindow:=TSrcEditHintWindow.Create(Self); SrcEditHintWindow:=TSrcEditHintWindow.Create(Self);
SrcEditHintWindow.Name:='TSourceNotebook_SrcEditHintWindow'; SrcEditHintWindow.Name:='TSourceNotebook_SrcEditHintWindow';
SrcEditHintWindow.Provider:=TLazDocHintProvider.Create(SrcEditHintWindow); SrcEditHintWindow.Provider:=TFPDocHintProvider.Create(SrcEditHintWindow);
end; end;
SrcEditHintWindow.AnchorForm:=CurCompletionControl.TheForm; SrcEditHintWindow.AnchorForm:=CurCompletionControl.TheForm;
{$IFDEF EnableCodeHelp} {$IFDEF EnableCodeHelp}