RxFPC:move registration TRxTextHolder from dcl_rxtools to rxnew

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6712 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-11-06 10:10:35 +00:00
parent 7594584f05
commit de7bf60e11
4 changed files with 42 additions and 22 deletions

View File

@ -58,7 +58,6 @@ type
procedure RegisterRxTextHolder; procedure RegisterRxTextHolder;
begin begin
RegisterComponents(sRxToolsPage,[TRxTextHolder]);
RegisterComponentEditor(TRxTextHolder, TRxTextHolderEditor); RegisterComponentEditor(TRxTextHolder, TRxTextHolderEditor);
end; end;

View File

@ -6,12 +6,14 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
Caption = 'RxTextHolder' Caption = 'RxTextHolder'
ClientHeight = 592 ClientHeight = 592
ClientWidth = 806 ClientWidth = 806
OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
Position = poScreenCenter
LCLVersion = '2.1.0.0' LCLVersion = '2.1.0.0'
object ButtonPanel1: TButtonPanel object ButtonPanel1: TButtonPanel
Left = 6 Left = 6
Height = 42 Height = 46
Top = 544 Top = 540
Width = 794 Width = 794
OKButton.Name = 'OKButton' OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True OKButton.DefaultCaption = True
@ -26,11 +28,11 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 538 Height = 534
Top = 0 Top = 0
Width = 170 Width = 170
Align = alLeft Align = alLeft
ClientHeight = 538 ClientHeight = 534
ClientWidth = 170 ClientWidth = 170
TabOrder = 1 TabOrder = 1
object ListBox1: TListBox object ListBox1: TListBox
@ -40,7 +42,7 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = BitBtn1 AnchorSideBottom.Control = BitBtn1
Left = 1 Left = 1
Height = 507 Height = 496
Top = 1 Top = 1
Width = 168 Width = 168
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
@ -58,8 +60,8 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideBottom.Control = Panel1 AnchorSideBottom.Control = Panel1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 29 Height = 36
Top = 508 Top = 497
Width = 84 Width = 84
Action = itemAdd Action = itemAdd
Anchors = [akLeft, akRight, akBottom] Anchors = [akLeft, akRight, akBottom]
@ -73,11 +75,12 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideBottom.Control = Panel1 AnchorSideBottom.Control = Panel1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 85 Left = 85
Height = 30 Height = 36
Top = 507 Top = 497
Width = 84 Width = 84
Action = itemRemove Action = itemRemove
Anchors = [akLeft, akRight, akBottom] Anchors = [akLeft, akRight, akBottom]
AutoSize = True
TabOrder = 2 TabOrder = 2
end end
object CLabel1: TLabel object CLabel1: TLabel
@ -93,17 +96,17 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 170 Left = 170
Height = 538 Height = 534
Top = 0 Top = 0
Width = 5 Width = 5
end end
object Panel2: TPanel object Panel2: TPanel
Left = 175 Left = 175
Height = 538 Height = 534
Top = 0 Top = 0
Width = 631 Width = 631
Align = alClient Align = alClient
ClientHeight = 538 ClientHeight = 534
ClientWidth = 631 ClientWidth = 631
TabOrder = 3 TabOrder = 3
object Edit1: TEdit object Edit1: TEdit
@ -112,10 +115,10 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideTop.Control = Panel2 AnchorSideTop.Control = Panel2
AnchorSideRight.Control = Panel2 AnchorSideRight.Control = Panel2
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 57 Left = 55
Height = 27 Height = 37
Top = 1 Top = 1
Width = 573 Width = 575
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
OnExit = Edit1Exit OnExit = Edit1Exit
TabOrder = 0 TabOrder = 0
@ -125,9 +128,9 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideBottom.Control = Edit1 AnchorSideBottom.Control = Edit1
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 17 Height = 20
Top = 11 Top = 18
Width = 50 Width = 48
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
BorderSpacing.Right = 6 BorderSpacing.Right = 6
Caption = 'Caption' Caption = 'Caption'
@ -142,8 +145,8 @@ object RxTextHolder_EditorForm: TRxTextHolder_EditorForm
AnchorSideBottom.Control = Panel2 AnchorSideBottom.Control = Panel2
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 1 Left = 1
Height = 509 Height = 495
Top = 28 Top = 38
Width = 629 Width = 629
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
Lines.Strings = ( Lines.Strings = (

View File

@ -61,6 +61,7 @@ type
PopupMenu1: TPopupMenu; PopupMenu1: TPopupMenu;
Splitter1: TSplitter; Splitter1: TSplitter;
procedure Edit1Exit(Sender: TObject); procedure Edit1Exit(Sender: TObject);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure itemAddExecute(Sender: TObject); procedure itemAddExecute(Sender: TObject);
procedure itemRemoveExecute(Sender: TObject); procedure itemRemoveExecute(Sender: TObject);
@ -141,6 +142,16 @@ begin
end; end;
end; end;
procedure TRxTextHolder_EditorForm.FormCloseQuery(Sender: TObject;
var CanClose: boolean);
begin
if ModalResult = mrOk then
begin
Edit1Exit(nil);
Memo1Exit(nil);
end;
end;
procedure TRxTextHolder_EditorForm.ListBox1Click(Sender: TObject); procedure TRxTextHolder_EditorForm.ListBox1Click(Sender: TObject);
begin begin
if (ListBox1.ItemIndex>=0) and (ListBox1.ItemIndex<ListBox1.Items.Count) then if (ListBox1.ItemIndex>=0) and (ListBox1.ItemIndex<ListBox1.Items.Count) then

View File

@ -41,7 +41,8 @@ uses
procedure Register; procedure Register;
implementation implementation
uses RxSystemServices, RxLogin, RxVersInfo, RxCloseFormValidator, RxIniPropStorage, RxXMLPropStorage, RxPopupNotifier; uses RxSystemServices, RxLogin, RxVersInfo, RxCloseFormValidator, RxIniPropStorage, RxXMLPropStorage, RxPopupNotifier,
RxTextHolder;
const const
sRxToolsPage = 'RX Tools'; sRxToolsPage = 'RX Tools';
@ -81,6 +82,11 @@ begin
RegisterComponents(sRxToolsPage,[TRxPopupNotifier]); RegisterComponents(sRxToolsPage,[TRxPopupNotifier]);
end; end;
procedure RegisterRxTextHolder;
begin
RegisterComponents(sRxToolsPage,[TRxTextHolder]);
end;
procedure Register; procedure Register;
begin begin
RegisterUnit('RxLogin', @RegisterRxLogin); RegisterUnit('RxLogin', @RegisterRxLogin);
@ -90,6 +96,7 @@ begin
RegisterUnit('RxIniPropStorage', @RegisterRxIniPropStorage); RegisterUnit('RxIniPropStorage', @RegisterRxIniPropStorage);
RegisterUnit('RxXMLPropStorage', @RegisterRxXMLPropStorage); RegisterUnit('RxXMLPropStorage', @RegisterRxXMLPropStorage);
RegisterUnit('RxPopupNotifier', @RegisterRxPopupNotifier); RegisterUnit('RxPopupNotifier', @RegisterRxPopupNotifier);
RegisterUnit('RxTextHolder', @RegisterRxTextHolder);
end; end;
end. end.