diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po index 24b967130..02355667e 100644 --- a/components/rx/trunk/languages/rxdconst.es.po +++ b/components/rx/trunk/languages/rxdconst.es.po @@ -75,8 +75,8 @@ msgstr "Campo '%s' no usado en expresión de filtro" #: rxdconst.sexprbadnulltest #, fuzzy -#| msgid "NULL-values enabled in '=' и '<>'" -msgid "NULL-values enabled in '=' и '<>'" +#| msgid "NULL-values enabled in '=' и '<>'" +msgid "NULL-values enabled in '=' и '<>'" msgstr "Valor nulo habilitado en '=' y '<>'" #: rxdconst.sexprexpected diff --git a/components/rx/trunk/languages/rxdconst.po b/components/rx/trunk/languages/rxdconst.po index 65236678f..d1d1df4f9 100644 --- a/components/rx/trunk/languages/rxdconst.po +++ b/components/rx/trunk/languages/rxdconst.po @@ -74,7 +74,7 @@ msgid "Field '%s' not used in filter expression" msgstr "" #: rxdconst.sexprbadnulltest -msgid "NULL-values enabled in '=' и '<>'" +msgid "NULL-values enabled in '=' и '<>'" msgstr "" #: rxdconst.sexprexpected diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po index 5e5b697a8..bfe3c79db 100644 --- a/components/rx/trunk/languages/rxdconst.ru.po +++ b/components/rx/trunk/languages/rxdconst.ru.po @@ -75,8 +75,8 @@ msgstr "Поле '%s' не может быть использовано в вы #: rxdconst.sexprbadnulltest #, fuzzy -#| msgid "NULL-values enabled in '=' и '<>'" -msgid "NULL-values enabled in '=' и '<>'" +#| msgid "NULL-values enabled in '=' и '<>'" +msgid "NULL-values enabled in '=' и '<>'" msgstr "NULL-значения разрешены только в выражениях '=' и '<>'" #: rxdconst.sexprexpected diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po index 4fde60bdb..9f1dd6381 100644 --- a/components/rx/trunk/languages/rxdconst.uk.po +++ b/components/rx/trunk/languages/rxdconst.uk.po @@ -84,8 +84,8 @@ msgstr "Поле '%s' не може бути використане в вира #: rxdconst.sexprbadnulltest #, fuzzy -#| msgid "NULL-values enabled in '=' и '<>'" -msgid "NULL-values enabled in '=' и '<>'" +#| msgid "NULL-values enabled in '=' и '<>'" +msgid "NULL-values enabled in '=' и '<>'" msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'" #: rxdconst.sexprexpected diff --git a/components/rx/trunk/seldsfrm.lfm b/components/rx/trunk/seldsfrm.lfm index 04276bd6c..ab29b1d9d 100644 --- a/components/rx/trunk/seldsfrm.lfm +++ b/components/rx/trunk/seldsfrm.lfm @@ -9,15 +9,15 @@ object SelectDataSetForm: TSelectDataSetForm ClientWidth = 400 OnCreate = FormCreate Position = poScreenCenter - LCLVersion = '0.9.29' + LCLVersion = '1.3' object Label1: TLabel AnchorSideLeft.Control = Owner AnchorSideTop.Control = CheckBox1 AnchorSideTop.Side = asrBottom Left = 6 - Height = 18 - Top = 31 - Width = 106 + Height = 21 + Top = 35 + Width = 98 BorderSpacing.Around = 6 Caption = 'Sourse dataset' FocusControl = DataSetList @@ -27,9 +27,9 @@ object SelectDataSetForm: TSelectDataSetForm AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner Left = 6 - Height = 19 + Height = 23 Top = 6 - Width = 156 + Width = 154 BorderSpacing.Around = 6 Caption = 'Copy only metadata' OnChange = CheckBox1Change @@ -43,22 +43,31 @@ object SelectDataSetForm: TSelectDataSetForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = ButtonPanel1 Left = 6 - Height = 208 - Top = 55 + Height = 200 + Top = 62 Width = 388 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 ItemHeight = 0 OnDblClick = ListBox1DblClick OnKeyPress = ListBox1KeyPress + ScrollWidth = 386 TabOrder = 1 TopIndex = -1 end object ButtonPanel1: TButtonPanel Left = 6 - Height = 40 - Top = 269 + Height = 41 + Top = 268 Width = 388 + OKButton.Name = 'OKButton' + OKButton.DefaultCaption = True + HelpButton.Name = 'HelpButton' + HelpButton.DefaultCaption = True + CloseButton.Name = 'CloseButton' + CloseButton.DefaultCaption = True + CancelButton.Name = 'CancelButton' + CancelButton.DefaultCaption = True TabOrder = 2 ShowButtons = [pbOK, pbCancel, pbHelp] end diff --git a/components/rx/trunk/seldsfrm.lrs b/components/rx/trunk/seldsfrm.lrs deleted file mode 100644 index 3164ac634..000000000 --- a/components/rx/trunk/seldsfrm.lrs +++ /dev/null @@ -1,26 +0,0 @@ -{ This is an automatically generated lazarus resource file } - -LazarusResources.Add('TSelectDataSetForm','FORMDATA',[ - 'TPF0'#18'TSelectDataSetForm'#17'SelectDataSetForm'#4'Left'#3#189#1#6'Height' - +#3';'#1#3'Top'#3#197#0#5'Width'#3#144#1#13'ActiveControl'#7#9'CheckBox1'#7'C' - +'aption'#6#25'Select dataset to copy to'#12'ClientHeight'#3';'#1#11'ClientWi' - +'dth'#3#144#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter' - +#10'LCLVersion'#6#6'0.9.29'#0#6'TLabel'#6'Label1'#22'AnchorSideLeft.Control' - +#7#5'Owner'#21'AnchorSideTop.Control'#7#9'CheckBox1'#18'AnchorSideTop.Side'#7 - +#9'asrBottom'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#31#5'Width'#2'j'#20'Border' - +'Spacing.Around'#2#6#7'Caption'#6#14'Sourse dataset'#12'FocusControl'#7#11'D' - +'ataSetList'#11'ParentColor'#8#0#0#9'TCheckBox'#9'CheckBox1'#22'AnchorSideLe' - +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#6#6'H' - +'eight'#2#19#3'Top'#2#6#5'Width'#3#156#0#20'BorderSpacing.Around'#2#6#7'Capt' - +'ion'#6#18'Copy only metadata'#8'OnChange'#7#15'CheckBox1Change'#8'TabOrder' - +#2#0#0#0#8'TListBox'#11'DataSetList'#22'AnchorSideLeft.Control'#7#5'Owner'#21 - +'AnchorSideTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23 - +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom' - +#24'AnchorSideBottom.Control'#7#12'ButtonPanel1'#4'Left'#2#6#6'Height'#3#208 - +#0#3'Top'#2'7'#5'Width'#3#132#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8 - +'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#0#10'OnDblClick'#7 - +#16'ListBox1DblClick'#10'OnKeyPress'#7#16'ListBox1KeyPress'#8'TabOrder'#2#1#8 - +'TopIndex'#2#255#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Height' - +#2'('#3'Top'#3#13#1#5'Width'#3#132#1#8'TabOrder'#2#2#11'ShowButtons'#11#4'pb' - +'OK'#8'pbCancel'#6'pbHelp'#0#0#0#0 -]); diff --git a/components/rx/trunk/seldsfrm.pas b/components/rx/trunk/seldsfrm.pas index 2127d4153..7c2144361 100644 --- a/components/rx/trunk/seldsfrm.pas +++ b/components/rx/trunk/seldsfrm.pas @@ -87,6 +87,8 @@ var implementation uses rxmemds, rxdconst; +{$R *.lfm} + function SelectDataSet(ADesigner: TComponentEditorDesigner; const ACaption: string; ExcludeDataSet: TDataSet): TDataSet; begin @@ -286,8 +288,5 @@ begin Result:=DefaultEditor.GetVerbCount + 1; end; -initialization - {$I seldsfrm.lrs} - end.